diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
5 files changed, 272 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 1db54a4933..1faf07dde3 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -44,6 +44,7 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaG import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GTNH; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GlueLine; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_Nuclear; import gtPlusPlus.xmod.gregtech.registration.gregtech.*; import net.minecraft.item.ItemStack; @@ -236,7 +237,8 @@ public class COMPAT_HANDLER { //Add hand-made recipes RECIPES_GREGTECH.run(); RecipeLoader_GTNH.generate(); - RecipeLoader_Nuclear.generate(); + RecipeLoader_Nuclear.generate(); + RecipeLoader_GlueLine.generate(); //Add autogenerated Recipes from Item Components for (Set<RunnableWithInfo<Material>> m : MaterialGenerator.mRecipeMapsToGenerate) { for (RunnableWithInfo<Material> r : m) { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index 43bd669829..bb7edec42e 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -104,6 +104,7 @@ public class GenericChem extends ItemPackage { public static ItemStack mBrownCatalyst; public static ItemStack mPinkCatalyst; public static ItemStack mFormaldehydeCatalyst; + public static ItemStack mSolidAcidCatalyst; public static ItemStack mMillingBallAlumina; public static ItemStack mMillingBallSoapstone; @@ -153,6 +154,7 @@ public class GenericChem extends ItemPackage { mPotassiumEthylXanthate = ItemUtils.simpleMetaStack(mGenericChemItem1, 11, 1); mPotassiumHydroxide = ItemUtils.simpleMetaStack(mGenericChemItem1, 12, 1); mFormaldehydeCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 13, 1); + mSolidAcidCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 14, 1); } @@ -172,6 +174,7 @@ public class GenericChem extends ItemPackage { ItemUtils.addItemToOreDictionary(mPotassiumEthylXanthate, "dustPotassiumEthylXanthate"); ItemUtils.addItemToOreDictionary(mPotassiumHydroxide, "dustPotassiumHydroxide"); ItemUtils.addItemToOreDictionary(mFormaldehydeCatalyst, "catalystFormaldehyde"); + ItemUtils.addItemToOreDictionary(mSolidAcidCatalyst, "catalystSolidAcid"); } @@ -293,6 +296,7 @@ public class GenericChem extends ItemPackage { recipeCatalystBrown(); recipeCatalystPink(); recipeCatalystFormaldehyde(); + recipeCatalystSolidAcid(); recipeGrindingBallAlumina(); recipeGrindingBallSoapstone(); @@ -792,6 +796,20 @@ public class GenericChem extends ItemPackage { } + private void recipeCatalystSolidAcid() { + // Assembly Recipe + CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] { + getTierThreeChip(), + CI.getEmptyCatalyst(5), + ItemUtils.getItemStackOfAmountFromOreDict("dustLapis", 2) + }, + MISC_MATERIALS.SOLID_ACID_MIXTURE.getFluidStack(1000), + ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 5), + 30 * 20, + 2000); + + } + private void recipeCadaverineAndPutrescine() { // Basic Recipe diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index c763a1a434..55a2301c4e 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -23,7 +23,7 @@ public class ItemGenericChemBase extends Item { final protected IIcon base[]; - final private int aMetaSize = 14; + final private int aMetaSize = 15; /* * 0 - Red Metal Catalyst //FeCu @@ -40,6 +40,7 @@ public class ItemGenericChemBase extends Item { * 11 - Potassium Ethyl Xanthate //CH3CH2OH + CS2 + KOH → CH3CH2OCS2K + H2O * 12 - Potassium Hydroxide // KOH * 13 - Formaldehyde Catalyst //Fe16V1 + * 14 - Solid Acid Catalyst //H2SO4 */ public ItemGenericChemBase() { diff --git a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java index 31ad5e466b..a827085b2a 100644 --- a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java +++ b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java @@ -19,6 +19,10 @@ public final class MISC_MATERIALS { MaterialUtils.generateSpecialDustAndAssignToAMaterial(SODIUM_NITRATE, false); MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_OXIDE, false); MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_HYDROXIDE, false); + MaterialUtils.generateSpecialDustAndAssignToAMaterial(CYANOACETIC_ACID, false); + MaterialUtils.generateSpecialDustAndAssignToAMaterial(SODIUM_CYANIDE, false); + MaterialUtils.generateSpecialDustAndAssignToAMaterial(COPPER_SULFATE, false); + MaterialUtils.generateSpecialDustAndAssignToAMaterial(COPPER_SULFATE_HYDRATED, false); WATER.registerComponentForMaterial(FluidUtils.getWater(1000)); } @@ -394,6 +398,248 @@ public final class MISC_MATERIALS { new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2) }); + // Glue Chemicals + public static final Material ACETIC_ANHYDRIDE = new Material( + "Acetic Anhydride", + MaterialState.PURE_LIQUID, //State + new short[] {250, 240, 110}, //Material Colour + -73, //Melting Point in C + 139, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + "(CH3CO)2O", + 0, + true, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CARBON, 4), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 3) + }); + + public static final Material CHLOROACETIC_ACID = new Material( + "Chloroacetic Acid", + MaterialState.PURE_LIQUID, //State + new short[] {230, 200, 90}, //Material Colour + 63, //Melting Point in C + 189, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + "ClCH2-COOH", + 0, + true, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CARBON, 2), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 1) + }); + + public static final Material DICHLOROACETIC_ACID = new Material( + "Dichloroacetic Acid", + MaterialState.PURE_LIQUID, //State + new short[] {190, 160, 60}, //Material Colour + 13, //Melting Point in C + 194, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + "Cl2CH-COOH", + 0, + true, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CARBON, 2), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 2) + }); + + public static final Material TRICHLOROACETIC_ACID = new Material( + "Trichloroacetic Acid", + MaterialState.PURE_LIQUID, //State + new short[] {120, 100, 30}, //Material Colour + 57, //Melting Point in C + 196, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + "Cl3C-COOH", + 0, + true, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CARBON, 2), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 3) + }); + + public static final Material CHLOROACETIC_MIXTURE = new Material( + "Chloroacetic Mixture", + MaterialState.LIQUID, //State + null, + new short[] {210, 160, 10}, + 40, + 192, + -1, + -1, + false, + "Cl?H?C-COOH", + 0, + true, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CARBON, 6), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 6), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 6) + }); + + public static final Material SODIUM_CYANIDE = new Material( + "Sodium Cyanide", + MaterialState.SOLID, //State + new short[] {180, 190, 255}, //Material Colour + 563, //Melting Point in C + 1496, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + "NaCN", + 0, + false, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().SODIUM, 1), + new MaterialStack(ELEMENT.getInstance().CARBON, 1), + new MaterialStack(ELEMENT.getInstance().NITROGEN, 1) + }); + + public static final Material CYANOACETIC_ACID = new Material( + "Cyanoacetic Acid", + MaterialState.SOLID, //State + new short[] {130, 130, 40}, //Material Colour + 66, //Melting Point in C + 108, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + "C3H3NO2", + 0, + false, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CARBON, 3), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3), + new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2) + }); + + public static final Material SOLID_ACID_MIXTURE = new Material( + "Solid Acid Catalyst Mixture", + MaterialState.LIQUID, //State + new short[] {80, 40, 0}, //Material Colour + -10, //Melting Point in C + 337, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + "?H2SO4?", + 0, + true, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), + new MaterialStack(ELEMENT.getInstance().SULFUR, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 4) + }); + public static final Material COPPER_SULFATE = new Material( + "Copper(II) Sulfate", + MaterialState.SOLID, //State + new short[] {200, 200, 200}, //Material Colour + 590, //Melting Point in C + 650, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + "CuSO4", + 0, + false, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().COPPER, 1), + new MaterialStack(ELEMENT.getInstance().SULFUR, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 4) + }); + + public static final Material COPPER_SULFATE_HYDRATED = new Material( + "Copper(II) Sulfate Pentahydrate", + MaterialState.SOLID, //State + new short[] {90, 170, 255}, //Material Colour + 590, //Melting Point in C + 650, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + "CuSO4∙5H2O", + 0, + false, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().COPPER, 1), + new MaterialStack(ELEMENT.getInstance().SULFUR, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 4) + }); + + public static final Material ETHYL_CYANOACETATE = new Material( + "Ethyl Cyanoacetate", + MaterialState.PURE_LIQUID, //State + new short[] {0, 75, 160}, //Material Colour + -22, //Melting Point in C + 210, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + "C5H7NO2", + 0, + true, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CARBON, 2), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 3) + }); + + public static final Material CYANOACRYLATE_POLYMER = new Material( + "Cyanoacrylate Polymer", + MaterialState.LIQUID, //State + new short[] {140, 150, 160}, //Material Colour + -25, //Melting Point in C + 55, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + "(-C6H7NO2-)n", + 0, + true, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CARBON, 2), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 3) + }); + + public static final Material ETHYL_CYANOACRYLATE = new Material( + "Ethyl Cyanoacrylate (Super Glue)", + MaterialState.PURE_LIQUID, //State + new short[] {170, 190, 200}, //Material Colour + -25, //Melting Point in C + 55, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + "C6H7NO2", + 0, + true, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CARBON, 2), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 3) + }); } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java index fa685aa93c..0f94a820db 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -1338,6 +1338,9 @@ public class ItemUtils { if (GT_Utility.areStacksEqual(aStack, GenericChem.mFormaldehydeCatalyst, true)) { return true; } + if (GT_Utility.areStacksEqual(aStack, GenericChem.mSolidAcidCatalyst, true)) { + return true; + } if (GT_Utility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) { return true; } |