aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/items/CombType.java34
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java77
2 files changed, 64 insertions, 47 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index 711d5226bf..3e4a33e21d 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -63,28 +63,32 @@ public enum CombType {
SLAG("slag", true, Materials._NULL, 50),
COPPER("coppon", true, Materials.Copper, 100),
TIN("tine", true, Materials.Tin, 100),
- LEAD("plumbilia", true, Materials.Lead, 100),
- IRON("ferru", true, Materials.Iron, 100),
- STEEL("steeldust", true, Materials.Steel, 100),
- NICKEL("nickeldust", true, Materials.Nickel, 100),
- ZINC("galvania", true, Materials.Zinc, 100),
+ LEAD("lead", true, Materials.Lead, 100),
+ IRON("iron", true, Materials.Iron, 100),
+ STEEL("steel", true, Materials.Steel, 95),
+ NICKEL("nickel", true, Materials.Nickel, 100),
+ ZINC("zinc", true, Materials.Zinc, 100),
SILVER("argentia", true, Materials.Silver, 100),
- GOLD("aurelia", true, Materials.Gold, 100),
+ GOLD("gold", true, Materials.Gold, 100),
+ SULFUR("sulfur", true, Materials.Sulfur, 100),
+ GALLIUM ("gallium", true, Materials.Gallium, 75),
+ ARSENIC ("arsenic", true, Materials.Arsenic, 75),
//Rare Metals Line
- ALUMINIUM("bauxia", true, Materials.Aluminium, 60),
- MANGANESE("pyrolusium", true, Materials.Manganese, 30),
+ BAUXITE("bauxite", true, Materials.Bauxite, 85),
+ ALUMINIUM("alluminium", true, Materials.Aluminium, 60),
+ MANGANESE("manganese", true, Materials.Manganese, 30),
MAGNESIUM("magnesium", true, Materials.Magnesium, 75),
TITANIUM("titanium", true, Materials.Ilmenite, 100),
CHROME("chromium", true, Materials.Chrome, 50),
- TUNGSTEN("scheelinium", true, Materials.Tungstate, 100),
- PLATINUM("platina", true, Materials.Platinum, 40),
- IRIDIUM("quantaria", true, Materials.Iridium, 20),
+ TUNGSTEN("tungsten", true, Materials.Tungstate, 100),
+ PLATINUM("platinum", true, Materials.Platinum, 40),
+ IRIDIUM("iridium", true, Materials.Iridium, 20),
//Radioactive Line
- URANIUM("urania", true, Materials.Uranium, 50),
+ URANIUM("uranium", true, Materials.Uranium, 50),
PLUTONIUM("plutonium", true, Materials.Plutonium, 10),
- NAQUADAH("stargatium", true, Materials.Naquadah, 10);
+ NAQUADAH("naquadah", true, Materials.Naquadah, 10);
private static int[][] colours = new int[][]{
//organic
@@ -148,7 +152,11 @@ public enum CombType {
{0xF0DEF0, 0xF2E1F2},
{0xC2C2D6, 0xCECEDE},
{0xE6B800, 0xCFA600},
+ {0x6F6F01, 0x8B8B8B},
+ {0xC5C5E4, 0x8B8B8B},
+ {0x736C52, 0x292412},
//Rare Metals
+ {0x6B3600, 0x8B8B8B},
{0x008AB8, 0xD6D6FF},
{0xD5D5D5, 0xAAAAAA},
{0xF1D9D9, 0x8B8B8B},
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 6082fa9c9e..63600fc70d 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -270,63 +270,72 @@ public class ItemComb extends Item {
tComb = getStackForType(CombType.COPPER);
addSpecialCentLV(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1), 70);
addProcessLV(tComb, Materials.Copper, 100);
- addProcessLV(tComb, Materials.Tetrahedrite, 100);
- addProcessLV(tComb, Materials.Chalcopyrite, 100);
- addProcessLV(tComb, Materials.Malachite, 100);
- addProcessLV(tComb, Materials.Pyrite, 100);
- addProcessLV(tComb, Materials.Stibnite, 100);
+ addProcessLV(tComb, Materials.Tetrahedrite, 85);
+ addProcessLV(tComb, Materials.Chalcopyrite, 95);
+ addProcessLV(tComb, Materials.Malachite, 80);
+ addProcessLV(tComb, Materials.Pyrite, 75);
+ addProcessLV(tComb, Materials.Stibnite, 65);
tComb = getStackForType(CombType.TIN);
addSpecialCentLV(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1), 60);
addProcessLV(tComb, Materials.Tin, 100);
- addProcessLV(tComb, Materials.Cassiterite, 100);
+ addProcessLV(tComb, Materials.Cassiterite, 85);
tComb = getStackForType(CombType.LEAD);
addSpecialCentLV(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1), 45);
addProcessLV(tComb, Materials.Lead, 100);
tComb = getStackForType(CombType.IRON);
addProcessLV(tComb, Materials.Iron, 100);
- addProcessLV(tComb, Materials.Magnetite, 100);
- addProcessLV(tComb, Materials.BrownLimonite, 100);
- addProcessLV(tComb, Materials.YellowLimonite, 100);
- addProcessLV(tComb, Materials.VanadiumMagnetite, 100);
- addProcessLV(tComb, Materials.BandedIron, 100);
- addProcessLV(tComb, Materials.Pyrite, 100);
+ addProcessLV(tComb, Materials.Magnetite, 90);
+ addProcessLV(tComb, Materials.BrownLimonite, 85);
+ addProcessLV(tComb, Materials.YellowLimonite, 85);
+ addProcessLV(tComb, Materials.VanadiumMagnetite, 80);
+ addProcessLV(tComb, Materials.BandedIron, 85);
+ addProcessLV(tComb, Materials.Pyrite, 80);
if (ProcessingModSupport.aEnableGCMarsMats)
- addProcessLV(tComb, Materials.MeteoricIron, 100);
+ addProcessLV(tComb, Materials.MeteoricIron, 75);
tComb = getStackForType(CombType.STEEL);
addProcessLV(tComb, Materials.Iron, Materials.Iron, 100);
- addProcessLV(tComb, Materials.Magnetite, Materials.Magnetite, 100);
- addProcessLV(tComb, Materials.BrownLimonite, Materials.BrownLimonite, 100);
- addProcessLV(tComb, Materials.YellowLimonite, Materials.YellowLimonite, 100);
- addProcessLV(tComb, Materials.VanadiumMagnetite, Materials.VanadiumMagnetite, 100);
- addProcessLV(tComb, Materials.BandedIron, Materials.BandedIron, 100);
- addProcessLV(tComb, Materials.Pyrite, Materials.Pyrite, 100);
+ addProcessLV(tComb, Materials.Magnetite, Materials.Magnetite, 90);
+ addProcessLV(tComb, Materials.BrownLimonite, Materials.BrownLimonite, 85);
+ addProcessLV(tComb, Materials.YellowLimonite, Materials.YellowLimonite, 85);
+ addProcessLV(tComb, Materials.VanadiumMagnetite, Materials.VanadiumMagnetite, 80);
+ addProcessLV(tComb, Materials.BandedIron, Materials.BandedIron, 85);
+ addProcessLV(tComb, Materials.Pyrite, Materials.Pyrite, 80);
if (ProcessingModSupport.aEnableGCMarsMats)
- addProcessLV(tComb, Materials.MeteoricIron, Materials.MeteoricIron, 100);
- addProcessLV(tComb, Materials.Molybdenite, 100);
- addProcessLV(tComb, Materials.Molybdenum, 100);
+ addProcessLV(tComb, Materials.MeteoricIron, Materials.MeteoricIron, 75);
+ addProcessLV(tComb, Materials.Molybdenite, 65);
+ addProcessLV(tComb, Materials.Molybdenum, 65);
tComb = getStackForType(CombType.NICKEL);
addProcessLV(tComb, Materials.Nickel, 100);
- addProcessLV(tComb, Materials.Garnierite, 100);
- addProcessLV(tComb, Materials.Pentlandite, 100);
- addProcessLV(tComb, Materials.Cobaltite, 100);
- addProcessLV(tComb, Materials.Wulfenite, 100);
- addProcessLV(tComb, Materials.Powellite, 100);
+ addProcessLV(tComb, Materials.Garnierite, 85);
+ addProcessLV(tComb, Materials.Pentlandite, 85);
+ addProcessLV(tComb, Materials.Cobaltite, 80);
+ addProcessLV(tComb, Materials.Wulfenite, 75);
+ addProcessLV(tComb, Materials.Powellite, 75);
tComb = getStackForType(CombType.ZINC);
addProcessLV(tComb, Materials.Zinc, 100);
- addProcessLV(tComb, Materials.Sphalerite, 100);
- addProcessLV(tComb, Materials.Sulfur, 100);
+ addProcessLV(tComb, Materials.Sphalerite, 80);
+ addProcessLV(tComb, Materials.Sulfur, 75);
tComb = getStackForType(CombType.SILVER);
addSpecialCentLV(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silver, 1), 30);
addProcessLV(tComb, Materials.Silver, 100);
- addProcessLV(tComb, Materials.Galena, 100);
+ addProcessLV(tComb, Materials.Galena, 80);
tComb = getStackForType(CombType.GOLD);
addProcessLV(tComb, Materials.Gold, 100);
- addProcessLV(tComb, Materials.Magnetite, Materials.Gold, 100);
-
- // Rare Metals Line
+ addProcessLV(tComb, Materials.Magnetite, Materials.Gold, 80);
+ tComb = getStackForType(CombType.SULFUR);
+ addProcessLV(tComb, Materials.Sulfur, 100);
+ tComb = getStackForType(CombType.GALLIUM);
+ addProcessLV(tComb, Materials.Gallium, 80);
+ tComb = getStackForType(CombType.ARSENIC);
+ addProcessLV(tComb, Materials.Arsenic, 80);
+
+ // Rare Metals Line
+ tComb = getStackForType(CombType.BAUXITE);
+ addProcessLV(tComb, Materials.Bauxite, 75);
+ addProcessLV(tComb,Materials.Aluminium,55);
tComb = getStackForType(CombType.ALUMINIUM);
addProcessLV(tComb,Materials.Aluminium,60);
- addProcessLV(tComb,Materials.Bauxite,100);
+ addProcessLV(tComb,Materials.Bauxite,80);
tComb = getStackForType(CombType.MANGANESE);
addProcessLV(tComb,Materials.Manganese,30);
addProcessLV(tComb,Materials.Grossular,100);
generated by cgit (git 2.46.0) at 2025-05-21 08:49:42 +0000