diff --git a/src/main/java/com/hbm/blocks/machine/MachineRefinery.java b/src/main/java/com/hbm/blocks/machine/MachineRefinery.java index d103d3711..10fab37d0 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRefinery.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRefinery.java @@ -17,6 +17,7 @@ import com.hbm.tileentity.machine.oil.TileEntityMachineRefinery; import com.hbm.util.I18nUtil; import api.hbm.block.IToolable; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; @@ -48,7 +49,24 @@ public class MachineRefinery extends BlockDummyable implements IPersistentInfoPr @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - return standardOpenBehavior(world, x, y, z, player, side); + + if(world.isRemote) { + return true; + } else if(!player.isSneaking()) { + int[] pos = this.findCore(world, x, y, z); + + if(pos == null) + return false; + + TileEntityMachineRefinery refinery = (TileEntityMachineRefinery) world.getTileEntity(pos[0], pos[1], pos[2]); + + if(refinery.hasExploded) return false; + + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); + return true; + } else { + return true; + } } @Override diff --git a/src/main/java/com/hbm/handler/nei/ReformingHandler.java b/src/main/java/com/hbm/handler/nei/ReformingHandler.java new file mode 100644 index 000000000..711fd355d --- /dev/null +++ b/src/main/java/com/hbm/handler/nei/ReformingHandler.java @@ -0,0 +1,16 @@ +package com.hbm.handler.nei; + +import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.recipes.ReformingRecipes; + +public class ReformingHandler extends NEIUniversalHandler { + + public ReformingHandler() { + super("Reforming", ModBlocks.machine_catalytic_reformer, ReformingRecipes.getRecipes()); + } + + @Override + public String getKey() { + return "ntmReforming"; + } +} diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index 4f10fd083..98f41b41b 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -239,11 +239,11 @@ public class Fluids { LIGHTOIL_VACUUM = new FluidType("LIGHTOIL_VACUUM", 0x8C8851, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID); SOURGAS = new FluidType("SOURGAS", 0xC9BE0D, 4, 4, 0, EnumSymbol.ACID).addTraits(GASEOUS, new FT_Corrosive(10)); XYLENE = new FluidType("XYLENE", 0x5C4E76, 2, 3, 0, EnumSymbol.NONE).addTraits(LIQUID); - HEATINGOIL_VACUUM = new FluidType("HEATINGOIL_VACUUM", 0x211806, 2, 2, 0, EnumSymbol.NONE); - DIESEL_REFORM = new FluidType("DIESEL_REFORM", 0xf2eed5, 1, 2, 0, EnumSymbol.NONE); - DIESEL_CRACK_REFORM = new FluidType("DIESEL_CRACK_REFORM",0xf2eed5, 1, 2, 0, EnumSymbol.NONE); - KEROSENE_REFORM = new FluidType("KEROSENE_REFORM", 0xffa5d2, 1, 2, 0, EnumSymbol.NONE); - REFORMGAS = new FluidType(98, "REFORMGAS", 0x628FAE, 1, 4, 1, EnumSymbol.NONE); + HEATINGOIL_VACUUM = new FluidType("HEATINGOIL_VACUUM", 0x211D06, 2, 2, 0, EnumSymbol.NONE).addTraits(LIQUID); + DIESEL_REFORM = new FluidType("DIESEL_REFORM", 0xCDC3C6, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID); + DIESEL_CRACK_REFORM = new FluidType("DIESEL_CRACK_REFORM",0xCDC3CC, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID); + KEROSENE_REFORM = new FluidType("KEROSENE_REFORM", 0xFFA5F3, 1, 2, 0, EnumSymbol.NONE).addTraits(LIQUID); + REFORMGAS = new FluidType(99, "REFORMGAS", 0x6362AE, 1, 4, 1, EnumSymbol.NONE).addTraits(GASEOUS); // ^ ^ ^ ^ ^ ^ ^ ^ @@ -447,6 +447,11 @@ public class Fluids { registerCalculatedFuel(NITAN, KEROSENE.getTrait(FT_Flammable.class).getHeatEnergy() * 25L, 2.5, FuelGrade.HIGH); registerCalculatedFuel(BALEFIRE, KEROSENE.getTrait(FT_Flammable.class).getHeatEnergy() * 100L, 2.5, FuelGrade.HIGH); + //TODO: consult the spreadsheet for the values of the vacuum oils + //all hail the spreadsheet + //the spreadsheet must not be questioned + //none may enter the orb- i mean the spreadsheet + int coalHeat = 400_000; // 200TU/t for 2000 ticks registerCalculatedFuel(COALOIL, (coalHeat * (1000 /* bucket */ / 100 /* mB per coal */) * flammabilityLow * demandLow * complexityChemplant), 0, null); long coaloil = COALOIL.getTrait(FT_Flammable.class).getHeatEnergy(); diff --git a/src/main/java/com/hbm/inventory/recipes/FractionRecipes.java b/src/main/java/com/hbm/inventory/recipes/FractionRecipes.java index 310914410..95e8a5f86 100644 --- a/src/main/java/com/hbm/inventory/recipes/FractionRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/FractionRecipes.java @@ -38,20 +38,27 @@ public class FractionRecipes extends SerializableRecipe { public static final int creo_frac_bitu = 90; public static final int reform_frac_arom = 40; public static final int reform_frac_xyle = 60; + public static final int hvac_frac_smear = 40; + public static final int hvac_frac_heat = 60; + public static final int lvac_frac_kero = 70; + public static final int lvac_frac_gas = 30; private static Map> fractions = new HashMap(); @Override public void registerDefaults() { - fractions.put(Fluids.HEAVYOIL, new Pair(new FluidStack(Fluids.BITUMEN, heavy_frac_bitu), new FluidStack(Fluids.SMEAR, heavy_frac_smear))); - fractions.put(Fluids.SMEAR, new Pair(new FluidStack(Fluids.HEATINGOIL, smear_frac_heat), new FluidStack(Fluids.LUBRICANT, smear_frac_lube))); - fractions.put(Fluids.NAPHTHA, new Pair(new FluidStack(Fluids.HEATINGOIL, napht_frac_heat), new FluidStack(Fluids.DIESEL, napht_frac_diesel))); - fractions.put(Fluids.NAPHTHA_CRACK, new Pair(new FluidStack(Fluids.HEATINGOIL, ncrack_frac_heat), new FluidStack(Fluids.DIESEL_CRACK, ncrack_frac_diesel))); - fractions.put(Fluids.LIGHTOIL, new Pair(new FluidStack(Fluids.DIESEL, light_frac_diesel), new FluidStack(Fluids.KEROSENE, light_frac_kero))); - fractions.put(Fluids.LIGHTOIL_CRACK, new Pair(new FluidStack(Fluids.KEROSENE, lcrack_frac_kero), new FluidStack(Fluids.PETROLEUM, lcrack_frac_petro))); - fractions.put(Fluids.COALOIL, new Pair(new FluidStack(Fluids.COALGAS, coal_frac_coalgas), new FluidStack(Fluids.OIL, coal_frac_oil))); - fractions.put(Fluids.COALCREOSOTE, new Pair(new FluidStack(Fluids.COALOIL, creo_frac_coaloil), new FluidStack(Fluids.BITUMEN, creo_frac_bitu))); - fractions.put(Fluids.REFORMATE, new Pair(new FluidStack(Fluids.AROMATICS, reform_frac_arom), new FluidStack(Fluids.XYLENE, reform_frac_xyle))); + fractions.put(Fluids.HEAVYOIL, new Pair(new FluidStack(Fluids.BITUMEN, heavy_frac_bitu), new FluidStack(Fluids.SMEAR, heavy_frac_smear))); + fractions.put(Fluids.SMEAR, new Pair(new FluidStack(Fluids.HEATINGOIL, smear_frac_heat), new FluidStack(Fluids.LUBRICANT, smear_frac_lube))); + fractions.put(Fluids.NAPHTHA, new Pair(new FluidStack(Fluids.HEATINGOIL, napht_frac_heat), new FluidStack(Fluids.DIESEL, napht_frac_diesel))); + fractions.put(Fluids.NAPHTHA_CRACK, new Pair(new FluidStack(Fluids.HEATINGOIL, ncrack_frac_heat), new FluidStack(Fluids.DIESEL_CRACK, ncrack_frac_diesel))); + fractions.put(Fluids.LIGHTOIL, new Pair(new FluidStack(Fluids.DIESEL, light_frac_diesel), new FluidStack(Fluids.KEROSENE, light_frac_kero))); + fractions.put(Fluids.LIGHTOIL_CRACK, new Pair(new FluidStack(Fluids.KEROSENE, lcrack_frac_kero), new FluidStack(Fluids.PETROLEUM, lcrack_frac_petro))); + fractions.put(Fluids.COALOIL, new Pair(new FluidStack(Fluids.COALGAS, coal_frac_coalgas), new FluidStack(Fluids.OIL, coal_frac_oil))); + fractions.put(Fluids.COALCREOSOTE, new Pair(new FluidStack(Fluids.COALOIL, creo_frac_coaloil), new FluidStack(Fluids.BITUMEN, creo_frac_bitu))); + fractions.put(Fluids.HEAVYOIL_VACUUM, new Pair(new FluidStack(Fluids.SMEAR, hvac_frac_smear), new FluidStack(Fluids.HEATINGOIL_VACUUM, hvac_frac_heat))); + fractions.put(Fluids.REFORMATE, new Pair(new FluidStack(Fluids.AROMATICS, reform_frac_arom), new FluidStack(Fluids.XYLENE, reform_frac_xyle))); + fractions.put(Fluids.LIGHTOIL_VACUUM, new Pair(new FluidStack(Fluids.KEROSENE, lvac_frac_kero), new FluidStack(Fluids.REFORMGAS, lvac_frac_gas))); + fractions.put(Fluids.SOURGAS, new Pair(new FluidStack(Fluids.GAS, 30), new FluidStack(Fluids.PETROLEUM, 20))); } public static Pair getFractions(FluidType oil) { diff --git a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java index fe6bb932c..9a9f3cbcd 100644 --- a/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MixerRecipes.java @@ -48,6 +48,10 @@ public class MixerRecipes extends SerializableRecipe { recipes.put(Fluids.PETROIL_LEADED, new MixerRecipe(1_000, 40).setStack1(new FluidStack(Fluids.PETROIL, 800)).setSolid(new ComparableStack(ModItems.antiknock))); recipes.put(Fluids.GASOLINE_LEADED, new MixerRecipe(1_000, 40).setStack1(new FluidStack(Fluids.GASOLINE, 800)).setSolid(new ComparableStack(ModItems.antiknock))); recipes.put(Fluids.COALGAS_LEADED, new MixerRecipe(1_000, 40).setStack1(new FluidStack(Fluids.COALGAS, 800)).setSolid(new ComparableStack(ModItems.antiknock))); + + recipes.put(Fluids.DIESEL_REFORM, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.DIESEL, 900)).setStack2(new FluidStack(Fluids.REFORMATE, 100))); + recipes.put(Fluids.DIESEL_CRACK_REFORM, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.DIESEL_CRACK, 900)).setStack2(new FluidStack(Fluids.REFORMATE, 100))); + recipes.put(Fluids.KEROSENE_REFORM, new MixerRecipe(1_000, 50).setStack1(new FluidStack(Fluids.KEROSENE, 900)).setStack2(new FluidStack(Fluids.REFORMATE, 100))); } public static MixerRecipe getOutput(FluidType type) { diff --git a/src/main/java/com/hbm/inventory/recipes/ReformingRecipes.java b/src/main/java/com/hbm/inventory/recipes/ReformingRecipes.java index e76473965..7dad1d4a1 100644 --- a/src/main/java/com/hbm/inventory/recipes/ReformingRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ReformingRecipes.java @@ -11,8 +11,11 @@ import com.hbm.inventory.FluidStack; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.recipes.loader.SerializableRecipe; +import com.hbm.items.machine.ItemFluidIcon; import com.hbm.util.Tuple.Triplet; +import net.minecraft.item.ItemStack; + public class ReformingRecipes extends SerializableRecipe { private static HashMap> recipes = new HashMap(); @@ -34,6 +37,21 @@ public class ReformingRecipes extends SerializableRecipe { public static Triplet getOutput(FluidType type) { return recipes.get(type); } + + public static HashMap getRecipes() { + + HashMap map = new HashMap(); + + for(Entry> recipe : recipes.entrySet()) { + map.put(ItemFluidIcon.make(recipe.getKey(), 1000), + new ItemStack[] { + ItemFluidIcon.make(recipe.getValue().getX().type, recipe.getValue().getX().fill * 10), + ItemFluidIcon.make(recipe.getValue().getY().type, recipe.getValue().getY().fill * 10), + ItemFluidIcon.make(recipe.getValue().getZ().type, recipe.getValue().getZ().fill * 10) }); + } + + return map; + } @Override public String getFileName() { diff --git a/src/main/java/com/hbm/items/weapon/ItemGunBase.java b/src/main/java/com/hbm/items/weapon/ItemGunBase.java index 58627c04e..507b1a603 100644 --- a/src/main/java/com/hbm/items/weapon/ItemGunBase.java +++ b/src/main/java/com/hbm/items/weapon/ItemGunBase.java @@ -766,7 +766,7 @@ public class ItemGunBase extends Item implements IHoldableWeapon, IItemHUD, IEqu NBTTagCompound data = new NBTTagCompound(); data.setString("type", "casing"); - data.setFloat("pitch", -(float) Math.toRadians(entity.rotationPitch)); + data.setFloat("pitch", (float) Math.toRadians(entity.rotationPitch)); data.setFloat("yaw", (float) Math.toRadians(entity.rotationYaw)); data.setBoolean("crouched", entity.isSneaking()); data.setString("name", bullet.spentCasing.getName()); diff --git a/src/main/java/com/hbm/main/NEIConfig.java b/src/main/java/com/hbm/main/NEIConfig.java index 987c769ec..ae26d9693 100644 --- a/src/main/java/com/hbm/main/NEIConfig.java +++ b/src/main/java/com/hbm/main/NEIConfig.java @@ -37,9 +37,10 @@ public class NEIConfig implements IConfigureNEI { registerHandler(new AssemblerRecipeHandler()); registerHandler(new RefineryRecipeHandler()); registerHandler(new VacuumRecipeHandler()); + registerHandler(new CrackingHandler()); + registerHandler(new ReformingHandler()); registerHandler(new BoilerRecipeHandler()); registerHandler(new ChemplantRecipeHandler()); - registerHandler(new FluidRecipeHandler()); registerHandler(new CrystallizerRecipeHandler()); registerHandler(new BookRecipeHandler()); registerHandler(new FusionRecipeHandler()); @@ -60,7 +61,6 @@ public class NEIConfig implements IConfigureNEI { } registerHandler(new LiquefactionHandler()); registerHandler(new SolidificationHandler()); - registerHandler(new CrackingHandler()); registerHandler(new FractioningHandler()); registerHandler(new BoilingHandler()); registerHandler(new CombinationHandler()); @@ -68,6 +68,9 @@ public class NEIConfig implements IConfigureNEI { registerHandler(new MixerHandler()); registerHandler(new OutgasserHandler()); + //fluids + registerHandler(new FluidRecipeHandler()); + //registerHandler(new ChunkyHandler()); //Some things are even beyond my control...or are they? diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 60bfbb02d..79b046e75 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -222,6 +222,7 @@ chem.NITRIC_ACID=Salpetersäureherstellung chem.OIL_SAND=Teersand-Extraktion chem.OSMIRIDIUM_DEATH=Osmiridiumlösung-Herstellung chem.PEROXIDE=Wasserstoffperoxidherstellung +chem.PET=PET-Synthese chem.PETROIL_LEADED=Bleigemisch mischen chem.POLYMER=Polymersynthese chem.PUF6=Plutoniumhexafluoridproduktion @@ -249,6 +250,7 @@ chem.SOLID_FUEL=Festbrennstoffherstellung chem.SOLVENT=Organisches Lösungsmittel mischen chem.STEAM=Wasser kochen chem.SULFURIC_ACID=Schwefelsäureherstellung +chem.TATB=TATB-Synthese chem.TEL=TEL mischen chem.TEST=Test chem.TNT=TNT-Synthese @@ -271,6 +273,7 @@ container.barrel=Fass container.bat9000=Big-Ass Tank 9000 container.battery=Energiespeicher container.bombMulti=Mehrzweckbombe +container.catalyticReformer=Katalytischer Reformer container.centrifuge=Zentrifuge container.chemplant=Chemiewerk container.compactLauncher=Kompakt-Startrampe @@ -604,6 +607,8 @@ hbmfluid.death=Osmiridiumlösung hbmfluid.deuterium=Deuterium hbmfluid.diesel=Diesel hbmfluid.diesel_crack=Crackdiesel +hbmfluid.diesel_crack_reform=Hochoktan-Diesel +hbmfluid.diesel_reform=Hochoktan-Crackdiesel hbmfluid.ethanol=Ethanol hbmfluid.enderjuice=Endersaft hbmfluid.fracksol=Frackinglösung @@ -611,6 +616,7 @@ hbmfluid.gas=Erdgas hbmfluid.gasoline=Benzin hbmfluid.gasoline_leaded=Bleibenzin hbmfluid.heatingoil=Heizöl +hbmfluid.heatingoil_vacuum=Schweres Heizöl hbmfluid.heavyoil=Schweröl hbmfluid.heavyoil_vacuum=Vakuum-Schweröl hbmfluid.heavywater=Schweres Wasser @@ -620,6 +626,7 @@ hbmfluid.hotoil=Heißes Rohöl hbmfluid.hotsteam=Dichter Dampf hbmfluid.hydrogen=Flüssiger Wasserstoff hbmfluid.kerosene=Kerosin +hbmfluid.kerosene_reform=Düsentreibstoff hbmfluid.lava=Lava hbmfluid.lightoil=Leichtöl hbmfluid.lightoil_crack=Crack-Leichtöl @@ -651,6 +658,7 @@ hbmfluid.puf6=Plutoniumhexafluorid hbmfluid.radiosolvent=Hochleistungs-Lösungsmittel hbmfluid.reclaimed=Wiederaufbetreitetes Industrieöl hbmfluid.reformate=Reformat +hbmfluid.reformgas=Reformatgas hbmfluid.salient=Saftiges Grün hbmfluid.sas3=Schrabidiumtrisulfat hbmfluid.schrabidic=Schrabidische Säure @@ -3786,6 +3794,7 @@ tile.machine_boiler_electric_on.name=Elektrischer Ölwärmer tile.machine_boiler_off.name=Ölwärmer tile.machine_boiler_on.name=Ölwärmer tile.machine_catalytic_cracker.name=Katalytischer Cracking-Turm +tile.machine_catalytic_reformer.name=Katalytischer Reformer tile.machine_centrifuge.name=Zentrifuge tile.machine_chemfac.name=Chemiefabrik tile.machine_chemplant.name=Chemiewerk diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 46e9ad2a6..c71c8167a 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -501,6 +501,7 @@ chem.NITRIC_ACID=Nitric Acid Production chem.OIL_SAND=Tar Sand Extraction chem.OSMIRIDIUM_DEATH=Osmiridic Solution Production chem.PEROXIDE=Hydrogen Peroxide Production +chem.PET=PET Synthesis chem.PETROIL_LEADED=Leaded Petroil Mixing chem.POLYMER=Polymer Synthesis chem.PUF6=Plutonium Hexafluoride Production @@ -528,6 +529,7 @@ chem.SOLID_FUEL=Solid Rocket Fuel Production chem.SOLVENT=Organic Solvent Mixing chem.STEAM=Water Boiling chem.SULFURIC_ACID=Sulfuric Acid Production +chem.TATB=TATB Synthesis chem.TEL=TEL Mixing chem.TEST=Test chem.TNT=TNT Synthesis @@ -550,6 +552,7 @@ container.barrel=Barrel container.bat9000=Big-Ass Tank 9000 container.battery=Energy Storage container.bombMulti=Multi Purpose Bomb +container.catalyticReformer=Catalytic Reformer container.centrifuge=Centrifuge container.chemplant=Chemical Plant container.compactLauncher=Compact Launch Pad @@ -1161,6 +1164,8 @@ hbmfluid.death=Osmiridic Solution hbmfluid.deuterium=Deuterium hbmfluid.diesel=Diesel hbmfluid.diesel_crack=Cracked Diesel +hbmfluid.diesel_crack_reform=High-Octane Cracked Diesel +hbmfluid.diesel_reform=High-Octane Diesel hbmfluid.ethanol=Ethanol hbmfluid.enderjuice=Ender Juice hbmfluid.fracksol=Fracking Solution @@ -1168,6 +1173,7 @@ hbmfluid.gas=Natural Gas hbmfluid.gasoline=Gasoline hbmfluid.gasoline_leaded=Leaded Gasoline hbmfluid.heatingoil=Heating Oil +hbmfluid.heatingoil_vacuum=Heavy Heating Oil hbmfluid.heavyoil=Heavy Oil hbmfluid.heavyoil_vacuum=Vacuum Heavy Oil hbmfluid.heavywater=Heavy Water @@ -1177,6 +1183,7 @@ hbmfluid.hotoil=Hot Crude Oil hbmfluid.hotsteam=Dense Steam hbmfluid.hydrogen=Liquid Hydrogen hbmfluid.kerosene=Kerosene +hbmfluid.kerosene_reform=Jet Fuel hbmfluid.lava=Lava hbmfluid.lightoil=Light Oil hbmfluid.lightoil_crack=Cracked Light Oil @@ -1208,6 +1215,7 @@ hbmfluid.puf6=Plutonium Hexafluoride hbmfluid.radiosolvent=High-Performance Solvent hbmfluid.reclaimed=Reclaimed Industrial Oil hbmfluid.reformate=Reformate +hbmfluid.reformgas=Reformate Gas hbmfluid.salient=Salient Green hbmfluid.sas3=Schrabidium Trisulfide hbmfluid.schrabidic=Schrabidic Acid @@ -4587,6 +4595,7 @@ tile.machine_boiler_electric_on.name=Electric Oil Heater tile.machine_boiler_off.name=Oil Heater tile.machine_boiler_on.name=Oil Heater tile.machine_catalytic_cracker.name=Catalytic Cracking Tower +tile.machine_catalytic_reformer.name=Catalytic Reformer tile.machine_centrifuge.name=Centrifuge tile.machine_chemfac.name=Chemical Factory tile.machine_chemplant.name=Chemical Plant diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/diesel_crack_reform.png b/src/main/resources/assets/hbm/textures/gui/fluids/diesel_crack_reform.png new file mode 100644 index 000000000..6be215517 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/diesel_crack_reform.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/diesel_reform.png b/src/main/resources/assets/hbm/textures/gui/fluids/diesel_reform.png new file mode 100644 index 000000000..87c3e5481 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/diesel_reform.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/heatingoil_vacuum.png b/src/main/resources/assets/hbm/textures/gui/fluids/heatingoil_vacuum.png new file mode 100644 index 000000000..5d5fff9c4 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/heatingoil_vacuum.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/kerosene_reform.png b/src/main/resources/assets/hbm/textures/gui/fluids/kerosene_reform.png new file mode 100644 index 000000000..305b9d901 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/kerosene_reform.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/fluids/reformgas.png b/src/main/resources/assets/hbm/textures/gui/fluids/reformgas.png new file mode 100644 index 000000000..99ba978cd Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/fluids/reformgas.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_DIESEL_CRACK_REFORM.png b/src/main/resources/assets/hbm/textures/models/tank/tank_DIESEL_CRACK_REFORM.png new file mode 100644 index 000000000..6da1c4de6 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank/tank_DIESEL_CRACK_REFORM.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_DIESEL_REFORM.png b/src/main/resources/assets/hbm/textures/models/tank/tank_DIESEL_REFORM.png new file mode 100644 index 000000000..a1ff204ed Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank/tank_DIESEL_REFORM.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_HEATINGOIL_VACUUM.png b/src/main/resources/assets/hbm/textures/models/tank/tank_HEATINGOIL_VACUUM.png new file mode 100644 index 000000000..c12457f89 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank/tank_HEATINGOIL_VACUUM.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_KEROSENE_REFORM.png b/src/main/resources/assets/hbm/textures/models/tank/tank_KEROSENE_REFORM.png new file mode 100644 index 000000000..e842ec97e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank/tank_KEROSENE_REFORM.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank/tank_REFORMGAS.png b/src/main/resources/assets/hbm/textures/models/tank/tank_REFORMGAS.png new file mode 100644 index 000000000..f90f04e82 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank/tank_REFORMGAS.png differ