the slop consumes

changelog

@@ -1,4 +1,24 @@
+## Added
+* Limestone dust
+  * Limestone now shreds into limestone dust instead of calcium (yields 4)
+  * Can be combination cooked into calcium
+  * Used for making cement
+* Cement
+  * Used in all concretes (only requires 1 per 16 concrete)
+  * Either made from combining 1 limestone dust with 3 clay (yields 4) or from shredding slag (also yields 4)
+* Bedrock ore processor
+  * Used for separating the new bedrock ore
+  * Creates ore slop as a byproduct
+  * Slop can be coked into some rare byproducts or solidified into tar sand
+  * Vitriol can be coked into iron and sulfuric acid or electrolyzed into sulfuric acid and chlorine
+* New bedrock ore processing
+  * Most bedrock ores now create a single common item that contains different quantities of the 6 main ore types
+  * Ores can be processed in many different ways with three tiers of byproducts and many optional steps, also making use of machines that the old bedrock ores didn't
+  * New bedrock ores are now rarer, only spawning in every 10th chunk vs in evbery 3rd
+  * The old system can be restored via config
+
 ## Changed
+* Updated italian localization
 * Updated boxducts
   * All boxducts are now way cleaner, only having bolts on intersections, with straight parts only having very light seams
   * Intersections now have unique textures for each size
@@ -21,7 +41,20 @@
 * Diodes now use silicon nuggets instead of nether quartz
 * Aluminium wire's coloring is now consistent with the ingot
 * Nuclear explosions below a radius of 75 no longer have a gamma flash, therefore a high yield mini nuke should no longer be able to instakill someone wearing full euph armor
+* Updated OpenComputers compat
+* The solar boiler now has a tooltip showing its contents
+* Updated drones
+  * Drones will now drop when destroyed
+  * Drones are now generally faster (standard drones are now as fast as express drones used to be)
+  * Holding a transport drone item now shows transport drone paths, just like how logistics drones work
+  * Drones should no longer randomly get stuck on waypoints
+  * Drones will now move upwards to avoid small ledges, this usually happens when drones approach docks from a lower angle
+  * Logistics drone crates can now be disabled with a redstone signal
+  * Logistics drone docks are now 5x faster, spawning a new rone every second instead of every 5 seconds
+  * Drones are now a fair bit cheaper
+* Tar sand can now be liquefacted into bitumen directly with a higher yield than the chemplant recipe
+  * This however is slower, more energy intensive and yields no sand byproduct
 
 ## Fixed
 * Fixed crash caused by PRISM updating unloaded worlds
-* Hopefully fixed another crash caused by PRISM (reproduction was unreliable and sporadic, not confirmed)
+* Hopefully fixed another crash caused by PRISM (reproduction was unreliable and sporadic, not confirmed)

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

@@ -33,6 +33,7 @@ public class WorldConfig {
 	public static int bedrockOilSpawn = 200;
 	public static int meteoriteSpawn = 500;
 
+	public static boolean newBedrockOres = true;
 	public static int bedrockIronSpawn = 100;
 	public static int bedrockCopperSpawn = 200;
 	public static int bedrockBoraxSpawn = 50;
@@ -154,6 +155,7 @@ public class WorldConfig {
 		bedrockOilSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.22_bedrockOilSpawnRate", "Spawns a bedrock oil node every nTH chunk", 200);
 		meteoriteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.23_meteoriteSpawnRate", "Spawns a fallen meteorite every nTH chunk", 200);
 
+		newBedrockOres = CommonConfig.createConfigBool(config, CATEGORY_OREGEN, "2.NB_newBedrockOres", "Enables the newer genreric bedrock ores", true);
 		bedrockIronSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B00_bedrockIronWeight", "Spawn weight for iron bedrock ore", 100);
 		bedrockCopperSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B01_bedrockCopperWeight", "Spawn weight for copper bedrock ore", 200);
 		bedrockBoraxSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.B02_bedrockBoraxWeight", "Spawn weight for borax bedrock ore", 50);

src/main/java/com/hbm/crafting/PowderRecipes.java

@@ -33,6 +33,7 @@ public class PowderRecipes {
 		CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_semtex_mix, 1), new Object[] { ModItems.solid_fuel, ModItems.ballistite, KNO.dust() });
 		CraftingManager.addShapelessAuto(new ItemStack(Items.clay_ball, 4), new Object[] { KEY_SAND, ModItems.dust, ModItems.dust, Fluids.WATER.getDict(1_000) });
 		CraftingManager.addShapelessAuto(new ItemStack(Items.clay_ball, 4), new Object[] { Blocks.clay }); //clay uncrafting because placing and breaking it isn't worth anyone's time
+		CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_cement, 4), new Object[] { LIMESTONE.dust(), Items.clay_ball, Items.clay_ball, Items.clay_ball });
 		
 		//Other
 		CraftingManager.addShapelessAuto(new ItemStack(ModItems.ingot_steel_dusted, 1), new Object[] { STEEL.ingot(), COAL.dust() });
