Merge branch 'HbmMods:master' into master

changelog

@@ -10,7 +10,7 @@
 
 ## Changed
 * Bedrock ores now spawn in the nether
-  * Nether bedrock ores include red phosphorus and glowstone, both yielding powders instead of ores
+  * Nether bedrock ores include red phosphorus, quartz and glowstone, all yielding the items directly instead of ores
   * All current nether bedrock ores are tier 1 and do not require any bore fluid
 * Custom machines now show their recipes in NEI
   * All it took was battling NEI's source code for 3 hours and my sanity
@@ -20,6 +20,8 @@
 * Mixed chlorocalcite solution now requires flux as a reducing agent
 * All chlorine producing electrolysis recipes have been moved to the electrolysis machine and can no longer be done in the chemical plant
   * If only there was a much simpler recipe that may have existed at some point, life could be a dream
+* Zirconium and lithium are now recognized crucible materials
+* Glowstone now yields 100mB of chlorine in the combination oven instead of the initial 50mB
 
 ## Fixed
 * Fixed custom machines not sending fluid

gradle.properties

@@ -1,6 +1,6 @@
 mod_version=1.0.27
 # Empty build number makes a release type
-mod_build_number=4671
+mod_build_number=4683
 
 credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion algorithms),\
   \ Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models,\

src/main/java/api/hbm/fluid/PipeNet.java

@@ -1,9 +1,12 @@
 package api.hbm.fluid;
 
 import java.math.BigInteger;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+import java.util.TimeZone;
 
 import com.hbm.inventory.fluid.FluidType;
 
