Merge branch 'master' into zb-lotsa-mui2

Author: Zorbatron

dependencies.gradle

@@ -40,8 +40,8 @@
 dependencies {
     // Published dependencies
     api("codechicken:codechickenlib:3.2.3.358")
-    api("com.cleanroommc:modularui:2.5.0-rc1") { transitive = false }
-    api("com.cleanroommc:groovyscript:1.1.1") { transitive = false }
+    api("com.cleanroommc:modularui:2.5.0-rc2") { transitive = false }
+    api("com.cleanroommc:groovyscript:1.2.0-hotfix1") { transitive = false }
     api("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700")
     api("appeng:ae2-uel:v0.56.4") { transitive = false }
     api rfg.deobf("curse.maven:ctm-267602:2915363") // CTM 1.0.2.31

src/api/java/meldexun/nothirium/api/renderer/chunk/ChunkRenderPass.java

@@ -0,0 +1,12 @@
+package meldexun.nothirium.api.renderer.chunk;
+
+/**
+ * Adapted and minimized from <a
+ * href="https://github.com/Meldexun/Nothirium/blob/main/src/main/java/meldexun/nothirium/api/renderer/chunk/ChunkRenderPass.java">ChunkRenderPass.java</a>
+ */
+public enum ChunkRenderPass {
+    ;
+
+    public static final ChunkRenderPass[] ALL = ChunkRenderPass.values();
+
+}

src/main/java/gregtech/GregTechMod.java

@@ -33,7 +33,7 @@
      dependencies = "required:forge@[14.23.5.2847,);" + "required-after:codechickenlib@[3.2.3,);" +
              "required-after:modularui@[2.3,);" + "required-after:mixinbooter@[8.0,);" + "after:appliedenergistics2;" +
              "after:forestry;" + "after:extrabees;" + "after:extratrees;" + "after:genetics;" + "after:magicbees;" +
-             "after:jei@[4.15.0,);" + "after:crafttweaker@[4.1.20,);" + "after:groovyscript@[1.1.0,);" +
+             "after:jei@[4.15.0,);" + "after:crafttweaker@[4.1.20,);" + "after:groovyscript@[1.2.0,);" +
              "after:theoneprobe;" + "after:hwyla;")
 public class GregTechMod {
 

src/main/java/gregtech/api/GTValues.java

@@ -54,7 +54,7 @@ public class GTValues {
      * The Voltage Tiers. Use this Array instead of the old named Voltage Variables
      */
     public static final long[] V = { 8, 32, 128, 512, 2048, 8192, 32768, 131072, 524288, 2097152, 8388608, 33554432,
-            134217728, 536870912, Integer.MAX_VALUE };
+            134217728, 536870912, 2147483648L };
 
     /**
      * The Voltage Tiers divided by 2.
@@ -78,10 +78,10 @@ public class GTValues {
      * The Voltage Tiers extended all the way to max Long value for overclocking
      */
     public static final long[] VOC = { 8, 32, 128, 512, 2048, 8192, 32768, 131072, 524288, 2097152, 8388608, 33554432,
-            134217728, 536870912, Integer.MAX_VALUE, 8589934592L, 34359738368L, 137438953472L, 549755813888L,
-            2199023255552L,
-            8796093022208L, 35184372088832L, 140737488355328L, 562949953421312L, 2251799813685248L, 9007199254740992L,
-            36028797018963968L, 144115188075855872L, 576460752303423488L, 2305843009213693952L, Long.MAX_VALUE };
+            134217728, 536870912, 2147483648L, 8589934592L, 34359738368L, 137438953472L, 549755813888L,
+            2199023255552L, 8796093022208L, 35184372088832L, 140737488355328L, 562949953421312L, 2251799813685248L,
+            9007199254740992L, 36028797018963968L, 144115188075855872L, 576460752303423488L, 2305843009213693952L,
+            Long.MAX_VALUE };
 
     public static final int ULV = 0;
     public static final int LV = 1;
