diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index 0adaebed3..9a10f940d 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -248,9 +248,8 @@ public class Fluids { KEROSENE_REFORM = new FluidType("KEROSENE_REFORM", 0xFFA5F3, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID).addContainers(0xFF377D, ExtContainer.CANISTER); REFORMGAS = new FluidType("REFORMGAS", 0x6362AE, 1, 4, 1, EnumSymbol.NONE).addTraits(GASEOUS); COLLOID = new FluidType("COLLOID", 0x787878, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID); - //TODO - PHOSGENE = new FluidType("PHOSGENE", 0xffffff, 0, 0, 0, EnumSymbol.NONE).addTraits(GASEOUS); - MUSTARDGAS = new FluidType(102, "MUSTARDGAS", 0xffffff, 0, 0, 0, EnumSymbol.NONE).addTraits(GASEOUS); + PHOSGENE = new FluidType("PHOSGENE", 0xCFC4A4, 4, 0, 1, EnumSymbol.NONE).addTraits(GASEOUS); + MUSTARDGAS = new FluidType(102, "MUSTARDGAS", 0xBAB572, 4, 1, 1, EnumSymbol.NONE).addTraits(GASEOUS); // ^ ^ ^ ^ ^ ^ ^ ^ @@ -355,6 +354,9 @@ public class Fluids { metaOrder.add(WATZ); //solutions and working fluids metaOrder.add(FRACKSOL); + //the fun guys + metaOrder.add(PHOSGENE); + metaOrder.add(MUSTARDGAS); //antimatter metaOrder.add(AMAT); metaOrder.add(ASCHRAB); diff --git a/src/main/java/com/hbm/inventory/material/Mats.java b/src/main/java/com/hbm/inventory/material/Mats.java index 05f606da3..727d1b405 100644 --- a/src/main/java/com/hbm/inventory/material/Mats.java +++ b/src/main/java/com/hbm/inventory/material/Mats.java @@ -31,7 +31,6 @@ public class Mats { public static HashMap prefixByName = new HashMap(); public static HashMap matById = new HashMap(); public static HashMap matByName = new HashMap(); - //public static HashMap matRemap = new HashMap(); public static HashMap> materialEntries = new HashMap(); public static HashMap> materialOreEntries = new HashMap(); diff --git a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java index c07b69d6a..8844cd417 100644 --- a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java @@ -1,6 +1,6 @@ package com.hbm.inventory.recipes; -import static com.hbm.inventory.OreDictManager.KNO; +import static com.hbm.inventory.OreDictManager.*; import java.io.IOException; import java.util.ArrayList; @@ -31,14 +31,16 @@ public class MixerRecipes extends SerializableRecipe { recipes.put(Fluids.COOLANT, new MixerRecipe(2_000, 50).setStack1(new FluidStack(Fluids.WATER, 1_800)).setSolid(new OreDictStack(KNO.dust()))); recipes.put(Fluids.CRYOGEL, new MixerRecipe(2_000, 50).setStack1(new FluidStack(Fluids.COOLANT, 1_800)).setSolid(new ComparableStack(ModItems.powder_ice))); recipes.put(Fluids.NITAN, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.KEROSENE, 600)).setStack2(new FluidStack(Fluids.MERCURY, 200)).setSolid(new ComparableStack(ModItems.powder_nitan_mix))); - recipes.put(Fluids.FRACKSOL, new MixerRecipe(1_000, 20).setStack1(new FluidStack(Fluids.WATER, 1_000)).setStack2(new FluidStack(Fluids.PETROLEUM, 100)).setSolid(new OreDictStack(OreDictManager.S.dust()))); - recipes.put(Fluids.ENDERJUICE, new MixerRecipe(100, 100).setStack1(new FluidStack(Fluids.XPJUICE, 500)).setSolid(new OreDictStack(OreDictManager.DIAMOND.dust()))); + recipes.put(Fluids.FRACKSOL, new MixerRecipe(1_000, 20).setStack1(new FluidStack(Fluids.WATER, 1_000)).setStack2(new FluidStack(Fluids.PETROLEUM, 100)).setSolid(new OreDictStack(S.dust()))); + recipes.put(Fluids.ENDERJUICE, new MixerRecipe(100, 100).setStack1(new FluidStack(Fluids.XPJUICE, 500)).setSolid(new OreDictStack(DIAMOND.dust()))); recipes.put(Fluids.SALIENT, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.SEEDSLURRY, 500)).setStack2(new FluidStack(Fluids.BLOOD, 500))); recipes.put(Fluids.COLLOID, new MixerRecipe(500, 20).setStack1(new FluidStack(Fluids.WATER, 500)).setSolid(new ComparableStack(ModItems.dust))); + recipes.put(Fluids.PHOSGENE, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.UNSATURATEDS, 500)).setStack2(new FluidStack(Fluids.CHLORINE, 500))); + recipes.put(Fluids.MUSTARDGAS, new MixerRecipe(1000, 20).setStack1(new FluidStack(Fluids.REFORMGAS, 750)).setStack2(new FluidStack(Fluids.CHLORINE, 250)).setSolid(new OreDictStack(S.dust()))); recipes.put(Fluids.SOLVENT, new MixerRecipe(1000, 50).setStack1(new FluidStack(Fluids.NAPHTHA, 500)).setStack2(new FluidStack(Fluids.AROMATICS, 500))); - recipes.put(Fluids.SULFURIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.ACID, 800)).setSolid(new OreDictStack(OreDictManager.S.dust()))); - recipes.put(Fluids.NITRIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new OreDictStack(OreDictManager.KNO.dust()))); + recipes.put(Fluids.SULFURIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.ACID, 800)).setSolid(new OreDictStack(S.dust()))); + recipes.put(Fluids.NITRIC_ACID, new MixerRecipe(500, 50).setStack1(new FluidStack(Fluids.SULFURIC_ACID, 500)).setSolid(new OreDictStack(KNO.dust()))); recipes.put(Fluids.SCHRABIDIC, new MixerRecipe(16_000, 100).setStack1(new FluidStack(Fluids.SAS3, 8_000)).setStack2(new FluidStack(Fluids.ACID, 6_000)).setSolid(new ComparableStack(ModItems.pellet_charged))); recipes.put(Fluids.LUBRICANT, new MixerRecipe(1_000, 20).setStack1(new FluidStack(Fluids.HEATINGOIL, 500)).setStack2(new FluidStack(Fluids.UNSATURATEDS, 500))); diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java index 2a3d52faf..568431479 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java @@ -876,7 +876,6 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple cachedCasingConfig = null; } - @SideOnly(Side.CLIENT) @Override public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { return new ContainerTurretBase(player.inventory, this); diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java index 02273e7be..dd6c17687 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java @@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.world.World; public class TileEntityTurretBrandon extends TileEntityTurretBaseNT { @@ -33,6 +34,11 @@ public class TileEntityTurretBrandon extends TileEntityTurretBaseNT { // TODO Auto-generated method stub return null; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 329b5c1d3..beb93e933 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -637,6 +637,7 @@ hbmfluid.lubricant=Schmiermittel hbmfluid.mercury=Quecksilber hbmfluid.mug=Mug Root Beer hbmfluid.mug_hot=Heißes Mug Root Beer +hbmfluid.mustardgas=Senfgas hbmfluid.naphtha=Mitteldestillat hbmfluid.naphtha_crack=Crack-Mitteldestillat hbmfluid.nitan=NITAN© 100 Oktan Supertreibstoff @@ -649,6 +650,7 @@ hbmfluid.pain=Pandemonium(III)tantalit-Lösung hbmfluid.petroil=Gemisch hbmfluid.petroil_leaded=Bleigemisch hbmfluid.petroleum=Petroleumgas +hbmfluid.phosgene=Phosgen hbmfluid.plasma_bf=Balefire-Plasma hbmfluid.plasma_dh3=Deuterium-Helium-3-Plasma hbmfluid.plasma_dt=Deuterium-Tritium-Plasma diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 5ea4011c9..3da4ce06f 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -1194,6 +1194,7 @@ hbmfluid.lubricant=Engine Lubricant hbmfluid.mercury=Mercury hbmfluid.mug=Mug Root Beer hbmfluid.mug_hot=Hot Mug Root Beer +hbmfluid.mustardgas=Mustard Gas hbmfluid.naphtha=Naphtha hbmfluid.naphtha_crack=Cracked Naphtha hbmfluid.nitan=NITAN© 100 Octane Super Fuel @@ -1206,6 +1207,7 @@ hbmfluid.pain=Pandemonium(III)tantalite Solution hbmfluid.petroil=Petroil hbmfluid.petroil_leaded=Leaded Petroil hbmfluid.petroleum=Petroleum Gas +hbmfluid.phosgene=Phosgene hbmfluid.plasma_bf=Balefire Plasma hbmfluid.plasma_dh3=Deuterium-Helium-3 Plasma hbmfluid.plasma_dt=Deuterium-Tritium Plasma diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/mustardgas.png b/src/main/resources/assets/hbm/textures/gui/fluids/mustardgas.png new file mode 100644 index 000000000..30ba3d6b9 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/mustardgas.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/phosgene.png b/src/main/resources/assets/hbm/textures/gui/fluids/phosgene.png new file mode 100644 index 000000000..83d75da9b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/phosgene.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/toxin_base.png b/src/main/resources/assets/hbm/textures/gui/fluids/toxin_base.png new file mode 100644 index 000000000..6d37902b8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/toxin_base.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_MUSTARDGAS.png b/src/main/resources/assets/hbm/textures/models/tank/tank_MUSTARDGAS.png new file mode 100644 index 000000000..424fd0ed1 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank/tank_MUSTARDGAS.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_PHOSGENE.png b/src/main/resources/assets/hbm/textures/models/tank/tank_PHOSGENE.png new file mode 100644 index 000000000..e6f057925 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank/tank_PHOSGENE.png differ