diff options
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/CombType.java | 30 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/ItemComb.java | 10 |
3 files changed, 21 insertions, 21 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 9e600a9c09..ae095229a0 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -160,7 +160,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { public int mGraniteHavestLevel=3; public int mMaxHarvestLevel=7; public boolean mChangeHarvestLevels=false; - public boolean mNervedCombs = true; + public boolean mNerfedCombs = true; public int mWireHeatingTicks = 4; public GT_Proxy() { diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index da63c0643e..ffde997fb9 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -22,30 +22,30 @@ public enum CombType { // Metals Line SLAG("slag", true, Materials._NULL, 50), - COPPER("copperdust", true, Materials.Copper, 100), - TIN("tindust", true, Materials.Tin, 100), - LEAD("leaddust", true, Materials.Lead, 100), - IRON("irondust", true, Materials.Iron, 100), + 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("zincdust", true, Materials.Zinc, 100), - SILVER("silverdust", true, Materials.Silver, 100), - GOLD("golddust", true, Materials.Gold, 100), + ZINC("galvania", true, Materials.Zinc, 100), + SILVER("argentia", true, Materials.Silver, 100), + GOLD("aurelia", true, Materials.Gold, 100), // Rare Metals Line - ALUMINIUM("aluminium", true, Materials.Aluminium, 60), - MANGANESE("manganese", true, Materials.Manganese, 30), + ALUMINIUM("bauxia", true, Materials.Aluminium, 60), + MANGANESE("pyrolusium", true, Materials.Manganese, 30), TITANIUM("titanium", true, Materials.Ilmenite, 100), - CHROME("chrome", true, Materials.Chrome, 50), - TUNGSTEN("tungsten", true, Materials.Tungstate, 100), - PLATINUM("platinum", true, Materials.Platinum, 40), - IRIDIUM("iridium", true, Materials.Iridium, 20), + CHROME("chromium", true, Materials.Chrome, 50), + TUNGSTEN("scheelinium", true, Materials.Tungstate, 100), + PLATINUM("platina", true, Materials.Platinum, 40), + IRIDIUM("quantaria", true, Materials.Iridium, 20), // Radioactive Line - URANIUM("uranium", true, Materials.Uranium, 50), + URANIUM("urania", true, Materials.Uranium, 50), PLUTONIUM("plutonium", true, Materials.Plutonium, 10), - NAQUADAH("naquada", true, Materials.Naquadah, 10),; + NAQUADAH("stargatium", true, Materials.Naquadah, 10),; private static int[][] colours = new int[][]{ {0x906237, 0x58300B}, diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index dff47eeeda..417d95ce3d 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -109,7 +109,7 @@ public class ItemComb extends Item { tComb = getStackForType(CombType.STICKY); addSpecialCent(tComb, ItemList.IC2_Resin.get(1, new Object[0]), 70); tComb = getStackForType(CombType.OIL); - addSpecialCent(tComb, ItemList.Crop_Drop_OilBerry.get(1, new Object[0]), 70); + addSpecialCent(tComb, ItemList.Crop_Drop_OilBerry.get(2, new Object[0]), 70); addProcess(tComb, Materials.Oilsands, 100); //Gem Line @@ -269,9 +269,9 @@ public class ItemComb extends Item { } public void addProcess(ItemStack tComb, Materials aMaterial, int chance){ - if(GT_Mod.gregtechproxy.mNervedCombs){ + if(GT_Mod.gregtechproxy.mNerfedCombs){ GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tComb), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4), 96, 300); - GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 1000, 1000, 24); + GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 10000, (int) (aMaterial.getMass() * 128), 384); }else{ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5); RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); @@ -279,9 +279,9 @@ public class ItemComb extends Item { } public void addProcess(ItemStack tComb, Materials aInMaterial, Materials aOutMaterial, int chance){ - if(GT_Mod.gregtechproxy.mNervedCombs){ + if(GT_Mod.gregtechproxy.mNerfedCombs){ GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tComb), GT_OreDictUnificator.get(OrePrefixes.crushed, aInMaterial, 1), Materials.Water.getFluid(1000), aInMaterial.mOreByProducts.isEmpty() ? null : aInMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 4), 96, 300); - GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(Math.max(1, ((aOutMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 1), 1000, 1000, 24); + GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(Math.max(1, ((aOutMaterial.getMass()+9)/10))), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 1), 10000, (int) (aOutMaterial.getMass() * 128), 384); }else{ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5); RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); |