aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common/items')
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java4
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java66
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java10
3 files changed, 34 insertions, 46 deletions
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index 88a7e1f69e..17d0c13f03 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -67,7 +67,6 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.MathHelper;
import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
@@ -91,6 +90,7 @@ import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
+import gregtech.common.config.other.ConfigGeneral;
import gregtech.common.covers.GT_Cover_Arm;
import gregtech.common.covers.GT_Cover_Chest;
import gregtech.common.covers.GT_Cover_ControlsWork;
@@ -4068,7 +4068,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
ItemList.Spray_Empty.get(1L),
ItemList.SPRAY_CAN_DYES_USED[i].get(1L),
ItemList.SPRAY_CAN_DYES[i].get(1L),
- GregTech_API.sSpecialFile.get(ConfigCategories.general, "SprayCanUses", 512),
+ ConfigGeneral.sprayCanUses,
i);
addItemBehavior(32000 + Spray_Colors[i], behaviourSprayColor);
addItemBehavior(32000 + Spray_Colors_Used[i], behaviourSprayColor);
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
index 33cf67cfd5..f8777dcf58 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
@@ -59,7 +59,6 @@ import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TC_Aspects;
@@ -618,10 +617,6 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool {
}
private void initCraftingShapelessRecipes() {
- if (GregTech_API.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false)) {
- return;
- }
-
GT_ModHandler.addShapelessCraftingRecipe(
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L),
GT_ModHandler.RecipeBits.NOT_REMOVABLE,
@@ -718,37 +713,34 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool {
new Object[] { " S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.IronWood), 'S',
OrePrefixes.stick.get(Materials.IronWood) });
- if (!GregTech_API.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false)) {
- GT_ModHandler.addCraftingRecipe(
- INSTANCE.getToolWithStats(SWORD.ID, 1, Materials.Flint, Materials.Wood, null),
- GT_ModHandler.RecipeBits.NOT_REMOVABLE,
- new Object[] { "F", "F", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
- new ItemStack(Items.flint, 1) });
- GT_ModHandler.addCraftingRecipe(
- INSTANCE.getToolWithStats(PICKAXE.ID, 1, Materials.Flint, Materials.Wood, null),
- GT_ModHandler.RecipeBits.NOT_REMOVABLE,
- new Object[] { "FFF", " S ", " S ", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
- new ItemStack(Items.flint, 1) });
- GT_ModHandler.addCraftingRecipe(
- INSTANCE.getToolWithStats(SHOVEL.ID, 1, Materials.Flint, Materials.Wood, null),
- GT_ModHandler.RecipeBits.NOT_REMOVABLE,
- new Object[] { "F", "S", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
- new ItemStack(Items.flint, 1) });
- GT_ModHandler.addCraftingRecipe(
- INSTANCE.getToolWithStats(AXE.ID, 1, Materials.Flint, Materials.Wood, null),
- GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
- new Object[] { "FF", "FS", " S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
- new ItemStack(Items.flint, 1) });
- GT_ModHandler.addCraftingRecipe(
- INSTANCE.getToolWithStats(HOE.ID, 1, Materials.Flint, Materials.Wood, null),
- GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
- new Object[] { "FF", " S", " S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
- new ItemStack(Items.flint, 1) });
- GT_ModHandler.addCraftingRecipe(
- INSTANCE.getToolWithStats(KNIFE.ID, 1, Materials.Flint, Materials.Wood, null),
- GT_ModHandler.RecipeBits.NOT_REMOVABLE,
- new Object[] { "F", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
- new ItemStack(Items.flint, 1) });
- }
+ GT_ModHandler.addCraftingRecipe(
+ INSTANCE.getToolWithStats(SWORD.ID, 1, Materials.Flint, Materials.Wood, null),
+ GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[] { "F", "F", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
+ new ItemStack(Items.flint, 1) });
+ GT_ModHandler.addCraftingRecipe(
+ INSTANCE.getToolWithStats(PICKAXE.ID, 1, Materials.Flint, Materials.Wood, null),
+ GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[] { "FFF", " S ", " S ", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
+ new ItemStack(Items.flint, 1) });
+ GT_ModHandler.addCraftingRecipe(
+ INSTANCE.getToolWithStats(SHOVEL.ID, 1, Materials.Flint, Materials.Wood, null),
+ GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[] { "F", "S", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
+ new ItemStack(Items.flint, 1) });
+ GT_ModHandler.addCraftingRecipe(
+ INSTANCE.getToolWithStats(AXE.ID, 1, Materials.Flint, Materials.Wood, null),
+ GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[] { "FF", "FS", " S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
+ new ItemStack(Items.flint, 1) });
+ GT_ModHandler.addCraftingRecipe(
+ INSTANCE.getToolWithStats(HOE.ID, 1, Materials.Flint, Materials.Wood, null),
+ GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[] { "FF", " S", " S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F',
+ new ItemStack(Items.flint, 1) });
+ GT_ModHandler.addCraftingRecipe(
+ INSTANCE.getToolWithStats(KNIFE.ID, 1, Materials.Flint, Materials.Wood, null),
+ GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[] { "F", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', new ItemStack(Items.flint, 1) });
}
}
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
index cbc698d474..216eb4d745 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
@@ -19,14 +19,13 @@ import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.implementations.tiles.IColorableTile;
import appeng.api.util.AEColor;
import appeng.block.networking.BlockCableBus;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.SoundResource;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.items.GT_MetaBase_Item;
import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_Utility;
+import gregtech.common.config.other.ConfigGeneral;
public class Behaviour_Spray_Color extends Behaviour_None {
@@ -96,7 +95,7 @@ public class Behaviour_Spray_Color extends Behaviour_None {
tUses = this.mUses;
}
int painted = 0;
- int maxPainted = GregTech_API.sSpecialFile.get(ConfigCategories.general, "SprayCanChainRange", 256);
+ int maxPainted = ConfigGeneral.sprayCanChainRange;
ForgeDirection lookSide;
Vec3 look = aPlayer.getLookVec();
double absX = Math.abs(look.xCoord);
@@ -208,10 +207,7 @@ public class Behaviour_Spray_Color extends Behaviour_None {
public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
aList.add(this.mTooltip);
aList.add(this.mTooltipChain);
- aList.add(
- String.format(
- this.mTooltipChainAmount,
- GregTech_API.sSpecialFile.get(ConfigCategories.general, "SprayCanChainRange", 256)));
+ aList.add(String.format(this.mTooltipChainAmount, ConfigGeneral.sprayCanChainRange));
NBTTagCompound tNBT = aStack.getTagCompound();
long tRemainingPaint = tNBT == null ? this.mUses
: GT_Utility.areStacksEqual(aStack, this.mFull, true) ? this.mUses : tNBT.getLong("GT.RemainingPaint");
generated by cgit (git 2.46.0) at 2025-06-12 13:59:22 +0000