diff options
author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-12-12 02:52:34 +0000 |
---|---|---|
committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-12-12 02:52:34 +0000 |
commit | 1e4744ad4ed88bbda32a61b16225244aab2ab472 (patch) | |
tree | 24982a28ece1ab21a157c2070f97602e2b0015fe /src | |
parent | b8069dc5a8c0c8c2cfd5e4ec2401f28d6a84e626 (diff) | |
download | GT5-Unofficial-1e4744ad4ed88bbda32a61b16225244aab2ab472.tar.gz GT5-Unofficial-1e4744ad4ed88bbda32a61b16225244aab2ab472.tar.bz2 GT5-Unofficial-1e4744ad4ed88bbda32a61b16225244aab2ab472.zip |
+ Added Red Mud. (Future source of Rare Earth Materials and various processing chains)
$ Fixed a minor oversight with fluid textures.
$ Fixed Heavy Oil Cell generating when it shouldn't.
Diffstat (limited to 'src')
4 files changed, 16 insertions, 12 deletions
diff --git a/src/Java/gtPlusPlus/core/fluids/FactoryFluid.java b/src/Java/gtPlusPlus/core/fluids/FactoryFluid.java index 3359f18f7d..e3383aee91 100644 --- a/src/Java/gtPlusPlus/core/fluids/FactoryFluid.java +++ b/src/Java/gtPlusPlus/core/fluids/FactoryFluid.java @@ -43,7 +43,7 @@ public class FactoryFluid extends Fluid implements Runnable { @Override public void run() { - this.setIcons(GregTech_API.sBlockIcons.registerIcon(CORE.MODID+ ":" + "fluids/fluid." + this.mTextureName)); + this.setIcons(GregTech_API.sBlockIcons.registerIcon(this.mTextureName)); } }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index 6f36b359ad..0e23e9a845 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -48,7 +48,8 @@ public class AgriculturalChem extends ItemPackage { public static Fluid FertileManureSlurry; // Blood public static Fluid CustomBlood; - + // Red Mud + public static Fluid RedMud; /** * Items */ @@ -260,7 +261,10 @@ public class AgriculturalChem extends ItemPackage { // Sewage FertileManureSlurry = FluidUtils.generateFluidNonMolten("fertile.manure.slurry", "Fertile Manure Slurry", - 45 + 175, new short[] { 65, 50, 15, 100 }, null, null, 0, true); + 45 + 175, new short[] { 65, 50, 15, 100 }, null, null, 0, true); + + RedMud = FluidUtils.generateFluidNoPrefix("mud.red.slurry", "Red Mud Slurry", 32 + 175, new short[] { 180, 35, 25, 100 }, true); + } diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 2d063c45d4..bbdf322817 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -676,8 +676,8 @@ public class RocketFuels extends ItemPackage { Diesel = MaterialUtils.getMaterial("Fuel", "Diesel").getFluid(1).getFluid(); // 5.08 Compat - if (!FluidUtils.doesFluidExist("OilHeavy")){ - Oil_Heavy = FluidUtils.generateFluidNoPrefix("OilHeavy", "Heavy Oil", 200, new short[]{10, 10, 10, 100}); + if (!FluidUtils.doesFluidExist("liquid_heavy_oil")){ + Oil_Heavy = FluidUtils.generateFluidNoPrefix("liquid_heavy_oil", "Heavy Oil", 200, new short[]{10, 10, 10, 100}); } else { Oil_Heavy = MaterialUtils.getMaterial("OilHeavy", "Oil").getFluid(1).getFluid(); diff --git a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java index 051f73b962..9fc7d5b64e 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -321,8 +321,8 @@ public class BioRecipes { }, GT_Values.NF, ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 2), - 20 * 30, - 30); + 20 * 4, + 8); // Methanol Extraction GT_Values.RA.addFluidExtractionRecipe( @@ -379,8 +379,8 @@ public class BioRecipes { ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12), ItemUtils.getSimpleStack(AgriculturalChem.mPelletMold, 0), ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 3), - 20 * 2, - 30); + 20 * 10, + 16); // Assembly Recipe CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] { @@ -946,17 +946,17 @@ public class BioRecipes { ItemUtils.getSimpleStack(aOreCache.get(aOreName), aOreData2.get(aOreName)) }, new FluidStack[] { - FluidUtils.getSteam(4000) + FluidUtils.getSteam(2000 * aOreData2.get(aOreName)) }, new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mCleanAluminiumMix, (int) (Math.ceil(aOreData3.get(aOreName) * 1.4))) }, new FluidStack[] { - FluidUtils.getFluidStack("fluid.sludge", 2500) + FluidUtils.getFluidStack(AgriculturalChem.RedMud, 100 * (int) (Math.ceil(aOreData3.get(aOreName) * 1.4))) }, 20 * 60, aOreData1.get(aOreName), - 1); + aOreName.equals("Bauxite") ? 2 : 1); } GT_Values.RA.addExtruderRecipe( |