diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a425b0c0..d56446589 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ ### 0.6.11 **Bugfixes** - Fixed crafting patterns crashing when item of an input or output no longer exists +- Fixed importer / exporter / crafter not being able to interact with some inventories + +**NOTE: Backwards incompatible changes** + +Machines that can be whitelisted or blacklisted are now blacklisted by default. + +Machines used to work with an empty whitelist, now they don't anymore. They now just work with an empty blacklist. + +That means all machines with default empty whitelists from the previous version will no longer work. + +If you want to have the old behaviour back, change the machine to be in blacklist mode. ### 0.6.10 **Bugfixes** diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java index 3a1b7c97c..e2b770510 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java @@ -5,6 +5,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.gui.GuiBase; import refinedstorage.network.MessageModeToggle; import refinedstorage.tile.config.IModeConfig; +import refinedstorage.tile.config.ModeConstants; public class SideButtonMode extends SideButton { private IModeConfig config; @@ -15,7 +16,7 @@ public class SideButtonMode extends SideButton { @Override public String getTooltip(GuiBase gui) { - return TextFormatting.GREEN + gui.t("sidebutton.refinedstorage:mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:mode." + (config.isWhitelist() ? "whitelist" : "blacklist")); + return TextFormatting.GREEN + gui.t("sidebutton.refinedstorage:mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:mode." + (config.getMode() == ModeConstants.WHITELIST ? "whitelist" : "blacklist")); } @Override @@ -24,9 +25,9 @@ public class SideButtonMode extends SideButton { int tx = 0; - if (config.isWhitelist()) { + if (config.getMode() == ModeConstants.WHITELIST) { tx = 0; - } else if (config.isBlacklist()) { + } else if (config.getMode() == ModeConstants.WHITELIST) { tx = 16; } diff --git a/src/main/java/refinedstorage/network/MessageModeToggle.java b/src/main/java/refinedstorage/network/MessageModeToggle.java index 22ffd847a..c7202adf5 100755 --- a/src/main/java/refinedstorage/network/MessageModeToggle.java +++ b/src/main/java/refinedstorage/network/MessageModeToggle.java @@ -6,6 +6,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.config.IModeConfig; +import refinedstorage.tile.config.ModeConstants; public class MessageModeToggle extends MessageHandlerPlayerToServer implements IMessage { private int x; @@ -42,10 +43,10 @@ public class MessageModeToggle extends MessageHandlerPlayerToServer