From 92ba4e62b6628a146dd24df13ae9ec40b0a69a22 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Mon, 29 Nov 2021 16:38:31 +0000 Subject: Added new generic Nuclear Chem item. Added ability to set Fluid for a Material. Moved Nuclear recipe generation to a different phase during init. --- src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/handler') diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 4fda17ee8a..c345863a61 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -43,6 +43,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaGarbageCollector; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_Nuclear; import gtPlusPlus.xmod.gregtech.registration.gregtech.*; import net.minecraft.item.ItemStack; @@ -228,7 +229,8 @@ public class COMPAT_HANDLER { public static void startLoadingGregAPIBasedRecipes(){ //Add hand-made recipes - RECIPES_GREGTECH.run(); + RECIPES_GREGTECH.run(); + RecipeLoader_Nuclear.generate(); //Add autogenerated Recipes from Item Components for (Set> m : MaterialGenerator.mRecipeMapsToGenerate) { for (RunnableWithInfo r : m) { -- cgit From b3aba53222d66327557cf06a4aea202b72851f03 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Fri, 10 Dec 2021 18:11:45 +0000 Subject: Migrate some recipe from GTNH CoreMod. --- build.properties | 2 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 2 ++ .../gregtech/loaders/recipe/RecipeLoader_GTNH.java | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java (limited to 'src/Java/gtPlusPlus/core/handler') diff --git a/build.properties b/build.properties index 931a06e7e0..dc028128c1 100644 --- a/build.properties +++ b/build.properties @@ -3,6 +3,6 @@ forge.version=10.13.4.1614-1.7.10 ic2.version=2.2.817-experimental gt.version=5.09.37 ae2.version=rv3-beta-22 -gtpp.version=1.7.15 +gtpp.version=1.7.17 commit.hash=aa9f04218e5298414f900b9fe61131f7ed26b8f1 structurelib.version=1.0.6 diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index c345863a61..53d63499a6 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -43,6 +43,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaGarbageCollector; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GTNH; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_Nuclear; import gtPlusPlus.xmod.gregtech.registration.gregtech.*; import net.minecraft.item.ItemStack; @@ -230,6 +231,7 @@ public class COMPAT_HANDLER { public static void startLoadingGregAPIBasedRecipes(){ //Add hand-made recipes RECIPES_GREGTECH.run(); + RecipeLoader_GTNH.generate(); RecipeLoader_Nuclear.generate(); //Add autogenerated Recipes from Item Components for (Set> m : MaterialGenerator.mRecipeMapsToGenerate) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java new file mode 100644 index 0000000000..0197142e96 --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java @@ -0,0 +1,22 @@ +package gtPlusPlus.xmod.gregtech.loaders.recipe; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gtPlusPlus.core.material.ELEMENT; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +public class RecipeLoader_GTNH { + + public static void generate() { + GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ball.get(0L), new FluidStack(FluidRegistry.getFluid("ender"), 250), new ItemStack(Items.ender_pearl, 1, 0), 100, 30); + //MK4 + GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium241.getMolten(144), Materials.Helium.getGas(1000), ELEMENT.getInstance().CURIUM.getFluidStack(144), 96, 98304, 500000000); + GT_Values.RA.addFusionReactorRecipe(ELEMENT.getInstance().CURIUM.getFluidStack(144), Materials.Helium.getPlasma(144), ELEMENT.getInstance().CALIFORNIUM.getFluidStack(144), 128, 196608, 750000000); + GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium241.getMolten(144), Materials.Calcium.getPlasma(144), Materials.Flerovium.getMolten(144), 160, 196608, 1000000000); + } + +} -- cgit From 2a6d7ff6b93b309e9857057d5d0d1c612da9d1e8 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Sat, 11 Dec 2021 11:10:21 +0000 Subject: Fixed ChemPlant book. --- src/Java/gtPlusPlus/core/handler/BookHandler.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/Java/gtPlusPlus/core/handler') diff --git a/src/Java/gtPlusPlus/core/handler/BookHandler.java b/src/Java/gtPlusPlus/core/handler/BookHandler.java index 4bfd39e9a3..d85de925bf 100644 --- a/src/Java/gtPlusPlus/core/handler/BookHandler.java +++ b/src/Java/gtPlusPlus/core/handler/BookHandler.java @@ -288,49 +288,49 @@ public class BookHandler { "XXXXXXX", "Layer 2:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AMMMMMA" + "\n" + "AMCCCMA" + "\n" + "AMCCCMA" + "\n" + "AMCCCMA" + "\n" + "AMMMMMA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 3:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AAAAAAA" + "\n" + "AAPPPAA" + "\n" + "AAPPPAA" + "\n" + "AAPPPAA" + "\n" + "AAAAAAA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 4:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AAAAAAA" + "\n" + "AACCCAA" + "\n" + "AACCCAA" + "\n" + "AACCCAA" + "\n" + "AAAAAAA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 5:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AAAAAAA" + "\n" + "AAPPPAA" + "\n" + "AAPPPAA" + "\n" + "AAPPPAA" + "\n" + "AAAAAAA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 6:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AMMMMMA" + "\n" + "AMCCCMA" + "\n" + "AMCCCMA" + "\n" + "AMCCCMA" + "\n" + "AMMMMMA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 7:" + "\n" + "\n" + "XXXXXXX" + "\n" + -- cgit From 17f817dd419952fc089c5fc9564a9a2eb93de1f7 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Sat, 11 Dec 2021 11:23:35 +0000 Subject: Adjusted LFTR a bit. --- .../handler/StopAnnoyingFuckingAchievements.java | 2 +- .../production/GregtechMTE_NuclearReactor.java | 22 +++++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-) (limited to 'src/Java/gtPlusPlus/core/handler') diff --git a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java index b3b720497e..8499f98525 100644 --- a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java +++ b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java @@ -38,7 +38,7 @@ public class StopAnnoyingFuckingAchievements { Field aGameSettings = ReflectionUtils.getField(aClazz2, "gameSettings"); Object aGameSettingsObj = ReflectionUtils.getFieldValue(aInstanceMC, aGameSettings); Class aClazz3 = aGameSettingsObj.getClass(); - if (aClazz2 != null) { + if (aClazz3 != null) { Field ainvHint = ReflectionUtils.getField(aClazz3, "showInventoryAchievementHint"); ReflectionUtils.setField(aGameSettingsObj, ainvHint, false); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java index 7d5c47e185..3b3b6998ef 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java @@ -36,7 +36,6 @@ import gregtech.api.util.GasSpargingRecipeMap; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.nuclear.NUCLIDE; @@ -104,9 +103,9 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { .addDynamoHatch("Top or bottom layer edges", 1) .addMaintenanceHatch("Top or bottom layer edges", 1) .addMufflerHatch("Top 3x3", 2) - .addStructureInfo("All dynamos must be IV tier.") + .addStructureInfo("All dynamos must be IV or LuV tier.") .addStructureInfo("All other hatches must be IV+ tier.") - .addStructureInfo("14+ Output Hatches, 4+ Input Hatches, 4x Dynamo Hatches") + .addStructureInfo("3x Output Hatches, 2x Input Hatches, 4x Dynamo Hatches") .addStructureInfo("2x Maintenance Hatches, 4x Mufflers") .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; @@ -135,14 +134,15 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - if (!aBaseMetaTileEntity.isActive() || this.mEfficiency < 500){ + boolean aWarmedUp = this.mEfficiency == this.getMaxEfficiency(null); + if (!aBaseMetaTileEntity.isActive() || !aWarmedUp){ if (aSide == aFacing) { return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)), new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR)}; } return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12))}; } - else if(aBaseMetaTileEntity.isActive() && this.mEfficiency >= 500){ + else if(aBaseMetaTileEntity.isActive() && aWarmedUp){ if (aSide == aFacing) { return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(13)), new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR)}; @@ -171,10 +171,10 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo && ((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity).mTier >= 5){ + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo && (((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity).mTier >= 5 && ((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity).mTier <= 6)){ ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input && ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mTier == 5) { + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input && ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mTier >= 5) { ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output && ((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity).mTier >= 5) { @@ -263,7 +263,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { mCasing = 0; if (checkPiece(mName, 3, 3, 0) && mCasing >= 27) { - if (mOutputHatches.size() >= 14 && mInputHatches.size() >= 4 && mDynamoHatches.size() == 4 && + if (mOutputHatches.size() >= 3 && mInputHatches.size() >= 2 && mDynamoHatches.size() == 4 && mMufflerHatches.size() == 4 && mMaintenanceHatches.size() == 2) { this.mWrench = true; this.mScrewdriver = true; @@ -308,7 +308,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { @Override public int getPollutionPerTick(final ItemStack aStack) { - return 10; + return 0; } @Override @@ -481,10 +481,6 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { return 0; } - public int getAmountOfOutputs() { - return 10; - } - @Override public void explodeMultiblock() { this.mInventory[1] = null; -- cgit