From 39ba9e4d5f528b21397977807eae5eb9e62988d1 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Wed, 26 Oct 2016 06:43:17 +1000 Subject: % Turned lots of logging off, moved it to debug logging. % Changed up the Alloys a bit to make them more unique. % Tweaked Chemical Formula handling, now it brackets compounds and crashes less. % Made mixer recipes generate for materials with 4 or less input stacks. % Got every material except 3 working within the Blast Smelter. (Hastelloy X & W, Zirconium Carbide) + Added Helium Blobs to dustHydrogen oreDict name. --- src/Java/gtPlusPlus/core/item/ModItems.java | 1 + src/Java/gtPlusPlus/core/material/ALLOY.java | 61 +++++++++------- src/Java/gtPlusPlus/core/material/Material.java | 84 ++++++++++++++-------- .../core/util/materials/MaterialUtils.java | 2 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 65 +++++++++-------- .../gregtech/loaders/RecipeGen_DustGeneration.java | 32 ++++----- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 22 +++--- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 22 +++--- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 42 +++++------ 9 files changed, 186 insertions(+), 145 deletions(-) (limited to 'src') diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 1d1b38bcfc..05e5661c69 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -449,6 +449,7 @@ public final class ModItems { GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStack(CORE.MODID+":itemStickyRubber", 1)); itemHeliumBlob = new CoreItem("itemHeliumBlob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob"); + GT_OreDictUnificator.registerOre("dustHydrogen", new ItemStack(ModItems.itemHeliumBlob)); //GameRegistry.registerItem(itemHeliumBlob, "itemHeliumBlob"); itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit").setTextureName(CORE.MODID + ":itemPLACEHOLDER_Circuit"); diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index ae1928a749..642e402917 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -65,8 +65,7 @@ public final class ALLOY { true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ - new MaterialStack(ELEMENT.TUNGSTEN, 20), - new MaterialStack(ELEMENT.TANTALUM, 60), + new MaterialStack(ALLOY.TANTALLOY_60, 2), new MaterialStack(ELEMENT.TITANIUM, 12), new MaterialStack(ELEMENT.YTTRIUM, 8) }); @@ -212,10 +211,12 @@ public final class ALLOY { true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ - new MaterialStack(ELEMENT.CHROMIUM, 25), + new MaterialStack(ELEMENT.CHROMIUM, 26), new MaterialStack(ELEMENT.NICKEL, 6), - new MaterialStack(ELEMENT.COBALT, 9), - new MaterialStack(ALLOY.STEEL, 60) + new MaterialStack(ELEMENT.MOLYBDENUM, 4), + new MaterialStack(ELEMENT.COPPER, 20), + new MaterialStack(ELEMENT.TUNGSTEN, 4), + new MaterialStack(ALLOY.STEEL, 40) }); public static final Material MARAGING250 = new Material( @@ -228,10 +229,11 @@ public final class ALLOY { true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ - new MaterialStack(ELEMENT.TITANIUM, 5), - new MaterialStack(ELEMENT.NICKEL, 25), - new MaterialStack(ELEMENT.COBALT, 10), - new MaterialStack(ALLOY.STEEL, 60) + new MaterialStack(ALLOY.STEEL, 64), + new MaterialStack(ELEMENT.MOLYBDENUM, 4), + new MaterialStack(ELEMENT.TITANIUM, 4), + new MaterialStack(ELEMENT.NICKEL, 16), + new MaterialStack(ELEMENT.COBALT, 8), }); public static final Material MARAGING300 = new Material( @@ -244,10 +246,11 @@ public final class ALLOY { true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ - new MaterialStack(ELEMENT.TITANIUM, 10), - new MaterialStack(ELEMENT.NICKEL, 20), - new MaterialStack(ELEMENT.COBALT, 15), - new MaterialStack(ALLOY.STEEL, 55) + new MaterialStack(ALLOY.STEEL, 64), + new MaterialStack(ELEMENT.TITANIUM, 4), + new MaterialStack(ELEMENT.ALUMINIUM, 4), + new MaterialStack(ELEMENT.NICKEL, 16), + new MaterialStack(ELEMENT.COBALT, 8), }); public static final Material MARAGING350 = new Material( @@ -260,10 +263,11 @@ public final class ALLOY { true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ - new MaterialStack(ELEMENT.TITANIUM, 15), - new MaterialStack(ELEMENT.NICKEL, 20), - new MaterialStack(ELEMENT.COBALT, 10), - new MaterialStack(ALLOY.STEEL, 55) + new MaterialStack(ALLOY.STEEL, 64), + new MaterialStack(ELEMENT.ALUMINIUM, 4), + new MaterialStack(ELEMENT.MOLYBDENUM, 4), + new MaterialStack(ELEMENT.NICKEL, 16), + new MaterialStack(ELEMENT.COBALT, 8), }); public static final Material STELLITE = new Material( @@ -450,8 +454,9 @@ public final class ALLOY { false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ + new MaterialStack(ELEMENT.SILICON, 40), new MaterialStack(ELEMENT.CARBON, 50), - new MaterialStack(ELEMENT.SILICON, 50) + new MaterialStack(ELEMENT.OXYGEN, 10) }); public static final Material TANTALUM_CARBIDE = new Material( @@ -464,8 +469,9 @@ public final class ALLOY { true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ + new MaterialStack(ELEMENT.TANTALUM, 40), new MaterialStack(ELEMENT.CARBON, 50), - new MaterialStack(ELEMENT.TANTALUM, 50) + new MaterialStack(ELEMENT.OXYGEN, 10) }); public static final Material ZIRCONIUM_CARBIDE = new Material( @@ -478,8 +484,9 @@ public final class ALLOY { true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ + new MaterialStack(ELEMENT.ZIRCONIUM, 40), new MaterialStack(ELEMENT.CARBON, 50), - new MaterialStack(ELEMENT.ZIRCONIUM, 50) + new MaterialStack(ELEMENT.OXYGEN, 10) }); public static final Material NIOBIUM_CARBIDE = new Material( @@ -492,8 +499,9 @@ public final class ALLOY { true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ + new MaterialStack(ELEMENT.NIOBIUM, 40), new MaterialStack(ELEMENT.CARBON, 50), - new MaterialStack(ELEMENT.NIOBIUM, 50) + new MaterialStack(ELEMENT.OXYGEN, 10) }); @@ -506,11 +514,12 @@ public final class ALLOY { 128, //Neutrons true, //Uses Blast furnace? new MaterialStack[]{ - new MaterialStack(ELEMENT.NICKEL, 30), - new MaterialStack(ELEMENT.CHROMIUM, 10), - new MaterialStack(ELEMENT.ZIRCONIUM, 20), - new MaterialStack(ELEMENT.IRON, 30), - new MaterialStack(ELEMENT.TUNGSTEN, 10) + new MaterialStack(ELEMENT.TITANIUM, 18), + new MaterialStack(ELEMENT.CARBON, 18), + new MaterialStack(ELEMENT.POTASSIUM, 18), + new MaterialStack(ELEMENT.LITHIUM, 18), + new MaterialStack(ELEMENT.SULFUR, 18), + new MaterialStack(ELEMENT.HYDROGEN, 10) }); //Material Stacks with Percentage of required elements. diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index c79fc04636..104414ee4c 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -167,14 +167,25 @@ public class Material { Utils.LOG_WARNING("MaterialInput == null && chemicalSymbol probably equals nothing"); this.vChemicalFormula = "??"; } - + this.vMoltenFluid = generateFluid(); dataVar = MathUtils.generateSingularRandomHexValue(); + String ratio = ""; + if (vSmallestRatio != null) + for (int hu=0;hu= 1){ ItemStack[] temp = new ItemStack[vMaterialInput.length]; for (int i=0;i 0){ Utils.LOG_WARNING("length: "+inputs.length); Utils.LOG_WARNING("(inputs != null): "+(inputs != null)); - //Utils.LOG_INFO("length: "+inputs.length); + //Utils.LOG_WARNING("length: "+inputs.length); double tempPercentage=0; long[] tempRatio = new long[inputs.length]; for (int x=0;x= 101){ - Utils.LOG_INFO("The compound for "+localizedName+" doesn't equal 98-100%, this isn't good."); + Utils.LOG_WARNING("The compound for "+localizedName+" doesn't equal 98-100%, this isn't good."); }*/ long[] smallestRatio = MathUtils.simplifyNumbersToSmallestForm(tempRatio); @@ -465,19 +476,34 @@ public class Material { if (dummyFormulaArray.length >= 1){ for (int e=0;e 1){ - dummyFormula = dummyFormula + tempInput[e].stackMaterial.vChemicalSymbol + dummyFormulaArray[e]; - } - else if (dummyFormulaArray[e] == 1){ - dummyFormula = dummyFormula + tempInput[e].stackMaterial.vChemicalSymbol; - } - else if (dummyFormulaArray[e] <= 0){ - dummyFormula = dummyFormula+""; + if (tempInput[e].stackMaterial != null){ + if (!tempInput[e].stackMaterial.vChemicalSymbol.equals("??")){ + if (dummyFormulaArray[e] > 1){ + + if (tempInput[e].stackMaterial.vChemicalFormula.length() > 3){ + dummyFormula = dummyFormula + "(" + tempInput[e].stackMaterial.vChemicalFormula + ")" + dummyFormulaArray[e]; + } + else { + dummyFormula = dummyFormula + tempInput[e].stackMaterial.vChemicalFormula + dummyFormulaArray[e]; + } + } + else if (dummyFormulaArray[e] == 1){ + if (tempInput[e].stackMaterial.vChemicalFormula.length() > 3){ + dummyFormula = dummyFormula + "(" +tempInput[e].stackMaterial.vChemicalFormula + ")"; + } + else { + dummyFormula = dummyFormula + "" +tempInput[e].stackMaterial.vChemicalFormula + ""; + } + } + else if (dummyFormulaArray[e] <= 0){ + dummyFormula = dummyFormula+""; + } } - - }else - dummyFormula = dummyFormula + "??"; + else + dummyFormula = dummyFormula + "??"; + } + else + dummyFormula = dummyFormula + "▓▓"; } else { dummyFormula = dummyFormula+""; @@ -496,11 +522,11 @@ public class Material { return "??"; } - + Fluid generateFluid(){ if (Materials.get(localizedName).mFluid == null){ - Utils.LOG_INFO("Generating our own fluid."); - + Utils.LOG_WARNING("Generating our own fluid."); + //Generate a Cell if we need to if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+getUnlocalizedName(), 1) == null){ Item temp = new BaseItemCell(this); @@ -515,21 +541,21 @@ public class Material { ItemList.Cell_Empty.get(1L, new Object[0]), 1000); } - Utils.LOG_INFO("Getting the fluid from a GT material instead."); + Utils.LOG_WARNING("Getting the fluid from a GT material instead."); return Materials.get(localizedName).mFluid; } public FluidStack getFluid(int fluidAmount) { - Utils.LOG_INFO("Attempting to get "+fluidAmount+"L of "+this.vMoltenFluid.getName()); + Utils.LOG_WARNING("Attempting to get "+fluidAmount+"L of "+this.vMoltenFluid.getName()); FluidStack moltenFluid = new FluidStack(this.vMoltenFluid, fluidAmount); - - Utils.LOG_INFO("Info: "+moltenFluid.getFluid().getName()+" Info: "+moltenFluid.amount+" Info: "+moltenFluid.getFluidID()); - + + Utils.LOG_WARNING("Info: "+moltenFluid.getFluid().getName()+" Info: "+moltenFluid.amount+" Info: "+moltenFluid.getFluidID()); + //FluidStack moltenFluid = FluidUtils.getFluidStack(this.vMoltenFluid.getName(), fluidAmount); /*boolean isNull = (moltenFluid == null); - if (isNull) Utils.LOG_INFO("Did not obtain fluid."); - else Utils.LOG_INFO("Found fluid."); + if (isNull) Utils.LOG_WARNING("Did not obtain fluid."); + else Utils.LOG_WARNING("Found fluid."); if (isNull){ return null; }*/ diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java index 52e925df0e..35605169c5 100644 --- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java @@ -59,7 +59,7 @@ public class MaterialUtils { if (material.isRadioactive()){ radioactivity = 1; } - if (hasValidRGBA(rgba)){ + if (hasValidRGBA(rgba) || element == Element.H){ //ModItems.itemBaseDecidust = UtilsItems.generateDecidust(material); //ModItems.itemBaseCentidust = UtilsItems.generateCentidust(material); return new Material(name, rgba, melting, boiling, protons, neutrons, blastFurnace, null, chemicalFormula, radioactivity); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index 1e69288e8e..fec8abce49 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -55,11 +55,11 @@ public class RecipeGen_BlastSmelter { ItemStack[] tItemStackTest = new ItemStack[]{circuitGT, ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+M, 1)}; inputStackCount = 1; fluidAmount = 144*inputStackCount; - Utils.LOG_INFO("Adding an Alloy Blast Smelter Recipe for "+M+". Gives "+fluidAmount+"L of molten metal."); - Utils.LOG_INFO("tMaterial.length: "+tMaterial.length+"."); + Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for "+M+". Gives "+fluidAmount+"L of molten metal."); + Utils.LOG_WARNING("tMaterial.length: "+tMaterial.length+"."); for (int das=0;das 1){ MaterialStack[] tempStack = new MaterialStack[mMaterialListSize]; @@ -91,8 +91,8 @@ public class RecipeGen_BlastSmelter { //Builds me a MaterialStack[] from the MaterialList of M. int ooo=0; for (MaterialStack xMaterial : M.mMaterialList){ - Utils.LOG_INFO("FOUND: "+xMaterial.mMaterial); - Utils.LOG_INFO("ADDING: "+xMaterial.mMaterial); + Utils.LOG_WARNING("FOUND: "+xMaterial.mMaterial); + Utils.LOG_WARNING("ADDING: "+xMaterial.mMaterial); tempStack[ooo] = M.mMaterialList.get(ooo); ooo++; } @@ -101,10 +101,10 @@ public class RecipeGen_BlastSmelter { components = new ItemStack[tempStack.length]; for (MaterialStack aOutputPart : tempStack){ if (aOutputPart != null){ - Utils.LOG_INFO("Finding dust: "+aOutputPart.mMaterial); + Utils.LOG_WARNING("Finding dust: "+aOutputPart.mMaterial); ItemStack rStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+aOutputPart.mMaterial, (int) aOutputPart.mAmount); if (rStack != null){ - Utils.LOG_INFO("Found dust: "+aOutputPart.mMaterial); + Utils.LOG_WARNING("Found dust: "+aOutputPart.mMaterial); components[counter] = rStack; inputStackCount = inputStackCount+rStack.stackSize; } @@ -138,11 +138,11 @@ public class RecipeGen_BlastSmelter { fluidAmount = 144*inputStackCount; - Utils.LOG_INFO("Adding an Alloy Blast Smelter Recipe for "+M+" using it's compound dusts. This material has "+ inputStackCount+" parts. Gives "+fluidAmount+"L of molten metal."); - Utils.LOG_INFO("tMaterial.length: "+components.length+"."); + Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for "+M+" using it's compound dusts. This material has "+ inputStackCount+" parts. Gives "+fluidAmount+"L of molten metal."); + Utils.LOG_WARNING("tMaterial.length: "+components.length+"."); for (int das=0;das 1){ gtPlusPlus.core.material.MaterialStack[] tempStack = new gtPlusPlus.core.material.MaterialStack[mMaterialListSize]; @@ -248,9 +248,14 @@ public class RecipeGen_BlastSmelter { int ooo=0; for (gtPlusPlus.core.material.MaterialStack xMaterial : M.getComposites()){ if (xMaterial != null){ - Utils.LOG_INFO("FOUND: "+xMaterial.getStackMaterial().getLocalizedName()); - Utils.LOG_INFO("ADDING: "+xMaterial.getStackMaterial().getLocalizedName()); + if (xMaterial.getStackMaterial() != null){ + Utils.LOG_WARNING("FOUND: "+xMaterial.getStackMaterial().getLocalizedName()); + Utils.LOG_WARNING("ADDING: "+xMaterial.getStackMaterial().getLocalizedName()); + + } + tempStack[ooo] = xMaterial; + } ooo++; } @@ -270,33 +275,33 @@ public class RecipeGen_BlastSmelter { fluidAmount = 144*inputStackCount; - Utils.LOG_INFO("Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+" using it's compound dusts. This material has "+ inputStackCount+" parts. Gives "+fluidAmount+"L of molten metal."); - Utils.LOG_INFO("tMaterial.length: "+components.length+"."); + Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+" using it's compound dusts. This material has "+ inputStackCount+" parts. Gives "+fluidAmount+"L of molten metal."); + Utils.LOG_WARNING("tMaterial.length: "+components.length+"."); for (int das=0;das= 2800 ? 64 : 16; - Utils.LOG_INFO("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO + Utils.LOG_WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO //Ring Recipe if (RecipeUtils.addShapedGregtechRecipe( @@ -20,10 +20,10 @@ public class RecipeGen_DustGeneration { null, material.getRod(1), null, null, null, null, material.getRing(1))){ - Utils.LOG_INFO("Ring Recipe: "+material.getLocalizedName()+" - Success"); + Utils.LOG_WARNING("Ring Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_INFO("Ring Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Ring Recipe: "+material.getLocalizedName()+" - Failed"); } @@ -39,10 +39,10 @@ public class RecipeGen_DustGeneration { tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, normalDust)){ - Utils.LOG_INFO("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); + Utils.LOG_WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_INFO("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); } if (RecipeUtils.recipeBuilder( @@ -50,10 +50,10 @@ public class RecipeGen_DustGeneration { null, null, null, null, null, null, material.getTinyDust(9))){ - Utils.LOG_INFO("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Success"); + Utils.LOG_WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_INFO("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Failed"); } @@ -62,10 +62,10 @@ public class RecipeGen_DustGeneration { smallDust, smallDust, null, null, null, null, normalDust)){ - Utils.LOG_INFO("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); + Utils.LOG_WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_INFO("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); } @@ -74,22 +74,22 @@ public class RecipeGen_DustGeneration { null, null, null, null, null, null, material.getSmallDust(4))){ - Utils.LOG_INFO("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); + Utils.LOG_WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_INFO("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); } - if (inputStacks.length > 0){ - Utils.LOG_INFO(ItemUtils.getArrayStackNames(inputStacks)); + if (inputStacks.length > 0 && inputStacks.length <= 4){ + Utils.LOG_WARNING(ItemUtils.getArrayStackNames(inputStacks)); long[] inputStackSize = material.vSmallestRatio; if (inputStackSize != null){ for (short x=0;x 0){ - Utils.LOG_INFO(ItemUtils.getArrayStackNames(inputStacks)); + Utils.LOG_WARNING(ItemUtils.getArrayStackNames(inputStacks)); long[] inputStackSize = material.vSmallestRatio; if (inputStackSize != null){ for (short x=0;x