diff --git a/src/main/java/com/hbm/handler/FluidTypeHandler.java b/src/main/java/com/hbm/handler/FluidTypeHandler.java index 2dfbadc0f..15d138c04 100644 --- a/src/main/java/com/hbm/handler/FluidTypeHandler.java +++ b/src/main/java/com/hbm/handler/FluidTypeHandler.java @@ -53,6 +53,7 @@ public class FluidTypeHandler { GAS (0xfffeed, 13, 1, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.gas"), PETROLEUM (0x7cb7c9, 7, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.petroleum"), + LPG (0x4747EA, 5, 2, 2, 1, 3, 1, EnumSymbol.NONE, "hbmfluid.lpg"), BIOGAS (0xbfd37c, 12, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.biogas"), BIOFUEL (0xeef274, 13, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.biofuel"), diff --git a/src/main/java/com/hbm/inventory/FluidContainerRegistry.java b/src/main/java/com/hbm/inventory/FluidContainerRegistry.java index bf8714f80..d07a27119 100644 --- a/src/main/java/com/hbm/inventory/FluidContainerRegistry.java +++ b/src/main/java/com/hbm/inventory/FluidContainerRegistry.java @@ -47,6 +47,7 @@ public class FluidContainerRegistry { FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_NITAN), new ItemStack(ModItems.canister_empty), FluidType.NITAN, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_full), new ItemStack(ModItems.gas_empty), FluidType.GAS, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_petroleum), new ItemStack(ModItems.gas_empty), FluidType.PETROLEUM, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_lpg), new ItemStack(ModItems.gas_empty), FluidType.LPG, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_biogas), new ItemStack(ModItems.gas_empty), FluidType.BIOGAS, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.red_barrel), new ItemStack(ModItems.tank_steel), FluidType.DIESEL, 10000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.pink_barrel), new ItemStack(ModItems.tank_steel), FluidType.KEROSENE, 10000)); diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java b/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java index fda998622..93b53cd9a 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java @@ -36,6 +36,7 @@ public class GUIMachineDiesel extends GuiInfoContainer { " Diesel (500 HE/t)", " Petroil (300 HE/t)", " Biofuel (400 HE/t)", + " LPG (450 HE/t)", " Hydrogen (10 HE/t)", " Leaded Gasoline (1500 HE/t)", " NITAN Superfuel (5000 HE/t)" }; diff --git a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java index d119dc175..c6c64b68a 100644 --- a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java @@ -1899,6 +1899,9 @@ public class MachineRecipes { case STEAM: input[0] = new FluidStack(1000, FluidType.WATER); break; + case LPG: + input[0] = new FluidStack(2000, FluidType.PETROLEUM); + break; case BP_BIOFUEL: input[0] = new FluidStack(2000, FluidType.BIOGAS); break; @@ -2228,6 +2231,9 @@ public class MachineRecipes { case BP_BIOFUEL: output[0] = new FluidStack(1000, FluidType.BIOFUEL); break; + case LPG: + output[0] = new FluidStack(1000, FluidType.LPG); + break; case UF6: output[0] = new FluidStack(900, FluidType.UF6); break; diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index d9a1d5939..809518cf1 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -800,6 +800,7 @@ public class ModItems { public static Item gas_full; public static Item gas_petroleum; public static Item gas_biogas; + public static Item gas_lpg; public static Item fluid_tank_full; public static Item fluid_tank_empty; @@ -3164,6 +3165,7 @@ public class ModItems { gas_full = new Item().setUnlocalizedName("gas_full").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_full"); gas_petroleum = new Item().setUnlocalizedName("gas_petroleum").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_petroleum"); gas_biogas = new Item().setUnlocalizedName("gas_biogas").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_biogas"); + gas_lpg = new Item().setUnlocalizedName("gas_lpg").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_lpg"); tank_waste = new ItemTankWaste().setUnlocalizedName("tank_waste").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab); @@ -6094,6 +6096,7 @@ public class ModItems { GameRegistry.registerItem(gas_full, gas_full.getUnlocalizedName()); GameRegistry.registerItem(gas_petroleum, gas_petroleum.getUnlocalizedName()); GameRegistry.registerItem(gas_biogas, gas_biogas.getUnlocalizedName()); + GameRegistry.registerItem(gas_lpg, gas_lpg.getUnlocalizedName()); //Universal Tank GameRegistry.registerItem(fluid_tank_empty, fluid_tank_empty.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java b/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java index b9f398c99..a0c04b335 100644 --- a/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java +++ b/src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java @@ -63,6 +63,7 @@ public class ItemChemistryTemplate extends Item { SF_BIOFUEL, BP_BIOGAS, BP_BIOFUEL, + LPG, OIL_SAND, ASPHALT, COOLANT, @@ -243,6 +244,8 @@ public class ItemChemistryTemplate extends Item { return 200; case BP_BIOFUEL: return 100; + case LPG: + return 100; case YELLOWCAKE: return 250; case UF6: diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index d7a2515ea..5a6377651 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -152,6 +152,8 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IS return 1500; if(type.name().equals(FluidType.NITAN.name())) return 5000; + if(type.name().equals(FluidType.LPG.name())) + return 450; return 0; } diff --git a/src/main/resources/assets/hbm/lang/en_NT.lang b/src/main/resources/assets/hbm/lang/en_NT.lang index 2b775c582..ff192cc4c 100644 --- a/src/main/resources/assets/hbm/lang/en_NT.lang +++ b/src/main/resources/assets/hbm/lang/en_NT.lang @@ -76,6 +76,7 @@ hbmfluid.biofuel=Biofuel hbmfluid.sas3=Schrabidium Trisulfide hbmfluid.nitan=NITAN© 100 Octane Super Fuel hbmfluid.cryogel=Cryogel +hbmfluid.lpg=LPG chem.TEST=Test chem.FP_HEAVYOIL=Heavy Oil Processing @@ -125,6 +126,7 @@ chem.UF6=Uranium Hexafluoride Production chem.PUF6=Plutonium Hexafluoride Production chem.BP_BIOGAS=Biogas Production chem.BP_BIOFUEL=Biofuel Transesterification +chem.LPG=Petroleum Gas Liquefaction chem.SAS3=Schrabidium Trisulfide Production chem.NITAN=NITAN Super Fuel Mixing chem.DYN_SCHRAB=Schrabidium Dynosynthesis @@ -1003,6 +1005,7 @@ item.gas_empty.name=Empty Gas Tank item.gas_full.name=Gas Tank item.gas_petroleum.name=Petroleum Gas Tank item.gas_biogas.name=Biogas Tank +item.gas_lpg.name=LPG Tank item.fluid_tank_empty.name=Empty Universal Fluid Tank item.fluid_tank_full.name=Universal Fluid Tank: item.fluid_barrel_empty.name=Empty Fluid Barrel diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index a5dff4f74..2eb575796 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -174,6 +174,7 @@ chem.ASPHALT=Asphalt Production chem.BALEFIRE=BF Rocket Fuel Mixing chem.BP_BIOFUEL=Biofuel Transesterification chem.BP_BIOGAS=Biogas Production +chem.LPG=Petroleum Gas Liquefaction chem.CC_HEATING=Advanced Coal Liquefaction chem.CC_HEAVY=Basic Coal Liquefaction chem.CC_I=Enhanced Coal Liquefaction @@ -534,6 +535,7 @@ hbmfluid.wastegas=Gaseous Nuclear Waste hbmfluid.water=Water hbmfluid.watz=Poisonous Mud hbmfluid.xenon=Xenon Gas +hbmfluid.lpg=LPG info.coil=Coil Strength info.templatefolder=Created with %s @@ -1308,6 +1310,7 @@ item.gadget_explosive8.name=Bundle of First Generation Implosion Propellant item.gadget_kit.name=The Gadget Kit item.gadget_wireing.name=Wiring item.gas_biogas.name=Biogas Tank +item.gas_lpg.name=LPG Tank item.gas_empty.name=Empty Gas Tank item.gas_full.name=Gas Tank item.gas_mask.name=Gas Mask diff --git a/src/main/resources/assets/hbm/textures/gui/fluids2.png b/src/main/resources/assets/hbm/textures/gui/fluids2.png index f165f4bc4..976dc8e46 100755 Binary files a/src/main/resources/assets/hbm/textures/gui/fluids2.png and b/src/main/resources/assets/hbm/textures/gui/fluids2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_LPG.png b/src/main/resources/assets/hbm/textures/items/chem_icon_LPG.png new file mode 100644 index 000000000..8432087dd Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/chem_icon_LPG.png differ diff --git a/src/main/resources/assets/hbm/textures/items/gas_lpg.png b/src/main/resources/assets/hbm/textures/items/gas_lpg.png new file mode 100644 index 000000000..b579ba33a Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/gas_lpg.png differ diff --git a/src/main/resources/assets/hbm/textures/models/tank_LPG.png b/src/main/resources/assets/hbm/textures/models/tank_LPG.png new file mode 100644 index 000000000..3f085dc25 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/tank_LPG.png differ