Remove WA leftovers (#778)

GTNewHorizons · Nov 6, 2023 · 75da632 · 75da632
1 parent 76b3a5d
commit 75da632
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 27 deletions.
diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
@@ -31,7 +31,6 @@
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SolarGenerators;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SteamConverter;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Tesseracts;
-import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_WorldAccelerators;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiSizeTools;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_Cyclotron;
@@ -255,11 +254,6 @@ public static void handleConfigFile(final FMLPreInitializationEvent event) {
                 GregTech.ID,
                 true,
                 "These may be overpowered, Consult a local geologist.");
-        enableMachine_WorldAccelerators = config.getBoolean(
-                "enableMachineWorldAccelerators",
-                GregTech.ID,
-                true,
-                "These allow boosting Block/TileEntity Tick times [OP].");
         enableMachine_Tesseracts = config.getBoolean(
                 "enableMachineTesseracts",
                 GregTech.ID,

diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -165,7 +165,6 @@ public static class ConfigSwitches {
         public static boolean enableMachine_FluidTanks = true;
         public static boolean enableMachine_RocketEngines = true;
         public static boolean enableMachine_GeothermalEngines = true;
-        public static boolean enableMachine_WorldAccelerators = true;
         public static boolean enableMachine_Tesseracts = true;
         public static boolean enableMachine_SimpleWasher = true;
         public static boolean enableMachine_Pollution = true;

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -770,16 +770,6 @@ public enum GregtechItemList implements GregtechItemContainer {
     GT_FluidTank_UV,
     GT_FluidTank_MAX,
 
-    // Tick Accelerators from GTNH
-    AcceleratorLV,
-    AcceleratorMV,
-    AcceleratorHV,
-    AcceleratorEV,
-    AcceleratorIV,
-    AcceleratorLuV,
-    AcceleratorZPM,
-    AcceleratorUV,
-
     // GT RTG
     RTG,
 

diff --git a/...main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.png b/...main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.png
diff --git a/...sources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png b/...sources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png
diff --git a/.../resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png.mcmeta b/.../resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png.mcmeta
diff --git a/...n/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE.png b/...n/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE.png
diff --git a/...rces/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png b/...rces/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png
diff --git a/...sources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png.mcmeta b/...sources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png.mcmeta