helium 4 plasma

changelog

@@ -10,11 +10,22 @@
   * Most polluting machines can now be connected to a smokestack with exhaust pipes
   * The smokestack will vent the pollution created by the machines, reducing it by 75%
   * Compatible with soot, heavy metal and poison pollution
+* Sliding blast door
+  * Everyone's favorite from 1.12
+  * Has multiple skins that can be applied
+* Helium-4
+  * Used in helium-4-oxygen plasma
+  * Made from ionized particles in a liquefactor
 
 ## Changed
 * Glyphids now have a config for a global spawn limit, which is 50 by default, no more than this many glyphids can be created at once
 * Removed the old oil and gas ducts for good
+* FBI agents and drones no longer take damage from rosenberg pest control boxes
+* Compressors now have a base comsumption of 2,500 HE/t instwad of 10,000
+* On 528 mode, gas shale now only contains 50mB of petroleum instead of 250mB
+* Xenon-mercury plasma has been changed into helium-4-oxygen plasma
 
 ## Fixed
 * Fixed player extprops like the HUD or backpack toggles not saving
 * Fixed desync caused by teleporting between dimensions, switching toggles for HUD or backpack
+* Fixed potential issue causing the plasma heater to overfill

src/main/java/com/hbm/inventory/FluidContainerRegistry.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.blocks.ModBlocks;
+import com.hbm.config.GeneralConfig;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.fluid.Fluids.CD_Canister;
@@ -33,7 +34,7 @@ public class FluidContainerRegistry {
 		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.lox_barrel), new ItemStack(ModItems.tank_steel), Fluids.OXYGEN, 10000));
 
 		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_oil), null, Fluids.OIL, 250));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_gneiss_gas), null, Fluids.PETROLEUM, 250));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_gneiss_gas), null, Fluids.PETROLEUM, GeneralConfig.enable528 ? 50 : 250));
 
 		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_deuterium), new ItemStack(ModItems.cell_empty), Fluids.DEUTERIUM, 1000));
 		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_tritium), new ItemStack(ModItems.cell_empty), Fluids.TRITIUM, 1000));

src/main/java/com/hbm/inventory/fluid/Fluids.java