@@ -18,6 +21,7 @@ public class PipeNet implements IPipeNet {
 	
 	public static List<PipeNet> trackingInstances = null;
 	protected BigInteger totalTransfer = BigInteger.ZERO;
+	public List<String> debug = new ArrayList();
 	
 	public PipeNet(FluidType type) {
 		this.type = type;
@@ -124,6 +128,15 @@ public class PipeNet implements IPipeNet {
 			long given = (long) Math.floor(fraction * fill);
 			
 			totalGiven += (given - con.transferFluid(type, pressure, given));
+
+			if(trackingInstances != null) {
+				for(int j = 0; j < trackingInstances.size(); j++) {
+					PipeNet net = trackingInstances.get(j);
+					SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss:SSS");
+					sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+					log(net, sdf.format(new Date(System.currentTimeMillis())) + " Sending " + given + "mB to " + conToString(con));
+				}
+			}
 		}
 		
 		if(trackingInstances != null) {
@@ -162,4 +175,22 @@ public class PipeNet implements IPipeNet {
 	public BigInteger getTotalTransfer() {
 		return this.totalTransfer;
 	}
+	
+	public static void log(PipeNet net, String msg) {
+		net.debug.add(msg);
+		
+		while(net.debug.size() > 50) {
+			net.debug.remove(0);
+		}
+	}
+	
+	public static String conToString(IFluidConnector con) {
+		
+		if(con instanceof TileEntity) {
+			TileEntity tile = (TileEntity) con;
+			return tile.getClass().getSimpleName() + " @ " + tile.xCoord + "/" + tile.yCoord + "/" + tile.zCoord;
+		}
+		
+		return "" + con;
+	}
 }

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

@@ -0,0 +1,10 @@
+package com.hbm.blocks;
+
+import java.util.List;
+
+import net.minecraft.world.World;
+
+public interface IAnalyzable {
+
+	public List<String> getDebugInfo(World world, int x, int y, int z);
+}

src/main/java/com/hbm/blocks/network/FluidDuctBase.java

@@ -1,9 +1,15 @@
 package com.hbm.blocks.network;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import com.hbm.blocks.IAnalyzable;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.items.machine.IItemFluidIdentifier;
 import com.hbm.tileentity.network.TileEntityPipeBaseNT;
 
+import api.hbm.fluid.IPipeNet;
+import api.hbm.fluid.PipeNet;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -12,7 +18,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class FluidDuctBase extends BlockContainer implements IBlockFluidDuct {
+public class FluidDuctBase extends BlockContainer implements IBlockFluidDuct, IAnalyzable {
 
 	public FluidDuctBase(Material mat) {
 		super(mat);
@@ -80,4 +86,35 @@ public class FluidDuctBase extends BlockContainer implements IBlockFluidDuct {
 			}
 		}
 	}
+
+	@Override
+	public List<String> getDebugInfo(World world, int x, int y, int z) {
+		
+		TileEntity te = world.getTileEntity(x, y, z);
+		
+		if(te instanceof TileEntityPipeBaseNT) {
+			TileEntityPipeBaseNT pipe = (TileEntityPipeBaseNT) te;
+			FluidType type = pipe.getType();
+			
+			if(type != null) {
+				
+				IPipeNet net = pipe.getPipeNet(type);
+				
+				if(net instanceof PipeNet) {
+					PipeNet pipeNet = (PipeNet) net;
+					
+					List<String> debug = new ArrayList();
+					debug.add("=== DEBUG START ===");
+					debug.addAll(pipeNet.debug);
+					debug.add("=== DEBUG END ===");
+					debug.add("Links: " + pipeNet.getLinks().size());
+					debug.add("Subscribers: " + pipeNet.getSubscribers().size());
+					debug.add("Transfer: " + pipeNet.getTotalTransfer());
+					return debug;
+				}
+			}
+		}
+		
+		return null;
+	}
 }

src/main/java/com/hbm/config/WorldConfig.java

@@ -50,6 +50,7 @@ public class WorldConfig {
 	public static int bedrockRedstoneSpawn = 50;
 	public static int bedrockGlowstoneSpawn = 100;
 	public static int bedrockPhosphorusSpawn = 50;
+	public static int bedrockQuartzSpawn = 100;
 
 	public static int ironClusterSpawn = 4;
 	public static int titaniumClusterSpawn = 2;
@@ -159,6 +160,7 @@ public class WorldConfig {
 
 		bedrockGlowstoneSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.BN00_bedrockGlowstoneWeight", "Spawn weight for glowstone bedrock ore", 100);
 		bedrockPhosphorusSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.BN01_bedrockPhosphorusWeight", "Spawn weight for phosphorus bedrock ore", 50);
+		bedrockQuartzSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.BN01_bedrockQuartzWeight", "Spawn weight for quartz bedrock ore", 100);
 
 		ironClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C00_ironClusterSpawn", "Amount of iron cluster veins per chunk", 4);
 		titaniumClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C01_titaniumClusterSpawn", "Amount of titanium cluster veins per chunk", 2);

src/main/java/com/hbm/inventory/material/Mats.java

@@ -106,6 +106,8 @@ public class Mats {
 	public static final NTMMaterial MAT_BERYLLIUM	= makeSmeltable(400,		BE,			0xB2B2A6, 0x0F0F03, 0xAE9572).setShapes(NUGGET, INGOT, DUST, BLOCK);
 	public static final NTMMaterial MAT_COBALT		= makeSmeltable(2700,		CO,			0xC2D1EE, 0x353554, 0x8F72AE).setShapes(NUGGET, DUSTTINY, BILLET, INGOT, DUST, BLOCK);
 	public static final NTMMaterial MAT_BORON		= makeSmeltable(500,		B,			0xBDC8D2, 0x29343E, 0xAD72AE).setShapes(DUSTTINY, INGOT, DUST, BLOCK);
+	public static final NTMMaterial MAT_ZIRCONIUM	= makeSmeltable(4000,		ZR,			0xE3DCBE, 0x3E3719, 0xADA688).setShapes(NUGGET, DUSTTINY, BILLET, INGOT, DUST, CASTPLATE, BLOCK);
+	public static final NTMMaterial MAT_LITHIUM		= makeSmeltable(300,		LI,			0xFFFFFF, 0x818181, 0xD6D6D6).setShapes(INGOT, DUST, BLOCK);
 	public static final NTMMaterial MAT_CADMIUM		= makeSmeltable(4800,		CD,			0xFFFADE, 0x350000, 0xA85600).setShapes(INGOT, DUST);
 	public static final NTMMaterial MAT_OSMIRIDIUM	= makeSmeltable(7699,		OSMIRIDIUM, 0xDBE3EF, 0x7891BE, 0xACBDD9).setShapes(NUGGET, INGOT, CASTPLATE);
 	

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

@@ -1001,6 +1001,16 @@ public class AssemblerRecipes {
 				new ComparableStack(ModItems.motor, 3),
 				new ComparableStack(ModItems.circuit_red_copper, 1)
 			}, 200);
+
+		makeRecipe(new ComparableStack(ModBlocks.machine_electrolyser, 1), new AStack[] {
+				new OreDictStack(STEEL.plateCast(), 8),
+				new OreDictStack(CU.plate528(), 16),
+				new OreDictStack(RUBBER.ingot(), 8),
+				new ComparableStack(ModItems.ingot_firebrick, 16),
+				new ComparableStack(ModItems.tank_steel, 3),
+				new ComparableStack(ModItems.coil_copper, 16),
+				new ComparableStack(ModItems.circuit_gold, 2)
+			}, 200);
 		
 		makeRecipe(new ComparableStack(ModItems.euphemium_capacitor, 1), new AStack[]
 				{

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

@@ -37,7 +37,6 @@ public class CombinationRecipes extends SerializableRecipe {
 		recipes.put(COAL.gem(),		new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.COAL), new FluidStack(Fluids.COALCREOSOTE, 100)));
 		recipes.put(COAL.dust(),	new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.COAL), new FluidStack(Fluids.COALCREOSOTE, 100)));
 		recipes.put(new ComparableStack(DictFrame.fromOne(ModItems.briquette, EnumBriquetteType.COAL)), new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.COAL), new FluidStack(Fluids.COALCREOSOTE, 150)));
-
 		
 		recipes.put(LIGNITE.gem(),										new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.LIGNITE), new FluidStack(Fluids.COALCREOSOTE, 50)));
 		recipes.put(LIGNITE.dust(),										new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.LIGNITE), new FluidStack(Fluids.COALCREOSOTE, 50)));
