Added DNT Drillbits

Added DNT Drillbits

Changed Gas Flare to vent non-combustable fluids

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

@@ -232,6 +232,11 @@ private static void registerDefaults() {
 				new ComparableStack(ModItems.drillbit_ferro),
 				new OreDictStack(DIAMOND.dust(), 64)
 			}, 100);
+		makeRecipe(new ComparableStack(ModItems.drillbit_dnt), new AStack[] {
+				new ComparableStack(ModItems.ingot_dineutronium, 32),
+				new OreDictStack(GH336.ingot(), 24),
+				new ComparableStack(ModItems.ingot_chainsteel, 8),
+			}, 2000);
 		makeRecipe(new ComparableStack(ModItems.telepad, 1), new AStack[] { new OreDictStack(ANY_PLASTIC.ingot(), 12), new OreDictStack(SA326.plate(), 2), new OreDictStack(CMB.plate(), 4), new OreDictStack(STEEL.plate(), 2), new ComparableStack(ModItems.wire_gold, 6), new ComparableStack(ModItems.circuit_schrabidium, 1), }, 300);
 		makeRecipe(new ComparableStack(ModItems.entanglement_kit, 1), new AStack[] { new ComparableStack(ModItems.coil_magnetized_tungsten, 6), new OreDictStack(PB.plate(), 16), new OreDictStack(OreDictManager.getReflector(), 4), new ComparableStack(ModItems.singularity_counter_resonant, 1), new ComparableStack(ModItems.singularity_super_heated, 1), new ComparableStack(ModItems.powder_power, 4), }, 200);
 		makeRecipe(new ComparableStack(ModItems.dysfunctional_reactor, 1), new AStack[] { new OreDictStack(STEEL.plate(), 15), new OreDictStack(PB.ingot(), 5), new ComparableStack(ModItems.rod_quad_empty, 10), new OreDictStack(KEY_BROWN, 3), }, 200);

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

@@ -80,7 +80,7 @@ public static void collectBedrockOres(){
 
 	public static int getOreIndex(String ore){
 		Integer x = oreToIndexes.get(ore);
-		if(x == null) return 0;
+		if(x == null) return -1;
 		return x;
 	}
 
@@ -96,7 +96,8 @@ public static FluidStack getFluidRequirement(int tier){
 		if(tier == 3) return new FluidStack(ModForgeFluids.nitric_acid, 5000);
 		if(tier == 4) return new FluidStack(ModForgeFluids.radiosolvent, 4000);
 		if(tier == 5) return new FluidStack(ModForgeFluids.schrabidic, 2000);
-		if(tier == 6) return new FluidStack(ModForgeFluids.liquid_osmiridium, 1500);
+		if(tier == 6) return new FluidStack(ModForgeFluids.uu_matter, 1500);
+		if(tier > 6) return new FluidStack(ModForgeFluids.liquid_osmiridium, 1000);
 		return new FluidStack(ModForgeFluids.solvent, 1500);
 	}
 

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

@@ -1661,6 +1661,8 @@ public class ModItems {
 	public static final Item drillbit_tcalloy_diamond = new ItemDrillbit(EnumDrillType.TCALLOY_DIAMOND, "drillbit_tcalloy_diamond").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab);
 	public static final Item drillbit_ferro = new ItemDrillbit(EnumDrillType.FERRO, "drillbit_ferro").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab);
 	public static final Item drillbit_ferro_diamond = new ItemDrillbit(EnumDrillType.FERRO_DIAMOND, "drillbit_ferro_diamond").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab);
+	public static final Item drillbit_dnt = new ItemDrillbit(EnumDrillType.DNT, "drillbit_dnt").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab);
+	public static final Item drillbit_dnt_diamond = new ItemDrillbit(EnumDrillType.DNT_DIAMOND, "drillbit_dnt_diamond").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab);
 
 	//Generic Items
 	public static final Item pellet_coal = new ItemFuelHazard("pellet_coal", 320, false).addCoal(1).toItem().setCreativeTab(MainRegistry.partsTab);

