diff options
Diffstat (limited to 'src/Java/gtPlusPlus')
8 files changed, 141 insertions, 95 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java index 2be7b76f6c..6ba9453467 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java @@ -202,10 +202,10 @@ public class BaseItemDust extends Item{ private boolean addBlastFurnaceRecipe(final ItemStack input1, final ItemStack input2, final ItemStack output1, final ItemStack output2, final int tempRequired){ - int timeTaken = 125*this.mTier*20; + int timeTaken = 125*this.mTier*10; if (this.mTier <= 4){ - timeTaken = 25*this.mTier*20; + timeTaken = 25*this.mTier*10; } int aSlot = mTier - 2; if (aSlot < 2) { diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index 23cb359ec9..53f778455c 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -141,8 +141,8 @@ public final class ALLOY { "Inconel-625", //Material Name MaterialState.SOLID, //State new short[]{128, 200, 128, 0}, //Material Colour - 1425, //Melting Point in C - -1, + 2425, //Melting Point in C + 3758, -1, -1, true, //Uses Blast furnace? @@ -159,8 +159,8 @@ public final class ALLOY { "Inconel-690", //Material Name MaterialState.SOLID, //State new short[]{118, 220, 138, 0}, //Material Colour - 1425, //Melting Point in C - -1, + 3425, //Melting Point in C + 4895, -1, -1, true, //Uses Blast furnace? @@ -176,8 +176,8 @@ public final class ALLOY { "Inconel-792", //Material Name MaterialState.SOLID, //State new short[]{108, 240, 118, 0}, //Material Colour - 1425, //Melting Point in C - -1, + 3425, //Melting Point in C + 6200, -1, -1, true, //Uses Blast furnace? @@ -194,8 +194,8 @@ public final class ALLOY { "Zeron-100", //Material Name MaterialState.SOLID, //State new short[]{180, 180, 20, 0}, //Material Colour - -1, - -1, + 6100, + 9785, -1, -1, true, //Uses Blast furnace? @@ -213,8 +213,8 @@ public final class ALLOY { "Maraging Steel 250", //Material Name MaterialState.SOLID, //State new short[]{140, 140, 140, 0}, //Material Colour - 1413, //Melting Point in C - -1, + 2413, //Melting Point in C + 4555, -1, -1, true, //Uses Blast furnace? @@ -231,8 +231,8 @@ public final class ALLOY { "Maraging Steel 300", //Material Name MaterialState.SOLID, //State new short[]{150, 150, 150, 0}, //Material Colour - 1413, //Melting Point in C - -1, + 2413, //Melting Point in C + 4555, -1, -1, true, //Uses Blast furnace? @@ -249,8 +249,8 @@ public final class ALLOY { "Maraging Steel 350", //Material Name MaterialState.SOLID, //State new short[]{160, 160, 160, 0}, //Material Colour - 1413, //Melting Point in C - -1, + 2413, //Melting Point in C + 4555, -1, -1, true, //Uses Blast furnace? @@ -267,8 +267,8 @@ public final class ALLOY { "Stellite", //Material Name MaterialState.SOLID, //State new short[]{129, 75, 120, 0}, //Material Colour - 1310, //Melting Point in C - -1, + 4310, //Melting Point in C + 6250, -1, -1, true, //Uses Blast furnace? @@ -284,11 +284,11 @@ public final class ALLOY { "Talonite", //Material Name MaterialState.SOLID, //State new short[]{228, 75, 120, 0}, //Material Colour - 1454, //Melting Point in C - -1, + 3454, //Melting Point in C + 5500, -1, -1, - false, //Uses Blast furnace? + true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().COBALT, 40), @@ -301,11 +301,11 @@ public final class ALLOY { "Hastelloy-W", //Material Name MaterialState.SOLID, //State new short[]{218, 165, 32, 0}, //Material Colour - 1350, //Melting Point in C - -1, + 3350, //Melting Point in C + 5755, -1, -1, - false, //Uses Blast furnace? + true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().IRON, 06), @@ -319,11 +319,11 @@ public final class ALLOY { "Hastelloy-X", //Material Name MaterialState.SOLID, //State new short[]{255, 193, 37, 0}, //Material Colour - 1350, //Melting Point in C + 3350, //Melting Point in C + 5755, -1, -1, - -1, - false, //Uses Blast furnace? + true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().IRON, 18), @@ -338,8 +338,8 @@ public final class ALLOY { "Hastelloy-N", //Material Name MaterialState.SOLID, //State new short[]{236, 213, 48, 0}, //Material Colour - 1350, //Melting Point in C - -1, + 4350, //Melting Point in C + 6875, -1, -1, true, //Uses Blast furnace? @@ -356,8 +356,8 @@ public final class ALLOY { "Hastelloy-C276", //Material Name MaterialState.SOLID, //State new short[]{238, 180, 34, 0}, //Material Colour - 1350, //Melting Point in C - -1, + 4350, //Melting Point in C + 6520, -1, -1, true, //Uses Blast furnace? @@ -375,11 +375,11 @@ public final class ALLOY { "Incoloy-020", //Material Name MaterialState.SOLID, //State new short[]{101, 81, 71, 0}, //Material Colour - 1425, //Melting Point in C - -1, + 3425, //Melting Point in C + 5420, -1, -1, - false, //Uses Blast furnace? + true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().IRON, 40), @@ -392,11 +392,11 @@ public final class ALLOY { "Incoloy-DS", //Material Name MaterialState.SOLID, //State new short[]{71, 101, 81, 0}, //Material Colour - 1425, //Melting Point in C - -1, + 3425, //Melting Point in C + 5420, -1, -1, - false, //Uses Blast furnace? + true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().IRON, 46), @@ -409,8 +409,8 @@ public final class ALLOY { "Incoloy-MA956", //Material Name MaterialState.SOLID, //State new short[]{81, 71, 101, 0}, //Material Colour - 1425, //Melting Point in C - -1, + 4425, //Melting Point in C + 6875, -1, -1, true, //Uses Blast furnace? @@ -506,8 +506,8 @@ public final class ALLOY { "Grisium", //Material Name MaterialState.SOLID, //State new short[]{53, 93, 106, 0}, //Material Colour - -1, //Melting Point in C - -1, //Boiling Point in C + 3850, //Melting Point in C + 5550, //Boiling Point in C 96, //Protons 128, //Neutrons true, //Uses Blast furnace? @@ -580,8 +580,8 @@ public final class ALLOY { "Trinium Titanium Alloy", //Material Name MaterialState.SOLID, //State new short[]{239,210,200, 0}, //Material Colour - -1, //Melting Point in C - -1, //Boiling Point in C + 3750, //Melting Point in C + 7210, //Boiling Point in C -1, -1, true, //Uses Blast furnace? @@ -593,8 +593,8 @@ public final class ALLOY { "Trinium Naquadah Alloy", //Material Name MaterialState.SOLID, //State new short[]{255, 243, 117, 0}, //Material Colour - -1, //Melting Point in C - -1, //Boiling Point in C + 4200, //Melting Point in C + 7400, //Boiling Point in C -1, -1, false, //Uses Blast furnace? @@ -606,8 +606,8 @@ public final class ALLOY { "Trinium Naquadah Carbonite", //Material Name MaterialState.SOLID, //State new short[]{255, 233, 0, 0}, //Material Colour - -1, //Melting Point in C - -1, //Boiling Point in C + 6500, //Melting Point in C + 9000, //Boiling Point in C -1, -1, true, //Uses Blast furnace? @@ -616,6 +616,9 @@ public final class ALLOY { new MaterialStack(ELEMENT.getInstance().CARBON, 1) }); + /* + * Witchery Material + */ public static final Material KOBOLDITE = new Material( "Koboldite", //Material Name @@ -633,6 +636,7 @@ public final class ALLOY { new MaterialStack(ELEMENT.getInstance().IRON, 35) }); + /* * Top Tier Alloys */ @@ -737,11 +741,14 @@ public final class ALLOY { true, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ - new MaterialStack(ALLOY.STELLITE, 25), + new MaterialStack(ALLOY.STELLITE, 15), + new MaterialStack(ALLOY.ENERGYCRYSTAL, 5), + new MaterialStack(ALLOY.SILICON_CARBIDE, 5), new MaterialStack(ELEMENT.getInstance().GALLIUM, 5), new MaterialStack(ELEMENT.getInstance().AMERICIUM, 5), new MaterialStack(ELEMENT.getInstance().PALLADIUM, 5), - new MaterialStack(ELEMENT.getInstance().BISMUTH, 5) + new MaterialStack(ELEMENT.getInstance().BISMUTH, 5), + new MaterialStack(ELEMENT.getInstance().GERMANIUM, 5) }); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 50658ee2a2..e5de6ab190 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -43,11 +43,11 @@ public class RECIPES_GREGTECH { chemicalReactorRecipes(); dehydratorRecipes(); blastFurnaceRecipes(); - + if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { largeChemReactorRecipes(); } - + fissionFuelRecipes(); autoclaveRecipes(); compressorRecipes(); @@ -120,9 +120,22 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().CERIUM.getDust(8) }, FluidUtils.getFluidStack("molten.trinium", 136 * 144), 0, 20 * 3000, - 2040); + 2040*4); } + // Germanium Roasting + CORE.RA.addBlastSmelterRecipe( + new ItemStack[] { + ItemUtils.getGregtechCircuit(22), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedSphalerite", 8), + ELEMENT.getInstance().CARBON.getDust(32), + }, + Materials.SulfuricAcid.getFluid(2000), + ELEMENT.getInstance().GERMANIUM.getFluid(288), + 0, + 20 * 300, + 2000); + } private static void fluidcannerRecipes() { diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index 553f3f7efa..9d1dbff23a 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -19,6 +19,7 @@ import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.EnumUtils; import gtPlusPlus.core.util.data.StringUtils; +import gtPlusPlus.core.util.reflect.ReflectionUtils; import net.minecraftforge.oredict.OreDictionary; public class MaterialUtils { @@ -27,11 +28,11 @@ public class MaterialUtils { @SuppressWarnings({ "rawtypes", "unused" }) private static Class[][] commonTypes = - {{Materials.class, int.class, TextureSet.class, float.class, int.class, - int.class, int.class, int.class, int.class, int.class, int.class, - String.class, int.class, int.class, int.class, int.class, boolean.class, - boolean.class, int.class, int.class, int.class, Dyes.class, int.class, - List.class , List.class}}; +{{Materials.class, int.class, TextureSet.class, float.class, int.class, + int.class, int.class, int.class, int.class, int.class, int.class, + String.class, int.class, int.class, int.class, int.class, boolean.class, + boolean.class, int.class, int.class, int.class, Dyes.class, int.class, + List.class , List.class}}; public static List<?> oreDictValuesForEntry(final String oredictName){ List<?> oredictItemNames; @@ -182,7 +183,7 @@ public class MaterialUtils { return 0; } } - + public static int getVoltageForTier(final int aTier) { if (aTier == 0) { return 16; @@ -214,9 +215,9 @@ public class MaterialUtils { if (aTier == 9) { return 1600000; } - - - return 120; + + + return 120; } private static Materials getMaterialByName(String materialName) { @@ -236,16 +237,19 @@ public class MaterialUtils { @SuppressWarnings("deprecation") public static String getMaterialName(Materials mat){ - String mName; + + String mName = null; + try { - mName = (String) FieldUtils.getDeclaredField(Materials.class, "mDefaultLocalName", true).get(mat); + mName = (String) ReflectionUtils.getField(Materials.class, "mDefaultLocalName").get(mat); if (mName == null) { - mName = (String) FieldUtils.getDeclaredField(Materials.class, "mName", true).get(mat); + mName = (String) ReflectionUtils.getField(Materials.class, "mName").get(mat); } } - catch (IllegalArgumentException | IllegalAccessException e) { - mName = mat.name(); + catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) { } + + if (mName == null || mName.equals("")){ mName = mat.name(); } @@ -257,7 +261,7 @@ public class MaterialUtils { TextureSet o = (r != null && r.isPresent() && r.get() != null) ? r.get() : null; return o; } - + public static Materials getMaterial(String aMaterialName) { Materials m = gtPlusPlus.xmod.gregtech.common.StaticFields59.getMaterial(aMaterialName); if (m == null) { diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java index 269289c608..8a8f0d86db 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java +++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java @@ -20,7 +20,7 @@ public class Preloader_Transformer_Handler implements IClassTransformer { private final boolean mEnabled = false; public static final AsmConfig mConfig; - + static { mConfig = new AsmConfig(new File("config/GTplusplus/asm.cfg")); System.out.println("[GT++ ASM] Asm Config Location: "+mConfig.config.getConfigFile().getAbsolutePath()); @@ -50,10 +50,12 @@ public class Preloader_Transformer_Handler implements IClassTransformer { } } + boolean probablyShouldBeFalse = false; + //Enable mapping of Tickets and loaded chunks. - Forge if (transformedName.equals("net.minecraftforge.common.ForgeChunkManager") && mConfig.enableChunkDebugging) { FMLRelaunchLog.log("[GT++ ASM] Chunkloading Patch", Level.INFO, "Transforming %s", transformedName); - return new ClassTransformer_Forge_ChunkLoading(basicClass, obfuscated).getWriter().toByteArray(); + return new ClassTransformer_Forge_ChunkLoading(basicClass, probablyShouldBeFalse).getWriter().toByteArray(); } // Fix the OreDictionary - Forge @@ -64,42 +66,44 @@ public class Preloader_Transformer_Handler implements IClassTransformer { return classWriter.toByteArray(); } // Fix the OreDictionary COFH - if (transformedName.equals("cofh.core.util.oredict.OreDictionaryArbiter") && mConfig.enableCofhPatch) { + if (transformedName.equals("cofh.core.util.oredict.OreDictionaryArbiter") && (mConfig.enableCofhPatch || !obfuscated)) { FMLRelaunchLog.log("[GT++ ASM] COFH", Level.INFO, "Transforming %s", transformedName); - return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass, obfuscated).getWriter().toByteArray(); + return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass, probablyShouldBeFalse).getWriter().toByteArray(); } // Fix Tinkers Fluids if (transformedName.equals("tconstruct.smeltery.blocks.TConstructFluid") && mConfig.enableTiConFluidLighting) { FMLRelaunchLog.log("[GT++ ASM] Bright Fluids", Level.INFO, "Transforming %s", transformedName); - return new ClassTransformer_TiConFluids("getLightValue", obfuscated, basicClass).getWriter().toByteArray(); + return new ClassTransformer_TiConFluids("getLightValue", probablyShouldBeFalse, basicClass).getWriter().toByteArray(); } //Fix GC stuff - if (transformedName.equals("micdoodle8.mods.galacticraft.core.util.FluidUtil")) { - FMLRelaunchLog.log("[GT++ ASM] Galacticraft FluidUtils Patch", Level.INFO, "Transforming %s", transformedName); - return new ClassTransformer_GC_FluidUtil(basicClass, obfuscated).getWriter().toByteArray(); - } - if (transformedName.equals("micdoodle8.mods.galacticraft.core.tile.TileEntityFuelLoader")) { - FMLRelaunchLog.log("[GT++ ASM] Galacticraft Fuel_Loader Patch", Level.INFO, "Transforming %s", transformedName); - return new ClassTransformer_GC_FuelLoader(basicClass, obfuscated).getWriter().toByteArray(); - } - if (transformedName.equals("micdoodle8.mods.galacticraft.api.prefab.entity.EntityAutoRocket")) { - FMLRelaunchLog.log("[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Transforming %s", transformedName); - return new ClassTransformer_GC_EntityAutoRocket(basicClass, obfuscated).getWriter().toByteArray(); + if (mConfig.enableGcFuelChanges) { + if (transformedName.equals("micdoodle8.mods.galacticraft.core.util.FluidUtil")) { + FMLRelaunchLog.log("[GT++ ASM] Galacticraft FluidUtils Patch", Level.INFO, "Transforming %s", transformedName); + return new ClassTransformer_GC_FluidUtil(basicClass, probablyShouldBeFalse).getWriter().toByteArray(); + } + if (transformedName.equals("micdoodle8.mods.galacticraft.core.tile.TileEntityFuelLoader")) { + FMLRelaunchLog.log("[GT++ ASM] Galacticraft Fuel_Loader Patch", Level.INFO, "Transforming %s", transformedName); + return new ClassTransformer_GC_FuelLoader(basicClass, probablyShouldBeFalse).getWriter().toByteArray(); + } + if (transformedName.equals("micdoodle8.mods.galacticraft.api.prefab.entity.EntityAutoRocket")) { + FMLRelaunchLog.log("[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Transforming %s", transformedName); + return new ClassTransformer_GC_EntityAutoRocket(basicClass, probablyShouldBeFalse).getWriter().toByteArray(); + } } //Fix GT NBT Persistency issue - if (transformedName.equals("gregtech.common.blocks.GT_Block_Machines") && mConfig.enableGtNbtFix) { + if (transformedName.equals("gregtech.common.blocks.GT_Block_Machines")) { FMLRelaunchLog.log("[GT++ ASM] Gregtech NBT Persistency Patch", Level.INFO, "Transforming %s", transformedName); - return new ClassTransformer_GT_BlockMachines_NBT(basicClass, obfuscated).getWriter().toByteArray(); + return new ClassTransformer_GT_BlockMachines_NBT(basicClass, probablyShouldBeFalse).getWriter().toByteArray(); } //Patching Meta Tile Tooltips if (transformedName.equals("gregtech.common.blocks.GT_Item_Machines") && mConfig.enableGtTooltipFix) { FMLRelaunchLog.log("[GT++ ASM] Gregtech Tooltip Patch", Level.INFO, "Transforming %s", transformedName); - return new ClassTransformer_GT_ItemMachines_Tooltip(basicClass, obfuscated).getWriter().toByteArray(); + return new ClassTransformer_GT_ItemMachines_Tooltip(basicClass, probablyShouldBeFalse).getWriter().toByteArray(); } - + return basicClass; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index ac3c8727d7..b3115bbab5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -87,10 +87,10 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { //Set a duration - NEW - int duration = 120*M.vTier*20; + int duration = 120*M.vTier*10; if (M.vTier <= 4){ - duration = 20*M.vTier*20; + duration = 20*M.vTier*10; } int mMaterialListSize=0; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index f78f81f82c..1bef648bd2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -142,13 +142,31 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { //Get us four ItemStacks to input into the mixer ItemStack[] input = new ItemStack[4]; - /*input[0] = (inputStacks.length >= 1) ? ((inputStacks[0] == null) ? null : inputStacks[0]) : null; + input[0] = (inputStacks.length >= 1) ? ((inputStacks[0] == null) ? null : inputStacks[0]) : null; input[1] = (inputStacks.length >= 2) ? ((inputStacks[1] == null) ? null : inputStacks[1]) : null; input[2] = (inputStacks.length >= 3) ? ((inputStacks[2] == null) ? null : inputStacks[2]) : null; input[3] = (inputStacks.length >= 4) ? ((inputStacks[3] == null) ? null : inputStacks[3]) : null; - */ - for (int g = 0; g<4; g++) { + + if (inputStacks.length == 1) { + input[1] = input[0]; + input[0] = CI.getNumberedCircuit(inputStacks.length+10); + } + else if (inputStacks.length == 2) { + input[2] = input[1]; + input[1] = input[0]; + input[0] = CI.getNumberedCircuit(inputStacks.length+10); + + } + else if (inputStacks.length == 3) { + input[3] = input[2]; + input[2] = input[1]; + input[1] = input[0]; + input[0] = CI.getNumberedCircuit(inputStacks.length+10); + } + + + /*for (int g = 0; g<4; g++) { if(inputStacks.length > g) { input[g] = inputStacks[g] != null ? inputStacks[g] : null; } @@ -156,7 +174,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { input[g] = CI.getNumberedCircuit(g+10); break; } - } + }*/ //Add mixer Recipe FluidStack oxygen = GT_Values.NF; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 5558d7551f..c611dda53e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -76,9 +76,9 @@ public class GregtechConduits { generateFluidMultiPipes(constructor, Materials.Copper, MaterialUtils.getMaterialName(Materials.Copper), "Copper", BasePipeHexadecupleID++, 60, 1000, true); generateFluidMultiPipes(constructor, Materials.Bronze, MaterialUtils.getMaterialName(Materials.Bronze), "Bronze", BasePipeHexadecupleID++, 120, 2000, true); generateFluidMultiPipes(constructor, Materials.Steel, MaterialUtils.getMaterialName(Materials.Steel), "Steel", BasePipeHexadecupleID++, 240, 2500, true); - generateFluidMultiPipes(constructor, Materials.StainlessSteel, MaterialUtils.getMaterialName(Materials.StainlessSteel), "StainlessSteel", BasePipeHexadecupleID++, 360, 3000, true); + generateFluidMultiPipes(constructor, Materials.StainlessSteel, MaterialUtils.getMaterialName(Materials.StainlessSteel), "Stainless Steel", BasePipeHexadecupleID++, 360, 3000, true); generateFluidMultiPipes(constructor, Materials.Titanium, MaterialUtils.getMaterialName(Materials.Titanium), "Titanium", BasePipeHexadecupleID++, 480, 5000, true); - generateFluidMultiPipes(constructor, Materials.TungstenSteel, MaterialUtils.getMaterialName(Materials.TungstenSteel), "Bronze", BasePipeHexadecupleID++, 600, 7500, true); + generateFluidMultiPipes(constructor, Materials.TungstenSteel, MaterialUtils.getMaterialName(Materials.TungstenSteel), "Tungsten Steel", BasePipeHexadecupleID++, 600, 7500, true); generateFluidMultiPipes(constructor, Materials.Plastic, MaterialUtils.getMaterialName(Materials.Plastic), "Plastic", BasePipeHexadecupleID++, 360, 350, true); Materials aPTFE = Materials.get("Polytetrafluoroethylene"); |