From 8a44b1c75cce4780742113cffe30c35d15fe5b3d Mon Sep 17 00:00:00 2001 From: dibby Date: Tue, 15 Apr 2025 20:46:09 +1000 Subject: [PATCH 1/4] Use SimpleStorageProvider not bespoke wrapper --- .../compat/StorageDrawersAddon.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/main/java/net/blay09/mods/cookingforblockheads/compat/StorageDrawersAddon.java b/src/main/java/net/blay09/mods/cookingforblockheads/compat/StorageDrawersAddon.java index 8e432e73..83a3a0a1 100644 --- a/src/main/java/net/blay09/mods/cookingforblockheads/compat/StorageDrawersAddon.java +++ b/src/main/java/net/blay09/mods/cookingforblockheads/compat/StorageDrawersAddon.java @@ -13,21 +13,8 @@ public class StorageDrawersAddon { public StorageDrawersAddon() { KitchenMultiBlock.tileEntityWrappers .put("com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard", DrawerWrapper.class); + .put("com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard", SimpleStorageProvider.class); KitchenMultiBlock.registerConnectorBlock(GameRegistry.findBlock("StorageDrawers", "trim")); MinecraftForge.EVENT_BUS.register(this); } - - public static class DrawerWrapper implements IKitchenStorageProvider { - - TileEntity tile; - - public DrawerWrapper(TileEntity tile) { - this.tile = tile; - } - - @Override - public IInventory getInventory() { - return (IInventory) tile; - } - } } From 5a8974c2b3c3397f790197931c47d20cd4ac0fee Mon Sep 17 00:00:00 2001 From: dibby Date: Tue, 15 Apr 2025 20:46:53 +1000 Subject: [PATCH 2/4] Make DrawerController kitchen compatible --- .../cookingforblockheads/compat/StorageDrawersAddon.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/blay09/mods/cookingforblockheads/compat/StorageDrawersAddon.java b/src/main/java/net/blay09/mods/cookingforblockheads/compat/StorageDrawersAddon.java index 83a3a0a1..50d0f332 100644 --- a/src/main/java/net/blay09/mods/cookingforblockheads/compat/StorageDrawersAddon.java +++ b/src/main/java/net/blay09/mods/cookingforblockheads/compat/StorageDrawersAddon.java @@ -1,9 +1,6 @@ package net.blay09.mods.cookingforblockheads.compat; import net.blay09.mods.cookingforblockheads.KitchenMultiBlock; -import net.blay09.mods.cookingforblockheads.api.kitchen.IKitchenStorageProvider; -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.registry.GameRegistry; @@ -12,8 +9,10 @@ public class StorageDrawersAddon { public StorageDrawersAddon() { KitchenMultiBlock.tileEntityWrappers - .put("com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard", DrawerWrapper.class); .put("com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard", SimpleStorageProvider.class); + KitchenMultiBlock.tileEntityWrappers + .put("com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityController", SimpleStorageProvider.class); + KitchenMultiBlock.registerConnectorBlock(GameRegistry.findBlock("StorageDrawers", "trim")); MinecraftForge.EVENT_BUS.register(this); } From 27f0623131448d268f102cb8a58d2d0b5b357cac Mon Sep 17 00:00:00 2001 From: dibby Date: Tue, 15 Apr 2025 20:47:26 +1000 Subject: [PATCH 3/4] Add JABBA Compatibility --- .../mods/cookingforblockheads/CommonProxy.java | 5 +++++ .../mods/cookingforblockheads/CookingConfig.java | 2 ++ .../cookingforblockheads/compat/JabbaAddon.java | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 src/main/java/net/blay09/mods/cookingforblockheads/compat/JabbaAddon.java diff --git a/src/main/java/net/blay09/mods/cookingforblockheads/CommonProxy.java b/src/main/java/net/blay09/mods/cookingforblockheads/CommonProxy.java index ae8452f6..bfc2ce64 100644 --- a/src/main/java/net/blay09/mods/cookingforblockheads/CommonProxy.java +++ b/src/main/java/net/blay09/mods/cookingforblockheads/CommonProxy.java @@ -489,6 +489,11 @@ public void postInit(FMLPostInitializationEvent event) { "StorageDrawers", "net.blay09.mods.cookingforblockheads.compat.StorageDrawersAddon"); } + if (CookingConfig.moduleJabba) { + event.buildSoftDependProxy( + "JABBA", + "net.blay09.mods.cookingforblockheads.compat.JabbaAddon"); + } if (CookingConfig.moduleDreamcraft) { event.buildSoftDependProxy("dreamcraft", "net.blay09.mods.cookingforblockheads.compat.DreamcraftAddon"); } diff --git a/src/main/java/net/blay09/mods/cookingforblockheads/CookingConfig.java b/src/main/java/net/blay09/mods/cookingforblockheads/CookingConfig.java index 26a44caf..249f5271 100644 --- a/src/main/java/net/blay09/mods/cookingforblockheads/CookingConfig.java +++ b/src/main/java/net/blay09/mods/cookingforblockheads/CookingConfig.java @@ -26,6 +26,7 @@ public class CookingConfig { public static boolean moduleEnviroMine; public static boolean moduleAppleCore; public static boolean moduleStorageDrawers; + public static boolean moduleJabba; public static boolean moduleDreamcraft; public static boolean moduleGrectech5U; public static boolean usePamsToast; @@ -93,6 +94,7 @@ public static void load(File configFile) { moduleEnviroMine = config.getBoolean("EnviroMine", "modules", true, "Multiblock Kitchen Support (Freezer)"); moduleAppleCore = config.getBoolean("AppleCore", "modules", true, "Dynamic Food Values"); moduleStorageDrawers = config.getBoolean("StorageDrawers", "modules", true, "StorageDrawers"); + moduleJabba = config.getBoolean("Jabba", "modules", true, "Jabba"); moduleDreamcraft = config.getBoolean("Dreamcraft", "modules", true, "Dreamcraft"); moduleGrectech5U = config.getBoolean("Gregtech5U", "modules", true, "Gregtech5U"); usePamsToast = config.getBoolean( diff --git a/src/main/java/net/blay09/mods/cookingforblockheads/compat/JabbaAddon.java b/src/main/java/net/blay09/mods/cookingforblockheads/compat/JabbaAddon.java new file mode 100644 index 00000000..4d0b514e --- /dev/null +++ b/src/main/java/net/blay09/mods/cookingforblockheads/compat/JabbaAddon.java @@ -0,0 +1,13 @@ +package net.blay09.mods.cookingforblockheads.compat; + +import net.blay09.mods.cookingforblockheads.KitchenMultiBlock; +import net.minecraftforge.common.MinecraftForge; + +public class JabbaAddon { + + public JabbaAddon() { + KitchenMultiBlock.tileEntityWrappers + .put("mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel", SimpleStorageProvider.class); + MinecraftForge.EVENT_BUS.register(this); + } +} From bf773b3690f57610e62a0b7d5ea82b8a32ff78f6 Mon Sep 17 00:00:00 2001 From: dibby Date: Tue, 15 Apr 2025 20:47:50 +1000 Subject: [PATCH 4/4] SA --- .../blay09/mods/cookingforblockheads/CommonProxy.java | 4 +--- .../compat/StorageDrawersAddon.java | 10 ++++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/blay09/mods/cookingforblockheads/CommonProxy.java b/src/main/java/net/blay09/mods/cookingforblockheads/CommonProxy.java index bfc2ce64..7793e949 100644 --- a/src/main/java/net/blay09/mods/cookingforblockheads/CommonProxy.java +++ b/src/main/java/net/blay09/mods/cookingforblockheads/CommonProxy.java @@ -490,9 +490,7 @@ public void postInit(FMLPostInitializationEvent event) { "net.blay09.mods.cookingforblockheads.compat.StorageDrawersAddon"); } if (CookingConfig.moduleJabba) { - event.buildSoftDependProxy( - "JABBA", - "net.blay09.mods.cookingforblockheads.compat.JabbaAddon"); + event.buildSoftDependProxy("JABBA", "net.blay09.mods.cookingforblockheads.compat.JabbaAddon"); } if (CookingConfig.moduleDreamcraft) { event.buildSoftDependProxy("dreamcraft", "net.blay09.mods.cookingforblockheads.compat.DreamcraftAddon"); diff --git a/src/main/java/net/blay09/mods/cookingforblockheads/compat/StorageDrawersAddon.java b/src/main/java/net/blay09/mods/cookingforblockheads/compat/StorageDrawersAddon.java index 50d0f332..8e17909c 100644 --- a/src/main/java/net/blay09/mods/cookingforblockheads/compat/StorageDrawersAddon.java +++ b/src/main/java/net/blay09/mods/cookingforblockheads/compat/StorageDrawersAddon.java @@ -8,10 +8,12 @@ public class StorageDrawersAddon { public StorageDrawersAddon() { - KitchenMultiBlock.tileEntityWrappers - .put("com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard", SimpleStorageProvider.class); - KitchenMultiBlock.tileEntityWrappers - .put("com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityController", SimpleStorageProvider.class); + KitchenMultiBlock.tileEntityWrappers.put( + "com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard", + SimpleStorageProvider.class); + KitchenMultiBlock.tileEntityWrappers.put( + "com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityController", + SimpleStorageProvider.class); KitchenMultiBlock.registerConnectorBlock(GameRegistry.findBlock("StorageDrawers", "trim")); MinecraftForge.EVENT_BUS.register(this);