@@ -105,14 +105,33 @@ public class GTValues {
      * The short names for the voltages, used for registration primarily
      */
     public static final String[] VN = new String[] { "ULV", "LV", "MV", "HV", "EV", "IV", "LuV", "ZPM", "UV", "UHV",
-            "UEV", "UIV", "UXV", "OpV", "MAX", "MAX+" };
+            "UEV", "UIV", "UXV", "OpV", "MAX" };
 
     /**
-     * The short names for the voltages, formatted for text
+     * The short names for the voltages, up to max Long, used for registration primarily
      */
-    public static final String MAX_PLUS = RED.toString() + BOLD + "M" + YELLOW + BOLD + "A" + GREEN + BOLD + "X" +
+    public static final String[] VOCN = new String[] { "ULV", "LV", "MV", "HV", "EV", "IV", "LuV", "ZPM", "UV", "UHV",
+            "UEV", "UIV", "UXV", "OpV", "MAX", "MAX+1", "MAX+2", "MAX+3", "MAX+4", "MAX+5", "MAX+6", "MAX+7", "MAX+8",
+            "MAX+9", "MAX+10", "MAX+11", "MAX+12", "MAX+13", "MAX+14", "MAX+15", "MAX+16",
+    };
+
+    private static final String MAX_PLUS = RED.toString() + BOLD + "M" + YELLOW + BOLD + "A" + GREEN + BOLD + "X" +
             AQUA + BOLD + "+" + LIGHT_PURPLE + BOLD;
