From be8913d7224b3ece4b2947d27c72c5b44567fac4 Mon Sep 17 00:00:00 2001 From: Blay09 Date: Fri, 26 Aug 2016 14:55:41 +0200 Subject: [PATCH 1/2] Add CraftingTweaks integration --- .../java/refinedstorage/RefinedStorage.java | 3 ++ .../IntegrationCraftingTweaks.java | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/main/java/refinedstorage/integration/IntegrationCraftingTweaks.java diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java index 93bd19006..34b101c70 100755 --- a/src/main/java/refinedstorage/RefinedStorage.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -14,6 +14,7 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import refinedstorage.integration.IntegrationCraftingTweaks; import refinedstorage.proxy.CommonProxy; @Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION, dependencies = RefinedStorage.DEPENDENCIES) @@ -149,6 +150,8 @@ public final class RefinedStorage { translucentCables = config.getBoolean("translucentCables", "misc", false, "For resource pack makers that want a translucent cable"); config.save(); + + IntegrationCraftingTweaks.register(); } @EventHandler diff --git a/src/main/java/refinedstorage/integration/IntegrationCraftingTweaks.java b/src/main/java/refinedstorage/integration/IntegrationCraftingTweaks.java new file mode 100644 index 000000000..8fe1959b0 --- /dev/null +++ b/src/main/java/refinedstorage/integration/IntegrationCraftingTweaks.java @@ -0,0 +1,31 @@ +package refinedstorage.integration; + +import com.google.common.base.Function; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import refinedstorage.block.EnumGridType; +import refinedstorage.container.ContainerGrid; + +public class IntegrationCraftingTweaks { + + public static final String MOD_ID = "craftingtweaks"; + + public static void register() { + if(Loader.isModLoaded(MOD_ID)) { + NBTTagCompound tagCompound = new NBTTagCompound(); + tagCompound.setString("ContainerClass", ContainerGrid.class.getName()); + tagCompound.setString("ContainerCallback", ContainerCallback.class.getName()); + tagCompound.setInteger("GridSlotNumber", 36); + tagCompound.setString("AlignToGrid", "left"); + FMLInterModComms.sendMessage(MOD_ID, "RegisterProvider", tagCompound); + } + } + + public static class ContainerCallback implements Function { + @Override + public Boolean apply(ContainerGrid containerGrid) { + return containerGrid.getGrid().getType() == EnumGridType.CRAFTING; + } + } +} From bc002e1c934e71e117e2a37d8695d0ff06f2f5e7 Mon Sep 17 00:00:00 2001 From: Blay09 Date: Fri, 26 Aug 2016 15:31:39 +0200 Subject: [PATCH 2/2] Make CraftingTweaks integration use RegisterProviderV2 so it doesn't trigger on older versions of CraftingTweaks. --- .../refinedstorage/integration/IntegrationCraftingTweaks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/refinedstorage/integration/IntegrationCraftingTweaks.java b/src/main/java/refinedstorage/integration/IntegrationCraftingTweaks.java index 8fe1959b0..4b17fe927 100644 --- a/src/main/java/refinedstorage/integration/IntegrationCraftingTweaks.java +++ b/src/main/java/refinedstorage/integration/IntegrationCraftingTweaks.java @@ -18,7 +18,7 @@ public class IntegrationCraftingTweaks { tagCompound.setString("ContainerCallback", ContainerCallback.class.getName()); tagCompound.setInteger("GridSlotNumber", 36); tagCompound.setString("AlignToGrid", "left"); - FMLInterModComms.sendMessage(MOD_ID, "RegisterProvider", tagCompound); + FMLInterModComms.sendMessage(MOD_ID, "RegisterProviderV2", tagCompound); } }