aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-10-16 20:37:36 +0100
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-10-16 20:37:36 +0100
commitae3c2ef515aa844f89d22325d19c6ebbfaf4ab28 (patch)
tree4fb336221cdc2dc4bc805f7fe40986fea1c2919d /src
parenta70491471175b00875dbf34db9388969cd29834a (diff)
downloadGT5-Unofficial-ae3c2ef515aa844f89d22325d19c6ebbfaf4ab28.tar.gz
GT5-Unofficial-ae3c2ef515aa844f89d22325d19c6ebbfaf4ab28.tar.bz2
GT5-Unofficial-ae3c2ef515aa844f89d22325d19c6ebbfaf4ab28.zip
+ Added first batch of Bio Recipes.
% Updated some Textures.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java15
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java10
-rw-r--r--src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java523
-rw-r--r--src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java19
-rw-r--r--src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java46
-rw-r--r--src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemBioChip.java138
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java4
-rw-r--r--src/resources/assets/miscutils/lang/en_US.lang11
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.pngbin210 -> 376 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.pngbin157 -> 397 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.pngbin194 -> 306 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.pngbin237 -> 442 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.pngbin174 -> 347 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.pngbin354 -> 364 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.pngbin273 -> 280 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.pngbin332 -> 0 bytes
16 files changed, 760 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 6e1e6ea5ad..b38451bba3 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -103,6 +103,21 @@ public final class MISC_MATERIALS {
new MaterialStack(ELEMENT.getInstance().NITROGEN, 1)
});
+ public static final Material CARBON_MONOXIDE = new Material(
+ "Carbon Monoxide",
+ MaterialState.PURE_LIQUID, //State
+ null, //Material Colour
+ -1, //Melting Point in C
+ -1, //Boiling Point in C
+ -1, //Protons
+ -1,
+ false, //Uses Blast furnace?
+ //Material Stacks with Percentage of required elements.
+ new MaterialStack[]{
+ new MaterialStack(ELEMENT.getInstance().CARBON, 1),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)
+ });
+
public static final Material CARBON_DIOXIDE = new Material(
"Carbon Dioxide",
MaterialState.PURE_LIQUID, //State
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
index 2f42e36bec..a0a684d3c6 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
@@ -248,10 +248,20 @@ public class PollutionUtils {
else {
MaterialGenerator.generate(MISC_MATERIALS.CARBON_DIOXIDE, false, false);
}
+
if (CM != null) {
Logger.INFO("[PollutionCompat] Found carbon monoxide fluid, registering it.");
PollutionUtils.mPollutionFluidStacks.put(CM);
+ ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonMonoxide", 1);
+ if (ItemUtils.checkForInvalidItems(cellCD)) {
+ Logger.INFO("[PollutionCompat] Found carbon dioxide cell, registering component.");
+ MISC_MATERIALS.CARBON_MONOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD);
+ }
+ }
+ else {
+ MaterialGenerator.generate(MISC_MATERIALS.CARBON_MONOXIDE, false, false);
}
+
if (SD != null) {
Logger.INFO("[PollutionCompat] Found sulfur dioxide fluid, registering it.");
PollutionUtils.mPollutionFluidStacks.put(SD);
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
new file mode 100644
index 0000000000..b6e4ce8881
--- /dev/null
+++ b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -0,0 +1,523 @@
+package gtPlusPlus.plugin.agrichem;
+
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_ModHandler.RecipeBits;
+import gtPlusPlus.core.item.chemistry.AgriculturalChem;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.RecipeUtils;
+import gtPlusPlus.plugin.agrichem.block.AgrichemFluids;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.railcraft.utils.RailcraftUtils;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+
+public class BioRecipes {
+
+ private static Item mFert;
+ private static Item mDustDirt;
+
+ private static Fluid mSalineWater;
+ private static Fluid mDistilledWater;
+ private static Fluid mThermalWater;
+ private static Fluid mAir;
+ private static Fluid mSulfuricWasteWater;
+ private static Fluid mAmmonia;
+ private static Fluid mMethanol;
+ private static Fluid mAceticAcid;
+ private static Fluid mPropionicAcid;
+ private static Fluid mLiquidPlastic;
+ private static Fluid mFermentationBase;
+ private static Fluid mCarbonDioxide;
+ private static Fluid mCarbonMonoxide;
+ private static Fluid mEthylene;
+ private static Fluid mEthanol;
+ private static Fluid mChlorine;
+ private static Fluid mHydrogen;
+ private static Fluid mDilutedSulfuricAcid;
+ private static Fluid mSulfuricAcid;
+ private static Fluid mUrea;
+ private static Fluid mFormaldehyde;
+ private static Fluid mLiquidResin;
+ private static Fluid mMethane;
+ private static Fluid mBenzene;
+ private static Fluid mEthylbenzene;
+ private static Fluid mStyrene;
+
+
+ private static final ItemStack getGreenAlgaeRecipeChip() {
+ return getBioChip(4);
+ }
+ private static final ItemStack getBrownAlgaeRecipeChip() {
+ return getBioChip(8);
+ }
+ private static final ItemStack getGoldenBrownAlgaeRecipeChip() {
+ return getBioChip(12);
+ }
+ private static final ItemStack getRedAlgaeRecipeChip() {
+ return getBioChip(16);
+ }
+
+ private static final ItemStack getBioChip(int aID) {
+ return ItemUtils.simpleMetaStack(Core_Agrichem.mBioCircuit, aID, 0);
+ }
+
+ public static void init() {
+ Core_Agrichem.mInstance.log("Setting Variables");
+ initRecipeVars();
+ Core_Agrichem.mInstance.log("Generating Biochip Recipes");
+ recipeBioChip();
+ Core_Agrichem.mInstance.log("Generating Recipes");
+ recipeAlgaeBiomass();
+ Core_Agrichem.mInstance.log("Finished with recipes");
+ }
+
+ private static final void initRecipeVars() {
+ mFert = AgriculturalChem.dustOrganicFertilizer;
+ mDustDirt = AgriculturalChem.dustDirt;
+
+
+ mDistilledWater = FluidUtils.getDistilledWater(1).getFluid();
+ mSalineWater = FluidUtils.getFluidStack("saltwater", 1).getFluid();
+ mThermalWater = FluidUtils.getFluidStack("ic2hotwater", 1).getFluid();
+ mAir = FluidUtils.getFluidStack("air", 1).getFluid();
+ mSulfuricWasteWater = FluidUtils.getFluidStack("sulfuricapatite", 1).getFluid();
+ mAmmonia = MISC_MATERIALS.AMMONIA.getFluid(1).getFluid();
+ mEthylene = FluidUtils.getFluidStack("ethylene", 1).getFluid();
+ mEthanol = FluidUtils.getFluidStack("bioethanol", 1).getFluid();
+ mDilutedSulfuricAcid = FluidUtils.getFluidStack("dilutedsulfuricacid", 1).getFluid();
+ mSulfuricAcid = FluidUtils.getFluidStack("sulfuricacid", 1).getFluid();
+ mFormaldehyde = FluidUtils.getFluidStack("fluid.formaldehyde", 1).getFluid();
+ mMethane = FluidUtils.getFluidStack("methane", 1).getFluid();
+ mBenzene = FluidUtils.getFluidStack("benzene", 1).getFluid();
+ mEthylbenzene = FluidUtils.getFluidStack("fluid.ethylbenzene", 1).getFluid();
+ mStyrene = FluidUtils.getFluidStack("styrene", 1).getFluid();
+ mMethanol = FluidUtils.getFluidStack("methanol", 1).getFluid();
+ mLiquidPlastic = FluidUtils.getFluidStack("plastic", 1).getFluid();
+ mCarbonDioxide = MISC_MATERIALS.CARBON_DIOXIDE.getFluid(1).getFluid();
+ mCarbonMonoxide = MISC_MATERIALS.CARBON_MONOXIDE.getFluid(1).getFluid();
+ mChlorine = FluidUtils.getFluidStack("chlorine", 1).getFluid();
+ mHydrogen = FluidUtils.getFluidStack("hydrogen", 1).getFluid();
+ mAceticAcid = AgrichemFluids.mAceticAcid;
+ mPropionicAcid = AgrichemFluids.mPropionicAcid;
+ mUrea = AgrichemFluids.mUrea;
+ mLiquidResin = AgrichemFluids.mLiquidResin;
+ mFermentationBase = AgrichemFluids.mFermentationBase;
+
+
+
+ }
+
+ private static void recipeAlgaeBiomass() {
+
+ // TODO
+ // Add in recipes to get initial Biomass
+
+ recipeGreenAlgae();
+ recipeBrownAlgae();
+ recipeGoldenBrownAlgae();
+ recipeRedAlgae();
+ recipeWoodPellets();
+ recipeWoodBricks();
+ recipeCellulosePulp();
+ recipeCatalystCarrier();
+ recipeAluminiumSilverCatalyst();
+ recipeAceticAcid();
+ recipePropionicAcid();
+ recipeFermentationBase();
+ recipeEthanol();
+ recipeCelluloseFibre();
+ recipeGoldenBrownCelluloseFiber();
+ recipeRedCelluloseFiber();
+ recipeSodiumHydroxide();
+ recipeSodiumCarbonate();
+ recipeAluminiumPellet();
+ recipeAlumina();
+ recipeAluminium();
+ recipeCalciumCarbonate();
+ recipeLithiumChloride();
+ recipeAlginicAcid();
+ recipeSulfuricAcid();
+ recipeUrea();
+ recipeRawBioResin();
+ recipeLiquidResin();
+ recipeCompost();
+ recipeMethane();
+ recipeBenzene();
+ recipeStyrene();
+ }
+
+ private static void recipeGreenAlgae() {
+ // Compost
+ GT_ModHandler.addPulverisationRecipe(
+ ItemUtils.getSimpleStack(Core_Agrichem.mGreenAlgaeBiosmass, 10),
+ ItemUtils.getSimpleStack(Core_Agrichem.mCompost, 1));
+
+ // Turn into Cellulose
+ CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+ getGreenAlgaeRecipeChip(),
+ ItemUtils.getSimpleStack(Core_Agrichem.mGreenAlgaeBiosmass, 30)
+ },
+ GT_Values.NF,
+ ItemUtils.getSimpleStack(Core_Agrichem.mCelluloseFiber, 5),
+ 20 * 30,
+ 16);
+
+
+ }
+
+ private static void recipeBrownAlgae() {
+ // Compost
+ GT_ModHandler.addPulverisationRecipe(
+ ItemUtils.getSimpleStack(Core_Agrichem.mBrownAlgaeBiosmass, 10),
+ ItemUtils.getSimpleStack(Core_Agrichem.mCompost, 1));
+
+ // Alginic acid
+ GT_Values.RA.addExtractorRecipe(
+ ItemUtils.getSimpleStack(Core_Agrichem.mBrownAlgaeBiosmass, 10),
+ ItemUtils.getSimpleStack(Core_Agrichem.mAlginicAcid, 1),
+ 20 * 15,
+ 30);
+
+ // Lithium Chloride
+ GT_Values.RA.addBlastRecipe(
+ getBrownAlgaeRecipeChip(),
+ ItemUtils.getSimpleStack(Core_Agrichem.mBrownAlgaeBiosmass, 20),
+ GT_Values.NF,
+ GT_Values.NF,
+ ItemUtils.getSimpleStack(Core_Agrichem.mLithiumChloride, 1),
+ GT_Values.NI,
+ 120,
+ 120,
+ 1200);
+
+ // Sodium Carbonate
+ CORE.RA.addChemicalRecipe(
+ getBrownAlgaeRecipeChip(),
+ ItemUtils.getSimpleStack(Core_Agrichem.mBrownAlgaeBiosmass, 20),
+ FluidUtils.getDistilledWater(2000),
+ GT_Values.NF,
+ ItemUtils.getSimpleStack(Core_Agrichem.mSodiumCarbonate, 1),
+ 20 * 30,
+ 30);
+
+ }
+
+ private static void recipeGoldenBrownAlgae() {
+ // Compost
+ GT_ModHandler.addPulverisationRecipe(
+ ItemUtils.getSimpleStack(Core_Agrichem.mGoldenBrownAlgaeBiosmass, 10),
+ ItemUtils.getSimpleStack(Core_Agrichem.mCompost, 1));
+
+ // Turn into Cellulose
+ CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+ getGoldenBrownAlgaeRecipeChip(),
+ ItemUtils.getSimpleStack(Core_Agrichem.mGoldenBrownAlgaeBiosmass, 30)
+ },
+ GT_Values.NF,
+ ItemUtils.getSimpleStack(Core_Agrichem.mGoldenBrownCelluloseFiber, 5),
+ 20 * 30,
+ 64);
+
+ }
+
+ private static void recipeRedAlgae() {
+ // Compost
+ GT_ModHandler.addPulverisationRecipe(
+ ItemUtils.getSimpleStack(Core_Agrichem.mRedAlgaeBiosmass, 10),
+ ItemUtils.getSimpleStack(Core_Agrichem.mCompost, 1));
+
+ // Turn into Cellulose
+ CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+ getRedAlgaeRecipeChip(),
+ ItemUtils.getSimpleStack(Core_Agrichem.mRedAlgaeBiosmass, 30)
+ },
+ GT_Values.NF,
+ ItemUtils.getSimpleStack(Core_Agrichem.mRedCelluloseFiber, 5),
+ 20 * 30,
+ 256);
+
+ }
+
+ private static void recipeCelluloseFibre() {
+
+ CORE.RA.addChemicalRecipe(
+ ItemUtils.getSimpleStack(Core_Agrichem.mCelluloseFiber, 20),
+ ItemUtils.getSimpleStack(Core_Agrichem.mAlginicAcid, 2),
+ GT_Values.NF,
+ GT_Values.NF,
+ ItemUtils.getSimpleStack(Core_Agrichem.mCellulosePulp, 10),
+ 30 * 20,
+ 16);
+
+ // Craft into Wood Pellets
+ CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+ getBioChip(2),
+ ItemUtils.getSimpleStack(Core_Agrichem.mCelluloseFiber, 12)
+ },
+ GT_Values.NF,
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodPellet, 2),
+ 20 * 30,
+ 30);
+
+ // Methanol Extraction
+ GT_Values.RA.addFluidExtractionRecipe(
+ ItemUtils.getSimpleStack(Core_Agrichem.mCelluloseFiber, 12),
+ GT_Values.NI,
+ FluidUtils.getFluidStack(mMethanol, 50),
+ 10000,
+ 20 * 30,
+ 30);
+
+ // Compost
+ GT_ModHandler.addPulverisationRecipe(
+ ItemUtils.getSimpleStack(Core_Agrichem.mCelluloseFiber, 5),
+ ItemUtils.getSimpleStack(Core_Agrichem.mCompost, 1));
+
+
+ }
+
+ private static void recipeWoodPellets() {
+ // Shapeless Recipe
+ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodPellet, 1),
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodPellet, 1)
+ }, ItemUtils.getSimpleStack(Core_Agrichem.mWoodBrick, 2));
+
+ // Assembly Recipe
+ CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+ getBioChip(2),
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodPellet, 8)
+ },
+ GT_Values.NF,
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodBrick, 2),
+ 20,
+ 8);
+
+ // CO2
+ CORE.RA.addFluidExtractionRecipe(
+ GT_Values.NI,
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodPellet, 1),
+ FluidUtils.getFluidStack(mCarbonDioxide, 70),
+ 10*20,
+ 30);
+
+
+ // Add Charcoal Recipe
+ if (LoadedMods.Railcraft) {
+ RailcraftUtils.addCokeOvenRecipe(
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodPellet, 2),
+ true,
+ true,
+ ItemUtils.getItemStackOfAmountFromOreDict("gemCharcoal", 3),
+ GT_Values.NF,
+ 1200);
+ }
+ CORE.RA.addCokeOvenRecipe(
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodPellet, 1),
+ getBioChip(3),
+ null,
+ GT_Values.NF,
+ ItemUtils.getItemStackOfAmountFromOreDict("gemCharcoal", 3),
+ 120,
+ 16);
+
+
+ }
+
+ private static void recipeWoodBricks() {
+
+ // Assembly Recipe
+ CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+ getBioChip(3),
+ ItemUtils.getOrePrefixStack(OrePrefixes.dust, Materials.Wood, 50)
+ },
+ GT_Values.NF,
+ ItemUtils.getSimpleStack(Core_Agrichem.mWoodBrick, 1),
+ 100,
+ 16);
+ }
+
+ private static void recipeCellulosePulp() {
+
+ // Assembly Recipe
+ CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+ getBioChip(2),
+ ItemUtils.getSimpleStack(Core_Agrichem.mCellulosePulp, 4)
+ },
+ GT_Values.NF,
+ ItemUtils.getSimpleStack(Items.paper, 1),
+ 50,
+ 16);
+ }
+
+ private static void recipeCatalystCarrier() {
+
+ }
+
+ private static void recipeAluminiumSilverCatalyst() {
+
+ }
+
+ private static void recipeAceticAcid() {
+
+ }
+
+ private static void recipeFermentationBase() {
+
+ }
+
+ private static void recipePropionicAcid() {
+
+ }
+
+ private static void recipeEthanol() {
+
+ }
+
+ private static void recipeGoldenBrownCelluloseFiber() {
+
+ }
+
+ private static void recipeRedCelluloseFiber() {
+
+ }
+
+ private static void recipeSodiumHydroxide() {
+
+ }
+
+ private static void recipeSodiumCarbonate() {
+
+ }
+
+ private static void recipeAluminiumPellet() {
+
+ }
+
+ private static void recipeAlumina() {
+
+ }
+
+ private static void recipeAluminium() {
+
+ }
+
+ private static void recipeCalciumCarbonate() {
+
+ }
+
+ private static void recipeLithiumChloride() {
+
+ }
+
+ private static void recipeAlginicAcid() {
+
+ }
+
+ private static void recipeSulfuricAcid() {
+
+ }
+
+ private static void recipeUrea() {
+
+ }
+
+ private static void recipeRawBioResin() {
+
+ }
+
+ private static void recipeLiquidResin() {
+
+ }
+
+ private static void recipeCompost() {
+
+ }
+
+ private static void recipeMethane() {
+
+ }
+
+ private static void recipeBenzene() {
+
+ }
+
+ private static void recipeStyrene() {
+
+ }
+
+ private static void recipeBioChip() {
+
+ GT_ModHandler.addShapelessCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 0L, new Object[0]),
+ RecipeBits.NOT_REMOVABLE, new Object[]{OrePrefixes.circuit.get(Materials.Primitive)});
+
+
+ long bits = RecipeBits.BUFFERED | RecipeBits.NOT_REMOVABLE;
+
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 1L, new Object[0]), bits,
+ new Object[]{"d ", " P ", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 2L, new Object[0]), bits,
+ new Object[]{" d ", " P ", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 3L, new Object[0]), bits,
+ new Object[]{" d", " P ", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 4L, new Object[0]), bits,
+ new Object[]{" ", " Pd", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 5L, new Object[0]), bits,
+ new Object[]{" ", " P ", " d", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 6L, new Object[0]), bits,
+ new Object[]{" ", " P ", " d ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 7L, new Object[0]), bits,
+ new Object[]{" ", " P ", "d ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 8L, new Object[0]), bits,
+ new Object[]{" ", "dP ", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 9L, new Object[0]), bits,
+ new Object[]{"P d", " ", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 10L, new Object[0]), bits,
+ new Object[]{"P ", " d", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 11L, new Object[0]), bits,
+ new Object[]{"P ", " ", " d", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 12L, new Object[0]), bits,
+ new Object[]{"P ", " ", " d ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 13L, new Object[0]), bits,
+ new Object[]{" P", " ", " d", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 14L, new Object[0]), bits,
+ new Object[]{" P", " ", " d ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 15L, new Object[0]), bits,
+ new Object[]{" P", " ", "d ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 16L, new Object[0]), bits,
+ new Object[]{" P", "d ", " ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 17L, new Object[0]), bits,
+ new Object[]{" ", " ", "d P", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 18L, new Object[0]), bits,
+ new Object[]{" ", "d ", " P", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 19L, new Object[0]), bits,
+ new Object[]{"d ", " ", " P", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 20L, new Object[0]), bits,
+ new Object[]{" d ", " ", " P", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 21L, new Object[0]), bits,
+ new Object[]{"d ", " ", "P ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 22L, new Object[0]), bits,
+ new Object[]{" d ", " ", "P ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 23L, new Object[0]), bits,
+ new Object[]{" d", " ", "P ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 24L, new Object[0]), bits,
+ new Object[]{" ", " d", "P ", 'P', GregtechItemList.Circuit_BioRecipeSelector.getWildcard(1L, new Object[0])});
+ }
+
+
+}
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java b/src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java
index 57c3f765a9..bb467699a7 100644
--- a/src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java
+++ b/src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java
@@ -4,10 +4,13 @@ import java.util.List;
import gtPlusPlus.api.interfaces.IPlugin;
import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.plugin.agrichem.block.AgrichemFluids;
import gtPlusPlus.plugin.agrichem.fluids.FluidLoader;
import gtPlusPlus.plugin.agrichem.item.algae.ItemAgrichemBase;
import gtPlusPlus.plugin.agrichem.item.algae.ItemAlgaeBase;
+import gtPlusPlus.plugin.agrichem.item.algae.ItemBioChip;
import gtPlusPlus.plugin.manager.Core_Manager;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -17,6 +20,7 @@ public class Core_Agrichem implements IPlugin {
final static Core_Agrichem mInstance;
public static Item mAlgae;
+ public static Item mBioCircuit;
public static Item mAgrichemItem1;
/*
@@ -75,15 +79,22 @@ public class Core_Agrichem implements IPlugin {
}
@Override
- public boolean preInit() {
+ public boolean preInit() {
+ mInstance.log("Generating Fluids");
FluidLoader.generate();
+ AgrichemFluids.init();
+ mInstance.log("Generating Items");
mAlgae = new ItemAlgaeBase();
mAgrichemItem1 = new ItemAgrichemBase();
+ mBioCircuit = new ItemBioChip();
+ mInstance.log("Setting Bio Circuit");
+ GregtechItemList.Circuit_BioRecipeSelector.set(mBioCircuit);
return true;
}
@Override
public boolean init() {
+ mInstance.log("Setting Items");
mAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 0, 1);
mGreenAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 1, 1);
mBrownAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 2, 1);
@@ -130,6 +141,7 @@ public class Core_Agrichem implements IPlugin {
mSodiumCarbonate = ItemUtils.simpleMetaStack(mAgrichemItem1, 20, 1);
mLithiumChloride = ItemUtils.simpleMetaStack(mAgrichemItem1, 21, 1);
+ mInstance.log("OreDicting Items");
ItemUtils.addItemToOreDictionary(mGreenAlgaeBiosmass, "biomassGreenAlgae");
ItemUtils.addItemToOreDictionary(mBrownAlgaeBiosmass, "biomassBrownAlgae");
ItemUtils.addItemToOreDictionary(mGoldenBrownAlgaeBiosmass, "biomassGoldenBrownAlgae");
@@ -156,13 +168,14 @@ public class Core_Agrichem implements IPlugin {
ItemUtils.addItemToOreDictionary(mSodiumHydroxide, "dustSodiumHydroxide");
}
ItemUtils.addItemToOreDictionary(mSodiumCarbonate, "dustSodiumCarbonate");
- ItemUtils.addItemToOreDictionary(mLithiumChloride, "dustLithiumChloride");
-
+ ItemUtils.addItemToOreDictionary(mLithiumChloride, "dustLithiumChloride");
return true;
}
@Override
public boolean postInit() {
+ mInstance.log("Generating Recipes");
+ BioRecipes.init();
return true;
}
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java b/src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
index ad869afc47..1f686cf810 100644
--- a/src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
+++ b/src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java
@@ -1,5 +1,9 @@
package gtPlusPlus.plugin.agrichem.block;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+
public class AgrichemFluids {
/*
@@ -22,5 +26,47 @@ public class AgrichemFluids {
* Ethylbenzene - fluid.ethylbenzene
* Styrene - styrene
*/
+
+ public static Fluid mAceticAcid;
+ public static Fluid mPropionicAcid;
+ public static Fluid mFermentationBase;
+ public static Fluid mUrea;
+ public static Fluid mLiquidResin;
+
+
+ public static void init() {
+ if (!FluidRegistry.isFluidRegistered("aceticacid")) {
+ mAceticAcid = FluidUtils.generateFluidNoPrefix("aceticacid", "Acetic Acid", 200, new short[] { 97, 168, 96, 100 }, true);
+ }
+ else {
+ mAceticAcid = FluidRegistry.getFluid("aceticacid");
+ }
+ if (!FluidRegistry.isFluidRegistered("propionicacid")) {
+ mPropionicAcid = FluidUtils.generateFluidNoPrefix("propionicacid", "Propionic Acid", 200, new short[] { 198, 209, 148, 100 }, true);
+ }
+ else {
+ mPropionicAcid = FluidRegistry.getFluid("propionicacid");
+ }
+ if (!FluidRegistry.isFluidRegistered("fermentation.base")) {
+ mFermentationBase = FluidUtils.generateFluidNoPrefix("fermentation.base", "Fermentation Base", 200, new short[] { 107, 100, 63, 100 }, true);
+ }
+ else {
+ mFermentationBase = FluidRegistry.getFluid("fermentation.base");
+ }
+ if (!FluidRegistry.isFluidRegistered("ureamix")) {
+ mUrea = FluidUtils.generateFluidNoPrefix("ureamix", "Urea Mix", 200, new short[] { 71, 55, 12, 100 }, true);
+ }
+ else {
+ mUrea = FluidRegistry.getFluid("ureamix");
+ }
+ if (!FluidRegistry.isFluidRegistered("liquidresin")) {
+ mLiquidResin = FluidUtils.generateFluidNoPrefix("liquidresin", "Liquid Resin", 200, new short[] { 59, 58, 56, 100 }, true);
+ }
+ else {
+ mLiquidResin = FluidRegistry.getFluid("liquidresin");
+ }
+ }
+
+
}
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemBioChip.java b/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemBioChip.java
new file mode 100644
index 0000000000..5ecfbbabe9
--- /dev/null
+++ b/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemBioChip.java
@@ -0,0 +1,138 @@
+package gtPlusPlus.plugin.agrichem.item.algae;
+
+import java.util.List;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class ItemBioChip extends Item {
+
+ protected IIcon base;
+
+ public ItemBioChip() {
+ this.setHasSubtypes(true);
+ this.setNoRepair();
+ this.setMaxStackSize(64);
+ this.setMaxDamage(0);
+ this.setUnlocalizedName("BioRecipeSelector");
+ GameRegistry.registerItem(this, this.getUnlocalizedName());
+ }
+
+ @Override
+ public boolean isDamageable() {
+ return false;
+ }
+
+ @Override
+ public boolean shouldRotateAroundWhenRendering() {
+ return super.shouldRotateAroundWhenRendering();
+ }
+
+ @Override
+ public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) {
+ super.onUpdate(p_77663_1_, p_77663_2_, p_77663_3_, p_77663_4_, p_77663_5_);
+ }
+
+ @Override
+ public String getItemStackDisplayName(ItemStack aStack) {
+ return super.getItemStackDisplayName(aStack);
+ }
+
+ @Override
+ public void addInformation(ItemStack aStack, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
+ try {
+ aList.add("Configuration == "+aStack.getItemDamage());
+ }
+ catch (Throwable t) {
+ t.printStackTrace();
+ }
+ super.addInformation(aStack, p_77624_2_, aList, p_77624_4_);
+ }
+
+ @Override
+ public EnumRarity getRarity(ItemStack p_77613_1_) {
+ return EnumRarity.common;
+ }
+
+ @Override
+ public void getSubItems(Item aItem, CreativeTabs p_150895_2_, List aList) {
+ aList.add(ItemUtils.simpleMetaStack(aItem, 0, 1));
+ }
+
+ @Override
+ public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) {
+ return false;
+ }
+
+ @Override
+ public boolean isRepairable() {
+ return false;
+ }
+
+ @Override
+ public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
+ return false;
+ }
+
+ @Override
+ public int getDisplayDamage(ItemStack stack) {
+ return stack.getItemDamage();
+ }
+
+ @Override
+ public boolean showDurabilityBar(ItemStack stack) {
+ return false;
+ }
+
+ @Override
+ public int getItemEnchantability() {
+ return 0;
+ }
+
+ @Override
+ public int getItemEnchantability(ItemStack stack) {
+ return 0;
+ }
+
+ @Override
+ public void registerIcons(final IIconRegister u) {
+ this.base = u.registerIcon(CORE.MODID + ":" + "bioscience/BioCircuit");
+ }
+
+ @Override
+ public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
+ return this.base;
+ }
+
+ @Override
+ public IIcon getIconFromDamage(int damage) {
+ return this.base;
+ }
+
+ @Override
+ public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
+ return this.base;
+ }
+
+ @Override
+ public IIcon getIcon(ItemStack stack, int pass) {
+ return this.base;
+ }
+
+ @Override
+ public String getUnlocalizedName(ItemStack stack) {
+ return super.getUnlocalizedName();
+ }
+
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 726fc1869d..7a83392c07 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -39,6 +39,9 @@ public enum GregtechItemList implements GregtechItemContainer {
Emitter_ULV,
Sensor_ULV,
+ //Recipe Circuit
+ Circuit_BioRecipeSelector,
+
//Circuits
Old_Circuit_Primitive, Old_Circuit_Basic, Old_Circuit_Good,
Old_Circuit_Advanced, Old_Circuit_Data, Old_Circuit_Elite,
@@ -611,7 +614,6 @@ public enum GregtechItemList implements GregtechItemContainer {
private ItemStack mStack;
private boolean mHasNotBeenSet = true;
- public static Fluid sOilExtraHeavy, sOilHeavy, sOilMedium, sOilLight, sNaturalGas;
@Override
public GregtechItemList set(final Item aItem) {
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index fe78eaf5ea..cbba0cc3d8 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -3038,6 +3038,14 @@ tile.blockRoundRobinator.4.name=Round Robinator V
//Added 16/10/19
+
+item.BioRecipeSelector.name=Programmed Circuit
+item.FermentationBase.name=Cell of Fermentation Base
+item.ureamix.name=Cell of Urea Mix
+item.liquidresin.name=Cell of Liquid Resin
+item.propionicacid.name=Propionic Acid Cell
+item.aceticacid.name=Acetic Acid Cell
+
item.BasicAgrichemItem.0.name=Algae Biomass
item.BasicAgrichemItem.1.name=Green Algae Biomass
item.BasicAgrichemItem.2.name=Brown Algae Biomass
@@ -3059,5 +3067,4 @@ item.BasicAgrichemItem.17.name=Aluminium Pellet
item.BasicAgrichemItem.18.name=Sodium Aluminate
item.BasicAgrichemItem.19.name=Sodium Hydroxide
item.BasicAgrichemItem.20.name=Sodium Carbonate
-item.BasicAgrichemItem.21.name=Carlcium Carbonate
-item.BasicAgrichemItem.22.name=Lithium Chloride \ No newline at end of file
+item.BasicAgrichemItem.21.name=Lithium Chloride \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.png
index 7b10c11773..31951671cd 100644
--- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.png
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.png
index 7a78764496..2c6e0b8cb6 100644
--- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.png
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.png
index 677a1aa6d0..4309f3a975 100644
--- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.png
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.png
index 5b1833bea9..e82660e9f8 100644
--- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.png
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.png
index a8b45c9288..dc2070e635 100644
--- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.png
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.png
index ab9ddf3e1b..9b536f84d0 100644
--- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.png
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.png
index 042d30a9a9..1a04c2415c 100644
--- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.png
+++ b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.png b/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.png
deleted file mode 100644
index 1aa59863ea..0000000000
--- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.png
+++ /dev/null
Binary files differ