@@ -67,6 +68,7 @@ public class PowderRecipes {
 		CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_flux, 2), new Object[] { COAL.dust(), KEY_SAND });
 		CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_flux, 4), new Object[] { F.dust(), KEY_SAND });
 		CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_flux, 8), new Object[] { PB.dust(), S.dust(), KEY_SAND });
+		CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_flux, 12), new Object[] { ModItems.powder_limestone, KEY_SAND });
 		CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_flux, 12), new Object[] { CA.dust(), KEY_SAND });
 		CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_flux, 16), new Object[] { BORAX.dust(), KEY_SAND });
 

src/main/java/com/hbm/crafting/ToolRecipes.java

@@ -131,7 +131,7 @@ public class ToolRecipes {
 		CraftingManager.addShapelessAuto(new ItemStack(ModBlocks.geiger), new Object[] { ModItems.geiger_counter });
 		CraftingManager.addShapelessAuto(new ItemStack(ModItems.digamma_diagnostic), new Object[] { ModItems.geiger_counter, PO210.billet(), ASBESTOS.ingot() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.pollution_detector, 1), new Object[] { "SFS", "SCS", " S ", 'S', STEEL.plate(), 'F', ModItems.filter_coal, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE) });
-		CraftingManager.addRecipeAuto(new ItemStack(ModItems.ore_density_scanner, 1), new Object[] { "VVV", "CSC", "GGG", " S ", 'V', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CAPACITOR), 'S', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CONTROLLER_CHASSIS), 'G', GOLD.plate() });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.ore_density_scanner, 1), new Object[] { "VVV", "CSC", "GGG", 'V', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CAPACITOR), 'S', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CONTROLLER_CHASSIS), 'G', GOLD.plate() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.defuser, 1), new Object[] { " PS", "P P", " P ", 'P', ANY_PLASTIC.ingot(), 'S', STEEL.plate() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.coltan_tool, 1), new Object[] { "ACA", "CXC", "ACA", 'A', ALLOY.ingot(), 'C', CINNABAR.crystal(), 'X', Items.compass });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.reacher, 1), new Object[] { "BIB", "P P", "B B", 'B', W.bolt(), 'I', W.ingot(), 'P', ANY_RUBBER.ingot() });

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

