Better Endgame Wireless EU (#1144)

* Basis of changes

* Adjust voltage tiers to remove OpV

* Better textures, move IDs around etc.

* Format cleanup

* Log level change

* Dynamos

* More stuff

* More OpV purging.

* Fixes

* Remove wire support.

* Textures

* IDs

* Update hatch/dynamo

* New number formatter

* Add default method

* Add save method on world close

* Cleanup old comments/debug

* Author

* Author

* Author

* Author

* Restructuring of code

* Unit tests

* More unit tests + cleanup

* Fix ID shift + add spares

Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>

4 files changed, 87 insertions, 7 deletions

diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java
index 5765fc42c2..f0a29e2dfc 100644
--- a/src/main/java/gregtech/api/enums/GT_Values.java
+++ b/src/main/java/gregtech/api/enums/GT_Values.java
@@ -98,6 +98,7 @@ public class GT_Values {
     //TODO:AND ALL THE MATERIALS... for that
     //TODO:LIST OF MACHINES WITH POINTLESS TIERS (unless you implement some other tiering mechanism like reducing eu cost if time=1tick)
     //Macerator/Compressor/Furnace... and for cheap recipes any
+
     /**
      * keeping Voltage*Amps < Integer.MAX_VALUE-7 for machines (and tier logic 4x EUt 2/ time)
      * AMV[4]= max amps at tier 4
@@ -448,9 +449,22 @@ public class GT_Values {
     public static boolean worldTickHappened = false;
 
     public static final int[] emptyIntArray = new int[0];
+
+
     public static final IFluidTank[] emptyFluidTank = new IFluidTank[0];
     public static final FluidTankGT[] emptyFluidTankGT = new FluidTankGT[0];
     public static final FluidTankInfo[] emptyFluidTankInfo = new FluidTankInfo[0];
     public static final FluidStack[] emptyFluidStack = new FluidStack[0];
     public static final ItemStack[] emptyItemStackArray = new ItemStack[0];
+
+    /**
+     *  Pretty formatting for author names.
+     */
+    public static final String AuthorColen = "Author: " +
+        EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + EnumChatFormatting.ITALIC + EnumChatFormatting.UNDERLINE + "C" +
+        EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + EnumChatFormatting.ITALIC + EnumChatFormatting.UNDERLINE + "o" +
+        EnumChatFormatting.GREEN + EnumChatFormatting.BOLD + EnumChatFormatting.ITALIC + EnumChatFormatting.UNDERLINE + "l" +
+        EnumChatFormatting.DARK_AQUA + EnumChatFormatting.BOLD + EnumChatFormatting.ITALIC + EnumChatFormatting.UNDERLINE + "e" +
+        EnumChatFormatting.DARK_PURPLE + EnumChatFormatting.BOLD + EnumChatFormatting.ITALIC + EnumChatFormatting.UNDERLINE + "n";
+
 }
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index b73e6bd3a8..6996a139c4 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -967,6 +967,38 @@ public enum ItemList implements IItemContainer {
     Hatch_Energy_UV,
     Hatch_Energy_MAX,
 
+    Wireless_Hatch_Energy_ULV,
+    Wireless_Hatch_Energy_LV,
+    Wireless_Hatch_Energy_MV,
+    Wireless_Hatch_Energy_HV,
+    Wireless_Hatch_Energy_EV,
+    Wireless_Hatch_Energy_IV,
+    Wireless_Hatch_Energy_LuV,
+    Wireless_Hatch_Energy_ZPM,
+    Wireless_Hatch_Energy_UV,
+    Wireless_Hatch_Energy_UHV,
+    Wireless_Hatch_Energy_UEV,
+    Wireless_Hatch_Energy_UIV,
+    Wireless_Hatch_Energy_UMV,
+    Wireless_Hatch_Energy_UXV,
+    Wireless_Hatch_Energy_MAX,
+
+    Wireless_Dynamo_Energy_ULV,
+    Wireless_Dynamo_Energy_LV,
+    Wireless_Dynamo_Energy_MV,
+    Wireless_Dynamo_Energy_HV,
+    Wireless_Dynamo_Energy_EV,
+    Wireless_Dynamo_Energy_IV,
+    Wireless_Dynamo_Energy_LuV,
+    Wireless_Dynamo_Energy_ZPM,
+    Wireless_Dynamo_Energy_UV,
+    Wireless_Dynamo_Energy_UHV,
+    Wireless_Dynamo_Energy_UEV,
+    Wireless_Dynamo_Energy_UIV,
+    Wireless_Dynamo_Energy_UMV,
+    Wireless_Dynamo_Energy_UXV,
+    Wireless_Dynamo_Energy_MAX,
+
     Hatch_Input_ULV,
     Hatch_Input_LV,
     Hatch_Input_MV,
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index c51086369b..e080df4e0f 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -2324,13 +2324,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     }
 
     private static void addHasGasFluid(Materials aMaterial, String aConfigPath) {
-//        System.out.println("ABC4321 " + aMaterial.mDefaultLocalName + " " + aMaterial.mIconSet.is_custom + " " + aMaterial.mName);
-//        if (aMaterial.mDefaultLocalName.toLowerCase().contains("spacetime")) {
-////            GT_Mod.gregtechproxy.addFluid("molten.spacetime", "Molten SpaceTime", Materials.SpaceTime, 0, 0, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SpaceTime, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 100);
-//            System.out.println("TESTING 1234");
-//            System.out.println("ABC4321 " + aMaterial.mDefaultLocalName + " " + aMaterial.mIconSet.is_custom + " " + aMaterial.mName + " " + aMaterial.mHasPlasma + " " + aMaterial.mHasGas);
-//            return;
-//        }
 
         if (aMaterial.mIconSet.is_custom) {
             return;
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index fb1ff424fc..26cd952a8d 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -548,6 +548,8 @@ public class Textures {
         OVERLAY_FRONT_VACUUM_FREEZER_GLOW,
         OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE,
         OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE_GLOW,
+        OVERLAY_ENERGY_ON_WIRELESS,
+        OVERLAY_ENERGY_OFF_WIRELESS,
 
         OVERLAY_FRONT_MULTI_SMELTER,
         OVERLAY_FRONT_MULTI_SMELTER_GLOW,
@@ -1850,6 +1852,45 @@ public class Textures {
                 TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[]{60, 60, 245, 0}),
                 TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[]{40, 40, 245, 0}),
         };
+
+        public static final ITexture[] OVERLAYS_ENERGY_IN_MULTI_WIRELESS_ON = {
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[]{255, 255, 255, 0}),
+        };
+
+        public static final ITexture[] OVERLAYS_ENERGY_IN_MULTI_WIRELESS_OFF = {
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+            TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[]{0, 0, 0, 0}),
+        };
+
         public static final ITexture[] OVERLAYS_ENERGY_OUT_MULTI = {
                 TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[]{180, 180, 180, 0}),
                 TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[]{220, 220, 220, 0}),