diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-05-28 19:32:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 19:32:56 +0200 |
| commit | e22cd98e9a185cf1fc6f44488f1fa6502a7557ab (patch) | |
| tree | 988c1ac08e65bb26a26069742a93ef03ac7e6f05 | |
| parent | 3997e9f86243bef67175609a6093fe6668cf5ed7 (diff) | |
| download | GT5-Unofficial-e22cd98e9a185cf1fc6f44488f1fa6502a7557ab.tar.gz GT5-Unofficial-e22cd98e9a185cf1fc6f44488f1fa6502a7557ab.tar.bz2 GT5-Unofficial-e22cd98e9a185cf1fc6f44488f1fa6502a7557ab.zip | |
No gtnh tested (#81)
* Added VoidMinerWIP
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Continue work on VoidMiner
+ Added a function to BWOreLayers
+ Made the voidminer actually WORK somewhat
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Continue work on VoidMiner
+ added recipes
+ made the void miner consume noble gasses to boost output
+ refactored code by quite a lot
+ added newest GT
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added GalacticGreg lib
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* added localisation of achivements
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* updated GTLib
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* updated GTlib
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Several fixes
+ Fixed BioVat
+ Added some Debug Commands
+ Changed Void Miner logic
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Refactor
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Refactor
+ removed Experimental ThreadedLoader
+ moved LoaderCalls into LoaderReference
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Refactor
+ moved FMLCommonHandler.instance().get(Effective)Side() into SideReference
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* made radio hatch compat call static
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Made More Stuff static
+ improved flow control
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added more Block-Recipes
+version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* api changes
+ fixed void miner not consuming energy
+ Made API standalone (mostly)
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Made OrePrefixes lookups NullSecure
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* fixed a typo
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* LICENSE update
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added Config for Metas and Tiers for Ross
+ fixed GT++ compability
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Fixes
+ Fixed ConfigHandler initiating GTValues during coremod startup
+ Fixed MegaEBF sometimes overflowing
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* change recipes for Void Miner using Ore Drill Tier 6
bump gt dependencie and version
* update code chicken core and gt version
* Added VoidMiner Tiers
+ Added Recipes for Void Miners
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Fixed VoidMiner Output
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* added void miner localisation for achievements
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* fixed NPE
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Made Void Miner Times in Assembly Line more reasonable
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* fixed fermentation recipes in biovat
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added a force shutdown, due to licensing of GT++
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Fixed Glass Checked
+ buffed Oganesson
+ made LoadItemContainers static
+ removed force shutdown
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Update WerkstoffLoader.java
* Fix imports
import cpw.mods.fml.common.Loader was missing
* Redid CLS support
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Some new featues
+ Added Multiblock Updateability to BW Blocks
+ Added Pollution to WaterPump
+ Added new Windmill GUI
+ Refactored Windmill a bit
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added animation to windmill
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* add gt to libs folder to let jenkins build
(cherry picked from commit 12f6dae5e2233b533bce1cf6b0c29e9e85a60a0b)
* Various Development
+ Added TT support to MEBF and MVAC
+ Fixed Energy Logic on MDT
+ Fixed MEBF not outputting fluids on bottom hatches
+ added auto-export for water on the simple stirling pump
+ redid glass folder structure
+ added EBF / Large Chem circuit Unification
+ updated TT dependancy
+ version increase x2
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Various Development (#75)
+ Added TT support to MEBF and MVAC
+ Fixed Energy Logic on MDT
+ Fixed MEBF not outputting fluids on bottom hatches
+ added auto-export for water on the simple stirling pump
+ redid glass folder structure
+ added EBF / Large Chem circuit Unification
+ updated TT dependancy
+ version increase x2
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added TT Low Power Lasers
+ Fixed Circuit Logic and added bounds check
+ added TT Low Power recipes
+ updated GT-lib
+ version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Block changes2 (#77)
* Various Development
+ Added TT support to MEBF and MVAC
+ Fixed Energy Logic on MDT
+ Fixed MEBF not outputting fluids on bottom hatches
+ added auto-export for water on the simple stirling pump
+ redid glass folder structure
+ added EBF / Large Chem circuit Unification
+ updated TT dependancy
+ version increase x2
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added TT Low Power Lasers
+ Fixed Circuit Logic and added bounds check
+ added TT Low Power recipes
+ updated GT-lib
+ version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Redid LuV Osmiridium Replacer
+ version increase
+ deleted old lib
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Fixes
+ Unified usage of .hasItemType instead of bitshifts/ .getGenerationFeatures().hasXY()
+ removed a wrong cast
+ fixed textures
+ cleaned up code
+ removed *some* duplicate recipes for tool items
+ increased version, increased api version
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* fixed voidminer
+ fixed MEBF not working with LAZORS or Multi Amp hatches below UV-Glas
+ fixed LAZORS not exploding when they recive too much Amp lasers
* Redid Radio Hatch Stuffs ~~~
+ ItemStacks finally work properly
+ Forbid insertion of a non-Rad-Material
+ Version increase
* fixes
+ disabled circuit unification
+ removed unused decoratePlanet on Ross128ba
+ changed "splitStack" to "setStackSize"
+ renamed "WorldProviderRoss128Ba" to "WorldProviderRoss128ba"
* Math update
+ Added specialised functions for floor ceil wrap and clamp
+ Replaced old function calls
+ LowPower Pipes now have the IC2 glass fibre texture
+ fixed overflow on the AccessPriorityList
+ fixed "NOSUCHITEM rod" error
+ suppressed some warnings
+ version increase
* Fixed Burned Out THTR Stuff
* Had the wrong version number
* Made a NoGTNH-GT compatible version
* renamed hardmode setting in code
+ unregistered my TileEntitys as machine blocks (caused trouble during worldgen with gtnh gt)
+ version increase
+ added a specialised TE container class
Co-authored-by: Dream-Master <dream-master@gmx.net>
Co-authored-by: jackowski626 <jf@wikiera.net>
Former-commit-id: 136db10e36bc33619904d18c513fd3357759cad4
11 files changed, 117 insertions, 55 deletions
diff --git a/build.properties b/build.properties index 0c2cf1116f..bfd657b23f 100644 --- a/build.properties +++ b/build.properties @@ -22,7 +22,7 @@ mc_version=1.7.10 majorUpdate=0 minorUpdate=5 -buildNumber=13 +buildNumber=13.1 APIVersion=11 ic2.version=2.2.828-experimental gregtech.version=5.09.33.38 diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java index 91e6b64e15..6562453ecc 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java @@ -67,10 +67,6 @@ public final class BioVatLogicAdder { giveItemStackRadioHatchAbilites(BW_NonMeta_MaterialItems.TiberiumCell_2.get(1), WerkstoffLoader.Tiberium.getBridgeMaterial(), 6); giveItemStackRadioHatchAbilites(BW_NonMeta_MaterialItems.TiberiumCell_4.get(1), WerkstoffLoader.Tiberium.getBridgeMaterial(), 12); - giveItemStackRadioHatchAbilites(ItemList.MNqCell_1.get(1), Materials.Naquadria, 3); - giveItemStackRadioHatchAbilites(ItemList.MNqCell_2.get(1), Materials.Naquadria, 6); - giveItemStackRadioHatchAbilites(ItemList.MNqCell_4.get(1), Materials.Naquadria, 12); - giveItemStackRadioHatchAbilites(BW_NonMeta_MaterialItems.TheCoreCell.get(1), Materials.Naquadah, 96); giveItemStackRadioHatchAbilites(ItemList.Depleted_Thorium_1.get(1), Materials.Thorium, 3, 10); @@ -93,11 +89,16 @@ public final class BioVatLogicAdder { giveItemStackRadioHatchAbilites(BW_NonMeta_MaterialItems.Depleted_Tiberium_2.get(1), WerkstoffLoader.Tiberium.getBridgeMaterial(), 6, 10); giveItemStackRadioHatchAbilites(BW_NonMeta_MaterialItems.Depleted_Tiberium_4.get(1), WerkstoffLoader.Tiberium.getBridgeMaterial(), 12, 10); - giveItemStackRadioHatchAbilites(ItemList.Depleted_MNq_1.get(1), Materials.Naquadria, 3, 10); - giveItemStackRadioHatchAbilites(ItemList.Depleted_MNq_2.get(1), Materials.Naquadria, 6, 10); - giveItemStackRadioHatchAbilites(ItemList.Depleted_MNq_4.get(1), Materials.Naquadria, 12, 10); - giveItemStackRadioHatchAbilites(BW_NonMeta_MaterialItems.Depleted_TheCoreCell.get(1), Materials.Naquadah, 96, 10); + + if (WerkstoffLoader.gtnhGT) { + giveItemStackRadioHatchAbilites(ItemList.MNqCell_1.get(1), Materials.Naquadria, 3); + giveItemStackRadioHatchAbilites(ItemList.MNqCell_2.get(1), Materials.Naquadria, 6); + giveItemStackRadioHatchAbilites(ItemList.MNqCell_4.get(1), Materials.Naquadria, 12); + giveItemStackRadioHatchAbilites(ItemList.Depleted_MNq_1.get(1), Materials.Naquadria, 3, 10); + giveItemStackRadioHatchAbilites(ItemList.Depleted_MNq_2.get(1), Materials.Naquadria, 6, 10); + giveItemStackRadioHatchAbilites(ItemList.Depleted_MNq_4.get(1), Materials.Naquadria, 12, 10); + } } private static final HashSet<BioVatLogicAdder.MaterialSvPair> MaSv = new HashSet<>(); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java index 33b47fd6a9..e2ad0b6416 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java @@ -104,15 +104,15 @@ public final class MainMod { } if (LoaderReference.dreamcraft) - ConfigHandler.GTNH = true; + ConfigHandler.hardmode = true; - ConfigHandler.GTNH = ConfigHandler.ezmode != ConfigHandler.GTNH; + ConfigHandler.hardmode = ConfigHandler.ezmode != ConfigHandler.hardmode; if (API_ConfigValues.debugLog) { try { DebugLog.initDebugLog(preinit); } catch (IOException e) { - e.printStackTrace(); + MainMod.LOGGER.catching(e); } } @@ -120,8 +120,8 @@ public final class MainMod { WerkstoffLoader.setUp(); } - if (ConfigHandler.GTNH) - MainMod.LOGGER.info("GTNH-Detected . . . ACTIVATE HARDMODE."); + if (ConfigHandler.hardmode) + MainMod.LOGGER.info(". . . ACTIVATED HARDMODE."); if (ConfigHandler.BioLab) { BioCultureLoader.run(); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java index 1cb8106399..f14e8a70a5 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java @@ -64,7 +64,6 @@ public class BW_TileEntityContainer extends BlockContainer implements ITileAddsI this.setCreativeTab(MainMod.BWT); this.setBlockName(blockName); this.setBlockTextureName(MainMod.MOD_ID + ":" + blockName); - GregTech_API.registerMachineBlock(this, -1); } @Override @@ -122,10 +121,6 @@ public class BW_TileEntityContainer extends BlockContainer implements ITileAddsI @Override public void breakBlock(World world, int x, int y, int z, Block block, int meta) { - if (GregTech_API.isMachineBlock(this, world.getBlockMetadata(x, y, z))) { - GregTech_API.causeMachineUpdate(world, x, y, z); - } - TileEntity t = world.getTileEntity(x, y, z); if (t instanceof ITileDropsContent) { int[] dropSlots = ((ITileDropsContent) t).getDropSlots(); @@ -200,11 +195,4 @@ public class BW_TileEntityContainer extends BlockContainer implements ITileAddsI } return new String[0]; } - - @Override - public void onBlockAdded(World aWorld, int aX, int aY, int aZ) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); - } - } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java new file mode 100644 index 0000000000..45f67ccfcb --- /dev/null +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2018-2020 bartimaeusnek + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package com.github.bartimaeusnek.bartworks.common.blocks; + +import gregtech.api.GregTech_API; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class BW_TileEntityContainer_MachineBlock extends BW_TileEntityContainer { + + public BW_TileEntityContainer_MachineBlock(Material p_i45386_1_, Class<? extends TileEntity> tileEntity, String blockName) { + super(p_i45386_1_, tileEntity, blockName); + GregTech_API.registerMachineBlock(this, -1); + } + + @Override + public void onBlockAdded(World aWorld, int aX, int aY, int aZ) { + if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + } + } + + @Override + public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { + if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + } + } +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java index b949444067..a6f781bf98 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java @@ -59,7 +59,7 @@ public class ConfigHandler { public static boolean DEHPDirectSteam; public static boolean teslastaff; public static boolean classicMode; - public static boolean GTNH; + public static boolean hardmode; public static boolean ezmode; public static boolean GTppLogDisabler; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java index df60aafa0f..10ada4ea61 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java @@ -27,6 +27,7 @@ import com.github.bartimaeusnek.bartworks.MainMod; import com.github.bartimaeusnek.bartworks.common.blocks.BW_Blocks; import com.github.bartimaeusnek.bartworks.common.blocks.BW_GlasBlocks; import com.github.bartimaeusnek.bartworks.common.blocks.BW_TileEntityContainer; +import com.github.bartimaeusnek.bartworks.common.blocks.BW_TileEntityContainer_MachineBlock; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.bartworks.common.items.*; import com.github.bartimaeusnek.bartworks.common.tileentities.classic.BW_RotorBlock; @@ -72,7 +73,7 @@ public class ItemRegistry { public static final Item ROCKCUTTER_MV = new GT_Rockcutter_Item(2); public static final Item ROCKCUTTER_HV = new GT_Rockcutter_Item(3); public static final Item CIRCUIT_PROGRAMMER = new Circuit_Programmer(); - public static final Block ROTORBLOCK = new BW_TileEntityContainer(Material.wood, BW_RotorBlock.class, "BWRotorBlock"); + public static final Block ROTORBLOCK = new BW_TileEntityContainer_MachineBlock(Material.wood, BW_RotorBlock.class, "BWRotorBlock"); public static final Item LEATHER_ROTOR = new BW_Stonage_Rotors(5, 0.15f, 15, 30, 2400, IKineticRotor.GearboxType.WIND, new ResourceLocation(MainMod.MOD_ID, "textures/items/rotors/rotorLeather.png"), "BW_LeatherRotor", "rotors/itemRotorLeather"); public static final Item WOOL_ROTOR = new BW_Stonage_Rotors(7, 0.18f, 10, 20, 1600, IKineticRotor.GearboxType.WIND, new ResourceLocation(MainMod.MOD_ID, "textures/items/rotors/rotorWool.png"), "BW_WoolRotor", "rotors/itemRotorWool"); public static final Item PAPER_ROTOR = new BW_Stonage_Rotors(9, 0.2f, 1, 10, 800, IKineticRotor.GearboxType.WIND, new ResourceLocation(MainMod.MOD_ID, "textures/items/rotors/rotorPaper.png"), "BW_PaperRotor", "rotors/itemRotorPaper"); @@ -207,7 +208,7 @@ public class ItemRegistry { ItemRegistry.giantOutputHatch = new GT_MetaTileEntity_GiantOutputHatch(ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 9, "GiantOutputHatch", "Giant Output Hatch").getStackForm(1L); ItemRegistry.megaMachines[2] = new GT_TileEntity_MegaDistillTower(ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 10, "MegaDistillationTower", "Mega Distillation Tower").getStackForm(1L); - if (LoaderReference.galacticgreg) { + if (LoaderReference.galacticgreg && WerkstoffLoader.gtnhGT) { ItemRegistry.voidminer[2] = new GT_TileEntity_VoidMiners.VMUV(ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 11, "VoidMiner3", "Void Miner III").getStackForm(1L); ItemRegistry.voidminer[1] = new GT_TileEntity_VoidMiners.VMZPM(ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 12, "VoidMiner2", "Void Miner II").getStackForm(1L); ItemRegistry.voidminer[0] = new GT_TileEntity_VoidMiners.VMLUV(ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 13, "VoidMiner1", "Void Miner I").getStackForm(1L); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java index 738fe18351..c8bc059230 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java @@ -57,7 +57,7 @@ public class RecipeLoader { @SuppressWarnings("deprecation") public static void run() { - if (ConfigHandler.GTNH) { + if (ConfigHandler.hardmode) { /* * GTNH "hardmode" Recipes */ @@ -102,11 +102,11 @@ public class RecipeLoader { "CDC", "SBS", "CFC", - 'C', ConfigHandler.GTNH ? "circuitAdvanced" : "circuitBasic", + 'C', ConfigHandler.hardmode ? "circuitAdvanced" : "circuitBasic", 'D', ItemList.Cover_Screen.get(1L), - 'S', GT_OreDictUnificator.get(OrePrefixes.cableGt12, ConfigHandler.GTNH ? Materials.Platinum : Materials.AnnealedCopper, 1L), + 'S', GT_OreDictUnificator.get(OrePrefixes.cableGt12, ConfigHandler.hardmode ? Materials.Platinum : Materials.AnnealedCopper, 1L), 'B', new ItemStack(ItemRegistry.BW_BLOCKS[1]), - 'F', ConfigHandler.GTNH ? ItemList.Field_Generator_HV.get(1L) : ItemList.Field_Generator_LV.get(1L) + 'F', ConfigHandler.hardmode ? ItemList.Field_Generator_HV.get(1L) : ItemList.Field_Generator_LV.get(1L) }); GT_ModHandler.addCraftingRecipe( @@ -117,7 +117,7 @@ public class RecipeLoader { "PLP", "CPC", 'C', "circuitAdvanced", - 'P', GT_OreDictUnificator.get(ConfigHandler.GTNH ? OrePrefixes.plateDouble : OrePrefixes.plate, Materials.Aluminium, 1L), + 'P', GT_OreDictUnificator.get(ConfigHandler.hardmode ? OrePrefixes.plateDouble : OrePrefixes.plate, Materials.Aluminium, 1L), 'L', new ItemStack(Items.lava_bucket) }); @@ -129,7 +129,7 @@ public class RecipeLoader { "PLP", "CPC", 'C', "circuitAdvanced", - 'P', GT_OreDictUnificator.get(ConfigHandler.GTNH ? OrePrefixes.plateDouble : OrePrefixes.plate, ConfigHandler.GTNH ? Materials.Steel : Materials.Iron, 1L), + 'P', GT_OreDictUnificator.get(ConfigHandler.hardmode ? OrePrefixes.plateDouble : OrePrefixes.plate, ConfigHandler.hardmode ? Materials.Steel : Materials.Iron, 1L), 'L', new ItemStack(Items.lava_bucket) }); @@ -225,7 +225,7 @@ public class RecipeLoader { } ); - if (!ConfigHandler.GTNH) + if (!ConfigHandler.hardmode) GT_ModHandler.addCraftingRecipe( ItemRegistry.dehp, RecipeLoader.BITSD, @@ -864,16 +864,16 @@ public class RecipeLoader { }; OrePrefixes[] prefixes = { - OrePrefixes.cableGt04, - OrePrefixes.cableGt08, - OrePrefixes.cableGt12, - OrePrefixes.cableGt16 + WerkstoffLoader.gtnhGT ? OrePrefixes.cableGt04 : OrePrefixes.wireGt04, + WerkstoffLoader.gtnhGT ? OrePrefixes.cableGt08 : OrePrefixes.wireGt08, + WerkstoffLoader.gtnhGT ? OrePrefixes.cableGt12 : OrePrefixes.wireGt12, + WerkstoffLoader.gtnhGT ? OrePrefixes.cableGt16 : OrePrefixes.cableGt12 }; GT_Values.RA.addAssemblerRecipe( new ItemStack[]{ ItemList.Circuit_Parts_GlassFiber.get(32), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silver, 8), + GT_OreDictUnificator.get(WerkstoffLoader.gtnhGT ? OrePrefixes.foil : OrePrefixes.plateDouble, Materials.Silver, WerkstoffLoader.gtnhGT ? 8 : 1), WerkstoffLoader.CubicZirconia.get(OrePrefixes.gemExquisite, 2) }, Materials.Polytetrafluoroethylene.getMolten(72), diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java index cf668d4d36..c0aabd973d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java @@ -24,6 +24,7 @@ package com.github.bartimaeusnek.bartworks.common.loaders; import com.github.bartimaeusnek.bartworks.MainMod; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.util.BWRecipes; import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.github.bartimaeusnek.bartworks.util.Pair; @@ -186,9 +187,9 @@ public class StaticRecipeChangeLoaders { @SuppressWarnings("ALL") private static void runMoltenUnificationEnfocement(Werkstoff werkstoff) { - if (werkstoff.getGenerationFeatures().enforceUnification && werkstoff.hasItemType(OrePrefixes.cellMolten)) { + if (werkstoff.getGenerationFeatures().enforceUnification && werkstoff.hasItemType(WerkstoffLoader.cellMolten)) { try { - FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(new FluidStack(Objects.requireNonNull(molten.get(werkstoff)), 144), werkstoff.get(cellMolten), Materials.Empty.getCells(1)); + FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(new FluidStack(Objects.requireNonNull(molten.get(werkstoff)), 144), werkstoff.get(WerkstoffLoader.cellMolten), Materials.Empty.getCells(1)); Field f = GT_Utility.class.getDeclaredField("sFilledContainerToData"); f.setAccessible(true); Map<GT_ItemStack, FluidContainerRegistry.FluidContainerData> sFilledContainerToData = (Map<GT_ItemStack, FluidContainerRegistry.FluidContainerData>) f.get(null); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java index 96e222ee11..fe66b74c40 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java @@ -23,6 +23,7 @@ package com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement; import com.github.bartimaeusnek.bartworks.API.LoaderReference; +import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -45,7 +46,21 @@ public class GTMetaItemEnhancer { private GTMetaItemEnhancer() { } - public static void init(){ + public static void init() { + if (!WerkstoffLoader.gtnhGT) { + Item moltenCell = new BWGTMetaItems(WerkstoffLoader.cellMolten, null); + Materials[] values = Materials.values(); + for (int i = 0, valuesLength = values.length; i < valuesLength; i++) { + Materials m = values[i]; + if (m != null && m.mStandardMoltenFluid != null) { + final FluidContainerRegistry.FluidContainerData emptyData = new FluidContainerRegistry.FluidContainerData(m.getMolten(144), new ItemStack(moltenCell, 1, i), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L)); + FluidContainerRegistry.registerFluidContainer(emptyData); + GT_Utility.addFluidContainerData(emptyData); + GT_Values.RA.addFluidCannerRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), new ItemStack(moltenCell, 1, i), m.getMolten(144), GT_Values.NF); + GT_Values.RA.addFluidCannerRecipe(new ItemStack(moltenCell, 1, i), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), GT_Values.NF, m.getMolten(144)); + } + } + } if (LoaderReference.Forestry) { NoMetaValue = Materials.getMaterialsMap().values().stream().filter(m -> m.mMetaItemSubID == -1).collect(Collectors.toList()); Item moltenCapsuls = new BWGTMetaItems(WerkstoffLoader.capsuleMolten, null); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index 1cc9b077cf..00c01f85aa 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -97,7 +97,6 @@ public class WerkstoffLoader { public static ItemList boltMold; public static boolean gtnhGT = false; - public static void setUp() { //GTNH detection hack try { @@ -106,15 +105,21 @@ public class WerkstoffLoader { } catch (Exception ignored) { gtnhGT = false; } - + //GTNH detection hack #2 //GTNH hack for molten cells for (OrePrefixes prefix : values()) { if (prefix.toString().equals("cellMolten")) { WerkstoffLoader.cellMolten = prefix; + gtnhGT = true; break; } } + if (!gtnhGT) { + WerkstoffLoader.HDCS.getGenerationFeatures().extraRecipes ^= 10; + break; + } + if (WerkstoffLoader.cellMolten == null) { WerkstoffLoader.cellMolten = EnumUtils.addNewOrePrefix( "cellMolten","Cells of Molten stuff", "Molten ", @@ -1573,7 +1578,7 @@ public class WerkstoffLoader { WerkstoffLoader.fluids.put(werkstoff, FluidRegistry.getFluid(werkstoff.getDefaultName())); } } - if (werkstoff.hasItemType(cellMolten)) { + if (werkstoff.hasItemType(WerkstoffLoader.cellMolten)) { if (!FluidRegistry.isFluidRegistered("molten." + werkstoff.getDefaultName())) { DebugLog.log("Adding new Molten: " + werkstoff.getDefaultName()); Fluid fluid = new GT_Fluid("molten." + werkstoff.getDefaultName(), "molten.autogenerated", werkstoff.getRGBA()); @@ -1740,7 +1745,7 @@ public class WerkstoffLoader { werkstoffBridgeMaterial.mGas = werkstoff.getFluidOrGas(1).getFluid(); } - if (werkstoff.hasItemType(cellMolten)) { + if (werkstoff.hasItemType(WerkstoffLoader.cellMolten)) { werkstoffBridgeMaterial.mStandardMoltenFluid = werkstoff.getMolten(1).getFluid(); } werkstoffBridgeMaterial.mName = werkstoff.getVarName(); @@ -2081,7 +2086,7 @@ public class WerkstoffLoader { //smallGear if (WerkstoffLoader.smallGearShape != null) GT_Values.RA.addExtruderRecipe(werkstoff.get(ingot), WerkstoffLoader.smallGearShape.get(0L), werkstoff.get(gearGtSmall), (int) werkstoff.getStats().mass, 8 * tVoltageMultiplier); - if (ConfigHandler.GTNH) + if (ConfigHandler.hardmode) GT_ModHandler.addCraftingRecipe(werkstoff.get(gearGtSmall), GT_Proxy.tBits, new Object[]{" S ", "hPx", " S ", 'S', werkstoff.get(stick), 'P', werkstoff.get(plate)}); else GT_ModHandler.addCraftingRecipe(werkstoff.get(gearGtSmall), GT_Proxy.tBits, new Object[]{"P ", " h ", 'P', werkstoff.get(plate)}); @@ -2096,7 +2101,7 @@ public class WerkstoffLoader { GT_Values.RA.addExtruderRecipe(werkstoff.get(ingot, 5), WerkstoffLoader.rotorShape.get(0L), werkstoff.get(rotor), 200, 60); //molten -> metal - if (werkstoff.hasItemType(cellMolten)) { + if (werkstoff.hasItemType(WerkstoffLoader.cellMolten)) { GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Gear.get(0L), werkstoff.getMolten(576), werkstoff.get(gearGt), 128, 8); GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Gear_Small.get(0L), werkstoff.getMolten(144), werkstoff.get(gearGtSmall), 16, 8); if (WerkstoffLoader.ringMold != null) @@ -2121,7 +2126,7 @@ public class WerkstoffLoader { if (werkstoff.hasItemType(ingot)) { GT_Values.RA.addArcFurnaceRecipe(werkstoff.get(block), new ItemStack[]{werkstoff.get(ingot, 9)}, null, 16, 90, false); } - if (werkstoff.hasItemType(cellMolten)) { + if (werkstoff.hasItemType(WerkstoffLoader.cellMolten)) { GT_Values.RA.addFluidExtractionRecipe(werkstoff.get(block), null, werkstoff.getMolten(1296), 0, 288, 8); } if (werkstoff.hasItemType(plate)) { @@ -2512,15 +2517,15 @@ public class WerkstoffLoader { } private static void addMoltenRecipes(Werkstoff werkstoff) { - if (!werkstoff.hasItemType(cellMolten)) + if (!werkstoff.hasItemType(WerkstoffLoader.cellMolten)) return; //Tank "Recipe" - final FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144), werkstoff.get(cellMolten), Materials.Empty.getCells(1)); + final FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144), werkstoff.get(WerkstoffLoader.cellMolten), Materials.Empty.getCells(1)); FluidContainerRegistry.registerFluidContainer(werkstoff.getMolten(144), werkstoff.get(cell), Materials.Empty.getCells(1)); GT_Utility.addFluidContainerData(data); - GT_Values.RA.addFluidCannerRecipe(Materials.Empty.getCells(1), werkstoff.get(cellMolten), new FluidStack(Objects.requireNonNull(molten.get(werkstoff)), 144), GT_Values.NF); - GT_Values.RA.addFluidCannerRecipe(werkstoff.get(cellMolten), Materials.Empty.getCells(1), GT_Values.NF, new FluidStack(Objects.requireNonNull(molten.get(werkstoff)), 144)); + GT_Values.RA.addFluidCannerRecipe(Materials.Empty.getCells(1), werkstoff.get(WerkstoffLoader.cellMolten), new FluidStack(Objects.requireNonNull(molten.get(werkstoff)), 144), GT_Values.NF); + GT_Values.RA.addFluidCannerRecipe(werkstoff.get(WerkstoffLoader.cellMolten), Materials.Empty.getCells(1), GT_Values.NF, new FluidStack(Objects.requireNonNull(molten.get(werkstoff)), 144)); if (LoaderReference.Forestry) { final FluidContainerRegistry.FluidContainerData emptyData = new FluidContainerRegistry.FluidContainerData(new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144), werkstoff.get(capsuleMolten), GT_ModHandler.getModItem("Forestry", "refractoryEmpty", 1)); |