@@ -229,6 +229,7 @@ public class OreDictManager {
 	public static final DictFrame VOLCANIC = new DictFrame("Volcanic");
 	public static final DictFrame HEMATITE = new DictFrame("Hematite");
 	public static final DictFrame MALACHITE = new DictFrame("Malachite");
+	public static final DictFrame LIMESTONE = new DictFrame("Limestone");
 	public static final DictFrame SLAG = new DictFrame("Slag");
 	/*
 	 * HAZARDS, MISC
@@ -427,6 +428,7 @@ public class OreDictManager {
 		VOLCANIC						.gem(gem_volcanic)																				.ore(DictFrame.fromOne(ore_basalt, EnumBasaltOreType.GEM));
 		HEMATITE																														.ore(fromOne(stone_resource, EnumStoneType.HEMATITE));
 		MALACHITE																														.ore(fromOne(stone_resource, EnumStoneType.MALACHITE));
+		LIMESTONE																		.dust(powder_limestone)							.ore(fromOne(stone_resource, EnumStoneType.LIMESTONE));
 		SLAG																									.block(block_slag);
 		
 		/*

src/main/java/com/hbm/inventory/container/ContainerOreSlopper.java

@@ -1,8 +1,12 @@
 package com.hbm.inventory.container;
 
 import com.hbm.inventory.SlotCraftingOutput;
+import com.hbm.items.ModItems;
+import com.hbm.items.machine.IItemFluidIdentifier;
+import com.hbm.items.machine.ItemMachineUpgrade;
 import com.hbm.tileentity.machine.TileEntityMachineOreSlopper;
 
+import api.hbm.energymk2.IBatteryItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -43,10 +47,51 @@ public class ContainerOreSlopper extends Container {
 			this.addSlotToContainer(new Slot(player, i, 8 + i * 18, 180));
 		}
 	}
-	
+
 	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
-		return null;
+	public ItemStack transferStackInSlot(EntityPlayer player, int par2) {
+		ItemStack var3 = null;
+		Slot var4 = (Slot) this.inventorySlots.get(par2);
+
+		if(var4 != null && var4.getHasStack()) {
+			ItemStack var5 = var4.getStack();
+			var3 = var5.copy();
+
+			if(par2 <= 10) {
+				if(!this.mergeItemStack(var5, 11, this.inventorySlots.size(), true)) {
+					return null;
+				}
+			} else {
+				
+				if(var3.getItem() == ModItems.bedrock_ore_base) {
+					if(!this.mergeItemStack(var5, 2, 3, false)) {
+						return null;
+					}
+				} else if(var3.getItem() instanceof ItemMachineUpgrade) {
+					if(!this.mergeItemStack(var5, 9, 11, false)) {
+						return null;
+					}
+				} else if(var3.getItem() instanceof IItemFluidIdentifier) {
+					if(!this.mergeItemStack(var5, 1, 2, false)) {
+						return null;
+					}
+				} else if(var3.getItem() instanceof IBatteryItem || var3.getItem() == ModItems.battery_creative) {
+					if(!this.mergeItemStack(var5, 0, 1, false)) {
+						return null;
+					}
+				} else {
+					return null;
+				}
+			}
+
+			if(var5.stackSize == 0) {
+				var4.putStack((ItemStack) null);
+			} else {
+				var4.onSlotChanged();
+			}
+		}
+
+		return var3;
 	}
 
 	@Override

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

@@ -466,6 +466,13 @@ public class AssemblerRecipes extends SerializableRecipe {
 				new ComparableStack(ModItems.motor, 2),
 				new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG)
 			}, 300);
+		makeRecipe(new ComparableStack(ModBlocks.machine_ore_slopper, 1), new AStack[] {
+				new OreDictStack(STEEL.plateCast(), 6),
+				new OreDictStack(TI.plate(), 8),
+				new OreDictStack(CU.pipe(), 3),
+				new ComparableStack(ModItems.motor, 3),
+				new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG)
+			}, 200);
 		makeRecipe(new ComparableStack(ModItems.drillbit, 1, EnumDrillType.STEEL.ordinal()), new AStack[] {
 				new OreDictStack(STEEL.ingot(), 12),
 				new OreDictStack(W.ingot(), 4)

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

@@ -184,12 +184,14 @@ public class ChemplantRecipes extends SerializableRecipe {
 				.outputItems(new ItemStack(ModItems.plate_kevlar, 4)));
 		recipes.add(new ChemRecipe(55, "CONCRETE", 100)
 				.inputItems(
+						new ComparableStack(ModItems.powder_cement, 1),
 						new ComparableStack(Blocks.gravel, 8),
 						new OreDictStack(KEY_SAND, 8))
 				.inputFluids(new FluidStack(Fluids.WATER, 2000))
 				.outputItems(new ItemStack(ModBlocks.concrete_smooth, 16)));
 		recipes.add(new ChemRecipe(56, "CONCRETE_ASBESTOS", 100)
 				.inputItems(
+						new ComparableStack(ModItems.powder_cement, 1),
 						new ComparableStack(Blocks.gravel, 2),
 						new OreDictStack(KEY_SAND, 2),
 						(GeneralConfig.enableLBSM && GeneralConfig.enableLBSMSimpleChemsitry) ?
@@ -199,9 +201,10 @@ public class ChemplantRecipes extends SerializableRecipe {
 				.outputItems(new ItemStack(ModBlocks.concrete_asbestos, 16)));
 		recipes.add(new ChemRecipe(79, "DUCRETE", 150)
 				.inputItems(
+						new ComparableStack(ModItems.powder_cement, 4),
+						new ComparableStack(Blocks.gravel, 2),
 						new OreDictStack(KEY_SAND, 8),
-						new OreDictStack(U238.billet(), 2),
-						new ComparableStack(Items.clay_ball, 4))
+						new OreDictStack(U238.billet(), 2))
 				.inputFluids(new FluidStack(Fluids.WATER, 2000))
 				.outputItems(new ItemStack(ModBlocks.ducrete_smooth, 8)));
 		recipes.add(new ChemRecipe(57, "SOLID_FUEL", 200)
@@ -409,7 +412,7 @@ public class ChemplantRecipes extends SerializableRecipe {
 				.outputFluids(new FluidStack(1000, Fluids.LPG)));
 		recipes.add(new ChemRecipe(34, "OIL_SAND", 200)
 				.inputItems(new ComparableStack(ModBlocks.ore_oil_sand, 16), new OreDictStack(ANY_TAR.any(), 1))
-				.outputItems(new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4))
+				.outputItems(new ItemStack(Blocks.sand, 16))
 				.outputFluids(new FluidStack(1000, Fluids.BITUMEN)));
 		recipes.add(new ChemRecipe(35, "ASPHALT", 100)
 				.inputItems(new ComparableStack(Blocks.gravel, 2), new ComparableStack(Blocks.sand, 6))

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

@@ -64,6 +64,8 @@ public class CokerRecipes extends SerializableRecipe {
 		registerRecipe(CALCIUM_SOLUTION, 125, new ItemStack(ModItems.powder_calcium), new FluidStack(SPENTSTEAM, 100));
 		//only cokable gas to extract sulfur content
 		registerRecipe(SOURGAS, 250, new ItemStack(ModItems.sulfur), new FluidStack(GAS_COKER, 150));
+		registerRecipe(SLOP, 1000, new ItemStack(ModItems.powder_limestone), new FluidStack(COLLOID, 250));
+		registerRecipe(VITRIOL, 4000, new ItemStack(ModItems.powder_iron), new FluidStack(SULFURIC_ACID, 500));
 	}
 
 	private static void registerAuto(FluidType fluid, FluidType type) {

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

@@ -54,6 +54,7 @@ public class CombinationRecipes extends SerializableRecipe {
 		recipes.put(SODALITE.gem(),								new Pair(new ItemStack(ModItems.powder_sodium), 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(NA.dust(),									new Pair(null, new FluidStack(Fluids.SODIUM, 100)));
+		recipes.put(LIMESTONE.dust(),							new Pair(new ItemStack(ModItems.powder_calcium), new FluidStack(Fluids.CARBONDIOXIDE, 50)));
 
 		recipes.put(KEY_LOG,		new Pair(new ItemStack(Items.coal, 1 ,1),							new FluidStack(Fluids.WOODOIL, 250)));
 		recipes.put(KEY_SAPLING,	new Pair(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.WOOD),	new FluidStack(Fluids.WOODOIL, 50)));

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

@@ -26,6 +26,7 @@ public class ElectrolyserFluidRecipes extends SerializableRecipe {
 	public void registerDefaults() {
 		recipes.put(Fluids.WATER, new ElectrolysisRecipe(2_000, new FluidStack(Fluids.HYDROGEN, 200), new FluidStack(Fluids.OXYGEN, 200)));
 		recipes.put(Fluids.HEAVYWATER, new ElectrolysisRecipe(2_000, new FluidStack(Fluids.DEUTERIUM, 200), new FluidStack(Fluids.OXYGEN, 200)));
+		recipes.put(Fluids.VITRIOL, new ElectrolysisRecipe(1_000, new FluidStack(Fluids.SULFURIC_ACID, 500), new FluidStack(Fluids.CHLORINE, 500), new ItemStack(ModItems.powder_iron), new ItemStack(ModItems.ingot_mercury)));
 
 		recipes.put(Fluids.POTASSIUM_CHLORIDE, new ElectrolysisRecipe(250, new FluidStack(Fluids.CHLORINE, 125), new FluidStack(Fluids.NONE, 0), new ItemStack(ModItems.dust)));
 		recipes.put(Fluids.CALCIUM_CHLORIDE, new ElectrolysisRecipe(250, new FluidStack(Fluids.CHLORINE, 125), new FluidStack(Fluids.CALCIUM_SOLUTION, 125)));

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

@@ -54,6 +54,7 @@ public class LiquefactionRecipes extends SerializableRecipe {
 		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(ModBlocks.ore_oil_sand),	new FluidStack(100, Fluids.BITUMEN));
 
 		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));
@@ -67,10 +68,6 @@ public class LiquefactionRecipes extends SerializableRecipe {
 		recipes.put(new ComparableStack(Blocks.tallgrass, 1, 1),	new FluidStack(100, Fluids.SEEDSLURRY));
 		recipes.put(new ComparableStack(Blocks.tallgrass, 1, 2),	new FluidStack(100, Fluids.SEEDSLURRY));
 		recipes.put(new ComparableStack(Blocks.vine),				new FluidStack(100, Fluids.SEEDSLURRY));
-		
-		//recipes.put(new ComparableStack(ModItems.solid_fuel_bf),	new FluidStack(250, Fluids.BALEFIRE));
-		
-		//TODO: more recipes as the crack oil derivatives are added
 	}
 	
 	public static FluidStack getOutput(ItemStack stack) {

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

@@ -98,6 +98,13 @@ public class SILEXRecipes {
 		recipes.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.DEATH.getID()), new SILEXRecipe(1000, 1000, 4)
 				.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_impure_osmiridium), 1))
 				);
+
+		recipes.put(new ComparableStack(ModItems.fluid_icon, 1, Fluids.VITRIOL.getID()), new SILEXRecipe(1000, 1000, EnumWavelengths.IR)
+				.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_bromine), 5))
+				.addOut(new WeightedRandomObject(new ItemStack(ModItems.pill_iodine), 5))
+				.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_iron), 5))
+				.addOut(new WeightedRandomObject(new ItemStack(ModItems.sulfur), 15))
+				);
 		
 		for(int i = 0; i < 5; i++) {
 			

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

@@ -171,7 +171,7 @@ public class ShredderRecipes extends SerializableRecipe {
 		ShredderRecipes.setRecipe(Blocks.clay, new ItemStack(Items.clay_ball, 4));
 		ShredderRecipes.setRecipe(Blocks.hardened_clay, new ItemStack(Items.clay_ball, 4));
 		ShredderRecipes.setRecipe(Blocks.tnt, new ItemStack(Items.gunpowder, Compat.isModLoaded(Compat.MOD_GT6) ? 4 : 5));
-		ShredderRecipes.setRecipe(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.LIMESTONE), new ItemStack(ModItems.powder_calcium));
+		ShredderRecipes.setRecipe(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.LIMESTONE), new ItemStack(ModItems.powder_limestone, 4));
 		ShredderRecipes.setRecipe(ModBlocks.stone_gneiss, new ItemStack(ModItems.powder_lithium_tiny, 1));
 		ShredderRecipes.setRecipe(ModItems.powder_lapis, new ItemStack(ModItems.powder_cobalt_tiny, 1));
 		ShredderRecipes.setRecipe(ModItems.fragment_neodymium, new ItemStack(ModItems.powder_neodymium_tiny, 1));
@@ -208,6 +208,7 @@ public class ShredderRecipes extends SerializableRecipe {
 		ShredderRecipes.setRecipe(ModBlocks.machine_well, new ItemStack(ModItems.powder_steel, 32));
 		ShredderRecipes.setRecipe(DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.RARE), new ItemStack(ModItems.powder_desh_mix));
 		ShredderRecipes.setRecipe(Blocks.sand, new ItemStack(ModItems.dust, 2));
+		ShredderRecipes.setRecipe(ModBlocks.block_slag, new ItemStack(ModItems.powder_cement, 4));
 		
 		List<ItemStack> logs = OreDictionary.getOres("logWood");
 		List<ItemStack> planks = OreDictionary.getOres("plankWood");

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

@@ -9,6 +9,7 @@ import java.util.Map.Entry;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonWriter;
+import com.hbm.blocks.ModBlocks;
 import com.hbm.inventory.FluidStack;
 import com.hbm.inventory.OreDictManager.DictFrame;
 import com.hbm.inventory.fluid.FluidType;
@@ -69,6 +70,7 @@ public class SolidificationRecipes extends SerializableRecipe {
 		registerRecipe(WATZ,		1000,			ModItems.ingot_mud);
 		registerRecipe(REDMUD,		1000,			Items.iron_ingot);
 		registerRecipe(SODIUM,		100,			ModItems.powder_sodium);
+		registerRecipe(SLOP,		250,			ModBlocks.ore_oil_sand);
 
 		registerRecipe(OIL,				SF_OIL,			DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRUDE));
 		registerRecipe(CRACKOIL,		SF_CRACK,		DictFrame.fromOne(ModItems.oil_tar, EnumTarType.CRACK));

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

@@ -116,6 +116,8 @@ public class ModItems {
 	public static Item coal_infernal;
 	public static Item cinnebar;
 	public static Item powder_ash;
+	public static Item powder_limestone;
+	public static Item powder_cement;
 
 	public static Item niter;
 	public static Item ingot_copper;
@@ -2757,6 +2759,8 @@ public class ModItems {
 		coal_infernal = new Item().setUnlocalizedName("coal_infernal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coal_infernal");
 		cinnebar = new Item().setUnlocalizedName("cinnebar").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":cinnebar");
 		powder_ash = new ItemEnumMulti(EnumAshType.class, true, true).setUnlocalizedName("powder_ash").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_ash");
+		powder_limestone = new Item().setUnlocalizedName("powder_limestone").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_limestone");
+		powder_cement = new Item().setUnlocalizedName("powder_cement").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_cement");
 		
 		ingot_gh336 = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("ingot_gh336").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_gh336");
 		nugget_gh336 = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("nugget_gh336").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_gh336");
@@ -5918,6 +5922,8 @@ public class ModItems {
 		GameRegistry.registerItem(dust_tiny, dust_tiny.getUnlocalizedName());
 		GameRegistry.registerItem(fallout, fallout.getUnlocalizedName());
 		GameRegistry.registerItem(powder_ash, powder_ash.getUnlocalizedName());
+		GameRegistry.registerItem(powder_limestone, powder_limestone.getUnlocalizedName());
+		GameRegistry.registerItem(powder_cement, powder_cement.getUnlocalizedName());
 		
 		//Powders
 		GameRegistry.registerItem(powder_fire, powder_fire.getUnlocalizedName());

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

@@ -152,20 +152,32 @@ public class HbmWorldGen implements IWorldGenerator {
 
 			DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.malachiteSpawn, 16, 6, 40, ModBlocks.stone_resource, EnumStoneType.MALACHITE.ordinal());
 			DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.limestoneSpawn, 12, 25, 30, ModBlocks.stone_resource, EnumStoneType.LIMESTONE.ordinal());
-			
-			if(rand.nextInt(3) == 0) {
-				@SuppressWarnings("unchecked")
-				WeightedRandomGeneric<BedrockOreDefinition> item = (WeightedRandomGeneric<BedrockOreDefinition>) WeightedRandom.getRandomItem(rand, BedrockOre.weightedOres);
-				BedrockOreDefinition def = item.get();
-				
-				if(GeneralConfig.enable528 && GeneralConfig.enable528BedrockReplacement) {
-					BedrockOreDefinition replacement = BedrockOre.replacements.get(def.id);
-					if(replacement != null) def = replacement;
+
+			if(WorldConfig.newBedrockOres) {
+
+				if(rand.nextInt(10) == 0) {
+					int randPosX = i + rand.nextInt(2) + 8;
+					int randPosZ = j + rand.nextInt(2) + 8;
+	
+					BedrockOre.generate(world, randPosX, randPosZ, new ItemStack(ModItems.bedrock_ore_base), null, 0xD78A16, 1);
+				}
+
+			} else {
+
+				if(rand.nextInt(3) == 0) {
+					@SuppressWarnings("unchecked")
+					WeightedRandomGeneric<BedrockOreDefinition> item = (WeightedRandomGeneric<BedrockOreDefinition>) WeightedRandom.getRandomItem(rand, BedrockOre.weightedOres);
+					BedrockOreDefinition def = item.get();
+
+					if(GeneralConfig.enable528 && GeneralConfig.enable528BedrockReplacement) {
+						BedrockOreDefinition replacement = BedrockOre.replacements.get(def.id);
+						if(replacement != null) def = replacement;
+					}
+
+					int randPosX = i + rand.nextInt(2) + 8;
+					int randPosZ = j + rand.nextInt(2) + 8;
+					BedrockOre.generate(world, randPosX, randPosZ, def.stack, def.acid, def.color, def.tier);
 				}
-				
-				int randPosX = i + rand.nextInt(2) + 8;
-				int randPosZ = j + rand.nextInt(2) + 8;
-				BedrockOre.generate(world, randPosX, randPosZ, def.stack, def.acid, def.color, def.tier);
 			}
 
 			for(int k = 0; k < WorldConfig.randomSpawn; k++) {

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

@@ -985,14 +985,14 @@ public class CraftingManager {
 		addRecipeAuto(new ItemStack(ModBlocks.radar_screen), new Object[] { "PCP", "SRS", "PCP", 'P', ANY_PLASTIC.ingot(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC), 'S', STEEL.plate(), 'R', ModItems.crt_display });
 		addRecipeAuto(new ItemStack(ModItems.radar_linker), new Object[] { "S", "C", "P", 'S', ModItems.crt_display, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC), 'P', STEEL.plate() });
 
-		addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL.ordinal()), new Object[] { "PPP", "HCH", " B ", 'P', ANY_PLASTIC.ingot(), 'H', STEEL.shell(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'B', ModBlocks.crate_steel });
+		addRecipeAuto(new ItemStack(ModItems.drone, 2, EnumDroneType.PATROL.ordinal()), new Object[] { " P ", "HCH", " B ", 'P', ANY_PLASTIC.ingot(), 'H', STEEL.pipe(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'B', STEEL.shell() });
 		addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_CHUNKLOADING.ordinal()), new Object[] { "E", "D", 'E', Items.ender_pearl, 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL.ordinal()) });
 		addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS.ordinal()), new Object[] { " P ", "KDK", " P ", 'P', TI.plateWelded(), 'K', Fluids.KEROSENE.getDict(1_000), 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL.ordinal()) });
 		addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS_CHUNKLOADING.ordinal()), new Object[] { "E", "D", 'E', Items.ender_pearl, 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS.ordinal()) });
 		addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS_CHUNKLOADING.ordinal()), new Object[] { " P ", "KDK", " P ", 'P', TI.plateWelded(), 'K', Fluids.KEROSENE.getDict(1_000), 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_CHUNKLOADING.ordinal()) });
 		addShapelessAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL.ordinal()), new Object[] { new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_CHUNKLOADING.ordinal()) });
 		addShapelessAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS.ordinal()), new Object[] { new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS_CHUNKLOADING.ordinal()) });
-		addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.REQUEST.ordinal()), new Object[] { "E", "D", 'E', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC), 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS.ordinal()) });
+		addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.REQUEST.ordinal()), new Object[] { "E", "D", 'E', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP), 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS.ordinal()) });
 
 		addRecipeAuto(new ItemStack(ModItems.drone_linker), new Object[] { "T", "C", 'T', ModBlocks.drone_waypoint, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC) });
 		addRecipeAuto(new ItemStack(ModBlocks.drone_waypoint, 4), new Object[] { "G", "T", "C", 'G', KEY_GREEN, 'T', Blocks.redstone_torch, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC) });

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

@@ -2717,6 +2717,7 @@ item.ore_byproduct.b_uranium.name=Kristallines Uranfragment
 item.ore_centrifuged.name=Zentrifugiertes %serz
 item.ore_cleaned.name=Gereinigtes %serz
 item.ore_deepcleaned.name=Tiefengereinigtes %serz
+item.ore_density_scanner.name=Bedrockerz-Analysegerät
 item.ore_enriched.name=Reiches %serz
 item.ore_nitrated.name=Nitriertes %serz
 item.ore_nitrocrystalline.name=Nitrokristallines %serz
@@ -2880,6 +2881,7 @@ item.powder_bromine.name=Bromstaub
 item.powder_cadmium.name=Cadmiumstaub
 item.powder_caesium.name=Caesiumstaub
 item.powder_calcium.name=Kalziumstaub
+item.powder_cement.name=Zement
 item.powder_cerium.name=Cerstaub
 item.powder_cerium_tiny.name=Kleiner Haufen Cerstaub
 item.powder_chlorocalcite.name=Chlorokalzit
@@ -2920,6 +2922,7 @@ item.powder_lanthanium_tiny.name=Kleiner Haufen Lanthanstaub
 item.powder_lapis.name=Lapis Lazuli-Staub
 item.powder_lead.name=Bleistaub
 item.powder_lignite.name=Braunkohlestaub
+item.powder_limestone.name=Kalksteinstaub
 item.powder_lithium.name=Lithiumstaub
 item.powder_lithium_tiny.name=Kleiner Haufen Lithiumstaub
 item.powder_magic.name=Pulverisierte Verzauberung

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

@@ -770,7 +770,7 @@ container.machineITER=Fusion Reactor
 container.machineLargeTurbine=Industrial Steam Turbine
 container.machineLiquefactor=Liquefactor
 container.machineMixer=Industrial Mixer
-container.machineOreSlopper=B.E.P.
+container.machineOreSlopper=B.O.P.
 container.machineRefinery=Oil Refinery
 container.machineSelenium=Radial Performance Engine
 container.machineShredder=Shredder
@@ -3548,6 +3548,7 @@ item.ore_byproduct.b_uranium.name=Crystalline Uranium Fragment
 item.ore_centrifuged.name=Centrifuged %s Ore
 item.ore_cleaned.name=Cleaned %s Ore
 item.ore_deepcleaned.name=Deep Cleaned %s Ore
+item.ore_density_scanner.name=Bedrock Ore Density Scanner
 item.ore_enriched.name=Enriched %s Ore
 item.ore_nitrated.name=Nitrated %s Ore
 item.ore_nitrocrystalline.name=Nitrocrystalline %s Ore
@@ -3758,6 +3759,7 @@ item.powder_bromine.name=Bromine Powder
 item.powder_cadmium.name=Cadmium Powder
 item.powder_caesium.name=Caesium Powder
 item.powder_calcium.name=Calcium Powder
+item.powder_cement.name=Cement
 item.powder_cerium.name=Cerium Powder
 item.powder_cerium_tiny.name=Tiny Pile of Cerium Powder
 item.powder_chlorocalcite.name=Chlorocalcite
@@ -3800,6 +3802,7 @@ item.powder_lanthanium_tiny.name=Tiny Pile of Lanthanium Powder
 item.powder_lapis.name=Lapis Lazuli Powder
 item.powder_lead.name=Lead Powder
 item.powder_lignite.name=Lignite Powder
+item.powder_limestone.name=Limestone Powder
 item.powder_lithium.name=Lithium Powder
 item.powder_lithium_tiny.name=Tiny Pile of Lithium Powder
 item.powder_magic.name=Pulverized Enchantment