@@ -45,7 +44,7 @@ public class CombinationRecipes extends SerializableRecipe {
 
 		recipes.put(CINNABAR.crystal(), new Pair(new ItemStack(ModItems.sulfur), new FluidStack(Fluids.MERCURY, 100)));
 		//recipes.put(CHLOROCALCITE.dust(), new Pair(new ItemStack(ModItems.powder_calcium), new FluidStack(Fluids.CHLORINE, 250)));
-		recipes.put(new ComparableStack(Items.glowstone_dust), new Pair(new ItemStack(ModItems.sulfur), new FluidStack(Fluids.CHLORINE, 50)));
+		recipes.put(new ComparableStack(Items.glowstone_dust), new Pair(new ItemStack(ModItems.sulfur), new FluidStack(Fluids.CHLORINE, 100)));
 		recipes.put(new ComparableStack(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.BAUXITE)), new Pair(new ItemStack(ModItems.ingot_aluminium, 2), new FluidStack(Fluids.REDMUD, 250)));
 
 		recipes.put(KEY_LOG,		new Pair(new ItemStack(Items.coal, 1 ,1),	new FluidStack(Fluids.WOODOIL, 250)));

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

@@ -35,12 +35,99 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe {
 		recipes.put(new ComparableStack(ModItems.crystal_iron), new ElectrolysisMetalRecipe(
 				new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(6)),
 				new MaterialStack(Mats.MAT_TITANIUM, MaterialShapes.INGOT.q(2)),
-				new ItemStack(ModItems.powder_lithium_tiny, 1)));
+				new ItemStack(ModItems.powder_lithium_tiny, 3)));
+		
 		recipes.put(new ComparableStack(ModItems.crystal_gold), new ElectrolysisMetalRecipe(
-				new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(6)),
+				new MaterialStack(Mats.MAT_GOLD, MaterialShapes.INGOT.q(6)),
 				new MaterialStack(Mats.MAT_LEAD, MaterialShapes.INGOT.q(2)),
-				new ItemStack(ModItems.powder_lithium_tiny, 1),
-				new ItemStack(ModItems.ingot_mercury, 1)));
+				new ItemStack(ModItems.powder_lithium_tiny, 3),
+				new ItemStack(ModItems.ingot_mercury, 2)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_uranium), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_URANIUM, MaterialShapes.INGOT.q(6)),
+				new MaterialStack(Mats.MAT_RADIUM, MaterialShapes.NUGGET.q(4)),
+				new ItemStack(ModItems.powder_lithium_tiny, 3)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_thorium), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_THORIUM, MaterialShapes.INGOT.q(6)),
+				new MaterialStack(Mats.MAT_URANIUM, MaterialShapes.INGOT.q(2)),
+				new ItemStack(ModItems.powder_lithium_tiny, 3)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_plutonium), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_PLUTONIUM, MaterialShapes.INGOT.q(6)),
+				new MaterialStack(Mats.MAT_POLONIUM, MaterialShapes.INGOT.q(2)),
+				new ItemStack(ModItems.powder_lithium_tiny, 3)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_titanium), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_TITANIUM, MaterialShapes.INGOT.q(6)),
+				new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(2)),
+				new ItemStack(ModItems.powder_lithium_tiny, 3)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_copper), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_COPPER, MaterialShapes.INGOT.q(6)),
+				new MaterialStack(Mats.MAT_LEAD, MaterialShapes.NUGGET.q(4)),
+				new ItemStack(ModItems.powder_lithium_tiny, 3),
+				new ItemStack(ModItems.sulfur, 2)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_tungsten), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_TUNGSTEN, MaterialShapes.INGOT.q(6)),
+				new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(2)),
+				new ItemStack(ModItems.powder_lithium_tiny, 3)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_aluminium), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_ALUMINIUM, MaterialShapes.INGOT.q(6)),
+				new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(2)),
+				new ItemStack(ModItems.powder_lithium_tiny, 3)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_beryllium), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_BERYLLIUM, MaterialShapes.INGOT.q(6)),
+				new MaterialStack(Mats.MAT_LEAD, MaterialShapes.NUGGET.q(4)),
+				new ItemStack(ModItems.powder_lithium_tiny, 3),
+				new ItemStack(ModItems.powder_quartz, 2)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_lead), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_LEAD, MaterialShapes.INGOT.q(6)),
+				new MaterialStack(Mats.MAT_GOLD, MaterialShapes.INGOT.q(2)),
+				new ItemStack(ModItems.powder_lithium_tiny, 3)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_schraranium), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_SCHRABIDIUM, MaterialShapes.NUGGET.q(5)),
+				new MaterialStack(Mats.MAT_URANIUM, MaterialShapes.NUGGET.q(2)),
+				new ItemStack(ModItems.nugget_plutonium, 2)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_schrabidium), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_SCHRABIDIUM, MaterialShapes.INGOT.q(6)),
+				new MaterialStack(Mats.MAT_PLUTONIUM, MaterialShapes.INGOT.q(2)),
+				new ItemStack(ModItems.powder_lithium_tiny, 3)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_rare), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_ZIRCONIUM, MaterialShapes.NUGGET.q(6)),
+				new MaterialStack(Mats.MAT_BORON, MaterialShapes.NUGGET.q(2)),
+				new ItemStack(ModItems.powder_desh_mix, 3)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_trixite), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_PLUTONIUM, MaterialShapes.INGOT.q(3)),
+				new MaterialStack(Mats.MAT_COBALT, MaterialShapes.INGOT.q(4)),
+				new ItemStack(ModItems.powder_niobium, 4),
+				new ItemStack(ModItems.powder_nitan_mix, 2)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_lithium), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_LITHIUM, MaterialShapes.INGOT.q(6)),
+				new MaterialStack(Mats.MAT_BORON, MaterialShapes.INGOT.q(2)),
+				new ItemStack(ModItems.powder_quartz, 2),
+				new ItemStack(ModItems.fluorite, 2)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_starmetal), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_DURA, MaterialShapes.INGOT.q(4)),
+				new MaterialStack(Mats.MAT_COBALT, MaterialShapes.INGOT.q(4)),
+				new ItemStack(ModItems.powder_astatine, 3),
+				new ItemStack(ModItems.ingot_mercury, 8)));
+		
+		recipes.put(new ComparableStack(ModItems.crystal_cobalt), new ElectrolysisMetalRecipe(
+				new MaterialStack(Mats.MAT_COBALT, MaterialShapes.INGOT.q(3)),
+				new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(4)),
+				new ItemStack(ModItems.powder_copper, 4),
+				new ItemStack(ModItems.powder_lithium_tiny, 3)));
 	}
 	
 	public static ElectrolysisMetalRecipe getRecipe(ItemStack stack) {
@@ -66,7 +153,7 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe {
 		for(Entry<AStack, ElectrolysisMetalRecipe> entry : ElectrolyserMetalRecipes.recipes.entrySet()) {
 			
 			ElectrolysisMetalRecipe recipe = entry.getValue();
-			Object[] input = new Object[] { entry.getKey().copy(), new ComparableStack(ItemFluidIcon.make(Fluids.NITRIC_ACID, 100)) };
+			Object[] input = new Object[] { entry.getKey().copy(), ItemFluidIcon.make(Fluids.NITRIC_ACID, 100) };
 			List outputs = new ArrayList();
 			if(recipe.output1 != null) outputs.add(ItemScraps.create(recipe.output1, true));
 			if(recipe.output2 != null) outputs.add(ItemScraps.create(recipe.output2, true));

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

@@ -1260,6 +1260,7 @@ public class ModItems {
 	public static Item rbmk_tool;
 	public static Item coltan_tool;
 	public static Item power_net_tool;
+	public static Item analysis_tool;
 	public static Item coupling_tool;
 
 	public static Item template_folder;
@@ -4591,6 +4592,7 @@ public class ModItems {
 		rbmk_tool = new ItemRBMKTool().setUnlocalizedName("rbmk_tool").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":rbmk_tool");
 		coltan_tool = new ItemColtanCompass().setUnlocalizedName("coltan_tool").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":coltass");
 		power_net_tool = new ItemPowerNetTool().setUnlocalizedName("power_net_tool").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":power_net_tool");
+		analysis_tool = new ItemAnalysisTool().setUnlocalizedName("analysis_tool").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":analysis_tool");
 		coupling_tool = new ItemCouplingTool().setUnlocalizedName("coupling_tool").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":coupling_tool");
 
 		key = new ItemKey().setUnlocalizedName("key").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":key");
