trim lossless wire configs

bruberu · Aug 9, 2021 · 90b8e04 · 90b8e04
1 parent 4f36d36
commit 90b8e04
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/src/main/java/gregtech/api/unification/material/properties/WireProperties.java b/src/main/java/gregtech/api/unification/material/properties/WireProperties.java
@@ -7,6 +7,7 @@ public class WireProperties implements IMaterialProperty<WireProperties> {
     public final int voltage;
     public final int amperage;
     public final int lossPerBlock;
+    public final boolean isSuperconductor = false; // todo implement
 
     public WireProperties(int voltage, int baseAmperage, int lossPerBlock) {
         this.voltage = voltage;

diff --git a/src/main/java/gregtech/common/ConfigHolder.java b/src/main/java/gregtech/common/ConfigHolder.java
@@ -113,13 +113,6 @@ public class ConfigHolder {
     @Config.RequiresMcRestart
     public static int gasTurbineBonusOutput = 6144;
 
-    @Config.Comment("If true, powered zero loss wires will damage the player. Default: false")
-    public static boolean doLosslessWiresDamage = false;
-
-    @Config.Comment("If true, lossless cables will have lossy wires. Default: false")
-    @Config.RequiresMcRestart
-    public static boolean doLosslessWiresMakeLossyCables = false;
-
     @Config.Comment("Array of blacklisted dimension IDs in which Air Collector does not work. Default: none")
     public static int[] airCollectorDimensionBlacklist = new int[]{};
 

diff --git a/src/main/java/gregtech/common/pipelike/cable/BlockCable.java b/src/main/java/gregtech/common/pipelike/cable/BlockCable.java
@@ -124,11 +124,10 @@ public boolean canPipeConnectToBlock(IPipeTile<Insulation, WireProperties> selfT
     public void onEntityCollision(World worldIn, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Entity entityIn) {
         if (worldIn.isRemote) return;
         Insulation insulation = getPipeTileEntity(worldIn, pos).getPipeType();
-        boolean damageOnLossless = ConfigHolder.doLosslessWiresDamage;
         if (!worldIn.isRemote && insulation.insulationLevel == -1 && entityIn instanceof EntityLivingBase) {
             EntityLivingBase entityLiving = (EntityLivingBase) entityIn;
             EnergyNet energyNet = getWorldPipeNet(worldIn).getNetFromPos(pos);
-            if (energyNet != null && (damageOnLossless || energyNet.getAllNodes().get(pos).data.lossPerBlock > 0)) {
+            if (energyNet != null && (energyNet.getAllNodes().get(pos).data.lossPerBlock > 0)) {
                 long voltage = energyNet.getLastMaxVoltage();
                 long amperage = energyNet.getLastAmperage();
                 if (voltage > 0L && amperage > 0L) {

diff --git a/src/main/java/gregtech/common/pipelike/cable/Insulation.java b/src/main/java/gregtech/common/pipelike/cable/Insulation.java
@@ -58,7 +58,7 @@ public OrePrefix getOrePrefix() {
     public WireProperties modifyProperties(WireProperties baseProperties) {
 
         int lossPerBlock;
-        if (ConfigHolder.doLosslessWiresMakeLossyCables && baseProperties.lossPerBlock == 0)
+        if (!baseProperties.isSuperconductor && baseProperties.lossPerBlock == 0)
             lossPerBlock = (int) (0.75 * lossMultiplier);
         else lossPerBlock = baseProperties.lossPerBlock * lossMultiplier;