From 54fa2533849efa38e4f29c3d61b6f7817b7bcf44 Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Thu, 16 Feb 2023 19:07:32 +0100 Subject: Remove need for maintenance --- .../multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index ea0141dd2d..19d3cee3ce 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -692,7 +692,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl .addElement( 'H', buildHatchAdder(GT_MetaTileEntity_EM_EyeOfHarmony.class) - .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance) + .atLeast(InputHatch, OutputHatch, InputBus, OutputBus) .casingIndex(texturePage << 7).dot(1).buildAndChain(sBlockCasingsBA0, 12)) .addElement( 'E', @@ -842,8 +842,13 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl return false; } - // 1 Maintenance hatch, as usual. - return (mMaintenanceHatches.size() == 1); + mHardHammer = true; + mSoftHammer = true; + mScrewdriver = true; + mCrowbar = true; + mSolderingTool = true; + mWrench = true; + return true; } @Override @@ -927,8 +932,6 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl + EnumChatFormatting.GRAY + " Spacetime Compression Field Generator.") .addStructureInfo("--------------------------------------------") - .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD + 1 + EnumChatFormatting.GRAY + " maintenance hatch.") .addStructureInfo( "Requires " + EnumChatFormatting.GOLD + 2 + EnumChatFormatting.GRAY + " input hatches.") .addStructureInfo( -- cgit From d21dfaa022ac0dc071fc10a4771590b2daec50a2 Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Thu, 16 Feb 2023 21:05:43 +0100 Subject: Added null-check to recipe processing --- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index 19d3cee3ce..012a99c69b 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -1014,6 +1014,9 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl // No item in multi gui slot. currentRecipe = eyeOfHarmonyRecipeStorage.recipeLookUp(aStack); + if (currentRecipe == null) { + return false; + } if (processRecipe(currentRecipe)) { return true; } -- cgit From c1b1d776c52bc1ea04c37552688957ece52cdd1a Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Thu, 16 Feb 2023 21:07:26 +0100 Subject: Fix tooltip --- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index 012a99c69b..8c11063d2b 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -920,7 +920,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl + EnumChatFormatting.GRAY + " Reinforced Temporal Structure Casing.") .addStructureInfo( - EnumChatFormatting.GOLD + "31" + EnumChatFormatting.GOLD + "32" + EnumChatFormatting.GRAY + " Infinite SpaceTime Energy Boundary Casing.") .addStructureInfo( -- cgit From 5b503c38d1f35874ced360890417e53d6a219eab Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Thu, 16 Feb 2023 21:08:57 +0100 Subject: Put TT after GT NEI Ore plugin in loading order and moved EOH initialisation to onLoadCompleted --- src/main/java/com/github/technus/tectech/TecTech.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 0a1aef7763..4e9d36eee8 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -7,6 +7,7 @@ import java.lang.reflect.Modifier; import java.util.Collection; import java.util.Iterator; +import cpw.mods.fml.common.eventhandler.EventPriority; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @@ -52,6 +53,7 @@ import gregtech.common.GT_Proxy; + "required-after:structurelib;" + "after:ComputerCraft;" + "after:OpenComputers;" + + "required-after:gtneioreplugin;" + "required-after:gregtech;" + "after:dreamcraft;" + "after:appliedenergistics2;" @@ -247,12 +249,11 @@ public class TecTech { pEvent.registerServerCommand(new ChargeCommand()); pEvent.registerServerCommand(new MassCommand()); } + } - // This must be done after game load otherwise it fails. + @Mod.EventHandler + public void onLoadCompleted(FMLLoadCompleteEvent event) { eyeOfHarmonyRecipeStorage = new EyeOfHarmonyRecipeStorage(); - // The reason we do this is to force the fields inside the class to instantiate at world load so NEI - // displays properly. - eyeOfHarmonyRecipeStorage.recipeLookUp(new ItemStack(ModBlocks.blocks.get("Ow"))); } public static EyeOfHarmonyRecipeStorage eyeOfHarmonyRecipeStorage = null; -- cgit From fd23315c47eef80ca8448ea945d7208eb9c543e0 Mon Sep 17 00:00:00 2001 From: GitHub GTNH Actions <> Date: Thu, 16 Feb 2023 20:49:57 +0000 Subject: spotlessApply --- src/main/java/com/github/technus/tectech/TecTech.java | 4 ---- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 4e9d36eee8..17b5c88828 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -7,12 +7,8 @@ import java.lang.reflect.Modifier; import java.util.Collection; import java.util.Iterator; -import cpw.mods.fml.common.eventhandler.EventPriority; -import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; -import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; - import com.github.technus.tectech.loader.MainLoader; import com.github.technus.tectech.loader.TecTechConfig; import com.github.technus.tectech.loader.gui.CreativeTabEM; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index 8c11063d2b..fc74091ea6 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -692,8 +692,8 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl .addElement( 'H', buildHatchAdder(GT_MetaTileEntity_EM_EyeOfHarmony.class) - .atLeast(InputHatch, OutputHatch, InputBus, OutputBus) - .casingIndex(texturePage << 7).dot(1).buildAndChain(sBlockCasingsBA0, 12)) + .atLeast(InputHatch, OutputHatch, InputBus, OutputBus).casingIndex(texturePage << 7).dot(1) + .buildAndChain(sBlockCasingsBA0, 12)) .addElement( 'E', ofBlocksTiered( -- cgit From 338d924537ea154851e94c33cff1b82f21ba6a71 Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Thu, 16 Feb 2023 21:52:36 +0100 Subject: Fixed blacklisted blocks deleting entries from ModBlocks.blocks --- dependencies.gradle | 2 +- .../github/technus/tectech/thing/block/TileEyeOfHarmony.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 657e29fe44..a17694aaf2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ dependencies { shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1') api("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.275:dev") api('com.github.GTNewHorizons:Yamcl:0.5.84:dev') - implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.0.27:dev') + implementation('com.github.GTNewHorizons:GTNEIOrePlugin:99.99.99:dev') compileOnly("com.github.GTNewHorizons:TinkersGregworks:master-SNAPSHOT:dev") {transitive = false} diff --git a/src/main/java/com/github/technus/tectech/thing/block/TileEyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/block/TileEyeOfHarmony.java index 1907906750..655a531432 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/TileEyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/block/TileEyeOfHarmony.java @@ -111,14 +111,15 @@ public class TileEyeOfHarmony extends TileEntity { private static final Set BLACKLISTED_BLOCKS = Collections .unmodifiableSet(new HashSet<>(Arrays.asList("Tf", "Ow", "ED", "EA", "VA"))); // Map of strings to blocks - private static final Map BLOCKS; + private static final Map BLOCKS = new HashMap<>(); static { // Initialize the map of blocks - BLOCKS = ModBlocks.blocks; - - // Remove blacklisted blocks from the map - BLOCKS.keySet().removeAll(BLACKLISTED_BLOCKS); + ModBlocks.blocks.forEach((dimString, dimBlock) -> { + if (!BLACKLISTED_BLOCKS.contains(dimString)) { + BLOCKS.put(dimString, dimBlock); + } + }); } private static final float MAX_ANGLE = 30; -- cgit From 397db3353bfef0f96455bd9c94e17675c7f38c44 Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Thu, 16 Feb 2023 22:03:34 +0100 Subject: Derp --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index a17694aaf2..657e29fe44 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ dependencies { shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1') api("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.275:dev") api('com.github.GTNewHorizons:Yamcl:0.5.84:dev') - implementation('com.github.GTNewHorizons:GTNEIOrePlugin:99.99.99:dev') + implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.0.27:dev') compileOnly("com.github.GTNewHorizons:TinkersGregworks:master-SNAPSHOT:dev") {transitive = false} -- cgit