@@ -155,6 +155,7 @@ public class Fluids {
 	public static FluidType SMOKE;
 	public static FluidType SMOKE_LEADED;
 	public static FluidType SMOKE_POISON;
+	public static FluidType HELIUM4;
 
 	private static final HashMap<Integer, FluidType> idMapping = new HashMap();
 	private static final HashMap<String, FluidType> nameMapping = new HashMap();
@@ -244,7 +245,7 @@ public class Fluids {
 		PLASMA_BF =				new FluidType("PLASMA_BF",			0xA7F1A3, 4, 5, 4, EnumSymbol.ANTIMATTER).setTemp(8500).addTraits(NOCON, NOID, PLASMA);
 		CARBONDIOXIDE =			new FluidType("CARBONDIOXIDE",		0x404040, 3, 0, 0, EnumSymbol.ASPHYXIANT).addTraits(GASEOUS);
 		PLASMA_DH3 =			new FluidType("PLASMA_DH3",			0xFF83AA, 0, 4, 0, EnumSymbol.RADIATION).setTemp(3480).addTraits(NOCON, NOID, PLASMA);
-		HELIUM3 =				new FluidType("HELIUM3",			0xFCF0C4, 3, 4, 0, EnumSymbol.ASPHYXIANT).addTraits(GASEOUS);
+		HELIUM3 =				new FluidType("HELIUM3",			0xFCF0C4, 0, 0, 0, EnumSymbol.ASPHYXIANT).addTraits(GASEOUS);
 		DEATH =					new FluidType("DEATH",				0x717A88, 2, 0, 1, EnumSymbol.ACID).setTemp(300).addTraits(new FT_Corrosive(80), new FT_Poison(true, 4), LEADCON, LIQUID, VISCOUS);
 		ETHANOL =				new FluidType("ETHANOL",			0xe0ffff, 2, 3, 0, EnumSymbol.NONE).addContainers(new CD_Canister(0xEAFFF3)).addTraits(new FT_Flammable(75_000), new FT_Combustible(FuelGrade.HIGH, 200_000), LIQUID);
 		HEAVYWATER =			new FluidType("HEAVYWATER",			0x00a0b0, 1, 0, 0, EnumSymbol.NONE).addTraits(LIQUID);
@@ -309,7 +310,8 @@ public class Fluids {
 		CALCIUM_SOLUTION =		new FluidType("CALCIUM_SOLUTION",	0x808080, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, NOCON, new FT_Corrosive(60));
 		SMOKE =					new FluidType("SMOKE",				0x808080, 0, 0, 0, EnumSymbol.NONE).addTraits(GASEOUS, NOID, NOCON);
 		SMOKE_LEADED =			new FluidType("SMOKE_LEADED",		0x808080, 0, 0, 0, EnumSymbol.NONE).addTraits(GASEOUS, NOID, NOCON);
-		SMOKE_POISON =			new FluidType(122, "SMOKE_POISON",	0x808080, 0, 0, 0, EnumSymbol.NONE).addTraits(GASEOUS, NOID, NOCON);
+		SMOKE_POISON =			new FluidType("SMOKE_POISON",		0x808080, 0, 0, 0, EnumSymbol.NONE).addTraits(GASEOUS, NOID, NOCON);
+		HELIUM4 =				new FluidType(123,"HELIUM4",		0xE54B0A, 0, 0, 0, EnumSymbol.ASPHYXIANT).addTraits(GASEOUS);
 		
 		// ^ ^ ^ ^ ^ ^ ^ ^
 		//ADD NEW FLUIDS HERE
@@ -342,6 +344,7 @@ public class Fluids {
 		metaOrder.add(DEUTERIUM);
 		metaOrder.add(TRITIUM);
 		metaOrder.add(HELIUM3);
+		metaOrder.add(HELIUM4);
 		metaOrder.add(OXYGEN);
 		metaOrder.add(XENON);
 		metaOrder.add(CHLORINE);

src/main/java/com/hbm/inventory/recipes/LiquefactionRecipes.java

@@ -52,6 +52,7 @@ public class LiquefactionRecipes extends SerializableRecipe {
 		recipes.put(new ComparableStack(Blocks.ice),				new FluidStack(1000, Fluids.WATER));
 		recipes.put(new ComparableStack(Blocks.packed_ice),			new FluidStack(1000, Fluids.WATER));
 		recipes.put(new ComparableStack(Items.ender_pearl),			new FluidStack(100, Fluids.ENDERJUICE));
+		recipes.put(new ComparableStack(ModItems.pellet_charged),	new FluidStack(4000, Fluids.HELIUM4));
 
 		recipes.put(new ComparableStack(Items.sugar),				new FluidStack(100, Fluids.ETHANOL));
 		recipes.put(new ComparableStack(ModBlocks.plant_flower, 1, 3), new FluidStack(150, Fluids.ETHANOL));

src/main/java/com/hbm/tileentity/machine/TileEntityMachineCompressor.java

@@ -34,13 +34,13 @@ public class TileEntityMachineCompressor extends TileEntityMachineBase implement
 	
 	public FluidTank[] tanks;
 	public long power;
-	public static final long maxPower = 1_000_000;
+	public static final long maxPower = 100_000;
 	public boolean isOn;
 	public int progress;
 	public int processTime = 100;
 	public static final int processTimeBase = 100;
 	public int powerRequirement;
-	public static final int powerRequirementBase = 10_000;
+	public static final int powerRequirementBase = 2_500;
 	
 	public float fanSpin;
 	public float prevFanSpin;

src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java

@@ -69,7 +69,7 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme
 			int powerReq = 10000;
 			
 			int convert = Math.min(tanks[0].getFill(), tanks[1].getFill());
-			convert = Math.min(convert, (plasma.getMaxFill() - plasma.getFill()));
+			convert = Math.min(convert, (plasma.getMaxFill() - plasma.getFill()) / 2);
 			convert = Math.min(convert, maxConv);
 			convert = (int) Math.min(convert, power / powerReq);
 			convert = Math.max(0, convert);
@@ -174,7 +174,7 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme
 			plasma.setTankType(Fluids.PLASMA_HT);
 			return;
 		}
-		if(types.contains(Fluids.XENON) && types.contains(Fluids.MERCURY)) {
+		if(types.contains(Fluids.HELIUM4) && types.contains(Fluids.OXYGEN)) {
 			plasma.setTankType(Fluids.PLASMA_XM);
 			return;
 		}

src/main/java/com/hbm/tileentity/machine/TileEntityRadiobox.java

@@ -2,6 +2,8 @@ package com.hbm.tileentity.machine;
 
 import java.util.List;
 
+import com.hbm.entity.mob.EntityFBI;
+import com.hbm.entity.mob.EntityFBIDrone;
 import com.hbm.inventory.container.ContainerRadiobox;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.tileentity.IGUIProvider;
@@ -42,8 +44,13 @@ public class TileEntityRadiobox extends TileEntityLoadedBase implements IEnergyU
 			int range = 15;
 			
 			List<IMob> entities = worldObj.getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(xCoord - range, yCoord - range, zCoord - range, xCoord + range, yCoord + range, zCoord + range));
-			for(IMob entity : entities)
+			
+			for(IMob entity : entities) {
+				
+				if(entity instanceof EntityFBI || entity instanceof EntityFBIDrone) continue;
+				
 				((Entity)entity).attackEntityFrom(ModDamageSource.enervation, 20.0F);
+			}
 		}
 	}
 	

src/main/resources/assets/hbm/lang/de_DE.lang

@@ -656,6 +656,7 @@ hbmfluid.heavyoil=Schweröl
 hbmfluid.heavyoil_vacuum=Vakuum-Schweröl
 hbmfluid.heavywater=Schweres Wasser
 hbmfluid.helium3=Helium-3
+hbmfluid.helium4=Helium-4
 hbmfluid.hotcrackoil=Heißes Crack-Öl
 hbmfluid.hotoil=Heißes Rohöl
 hbmfluid.hotsteam=Dichter Dampf
@@ -694,7 +695,7 @@ hbmfluid.plasma_dh3=Deuterium-Helium-3-Plasma
 hbmfluid.plasma_dt=Deuterium-Tritium-Plasma
 hbmfluid.plasma_hd=Wasserstoff-Deuterium-Plasma
 hbmfluid.plasma_ht=Wasserstoff-Tritium-Plasma
-hbmfluid.plasma_xm=Xenon-Quecksilber-Plasma
+hbmfluid.plasma_xm=Helium-4-Sauerstoff-Plasma
 hbmfluid.potassium_chloride=Kaliumchlorid-Lösung
 hbmfluid.puf6=Plutoniumhexafluorid
 hbmfluid.radiosolvent=Hochleistungs-Lösungsmittel

src/main/resources/assets/hbm/lang/en_US.lang

@@ -1273,6 +1273,7 @@ hbmfluid.heavyoil=Heavy Oil
 hbmfluid.heavyoil_vacuum=Vacuum Heavy Oil
 hbmfluid.heavywater=Heavy Water
 hbmfluid.helium3=Helium-3
+hbmfluid.helium4=Helium-4
 hbmfluid.hotcrackoil=Hot Cracked Oil
 hbmfluid.hotoil=Hot Crude Oil
 hbmfluid.hotsteam=Dense Steam
@@ -1311,7 +1312,7 @@ hbmfluid.plasma_dh3=Deuterium-Helium-3 Plasma
 hbmfluid.plasma_dt=Deuterium-Tritium Plasma
 hbmfluid.plasma_hd=Hydrogen-Deuterium Plasma
 hbmfluid.plasma_ht=Hydrogen-Tritium Plasma
-hbmfluid.plasma_xm=Xenon-Mercury Plasma
+hbmfluid.plasma_xm=Helium-4-Oxygen Plasma
 hbmfluid.potassium_chloride=Potassiumchloride Solution
 hbmfluid.puf6=Plutonium Hexafluoride
 hbmfluid.radiosolvent=High-Performance Solvent