diff --git a/src/main/java/refinedstorage/gui/GuiCrafter.java b/src/main/java/refinedstorage/gui/GuiCrafter.java index c25f9d12d..64358b1be 100755 --- a/src/main/java/refinedstorage/gui/GuiCrafter.java +++ b/src/main/java/refinedstorage/gui/GuiCrafter.java @@ -1,7 +1,7 @@ package refinedstorage.gui; import refinedstorage.container.ContainerCrafter; -import refinedstorage.gui.sidebutton.SideButtonCrafterAutocraftSignal; +import refinedstorage.gui.sidebutton.SideButtonCrafterTriggeredAutocrafting; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileCrafter; @@ -13,7 +13,7 @@ public class GuiCrafter extends GuiBase { @Override public void init(int x, int y) { addSideButton(new SideButtonRedstoneMode(TileCrafter.REDSTONE_MODE)); - addSideButton(new SideButtonCrafterAutocraftSignal()); + addSideButton(new SideButtonCrafterTriggeredAutocrafting()); } @Override diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCrafterAutocraftSignal.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java similarity index 61% rename from src/main/java/refinedstorage/gui/sidebutton/SideButtonCrafterAutocraftSignal.java rename to src/main/java/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java index dc1fb957f..259468035 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCrafterAutocraftSignal.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java @@ -5,10 +5,10 @@ import refinedstorage.gui.GuiBase; import refinedstorage.tile.TileCrafter; import refinedstorage.tile.data.TileDataManager; -public class SideButtonCrafterAutocraftSignal extends SideButton { +public class SideButtonCrafterTriggeredAutocrafting extends SideButton { @Override public String getTooltip(GuiBase gui) { - return TextFormatting.GREEN + gui.t("sidebutton.refinedstorage:crafter.autocraft_signal") + TextFormatting.RESET + "\n" + gui.t("gui." + (TileCrafter.AUTOCRAFT_SIGNAL.getValue() ? "yes" : "no")); + return TextFormatting.GREEN + gui.t("sidebutton.refinedstorage:crafter.triggered_autocrafting") + TextFormatting.RESET + "\n" + gui.t("gui." + (TileCrafter.TRIGGERED_AUTOCRAFTING.getValue() ? "yes" : "no")); } @Override @@ -19,6 +19,6 @@ public class SideButtonCrafterAutocraftSignal extends SideButton { @Override public void actionPerformed() { - TileDataManager.setParameter(TileCrafter.AUTOCRAFT_SIGNAL, !TileCrafter.AUTOCRAFT_SIGNAL.getValue()); + TileDataManager.setParameter(TileCrafter.TRIGGERED_AUTOCRAFTING, !TileCrafter.TRIGGERED_AUTOCRAFTING.getValue()); } } diff --git a/src/main/java/refinedstorage/tile/TileCrafter.java b/src/main/java/refinedstorage/tile/TileCrafter.java index 3754aa245..c333001c3 100755 --- a/src/main/java/refinedstorage/tile/TileCrafter.java +++ b/src/main/java/refinedstorage/tile/TileCrafter.java @@ -26,21 +26,21 @@ import java.util.ArrayList; import java.util.List; public class TileCrafter extends TileNode implements ICraftingPatternContainer { - public static final TileDataParameter AUTOCRAFT_SIGNAL = new TileDataParameter<>(DataSerializers.BOOLEAN, false, new ITileDataProducer() { + public static final TileDataParameter TRIGGERED_AUTOCRAFTING = new TileDataParameter<>(DataSerializers.BOOLEAN, false, new ITileDataProducer() { @Override public Boolean getValue(TileCrafter tile) { - return tile.autocraftSignal; + return tile.triggeredAutocrafting; } }, new ITileDataConsumer() { @Override public void setValue(TileCrafter tile, Boolean value) { - tile.autocraftSignal = value; + tile.triggeredAutocrafting = value; tile.markDirty(); } }); - private static final String NBT_AUTOCRAFT_SIGNAL = "AutocraftSignal"; + private static final String NBT_TRIGGERED_AUTOCRAFTING = "TriggeredAutocrafting"; private ItemHandlerBasic patterns = new ItemHandlerBasic(9, this, stack -> stack.getItem() instanceof ICraftingPatternProvider) { @Override @@ -61,10 +61,10 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer { private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED); - private boolean autocraftSignal = false; + private boolean triggeredAutocrafting = false; public TileCrafter() { - dataManager.addWatchedParameter(AUTOCRAFT_SIGNAL); + dataManager.addWatchedParameter(TRIGGERED_AUTOCRAFTING); } private void rebuildPatterns() { @@ -107,7 +107,7 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer { @Override public void updateNode() { - if (autocraftSignal && worldObj.isBlockPowered(pos)) { + if (triggeredAutocrafting && worldObj.isBlockPowered(pos)) { for (ICraftingPattern pattern : actualPatterns) { for (ItemStack output : pattern.getOutputs()) { NetworkUtils.scheduleCraftingTaskIfUnscheduled(network, output, 1, CompareUtils.COMPARE_DAMAGE | CompareUtils.COMPARE_NBT); @@ -131,8 +131,8 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer { public void read(NBTTagCompound tag) { super.read(tag); - if (tag.hasKey(NBT_AUTOCRAFT_SIGNAL)) { - autocraftSignal = tag.getBoolean(NBT_AUTOCRAFT_SIGNAL); + if (tag.hasKey(NBT_TRIGGERED_AUTOCRAFTING)) { + triggeredAutocrafting = tag.getBoolean(NBT_TRIGGERED_AUTOCRAFTING); } readItems(patterns, 0, tag); @@ -143,7 +143,7 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer { public NBTTagCompound write(NBTTagCompound tag) { super.write(tag); - tag.setBoolean(NBT_AUTOCRAFT_SIGNAL, autocraftSignal); + tag.setBoolean(NBT_TRIGGERED_AUTOCRAFTING, triggeredAutocrafting); writeItems(patterns, 0, tag); writeItems(upgrades, 1, tag); diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 29863d3b6..f400594a6 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -104,7 +104,7 @@ sidebutton.refinedstorage:detector.mode.1=Emit signal when on the amount sidebutton.refinedstorage:detector.mode.2=Emit signal when above the amount sidebutton.refinedstorage:detector.mode.3=Emit signal when is autocrafting -sidebutton.refinedstorage:crafter.autocraft_signal=Trigger autocrafting with redstone signal +sidebutton.refinedstorage:crafter.triggered_autocrafting=Trigger autocrafting with redstone signal block.refinedstorage:controller.0.name=Controller block.refinedstorage:controller.1.name=Creative Controller