changed iface for the RF converters, balefire and steel, gavel textures

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

@@ -119,6 +119,11 @@ hbmfluid.oxygen=Flüssiger Sauerstoff
 hbmfluid.xenon=Xenongas
 hbmfluid.balefire=BF-Raketentreibstoff
 hbmfluid.mercury=Quecksilber
+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_bf=Balefire-Plasma
 
 chem.TEST=Test
 chem.FP_HEAVYOIL=Schwerölverarbeitung
@@ -2247,6 +2252,7 @@ item.shimmer_sledge.name=Shimmer Sledge
 item.shimmer_axe.name=Shimmer Axe
 item.euphemium_stopper.name=Stopper
 item.matchstick.name=Streichholz
+item.balefire_and_steel.name=Balefire-Zeug
 item.remote.name=Kaputte Fernbedienung
 item.pch.name=Horse Nut Hammer
 

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

@@ -119,6 +119,11 @@ hbmfluid.oxygen=Liquid Oxygen
 hbmfluid.xenon=Xenon Gas
 hbmfluid.balefire=BF Rocket Fuel
 hbmfluid.mercury=Mercury
+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_bf=Balefire Plasma
 
 chem.TEST=Test
 chem.FP_HEAVYOIL=Heavy Oil Processing
@@ -2255,6 +2260,7 @@ item.shimmer_sledge.name=Shimmer Sledge
 item.shimmer_axe.name=Shimmer Axe
 item.euphemium_stopper.name=Stopper
 item.matchstick.name=Matchstick
+item.balefire_and_steel.name=Balefire and Steel
 item.remote.name=Broken Remote
 item.pch.name=Horse Nut Hammer
 

src/main/java/com/hbm/blocks/ModBlocks.java

@@ -487,6 +487,9 @@ public class ModBlocks {
 	public static Block fusion_core;
 	public static Block plasma;
 	public static final int guiID_fusion_multiblock = 27;
+	
+	public static Block iter;
+	public static final int guiID_iter = 27;
 
 	public static Block watz_element;
 	public static Block watz_control;
@@ -911,7 +914,7 @@ public class ModBlocks {
 		hazmat = new BlockGeneric(Material.cloth).setBlockName("hazmat").setStepSound(Block.soundTypeCloth).setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":hazmat");
 		
 		gravel_obsidian = new BlockFalling(Material.iron).setBlockName("gravel_obsidian").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":gravel_obsidian");
-		gravel_diamond = new BlockFalling(Material.ground).setBlockName("gravel_diamond").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(2.5F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":gravel_diamond");
+		gravel_diamond = new BlockFalling(Material.sand).setBlockName("gravel_diamond").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(0.6F).setBlockTextureName(RefStrings.MODID + ":gravel_diamond");
 		asphalt = new BlockGeneric(Material.rock).setBlockName("asphalt").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":asphalt");
 
 		reinforced_brick = new BlockGeneric(Material.rock).setBlockName("reinforced_brick").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(8000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_brick");
@@ -1155,6 +1158,7 @@ public class ModBlocks {
 		fusion_hatch = new FusionHatch(Material.iron).setBlockName("fusion_hatch").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fusion_hatch");
 		fusion_core = new FusionCore(Material.iron).setBlockName("fusion_core").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fusion_core_side");
 		plasma = new BlockPlasma(Material.iron).setBlockName("plasma").setHardness(5.0F).setResistance(6000.0F).setLightLevel(1.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":plasma");
+		iter = new MachineITER().setBlockName("iter").setHardness(5.0F).setResistance(6000.0F).setLightLevel(1.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":iter");
 
 		watz_element = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_element_top").setBlockName("watz_element").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_element_side");
 		watz_control = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_control_top").setBlockName("watz_control").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_control_side");
@@ -1857,6 +1861,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(fusion_hatch, fusion_hatch.getUnlocalizedName());
 		GameRegistry.registerBlock(fusion_core, fusion_core.getUnlocalizedName());
 		GameRegistry.registerBlock(plasma, ItemBlockLore.class, plasma.getUnlocalizedName());
