Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle

Author: KasumiNova

build.gradle

@@ -93,8 +93,10 @@ dependencies {
     implementation fg.deobf("curse.maven:draconicevolution-223565:3051542")
     implementation fg.deobf("mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.28-17")
 
-    //TODO Change to GregTech Community Edition: Unofficial (GTCEu)
     implementation fg.deobf("curse.maven:gregtech-293327:3266351")
+    //Because GTCEu 2.4 and above and NCo crashed, this is to use GTCEu 2.3.4 for testing
+    //Rendering errors occur when the GTCEu version is tested running, so just compileOnly
+    compileOnly fg.deobf("curse.maven:gregtech-ce-unofficial-557242:3859788")
 
     implementation fg.deobf("curse.maven:Mekanism-268560:2835175")
     implementation fg.deobf("curse.maven:industrialcraft-2-242638:3078604")

src/main/java/hellfirepvp/modularmachinery/common/block/prop/EnergyHatchData.java

@@ -10,6 +10,7 @@
 
 import gregtech.api.GTValues;
 import hellfirepvp.modularmachinery.ModularMachinery;
+import hellfirepvp.modularmachinery.common.base.Mods;
 import hellfirepvp.modularmachinery.common.util.MiscUtils;
 import net.minecraft.util.IStringSerializable;
 import net.minecraft.util.math.MathHelper;
@@ -18,6 +19,8 @@
 
 import javax.annotation.Nonnull;
 
+import static hellfirepvp.modularmachinery.common.base.Mods.GREGTECH;
+
 /**
  * This class is part of the Modular Machinery Mod
  * The complete source code for this mod can be found on github.
@@ -41,7 +44,7 @@ public enum EnergyHatchData implements IStringSerializable {
     public static int energyCoreSearchDelay = 100;
     public static int maxEnergyCoreSearchDelay = 300;
     public static int searchRange = 16;
-
+    public static boolean enableGTExplodes = true;
     private final int defaultConfigurationEnergy;
     private final int defaultConfigurationTransferLimit;
     private final int defaultIC2EnergyTier;
@@ -70,12 +73,19 @@ public static void loadFromConfig(Configuration cfg) {
 
             size.ic2EnergyTier = cfg.get("energyhatch.tier", size.name().toUpperCase(), size.defaultIC2EnergyTier, "Defines the IC2 output-voltage tier. Only affects the power the output hatches will output power as. 0 = 'ULV' = 8 EU/t, 1 = 'LV' = 32 EU/t, 2 = 'MV' = 128 EU/t, ... [range: 0 ~ 12, default: " + size.defaultIC2EnergyTier + "]").getInt();
 
-            size.gtEnergyTier = cfg.get("energyhatch.gtvoltage", size.name().toUpperCase(), size.defaultGTEnergyTier, "Defines the GT voltage tier. Affects both input and output hatches of this tier. [range: 0 ~ 8, default: " + size.defaultGTEnergyTier + "]").getInt();
-            size.gtEnergyTier = MathHelper.clamp(size.gtEnergyTier, 0, 8);
-            size.gtAmperage = cfg.get("energyhatch.gtamperage", size.name().toUpperCase(), size.defaultGTAmperage, "Defines the GT amperage. Affects both output amperage as well as maximum input amperage. [range: 1 ~ 16, default: " + size.defaultGTAmperage + "]").getInt();
-            size.gtAmperage = MathHelper.clamp(size.gtAmperage, 1, 16);
+            int gtEnergyTierlength = GTValues.VN.length - 1 ;
+
+            size.gtEnergyTier = cfg.get("energyhatch.gtvoltage", size.name().toUpperCase(), size.defaultGTEnergyTier, "Defines the GT voltage tier. Affects both input and output hatches of this tier. [range: 0 ~ "+ gtEnergyTierlength +", default: " + size.defaultGTEnergyTier + "]").getInt();
+            size.gtEnergyTier = MathHelper.clamp(size.gtEnergyTier, 0, gtEnergyTierlength);
+
+            size.gtAmperage = cfg.get("energyhatch.gtamperage", size.name().toUpperCase(), size.defaultGTAmperage, "Defines the GT amperage. Affects both output amperage as well as maximum input amperage. [range: 1 ~ "+Integer.MAX_VALUE +", default: " + size.defaultGTAmperage + "]").getInt();
+            size.gtAmperage = MathHelper.clamp(size.gtAmperage, 1, Integer.MAX_VALUE);
+
         }
 
+
+        enableGTExplodes = cfg.getBoolean("enable-GT-Explodes","energyhatch",true,
+                "When enabled, the energy chamber will use GT's explosive mechanism, which is only valid when GT is installed");
         enableDEIntegration = cfg.getBoolean("enable-de-integration", "energyhatch", true,
                 "When enabled, EnergyHatch can be used as an energy tower for the Draconic Evolution energy core and can automatically output energy at a rate that depends on the maximum rate in the configuration. Available only when Draconic Evolution is installed.");
         searchRange = cfg.getInt("energy-core-search-range", "energyhatch", 16, 1, 64,
@@ -106,7 +116,7 @@ public String getUnlocalizedEnergyDescriptor() {
 
     // MM only supports GTCE tiers from ULV to UV
     public int getGTEnergyTier() {
-        return MathHelper.clamp(this.gtEnergyTier, 0, 8);
+        return MathHelper.clamp(this.gtEnergyTier, 0, GTValues.VN.length - 1);
     }
 
     public int getGtAmperage() {

src/main/java/hellfirepvp/modularmachinery/common/tiles/base/GTEnergyContainer.java

@@ -10,12 +10,14 @@
 
 import gregtech.api.capability.IEnergyContainer;
 import gregtech.api.util.GTUtility;
-import gregtech.common.ConfigHolder;
+import hellfirepvp.modularmachinery.common.base.Mods;
 import hellfirepvp.modularmachinery.common.machine.IOType;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockPos;;
 import net.minecraftforge.fml.common.Optional;
 
+import static hellfirepvp.modularmachinery.common.block.prop.EnergyHatchData.enableGTExplodes;
+
 /**
  * This class is part of the Modular Machinery Mod
  * The complete source code for this mod can be found on github.
@@ -42,7 +44,7 @@ public long acceptEnergyFromNetwork(EnumFacing side, long voltage, long amperage
             long maxAmperage = Math.min(getInputAmperage(), amperage);
 
             if (voltage > getInputVoltage()) {
-                if (ConfigHolder.doExplosions) {
+                if (Mods.GREGTECH.isPresent() && enableGTExplodes) {
                     BlockPos pos = hatch.getPos();
                     hatch.getWorld().createExplosion(null,
                             pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5,
@@ -124,4 +126,5 @@ public long getInputAmperage() {
     public long getInputVoltage() {
         return ioType == IOType.INPUT ? hatch.getTier().getGTEnergyTransferVoltage() : 0L;
     }
+
 }