diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-10-30 13:08:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-30 13:08:50 +0200 |
| commit | 4ed691115ebc7c5fcda4a3eacc0b4c45ab55c6a0 (patch) | |
| tree | 8690c872aa48749b1c05f86f301487dfbbbe688a /src/main/java/gregtech/common/GT_Proxy.java | |
| parent | 09af2aa295ba87ff1f317256ac28a4702464a81e (diff) | |
| parent | c4f36c857fcdcf2ed9bc3923f40e0f7b3b3555e0 (diff) | |
| download | GT5-Unofficial-4ed691115ebc7c5fcda4a3eacc0b4c45ab55c6a0.tar.gz GT5-Unofficial-4ed691115ebc7c5fcda4a3eacc0b4c45ab55c6a0.tar.bz2 GT5-Unofficial-4ed691115ebc7c5fcda4a3eacc0b4c45ab55c6a0.zip | |
Merge pull request #710 from D-Cysteine/metaitem-98
Add support for more fluids in GT cells
Diffstat (limited to 'src/main/java/gregtech/common/GT_Proxy.java')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index dc9db6e8e3..ed99c1e3c0 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -650,6 +650,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { new Thread(new GT_PlayerActivityLogger()).start(); } GregTech_API.sPostloadStarted = true; + + // This needs to happen late enough that all of the fluids we need have been registered. + // onLoad() seems to be too early, as the New Horizons Core Mod registers some fluids in post-load. + GT_MetaGenerated_Item_98.init(); + GT_OreDictUnificator.addItemData(new ItemStack(Items.iron_door, 1), new ItemData(Materials.Iron, 21772800L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.wooden_door, 1, 32767), new ItemData(Materials.Wood, 21772800L)); for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { @@ -1813,8 +1818,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { new FluidStack(crackedFluids[i], 1000), 40 + 20 * i, 240 + 120 * i); GT_Values.RA.addChemicalRecipe(GT_ModHandler.getIC2Item("steamCell", 1L), GT_Utility.getIntegratedCircuit(i + 1), new FluidStack(uncrackedFluid, 1000), new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(1), 160 + 80 * i, 30); - GT_Values.RA.addChemicalRecipe(GT_MetaGenerated_Item_98.FluidCell.steam.get(), GT_Utility.getIntegratedCircuit(i + 1), new FluidStack(uncrackedFluid, 1000), - new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(1), 160 + 80 * i, 30); GT_Values.RA.addChemicalRecipe(aMaterial.getCells(1), GT_Utility.getIntegratedCircuit(i + 1), GT_ModHandler.getSteam(1000), new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(1), 160 + 80 * i, 30); } |