From bb9da48b9975cb27e3b7c538bff2853a34b36fcd Mon Sep 17 00:00:00 2001
From: miozune <miozune@gmail.com>
Date: Sun, 5 Feb 2023 01:40:43 +0900
Subject: Remove redundant flags (#529)

* Remove CORE.GTNH

* Remove LoadedMods.Gregtech

* Remove LoadedMods.IndustrialCraft2

* Remove LoadedMods.MiscUtils

* Remove CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK

* clean

* Remove mention to GT versions

* Fix assembler mode
---
 .../gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java  | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api/world')

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java
index e3f33f45e4..6e87662ef1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java
@@ -16,7 +16,6 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.common.blocks.GT_TileEntity_Ores;
 import gregtech.loaders.misc.GT_Achievements;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 
 public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen {
@@ -241,18 +240,10 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen {
         }
 
         if (mSetOre != null) {
-            if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-                try {
-                    return (boolean) mSetOre.invoke(world, x, y, z, secondarymeta, bool);
-                } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException t) {
-                    return false;
-                }
-            } else {
-                try {
-                    return (boolean) mSetOre.invoke(world, x, y, z, secondarymeta);
-                } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException t) {
-                    return false;
-                }
+            try {
+                return (boolean) mSetOre.invoke(world, x, y, z, secondarymeta, bool);
+            } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException t) {
+                return false;
             }
         } else {
             return false;
-- 
cgit