src/main/java/com/hbm/items/machine/ItemDrillbit.java

@@ -44,7 +44,9 @@ public static enum EnumDrillType {
 		TCALLOY			(2.0D, 4, 1, true, true),
 		TCALLOY_DIAMOND	(2.0D, 4, 4, true, true),
 		FERRO			(2.5D, 5, 1, true, true),
-		FERRO_DIAMOND	(2.5D, 5, 4, true, true);
+		FERRO_DIAMOND	(2.5D, 5, 4, true, true),
+		DNT				(4.0D, 6000, 1, true, true),
+		DNT_DIAMOND		(4.0D, 6000, 5, true, true);
 
 		public double speed;
 		public int tier;

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

@@ -2622,7 +2622,7 @@ public static void reg3(){
 		addShapelessAuto(new ItemStack(ModItems.ball_fireclay, 4), new Object[] { Items.CLAY_BALL, Items.CLAY_BALL, Items.CLAY_BALL, AL.ore()});
 
 		add1To9Pair(ModBlocks.block_semtex, ModItems.ingot_semtex);
-		
+
 		if(!GeneralConfig.enable528) {
 			addRecipeAuto(new ItemStack(ModBlocks.struct_launcher_core, 1), new Object[] { "SCS", "SIS", "BEB", 'S', ModBlocks.steel_scaffold, 'I', Blocks.IRON_BARS, 'C', ModItems.circuit_targeting_tier3, 'B', ModBlocks.struct_launcher, 'E', ModBlocks.machine_battery });
 			addRecipeAuto(new ItemStack(ModBlocks.struct_launcher_core_large, 1), new Object[] { "SIS", "ICI", "BEB", 'S', ModItems.circuit_red_copper, 'I', Blocks.IRON_BARS, 'C', ModItems.circuit_targeting_tier4, 'B', ModBlocks.struct_launcher, 'E', ModBlocks.machine_battery });
@@ -2674,6 +2674,8 @@ public static void reg3(){
 
 			addRecipeAuto(new ItemStack(ModItems.book_of_), new Object[] { "BGB", "GAG", "BGB", 'B', ModItems.egg_balefire_shard, 'G', GOLD.ingot(), 'A', Items.BOOK });
 		}
+
+		addShapelessAuto(new ItemStack(ModItems.drillbit_dnt_diamond, 1), new Object[] { ModItems.drillbit_dnt, new ItemStack(ModItems.ore_bedrock, 1, 3) });
 	}
 
 	public static void addSmelting(){

src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java

@@ -21,6 +21,7 @@
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.tileentity.IGUIProvider;
 import com.hbm.tileentity.TileEntityMachineBase;
+
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
@@ -191,10 +192,6 @@ void setupTanks() {
 			Fluid fluid = ItemForgeFluidIdentifier.getType(slotId);
 			int energy = FluidCombustionRecipes.getFlameEnergy(fluid);
 
-			if (energy == 0) {
-				return;
-			}
-
 			if (tankType != fluid) {
 				tankType = fluid;
 				cacheEnergy = energy;

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

@@ -12,6 +12,8 @@ turret.off=OFF
 turret.on=ON
 turret.players=Target Players: %s
 
+item.drillbit_dnt.name=Dineutronium Drillbit
+item.drillbit_dnt_diamond.name=Dineutronium Drillbit (Diamond-Tipped)
 item.drillbit_desh.name=Desh Drillbit
 item.drillbit_desh_diamond.name=Desh Drillbit (Diamond-Tipped)
 item.drillbit_ferro.name=Ferrouranium Drillbit

src/main/resources/assets/hbm/models/item/drillbit_dnt.json

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "hbm:items/drillbit_dnt"
+	}
+}

src/main/resources/assets/hbm/models/item/drillbit_dnt_diamond.json

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "hbm:items/drillbit_dnt_diamond"
+	}
+}