diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 2c5d3b751d..6fe2b66161 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -173,7 +173,7 @@ public class Blocks{ payloadConveyor, payloadRouter, reinforcedPayloadConveyor, reinforcedPayloadRouter, payloadMassDriver, largePayloadMassDriver, smallDeconstructor, deconstructor, constructor, largeConstructor, payloadLoader, payloadUnloader, //logic - message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, logicDisplayTile, memoryCell, memoryBank, + message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, tileLogicDisplay, memoryCell, memoryBank, canvas, reinforcedMessage, worldProcessor, worldCell, worldMessage, worldSwitch, @@ -6819,7 +6819,7 @@ public class Blocks{ size = 6; }}; - logicDisplayTile = new TileableLogicDisplay("tile-logic-display"){{ + tileLogicDisplay = new TileableLogicDisplay("tile-logic-display"){{ requirements(Category.logic, with(Items.lead, 8, Items.silicon, 8, Items.metaglass, 8, Items.phaseFabric, 3)); }}; diff --git a/core/src/mindustry/content/SerpuloTechTree.java b/core/src/mindustry/content/SerpuloTechTree.java index 062f8b3029..f8ebcea4d9 100644 --- a/core/src/mindustry/content/SerpuloTechTree.java +++ b/core/src/mindustry/content/SerpuloTechTree.java @@ -175,7 +175,7 @@ public class SerpuloTechTree{ }); - node(logicDisplayTile, () -> { + node(tileLogicDisplay, () -> { }); }); diff --git a/core/src/mindustry/world/blocks/logic/LogicDisplay.java b/core/src/mindustry/world/blocks/logic/LogicDisplay.java index 2b65768cb0..d29fe877a5 100644 --- a/core/src/mindustry/world/blocks/logic/LogicDisplay.java +++ b/core/src/mindustry/world/blocks/logic/LogicDisplay.java @@ -185,7 +185,7 @@ public class LogicDisplay extends Block{ Tmp.tr1.set(displays.get(id).buffer.getTexture()); Draw.rect(Tmp.tr1, x, y, p2, p2, p3 + 90); } - }else if(ctype < ContentType.all.length && Vars.content.getByID(ContentType.all[p4], id) instanceof UnlockableContent u){ + }else if(ctype < ContentType.all.length && Vars.content.getByID(ContentType.all[ctype], id) instanceof UnlockableContent u){ var icon = u.fullIcon; Draw.rect(icon, x, y, p2, p2 / icon.ratio(), p3); }