From 56d81eef562fe59b73345a4ce08b6acda37e8b8d Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Mon, 25 Jul 2022 22:08:34 +0800 Subject: [PATCH 1/3] move block loader to postinit --- dependencies.gradle | 2 +- src/main/java/com/glodblock/github/FluidCraft.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 7d2991e0..1fca148b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,7 +5,7 @@ dependencies { compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-75-GTNH:dev') compile('curse.maven:cofh-core-69162:2388751') compile('com.github.GTNewHorizons:ExtraCells2:2.5.9:dev') {transitive = false} - compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.8.5:dev") {transitive = false} + compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.8.5:dev") compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.4:dev") compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.27:dev") diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index 6c6c0d59..f731c1cb 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -20,7 +20,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -@Mod(modid = FluidCraft.MODID, version = FluidCraft.VERSION, name = FluidCraft.MODNAME) +@Mod(modid = FluidCraft.MODID, version = FluidCraft.VERSION, name = FluidCraft.MODNAME, dependencies = "required-after:appliedenergistics2") public class FluidCraft { public static final String MODID = "GRADLETOKEN_MODID"; @@ -43,8 +43,6 @@ public class FluidCraft { @Mod.EventHandler public static void init(FMLInitializationEvent event) { ModAndClassUtil.init(); - AEApi.instance().registries().cell().addCellHandler(new FluidCellHandler()); - ItemAndBlockHolder.loadSetting(); proxy.init(event); } @@ -52,6 +50,9 @@ public class FluidCraft { public static void postInit(FMLPostInitializationEvent event) { NetworkRegistry.INSTANCE.registerGuiHandler(FluidCraft.INSTANCE, new InventoryHandler()); + AEApi.instance().registries().cell().addCellHandler(new FluidCellHandler()); + ItemAndBlockHolder.loadSetting(); + if (!Config.removeRecipe) { (new RecipeLoader()).run(); } From ea9ba2c4ccedfb92fa1376987f26b86512a3ee80 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Tue, 26 Jul 2022 22:05:48 +0800 Subject: [PATCH 2/3] fix cell byte calulation --- .../glodblock/github/common/storage/FluidCellInventory.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java index 4764f298..bbf3918e 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java @@ -180,8 +180,7 @@ public class FluidCellInventory implements IFluidCellInventory { @Override public long getRemainingFluidCount() { - final long remaining = this.getFreeBytes() * 8 + this.getUnusedFluidCount(); - + final long remaining = this.getFreeBytes() * 8 * 256 + this.getUnusedFluidCount(); return remaining > 0 ? remaining : 0; } From 3d2df578a672e10a372e2b2b4a7395491a384cf7 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Wed, 27 Jul 2022 22:23:39 +0800 Subject: [PATCH 3/3] make dual interface use the same adpator like normal one --- dependencies.gradle | 1 + .../github/inventory/FluidConvertingInventoryAdaptor.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 1fca148b..344f1b3a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -19,6 +19,7 @@ dependencies { compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev") {transitive = false} compileOnly('com.github.GTNewHorizons:OpenComputers:1.7.5.23-GTNH:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.3.19-GTNH:dev') {transitive = false} + compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.29:dev") {transitive = false} runtime("com.github.GTNewHorizons:Baubles:1.0.1.14:dev") } diff --git a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java index 053ae7bb..0eba2edc 100644 --- a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java +++ b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java @@ -32,7 +32,7 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { TileEntity inter = capProvider.getWorldObj().getTileEntity(capProvider.xCoord + f.offsetX, capProvider.yCoord + f.offsetY, capProvider.zCoord + f.offsetZ); if (!Config.noFluidPacket && !(inter instanceof TileFluidInterface || (inter instanceof TileCableBus && ((TileCableBus) inter).getPart(f.getOpposite()) instanceof PartFluidInterface))) return InventoryAdaptor.getAdaptor(capProvider, f); - IInventory item = capProvider instanceof IInventory ? (IInventory) capProvider : null; + InventoryAdaptor item = InventoryAdaptor.getAdaptor(capProvider, f); IFluidHandler fluid = capProvider instanceof IFluidHandler ? (IFluidHandler) capProvider : null; return new FluidConvertingInventoryAdaptor(item, fluid, face); } @@ -41,8 +41,8 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { private final IFluidHandler invFluids; private final ForgeDirection side; - public FluidConvertingInventoryAdaptor(@Nullable IInventory invItems, @Nullable IFluidHandler invFluids, EnumFacing facing) { - this.invItems = invItems != null ? InventoryAdaptor.getAdaptor(invItems, Util.from(facing)) : null; + public FluidConvertingInventoryAdaptor(@Nullable InventoryAdaptor invItems, @Nullable IFluidHandler invFluids, EnumFacing facing) { + this.invItems = invItems; this.invFluids = invFluids; this.side = Util.from(facing); }