+		GameRegistry.registerBlock(iter, iter.getUnlocalizedName());
 
 		GameRegistry.registerBlock(watz_element, watz_element.getUnlocalizedName());
 		GameRegistry.registerBlock(watz_control, watz_control.getUnlocalizedName());

src/main/java/com/hbm/blocks/machine/MachineITER.java

@@ -0,0 +1,31 @@
+package com.hbm.blocks.machine;
+
+import com.hbm.blocks.BlockDummyable;
+import com.hbm.tileentity.machine.TileEntityITER;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+public class MachineITER extends BlockDummyable {
+
+	public MachineITER() {
+		super(Material.iron);
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World world, int meta) {
+		return new TileEntityITER();
+	}
+
+	@Override
+	public int[] getDimensions() {
+		return new int[] {4, 0, 7, 7, 7, 7};
+	}
+
+	@Override
+	public int getOffset() {
+		return 8;
+	}
+
+}

src/main/java/com/hbm/handler/FluidTypeHandler.java

@@ -63,7 +63,13 @@ public class FluidTypeHandler {
 		XENON			(0xba45e8,	5,	1,	2,	0,	0,	0,	EnumSymbol.ASPHYXIANT,	"hbmfluid.xenon"),
 		BALEFIRE		(0x28e02e,	6,	1,	2,	4,	4,	3,	EnumSymbol.RADIATION,	"hbmfluid.balefire", true, true, false),
 		
-		MERCURY			(0x808080,	7,	1,	2,	2,	0,	0,	EnumSymbol.NONE,		"hbmfluid.mercury");
+		MERCURY			(0x808080,	7,	1,	2,	2,	0,	0,	EnumSymbol.NONE,		"hbmfluid.mercury"),
+		
+		PLASMA_DT		(0xF7AFDE,	8,	1,	2,	0,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.plasma_dt", true, false, true),
+		PLASMA_HD		(0xF0ADF4,	9,	1,	2,	0,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.plasma_hd", true, false, true),
+		PLASMA_HT		(0xD1ABF2,	10,	1,	2,	0,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.plasma_ht", true, false, true),
+		PLASMA_XM		(0xC6A5FF,	11,	1,	2,	0,	4,	1,	EnumSymbol.RADIATION,	"hbmfluid.plasma_xm", true, false, true),
+		PLASMA_BF		(0xA7F1A3,	12,	1,	2,	4,	5,	4,	EnumSymbol.ANTIMATTER,	"hbmfluid.plasma_bf", true, false, true);
 		
 
 		//Approximate HEX Color of the fluid, used for pipe rendering

src/main/java/com/hbm/items/ModItems.java

@@ -1617,6 +1617,7 @@ public class ModItems {
 	public static Item centri_stick;
 
 	public static Item matchstick;
+	public static Item balefire_and_steel;
 	
 	public static Item mask_of_infamy;
 
@@ -3705,6 +3706,7 @@ public class ModItems {
 		bottle_opener = new WeaponSpecial(MainRegistry.enumToolMaterialBottleOpener).setUnlocalizedName("bottle_opener").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":bottle_opener");
 		euphemium_stopper = new ItemSyringe().setUnlocalizedName("euphemium_stopper").setMaxStackSize(1).setFull3D().setTextureName(RefStrings.MODID + ":euphemium_stopper");
 		matchstick = new ItemMatch().setUnlocalizedName("matchstick").setCreativeTab(CreativeTabs.tabTools).setFull3D().setTextureName(RefStrings.MODID + ":matchstick");
+		balefire_and_steel = new ItemBalefireMatch().setUnlocalizedName("balefire_and_steel").setCreativeTab(CreativeTabs.tabTools).setFull3D().setTextureName(RefStrings.MODID + ":balefire_and_steel");
 		crowbar = new ModSword(MainRegistry.tMatSteel).setUnlocalizedName("crowbar").setFull3D().setTextureName(RefStrings.MODID + ":crowbar");
 		wrench = new WeaponSpecial(MainRegistry.tMatSteel).setUnlocalizedName("wrench").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wrench");
 		wrench_flipped = new WeaponSpecial(MainRegistry.tMatElec).setUnlocalizedName("wrench_flipped").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wrench_flipped");
@@ -5328,6 +5330,7 @@ public class ModItems {
 		GameRegistry.registerItem(smashing_hammer, smashing_hammer.getUnlocalizedName());
 		GameRegistry.registerItem(centri_stick, centri_stick.getUnlocalizedName());
 		GameRegistry.registerItem(matchstick, matchstick.getUnlocalizedName());
+		GameRegistry.registerItem(balefire_and_steel, balefire_and_steel.getUnlocalizedName());
 		GameRegistry.registerItem(crowbar, crowbar.getUnlocalizedName());
 		GameRegistry.registerItem(wrench, wrench.getUnlocalizedName());
 		GameRegistry.registerItem(wrench_flipped, wrench_flipped.getUnlocalizedName());

src/main/java/com/hbm/items/block/ItemBlockLore.java

@@ -73,8 +73,17 @@ public class ItemBlockLore extends ItemBlock {
 			list.add("");
 			list.add("Update, 2020-07-04:");
 			list.add("We deny any implications of a joke on");
-			list.add("the basis that it was so severly unfunny");
+			list.add("the basis that it was so severely unfunny");
 			list.add("that people started stabbing their eyes out.");
+			list.add("");
+			list.add("Update, 2020-17-04:");
+			list.add("As it turns out, \"Diamond Gravel\" was");
+			list.add("never really a thing, rendering what might");
+			list.add("have been a joke as totally nonsensical.");
+			list.add("We apologize for getting your hopes up with");
+			list.add("this non-joke that hasn't been made.");
+			list.add("");
+			list.add("i added an item for a joke that isn't even here, what am i, stupid? can't even tell the difference between gravel and a gavel, how did i not forget how to breathe yet?");
 		}
 	}
 

src/main/java/com/hbm/items/tool/ItemBalefireMatch.java

@@ -0,0 +1,52 @@
+package com.hbm.items.tool;
+
+import com.hbm.blocks.ModBlocks;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class ItemBalefireMatch extends Item {
+
+    public ItemBalefireMatch() {
+        this.maxStackSize = 1;
+        this.setMaxDamage(64);
+        this.setCreativeTab(CreativeTabs.tabTools);
+    }
+    
+    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float fx, float fy, float fz) {
+    	
+        if (side == 0)
+            --y;
+
+        if (side == 1)
+            ++y;
+
+        if (side == 2)
+            --z;
+
+        if (side == 3)
+            ++z;
+
+        if (side == 4)
+            --x;
+
+        if (side == 5)
+            ++x;
+
+        if (!player.canPlayerEdit(x, y, z, side, stack)) {
+            return false;
+        } else {
+        	
+            if (world.isAirBlock(x, y, z)) {
+                world.playSoundEffect((double)x + 0.5D, (double)y + 0.5D, (double)z + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F);
+                world.setBlock(x, y, z, ModBlocks.balefire);
+            }
+
+            stack.damageItem(1, player);
+            return true;
+        }
+    }
+}

src/main/java/com/hbm/main/CraftingManager.java

@@ -1257,6 +1257,7 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.matchstick, 16), new Object[] { "I", "S", 'I', "sulfur", 'S', Items.stick }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.matchstick, 16), new Object[] { "I", "S", 'I', "dustSulfur", 'S', Items.stick }));
 		GameRegistry.addRecipe(new ItemStack(ModItems.matchstick, 24), new Object[] { "I", "S", 'I', ModItems.powder_fire, 'S', Items.stick });
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.balefire_and_steel, 1), new Object[] { "I ", " B", 'I', "ingotIron", 'B', ModItems.egg_balefire_shard }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.crowbar, 1), new Object[] { "II", " I", " I", 'I', "ingotSteel" }));
 
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_power, 5), new Object[] { "dustRedstone", "dustGlowstone", "dustDiamond", "dustNeptunium", "dustMagnetizedTungsten" }));

