From dbc10704fdbff100d1ae592aa0ddf1dc8b1aeca0 Mon Sep 17 00:00:00 2001
From: boubou19 <miisterunknown@gmail.com>
Date: Thu, 12 Sep 2024 22:30:04 +0200
Subject: Merge config categories (#3152)

Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
---
 src/main/java/gregtech/common/items/MetaGeneratedItem01.java        | 4 ++--
 .../java/gregtech/common/items/behaviors/BehaviourSprayColor.java   | 6 +++---
 .../common/items/behaviors/BehaviourSprayColorInfinite.java         | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/main/java/gregtech/common/items')

diff --git a/src/main/java/gregtech/common/items/MetaGeneratedItem01.java b/src/main/java/gregtech/common/items/MetaGeneratedItem01.java
index d1d7e1f9b1..9afdb22673 100644
--- a/src/main/java/gregtech/common/items/MetaGeneratedItem01.java
+++ b/src/main/java/gregtech/common/items/MetaGeneratedItem01.java
@@ -500,7 +500,7 @@ import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTRecipe;
 import gregtech.api.util.GTUtility;
-import gregtech.common.config.other.ConfigGeneral;
+import gregtech.common.config.Other;
 import gregtech.common.covers.CoverArm;
 import gregtech.common.covers.CoverChest;
 import gregtech.common.covers.CoverControlsWork;
@@ -4585,7 +4585,7 @@ public class MetaGeneratedItem01 extends MetaGeneratedItemX32 {
                 ItemList.Spray_Empty.get(1L),
                 ItemList.SPRAY_CAN_DYES_USED[i].get(1L),
                 ItemList.SPRAY_CAN_DYES[i].get(1L),
-                ConfigGeneral.sprayCanUses,
+                Other.sprayCanUses,
                 i);
             addItemBehavior(32000 + Spray_Colors[i], behaviourSprayColor);
             addItemBehavior(32000 + Spray_Colors_Used[i], behaviourSprayColor);
diff --git a/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColor.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColor.java
index 275b304e87..8c655907f2 100644
--- a/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColor.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColor.java
@@ -25,7 +25,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.items.MetaBaseItem;
 import gregtech.api.util.GTLanguageManager;
 import gregtech.api.util.GTUtility;
-import gregtech.common.config.other.ConfigGeneral;
+import gregtech.common.config.Other;
 
 public class BehaviourSprayColor extends BehaviourNone {
 
@@ -91,7 +91,7 @@ public class BehaviourSprayColor extends BehaviourNone {
         long tUses = getUses(aStack, tNBT);
 
         int painted = 0;
-        int maxPainted = ConfigGeneral.sprayCanChainRange;
+        int maxPainted = Other.sprayCanChainRange;
         ForgeDirection lookSide;
         Vec3 look = aPlayer.getLookVec();
         double absX = Math.abs(look.xCoord);
@@ -221,7 +221,7 @@ public class BehaviourSprayColor extends BehaviourNone {
     public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) {
         aList.add(this.mTooltip);
         aList.add(this.mTooltipChain);
-        aList.add(String.format(this.mTooltipChainAmount, ConfigGeneral.sprayCanChainRange));
+        aList.add(String.format(this.mTooltipChainAmount, Other.sprayCanChainRange));
         NBTTagCompound tNBT = aStack.getTagCompound();
         long tRemainingPaint = tNBT == null ? this.mUses
             : GTUtility.areStacksEqual(aStack, this.mFull, true) ? this.mUses : tNBT.getLong("GT.RemainingPaint");
diff --git a/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorInfinite.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorInfinite.java
index 4eb4fb565c..6f7d99fe3a 100644
--- a/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorInfinite.java
+++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorInfinite.java
@@ -16,7 +16,7 @@ import gregtech.api.enums.GTValues;
 import gregtech.api.items.MetaBaseItem;
 import gregtech.api.net.GTPacketInfiniteSpraycan;
 import gregtech.api.util.GTLanguageManager;
-import gregtech.common.config.other.ConfigGeneral;
+import gregtech.common.config.Other;
 
 public class BehaviourSprayColorInfinite extends BehaviourSprayColor {
 
@@ -32,14 +32,14 @@ public class BehaviourSprayColorInfinite extends BehaviourSprayColor {
     private byte mCurrentColor;
 
     public BehaviourSprayColorInfinite(ItemStack sprayCan) {
-        super(sprayCan, sprayCan, sprayCan, ConfigGeneral.sprayCanChainRange, 0);
+        super(sprayCan, sprayCan, sprayCan, Other.sprayCanChainRange, 0);
         this.mTooltip = "";
         mCurrentColor = 0;
     }
 
     @Override
     protected long getUses(ItemStack aStack, NBTTagCompound tNBT) {
-        return ConfigGeneral.sprayCanChainRange;
+        return Other.sprayCanChainRange;
     }
 
     @Override
-- 
cgit