@@ -6754,6 +6756,7 @@ public class ModItems {
 		GameRegistry.registerItem(rbmk_tool, rbmk_tool.getUnlocalizedName());
 		GameRegistry.registerItem(coltan_tool, coltan_tool.getUnlocalizedName());
 		GameRegistry.registerItem(power_net_tool, power_net_tool.getUnlocalizedName());
+		GameRegistry.registerItem(analysis_tool, analysis_tool.getUnlocalizedName());
 		GameRegistry.registerItem(coupling_tool, coupling_tool.getUnlocalizedName());
 		GameRegistry.registerItem(dosimeter, dosimeter.getUnlocalizedName());
 		GameRegistry.registerItem(geiger_counter, geiger_counter.getUnlocalizedName());

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

@@ -0,0 +1,48 @@
+package com.hbm.items.tool;
+
+import java.util.List;
+
+import com.hbm.blocks.BlockDummyable;
+import com.hbm.blocks.IAnalyzable;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
+public class ItemAnalysisTool extends Item {
+
+	@Override
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float fX, float fY, float fZ) {
+		
+		Block b = world.getBlock(x, y, z);
+		
+		if(b instanceof BlockDummyable) {
+			int[] pos = ((BlockDummyable) b).findCore(world, x, y, z);
+			
+			if(pos != null) {
+				x = pos[0];
+				y = pos[1];
+				z = pos[2];
+			}
+		}
+		
+		if(b instanceof IAnalyzable) {
+			List<String> debug = ((IAnalyzable) b).getDebugInfo(world, x, y, z);
+			
+			if(debug != null && !world.isRemote) {
+				for(String line : debug) {
+					player.addChatComponentMessage(new ChatComponentText(line).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW)));
+				}
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+}

src/main/java/com/hbm/lib/RefStrings.java

@@ -3,7 +3,7 @@ package com.hbm.lib;
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "1.0.27 BETA (4671)";
+	public static final String VERSION = "1.0.27 BETA (4683)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version

src/main/java/com/hbm/world/feature/BedrockOre.java

@@ -43,6 +43,7 @@ public class BedrockOre {
 
 		registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(Items.glowstone_dust, 4),		1,	0xF9FF4D),							WorldConfig.bedrockGlowstoneSpawn);
 		registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(ModItems.powder_fire, 4),		1,	0xD7341F),							WorldConfig.bedrockPhosphorusSpawn);