+
+    /**
+     * The short names for the voltages, formatted for text
+     */
     public static final String[] VNF = new String[] {
+            DARK_GRAY + "ULV", GRAY + "LV", AQUA + "MV",
+            GOLD + "HV", DARK_PURPLE + "EV", DARK_BLUE + "IV",
+            LIGHT_PURPLE + "LuV", RED + "ZPM", DARK_AQUA + "UV",
+            DARK_RED + "UHV", GREEN + "UEV", DARK_GREEN + "UIV",
+            YELLOW + "UXV", BLUE + "OpV", RED.toString() + BOLD + "MAX" };
+
+    /**
+     * The short names for the voltages, up to max Long, formatted for text
+     */
+    public static final String[] VOCNF = new String[] {
             DARK_GRAY + "ULV", GRAY + "LV", AQUA + "MV",
             GOLD + "HV", DARK_PURPLE + "EV", DARK_BLUE + "IV",
             LIGHT_PURPLE + "LuV", RED + "ZPM", DARK_AQUA + "UV",

src/main/java/gregtech/api/capability/GregtechCapabilities.java

@@ -2,7 +2,6 @@
 
 import gregtech.api.GTValues;
 import gregtech.api.capability.impl.EUToFEProvider;
-import gregtech.api.terminal.hardware.HardwareProvider;
 import gregtech.api.util.GTUtility;
 import gregtech.common.metatileentities.converter.ConverterTrait;
 
@@ -26,9 +25,6 @@ public class GregtechCapabilities {
     @CapabilityInject(IMultiblockController.class)
     public static Capability<IMultiblockController> CAPABILITY_MULTIBLOCK_CONTROLLER = null;
 
-    @CapabilityInject(HardwareProvider.class)
-    public static Capability<HardwareProvider> CAPABILITY_HARDWARE_PROVIDER = null;
-
     @CapabilityInject(ConverterTrait.class)
     public static Capability<ConverterTrait> CAPABILITY_CONVERTER = null;
 

src/main/java/gregtech/api/capability/GregtechDataCodes.java

@@ -140,6 +140,11 @@ public static int assignId() {
     public static final int UPDATE_ITEM_COUNT = assignId();
     public static final int UPDATE_FLUID_AMOUNT = assignId();
 
+    // Quantum Storage Controller
+    public static final int UPDATE_CONTROLLER_POS = assignId();
+    public static final int REMOVE_CONTROLLER = assignId();
+    public static final int LOCATE_CONTROLLER = assignId();
+
     // Detector Covers
     public static final int UPDATE_INVERTED = assignId();
 

src/main/java/gregtech/api/capability/IDualHandler.java

@@ -0,0 +1,14 @@
+package gregtech.api.capability;
+
+import net.minecraftforge.items.IItemHandler;
+
+public interface IDualHandler {
+
+    boolean hasFluidTanks();
+
+    boolean hasItemHandlers();
+
+    IMultipleTankHandler getFluidTanks();
+
+    IItemHandler getItemHandlers();
+}

src/main/java/gregtech/api/capability/IQuantumController.java

@@ -0,0 +1,34 @@
+package gregtech.api.capability;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraftforge.common.capabilities.ICapabilityProvider;
+
+// ICapabilityProvider is needed because getCapability is called in the quantum proxy against this interface
+public interface IQuantumController extends ICapabilityProvider {
+
+    /**
+     * Constructs the network upon placement and when storages are added/removed
+     * <br />
+     */
+    void rebuildNetwork();
+
+    /**
+     * Return whether this storage block can connect. Can be used to implement a maximum distance from controller for
+     * example.
+     */
+    boolean canConnect(IQuantumStorage<?> storage);
+
+    BlockPos getPos();
+
+    IDualHandler getHandler();
+
+    boolean isPowered();
+
+    long getEnergyUsage();
+
+    int getCount(IQuantumStorage.Type type);
+
+    long getTypeEnergy(IQuantumStorage<?> storage);
+
+    void updateHandler();
+}

src/main/java/gregtech/api/capability/IQuantumStorage.java

@@ -0,0 +1,77 @@
+package gregtech.api.capability;
+
+import gregtech.api.cover.CoverableView;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
+
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+
+import org.jetbrains.annotations.Nullable;
+
+public interface IQuantumStorage<T> extends CoverableView {
+
+    Type getType();
+
+    void setConnected(IQuantumController controller);
+
+    void setDisconnected();
+
+    BlockPos getControllerPos();
+
+    @Nullable
+    IQuantumController getQuantumController();
+
+    BlockPos getPos();
+
+    default boolean isConnected() {
+        // use controllerPos here because it is synced
+        // on both sides, where controller is not
+        return getControllerPos() != null;
+    }
+
+    default void tryFindNetwork() {
+        for (EnumFacing facing : EnumFacing.VALUES) {
+            var offset = getPos().offset(facing);
+            var state = getWorld().getBlockState(offset);
+            if (state.getBlock().isAir(state, getWorld(), offset)) continue;
+            MetaTileEntity mte;
+            if (getNeighbor(facing) instanceof IGregTechTileEntity gtte) {
+                mte = gtte.getMetaTileEntity();
+            } else {
+                continue;
+            }
+
+            IQuantumController candidate = null;
+            if (mte instanceof IQuantumStorage<?>storage) {
+                if (storage.isConnected()) {
+                    IQuantumController controller = storage.getQuantumController();
+                    if (controller != null && controller.canConnect(this)) {
+                        candidate = controller;
+                    }
+                }
+            } else if (mte instanceof IQuantumController quantumController) {
+                if (quantumController.canConnect(this)) {
+                    candidate = quantumController;
+                }
+            }
+            if (candidate != null) {
+                candidate.rebuildNetwork();
+                return;
+            }
+        }
+    }
+
+    T getTypeValue();
+
+    enum Type {
+
+        ITEM,
+        FLUID,
+        EXTENDER,
+        PROXY,
+        ENERGY;
+
+        public static final Type[] VALUES = values();
+    }
+}

src/main/java/gregtech/api/capability/SimpleCapabilityManager.java

@@ -3,7 +3,6 @@
 import gregtech.api.capability.impl.AbstractRecipeLogic;
 import gregtech.api.cover.CoverHolder;
 import gregtech.api.metatileentity.multiblock.IMaintenance;
-import gregtech.api.terminal.hardware.HardwareProvider;
 import gregtech.api.worldgen.generator.GTWorldGenCapability;
 import gregtech.common.metatileentities.converter.ConverterTrait;
 
@@ -48,7 +47,6 @@ public static void init() {
         registerCapabilityWithNoDefault(AbstractRecipeLogic.class);
         registerCapabilityWithNoDefault(IDataAccessHatch.class);
         registerCapabilityWithNoDefault(IOpticalComputationProvider.class);
-        registerCapabilityWithNoDefault(HardwareProvider.class);
         registerCapabilityWithNoDefault(ConverterTrait.class);
         registerCapabilityWithNoDefault(ILaserContainer.class);