aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2023-07-04 11:15:30 +0100
committerGitHub <noreply@github.com>2023-07-04 11:15:30 +0100
commit6a3fb59df8bdc0c25754331ec43c25ba532e3cb4 (patch)
treeebd529ea3fcad2735c1d01f5013fa79d850db14a /src/main/java/gtPlusPlus/core
parent5036c2adee48f43f1772c0574ba6627f44455615 (diff)
downloadGT5-Unofficial-6a3fb59df8bdc0c25754331ec43c25ba532e3cb4.tar.gz
GT5-Unofficial-6a3fb59df8bdc0c25754331ec43c25ba532e3cb4.tar.bz2
GT5-Unofficial-6a3fb59df8bdc0c25754331ec43c25ba532e3cb4.zip
Restore pams fish compat (#685)
* restore pams compat * restore harvestcraft compat file * cleanup * ra2 and more cleanup
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
-rw-r--r--src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java14
-rw-r--r--src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java5
2 files changed, 19 insertions, 0 deletions
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java
new file mode 100644
index 0000000000..f3c83785c4
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java
@@ -0,0 +1,14 @@
+package gtPlusPlus.core.common.compat;
+
+import gtPlusPlus.xmod.pamsharvest.fishtrap.FishTrapHandler;
+
+public class COMPAT_HarvestCraft {
+
+ public static void OreDict() {
+ run();
+ }
+
+ private static final void run() {
+ FishTrapHandler.pamsHarvestCraftCompat();
+ }
+}
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 5f9cfb732e..0d8c9fc529 100644
--- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.handler;
import static gregtech.api.enums.Mods.EnderIO;
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;
@@ -21,6 +22,7 @@ import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.api.objects.minecraft.ItemPackage;
import gtPlusPlus.core.common.compat.COMPAT_EnderIO;
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;
@@ -226,6 +228,9 @@ public class COMPAT_HANDLER {
if (ExtraUtilities.isModLoaded()) {
COMPAT_ExtraUtils.OreDict();
}
+ if (PamsHarvestCraft.isModLoaded()) {
+ COMPAT_HarvestCraft.OreDict();
+ }
COMPAT_IC2.OreDict();
if (Witchery.isModLoaded()) {