+		registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(Items.quartz, 4),				1,	0xF0EFDD),							WorldConfig.bedrockQuartzSpawn);
 	}
 	
 	public static void registerBedrockOre(List list, BedrockOreDefinition def, int weight) {

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

@@ -337,6 +337,7 @@ container.machineCompressor=Kompressor
 container.machineCrucible=Schmelztiegel
 container.machineDiesel=Dieselgenerator
 container.machineElectricBoiler=Elektrischer Ölwärmer
+container.machineElectrolyser=Electrolysegerät
 container.machineFEL=FEL
 container.machineITER=Kernfusionsreaktor
 container.machineLargeTurbine=Industrielle Dampfturbine
@@ -832,6 +833,7 @@ hbmmat.watzmud=Giftiger Schlamm
 hbmmat.whitephosphorus=Weißer Phosphor
 hbmmat.workersalloy=Desh
 hbmmat.wroughtiron=Schmiedeeisen
+hbmmat.zirconium=Zirkonium
 
 matshape.block=%s Block
 matshape.blocks=%s Blöcke
@@ -1711,6 +1713,10 @@ item.elec_shovel.name=Spiralbohrer
 item.elec_sword.name=Elektroimpulswaffe
 item.energy_core.name=Selbstgebauter Energiekern
 item.entanglement_kit.name=Verschränkungskit
+item.envsuit_boots.name=M1TTY Umgebungsanzug Stiefel
+item.envsuit_helmet.name=M1TTY Umgebungsanzug Helm
+item.envsuit_legs.name=M1TTY Umgebungsanzug Hose
+item.envsuit_plate.name=M1TTY Umgebungsanzug Brustplatte
 item.euphemium_boots.name=Euphemiumstiefel
 item.euphemium_helmet.name=Euphemiumstiefel
 item.euphemium_kit.name=Euphemium Kit
@@ -3991,6 +3997,7 @@ tile.machine_dineutronium_battery.name=Spark Energiespeicherblock
 tile.machine_drill.name=Automatischer Minenbohrer
 tile.machine_electric_furnace_off.name=Elektrischer Ofen
 tile.machine_electric_furnace_on.name=Elektrischer Ofen
+tile.machine_electrolyser.name=Electrolysegerät
 tile.machine_epress.name=Hydraulische Presse
 tile.machine_excavator.name=Großer Minenbohrer
 tile.machine_fel.name=FEL

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

@@ -695,6 +695,7 @@ container.machineCompressor=Compressor
 container.machineCrucible=Crucible
 container.machineDiesel=Diesel Generator
 container.machineElectricBoiler=Electric Oil Heater
+container.machineElectrolyser=Electrolysis Machine
 container.machineFEL=FEL
 container.machineITER=Fusion Reactor
 container.machineLargeTurbine=Industrial Steam Turbine
@@ -1479,6 +1480,7 @@ hbmmat.watzmud=Poisonous Mud
 hbmmat.whitephosphorus=White Phosphorus
 hbmmat.workersalloy=Desh
 hbmmat.wroughtiron=Wroght Iron
+hbmmat.zirconium=Zirconium
 
 matshape.block=%s Block
 matshape.blocks=%s Blocks
@@ -2410,6 +2412,10 @@ item.elec_sword.name=Stunstick
 item.energy_core.name=Makeshift Energy Core
 item.entanglement_kit.name=Entanglement Kit
 item.entanglement_kit.desc=Teleporter crafting item.$Enables dimension-shifting via a$beryllium-enhanced resource scanner.
+item.envsuit_boots.name=M1TTY Environment Suit Boots
+item.envsuit_helmet.name=M1TTY Environment Suit Helmet
+item.envsuit_legs.name=M1TTY Environment Suit Leggings
+item.envsuit_plate.name=M1TTY Environment Suit Chestplate
 item.euphemium_boots.name=Euphemium Boots
 item.euphemium_capacitor.name=Euphemium Capacitor
 item.euphemium_capacitor.desc=Permits passive dispersion of accumulated positive energy.
@@ -4915,6 +4921,7 @@ tile.machine_dineutronium_battery.name=Spark Energy Storage Block
 tile.machine_drill.name=Automatic Mining Drill
 tile.machine_electric_furnace_off.name=Electric Furnace
 tile.machine_electric_furnace_on.name=Electric Furnace
+tile.machine_electrolyser.name=Electrolysis Machine
 tile.machine_epress.name=Electric Press
 tile.machine_excavator.name=Large Mining Drill
 tile.machine_fel.name=FEL