add configurable colors for machines and cables

GregTechCEu · Jul 5, 2021 · 23f9c5d · 23f9c5d
1 parent 0201b71
commit 23f9c5d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -22,6 +22,7 @@
 import gregtech.api.render.Textures;
 import gregtech.api.util.GTFluidUtils;
 import gregtech.api.util.GTUtility;
+import gregtech.common.ConfigHolder;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -60,7 +61,7 @@
 
 public abstract class MetaTileEntity implements ICoverable {
 
-    public static final int DEFAULT_PAINTING_COLOR = 0xFFFFFF;
+    public static int DEFAULT_PAINTING_COLOR = ConfigHolder.U.GT5u.defaultPaintingColor;
     public static final IndexedCuboid6 FULL_CUBE_COLLISION = new IndexedCuboid6(null, Cuboid6.full);
     public static final String TAG_KEY_PAINTING_COLOR = "PaintingColor";
     public static final String TAG_KEY_FRAGILE = "Fragile";

diff --git a/src/main/java/gregtech/api/pipenet/tile/IPipeTile.java b/src/main/java/gregtech/api/pipenet/tile/IPipeTile.java
@@ -3,6 +3,7 @@
 import gnu.trove.map.TIntIntMap;
 import gregtech.api.pipenet.block.BlockPipe;
 import gregtech.api.pipenet.block.IPipeType;
+import gregtech.common.ConfigHolder;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
@@ -13,7 +14,7 @@
 
 public interface IPipeTile<PipeType extends Enum<PipeType> & IPipeType<NodeDataType>, NodeDataType> {
 
-    int DEFAULT_INSULATION_COLOR = 0x777777;
+    int DEFAULT_INSULATION_COLOR = ConfigHolder.U.GT5u.defaultInsulationColor;
 
     World getPipeWorld();
 

diff --git a/src/main/java/gregtech/api/pipenet/tile/PipeCoverableImplementation.java b/src/main/java/gregtech/api/pipenet/tile/PipeCoverableImplementation.java
@@ -160,7 +160,8 @@ public double getCoverPlateThickness() {
 
     @Override
     public int getPaintingColor() {
-        return holder.getInsulationColor() == IPipeTile.DEFAULT_INSULATION_COLOR ? 0xFFFFFF : holder.getInsulationColor();
+        //todo make insulation colors separate for pipes and cables so cover plates have the correct overlay
+        return holder.getInsulationColor() == IPipeTile.DEFAULT_INSULATION_COLOR ? IPipeTile.DEFAULT_INSULATION_COLOR : holder.getInsulationColor();
     }
 
     @Override

diff --git a/src/main/java/gregtech/common/ConfigHolder.java b/src/main/java/gregtech/common/ConfigHolder.java
@@ -212,6 +212,16 @@ public static class GT5U {
 
             @Config.Comment("Whether or not to use polymers instead of rare metals for Carbon Fibers. REMOVES THE CHANCED OUTPUT! Default: false")
             public boolean polymerCarbonFiber = false;
+
+            @Config.Comment("The default color to overlay onto machines. \n16777215 (0xFFFFFF in decimal) is no coloring (default), and 13819135 (0xD2DCFF in decimal) is the classic blue from GT5.")
+            @Config.Name("Default Machine Color")
+            @Config.RequiresMcRestart
+            public int defaultPaintingColor = 0xFFFFFF;
+
+            @Config.Comment("The default color to overlay onto machines. \n7829367 (0x777777 in decimal) is no coloring (default), and 4210752 (0x404040 in decimal) is the classic black from GT5.")
+            @Config.Name("Default Cable Color")
+            @Config.RequiresMcRestart
+            public int defaultInsulationColor = 0x777777;
         }
 
         public static class GT6 {