From fb5aa4825804f178aee00b5941dc523c2a80cb6c Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Tue, 17 Oct 2023 10:53:38 +0200 Subject: [PATCH] delete compat to set OpenBlock's grave hardness to 6 --- .../core/common/compat/COMPAT_OpenBlocks.java | 29 ------------------- .../core/handler/COMPAT_HANDLER.java | 7 ----- 2 files changed, 36 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java deleted file mode 100644 index 94b3d27c7e..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java +++ /dev/null @@ -1,29 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class COMPAT_OpenBlocks { - - public static void OreDict() { - run(); - } - - private static final void run() { - - Item aGraveItem = ItemUtils.getItemFromFQRN("OpenBlocks:grave"); - if (aGraveItem == null) { - return; - } - Block aGraveBlock = Block.getBlockFromItem(aGraveItem); - if (aGraveBlock == null) { - return; - } - - Logger.INFO("[Hungry Node Blacklist] Setting the Hardness of the OpenBlocks Grave to 6."); - aGraveBlock.setHardness(6f); - } -} diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 5b7d1de7fb..b359fe99ba 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.handler; import static gregtech.api.enums.Mods.ExtraUtilities; -import static gregtech.api.enums.Mods.OpenBlocks; import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.Witchery; @@ -22,7 +21,6 @@ import gtPlusPlus.core.common.compat.COMPAT_ExtraUtils; import gtPlusPlus.core.common.compat.COMPAT_HarvestCraft; import gtPlusPlus.core.common.compat.COMPAT_IC2; -import gtPlusPlus.core.common.compat.COMPAT_OpenBlocks; import gtPlusPlus.core.common.compat.COMPAT_Thaumcraft; import gtPlusPlus.core.common.compat.COMPAT_Witchery; import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler; @@ -192,10 +190,6 @@ public static void registerGregtechMachines() { // InterMod public static void intermodOreDictionarySupport() { - - if (OpenBlocks.isModLoaded()) { - COMPAT_OpenBlocks.OreDict(); - } if (Thaumcraft.isModLoaded()) { COMPAT_Thaumcraft.OreDict(); } @@ -206,7 +200,6 @@ public static void intermodOreDictionarySupport() { COMPAT_HarvestCraft.OreDict(); } COMPAT_IC2.OreDict(); - if (Witchery.isModLoaded()) { COMPAT_Witchery.OreDict(); }