src/main/java/com/hbm/main/ModEventHandler.java

@@ -455,13 +455,6 @@ public class ModEventHandler
 	public void onPlayerTick(TickEvent.PlayerTickEvent event) {
 		
 		EntityPlayer player = event.player;
-		String st = player.getUniqueID().toString();
-		
-		if(!player.worldObj.isRemote && (
-				st.equals("c874fd4e-5841-42e4-8f77-70efd5881bc1") ||
-				st.equals("6a058220-7d86-4f29-817b-418eb98bd842") ||
-				st.equals("dec34886-ef6b-409e-94ee-a99c5fbec9dd")))
-			player.getEntityData().setFloat("hfr_radiation", player.getEntityData().getFloat("hfr_radiation" + 0.05F));
 		
 		if(!player.worldObj.isRemote && event.phase == TickEvent.Phase.START) {
 

src/main/java/com/hbm/render/util/RenderAccessoryUtility.java

@@ -11,6 +11,7 @@ public class RenderAccessoryUtility {
 
 	private static ResourceLocation hbm = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeHbm3.png");
 	private static ResourceLocation hbm2 = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeHbm2.png");
+	private static ResourceLocation drillgon = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeDrillgon.png");
 	private static ResourceLocation dafnik = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeDafnik.png");
 	private static ResourceLocation lpkukin = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeShield.png");
 	private static ResourceLocation vertice = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeVertice_2.png");
@@ -43,7 +44,7 @@ public class RenderAccessoryUtility {
 		}
 
 		if(uuid.equals(Library.Drillgon)) {
-			return hbm;
+			return drillgon;
 		}
 		if(uuid.equals(Library.Dafnik)) {
 			return dafnik;

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

@@ -4,13 +4,13 @@ import com.hbm.calc.Location;
 import com.hbm.interfaces.IConsumer;
 
 import cofh.api.energy.EnergyStorage;
-import cofh.api.energy.IEnergyProvider;
+import cofh.api.energy.IEnergyHandler;
 import cofh.api.energy.IEnergyReceiver;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class TileEntityConverterHeRf extends TileEntity implements IConsumer, IEnergyProvider {
+public class TileEntityConverterHeRf extends TileEntity implements IConsumer, IEnergyHandler {
 	
 	public long power;
 	public final long maxPower = 1000000;
@@ -108,4 +108,9 @@ public class TileEntityConverterHeRf extends TileEntity implements IConsumer, IE
 		storage.writeToNBT(nbt);
 	}
 
+	@Override
+	public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
+		return 0;
+	}
+
 }

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

@@ -8,12 +8,12 @@ import com.hbm.interfaces.ISource;
 import com.hbm.lib.Library;
 
 import cofh.api.energy.EnergyStorage;
-import cofh.api.energy.IEnergyReceiver;
+import cofh.api.energy.IEnergyHandler;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class TileEntityConverterRfHe extends TileEntity implements ISource, IEnergyReceiver {
+public class TileEntityConverterRfHe extends TileEntity implements ISource, IEnergyHandler {
 	
 	public long power;
 	public final long maxPower = 1000000;
@@ -135,4 +135,9 @@ public class TileEntityConverterRfHe extends TileEntity implements ISource, IEne
 		storage.writeToNBT(nbt);
 	}
 
+	@Override
+	public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
+		return 0;
+	}
+
 }

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

@@ -0,0 +1,115 @@
+package com.hbm.tileentity.machine;
+
+import java.util.List;
+
+import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.interfaces.IConsumer;
+import com.hbm.interfaces.IFluidAcceptor;
+import com.hbm.interfaces.IFluidSource;
+import com.hbm.inventory.FluidTank;
+import com.hbm.tileentity.TileEntityMachineBase;
+
+public class TileEntityITER extends TileEntityMachineBase implements IConsumer, IFluidAcceptor, IFluidSource {
+
+	public TileEntityITER() {
+		super(1);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void setFillstate(int fill, int index) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setFluidFill(int fill, FluidType type) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setType(FluidType type, int index) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public List<FluidTank> getTanks() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getFluidFill(FluidType type) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void fillFluidInit(FluidType type) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public boolean getTact() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public List<IFluidAcceptor> getFluidList(FluidType type) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void clearFluidList(FluidType type) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public int getMaxFluidFill(FluidType type) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setPower(long i) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public long getPower() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public long getMaxPower() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public String getName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void updateEntity() {
+		// TODO Auto-generated method stub
+		
+	}
+
+}