From dfc9afa3232776774af3e54a7ee6c3bc6e98c79c Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 22 Sep 2018 13:15:31 +0200 Subject: fixed bees loaclizer, comb colors and bee names --- src/main/java/gregtech/common/items/CombType.java | 22 ++++---- src/main/java/gregtech/common/items/ItemComb.java | 68 ++++++++++++++++------- 2 files changed, 59 insertions(+), 31 deletions(-) (limited to 'src/main/java/gregtech/common/items') diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index 7971bf4602..e4e8dab86f 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -76,7 +76,7 @@ public enum CombType { //Rare Metals Line BAUXITE("bauxite", true, Materials.Bauxite, 85), - ALUMINIUM("alluminium", true, Materials.Aluminium, 60), + ALUMINIUM("aluminium", true, Materials.Aluminium, 60), MANGANESE("manganese", true, Materials.Manganese, 30), MAGNESIUM("magnesium", true, Materials.Magnesium, 75), TITANIUM("titanium", true, Materials.Ilmenite, 100), @@ -111,14 +111,14 @@ public enum CombType { private static int[][] colours = new int[][]{ //organic - {0x906237, 0x58300B}, + {0x58300B, 0x906237}, {0x525252, 0x666666}, {0x2E8F5B, 0xDCC289}, - {0x4C4C4C, 0x333333}, + {0x333333, 0x4C4C4C}, //ic2 {0x144F5A, 0x2494A2}, {0xC11F1F, 0xEBB9B9}, - {0x6478FF, 0x1414FF}, + {0x1414FF, 0x6478FF}, //alloy {0xE60000, 0xB80000}, {0xB80000, 0xA50808}, @@ -127,13 +127,13 @@ public enum CombType { {0xFF9933, 0xFFAD5C}, {0x787878, 0xD8D8D8}, {0x252525, 0x443B44}, - {0x6DD284, 0x006600}, + {0x006600, 0x6DD284}, {0x778899, 0xC8C8DC}, {0x2E8B57, 0x599087}, //Thaumcraft {0x7A007A, 0x5C005C}, {0x9966FF, 0xAD85FF}, - {0xEE7700, 0x774B15}, + {0x774B15, 0xEE7700}, {0xc7c7ea, 0xb5b3df}, {0xF7ADDE, 0x592582}, {0x904BB8, 0xE800FF}, @@ -172,7 +172,7 @@ public enum CombType { {0xC2C2D6, 0xCECEDE}, {0xE6B800, 0xCFA600}, {0x6F6F01, 0x8B8B8B}, - {0xC5C5E4, 0x8B8B8B}, + {0x8B8B8B, 0xC5C5E4}, {0x736C52, 0x292412}, //Rare Metals {0x6B3600, 0x8B8B8B}, @@ -193,9 +193,9 @@ public enum CombType { //Radioactive Line {0x19AF19, 0x169E16}, {0x240000, 0x570000}, - {0x003300, 0x002400}, + {0x000000, 0x004400}, {0x000000, 0x002400}, - {0x003300, 0x002400}, + {0x007700, 0x002400}, {0x001E00, 0x005000}, {0xE6FFE6, 0xFFFFFF}, {0xE6E6FF, 0xC8C8C8}, @@ -204,8 +204,8 @@ public enum CombType { {0x0D5A0D, 0x28874B}, {0x5C605E, 0xC5C5C5}, {0x872836, 0xB8132C}, - {0xA7041C, 0x7C0618}, - {0xD02001, 0x9C0018}, + {0x7C0618, 0xA7041C}, + {0x9C0018, 0xD02001}, }; public boolean showInList; public Materials material; diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index a2679ee355..9afa39eb0d 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -325,10 +325,15 @@ public class ItemComb extends Item { addProcessLV(tComb, Materials.Magnetite, Materials.Gold, 80); tComb = getStackForType(CombType.SULFUR); addProcessLV(tComb, Materials.Sulfur, 100); + addProcessLV(tComb, Materials.Pyrite, 90); + addProcessLV(tComb, Materials.Sphalerite, 80); tComb = getStackForType(CombType.GALLIUM); addProcessLV(tComb, Materials.Gallium, 80); + addProcessLV(tComb, Materials.Niobium, 75); tComb = getStackForType(CombType.ARSENIC); addProcessLV(tComb, Materials.Arsenic, 80); + addProcessLV(tComb, Materials.Bismuth, 70); + addProcessLV(tComb, Materials.Antimony, 70); // Rare Metals Line tComb = getStackForType(CombType.BAUXITE); @@ -344,27 +349,43 @@ public class ItemComb extends Item { addProcessLV(tComb,Materials.Pyrolusite,100); addProcessLV(tComb,Materials.Tantalite,100); tComb = getStackForType(CombType.TITANIUM); - addProcessLV(tComb,Materials.Titanium,100); - addProcessLV(tComb,Materials.Ilmenite,100); - addProcessLV(tComb,Materials.Bauxite,100); + addProcessEV(tComb,Materials.Titanium,90); + addProcessEV(tComb,Materials.Ilmenite,80); + addProcessEV(tComb,Materials.Bauxite,75); tComb = getStackForType(CombType.CHROME); - addProcessLV(tComb,Materials.Chrome,50); - addProcessLV(tComb,Materials.Ruby,100); - addProcessLV(tComb,Materials.Chromite,50); - addProcessLV(tComb,Materials.Redstone,100); - addProcessLV(tComb, Materials.Neodymium, 100); - addProcessLV(tComb, Materials.Bastnasite, 100); + addProcessHV(tComb,Materials.Chrome,50); + addProcessHV(tComb,Materials.Ruby,100); + addProcessHV(tComb,Materials.Chromite,50); + addProcessHV(tComb,Materials.Redstone,100); + addProcessHV(tComb, Materials.Neodymium, 80); + addProcessHV(tComb, Materials.Bastnasite, 80); tComb = getStackForType(CombType.TUNGSTEN); - addProcessLV(tComb,Materials.Tungstate,100); - addProcessLV(tComb,Materials.Scheelite,100); - addProcessLV(tComb,Materials.Lithium,100); + addProcessIV(tComb,Materials.Tungstate,80); + addProcessIV(tComb,Materials.Scheelite,75); + addProcessIV(tComb,Materials.Lithium,75); tComb = getStackForType(CombType.PLATINUM); - addProcessLV(tComb,Materials.Platinum,40); - addProcessLV(tComb,Materials.Cooperite,40); - addProcessLV(tComb,Materials.Palladium,40); + addProcessHV(tComb,Materials.Platinum,40); + addProcessHV(tComb,Materials.Cooperite,40); + addProcessHV(tComb,Materials.Palladium,40); tComb = getStackForType(CombType.IRIDIUM); - addProcessLV(tComb,Materials.Iridium,20); - addProcessLV(tComb,Materials.Osmium,20); + addProcessIV(tComb,Materials.Iridium,20); + addProcessIV(tComb,Materials.Osmium,15); + tComb = getStackForType(CombType.OSMIUM); + addProcessIV(tComb,Materials.Osmium,25); + addProcessIV(tComb,Materials.Iridium,15); + tComb = getStackForType(CombType.LITHIUM); + addProcessMV(tComb,Materials.Lithium,85); + addProcessMV(tComb,Materials.Aluminium,75); + tComb = getStackForType(CombType.SALT); + addProcessMV(tComb,Materials.Salt,100); + addProcessMV(tComb,Materials.Sodium,75); + addProcessMV(tComb,Materials.RockSalt,75); + addProcessMV(tComb,Materials.Saltpeter,65); + addSpecialCentMV(tComb, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 1), 100, GT_ModHandler.getModItem("dreamcraft", "item.EdibleSalt", 1L, 0), 50); + tComb = getStackForType(CombType.ELECTROTINE); + addProcessHV(tComb,Materials.Electrotine,80); + addProcessHV(tComb,Materials.Electrum,75); + addProcessHV(tComb,Materials.Redstone,65); // Radioactive Line tComb = getStackForType(CombType.URANIUM); @@ -423,17 +444,24 @@ public class ItemComb extends Item { GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, ItemList.FR_Wax.get(1, new Object[0]), aOutput2, aOutput3, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 5000, chance2 * 100, chance3*100 }, 128, 5); RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f,aOutput2,chance2 * 0.01f,aOutput3,chance3*0.01f)); } + public void addSpecialCentMV(ItemStack tComb, ItemStack aOutput, int chance){ + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput,GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 7000 }, 160, 120); + } + + public void addSpecialCentMV(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2){ + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, aOutput2, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, chance2 * 100}, 160, 120); + } public void addSpecialCentHV(ItemStack tComb, ItemStack aOutput, int chance){ - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput,GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 7000 }, 300, 480); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput,GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 7000 }, 196, 480); } public void addSpecialCentHV(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2){ - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, aOutput2, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, chance2 * 100}, 300, 480); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, aOutput2, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, chance2 * 100}, 196, 480); } public void addSpecialCentHV(ItemStack tComb, ItemStack aOutput, int chance, ItemStack aOutput2, int chance2, ItemStack aOutput3, int chance3){ - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, aOutput2, aOutput3, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, chance2 * 100, chance3 * 100 }, 300, 480); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, aOutput2, aOutput3, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, chance2 * 100, chance3 * 100 }, 196, 480); } public void addProcessLV(ItemStack tComb, Materials aMaterial, int chance){ -- cgit