Merge branch 'master' into electrolyzer-electric-boogaloo

changelog

@@ -1,37 +1,6 @@
-## Added
-* Acidizer Input Partitioner
-  * Buffers inputs for the ore acidizer and releases the exact amount needed to complete an operation
-  * This allows easy automation of acidizers accepting multiple types which have higher input requirements
-  * By simply shoving items into the acidizer all at once, there is a high likelihood of the acidizer to clog, as the remaining input is no longer sufficient
-  * The partitioner only has 9 slots for ingredients, for more types it's necessary to sort the items and use multiple partitioners
-  * The partitioner has 9 additional slots for invalid items that cannot be processed via acidizer, those can be ejected via hopper IO
-  * An inline conveyor machine similar to the splitter, receives items from conveyors (but not from ejectors directly) and outputs them on its built-in conveyor belt
-* New circuit items
-  * Quantum computer themed circuits for post fusion circuits
-  * The ICF core now needs 16 solid state quantum processors
-  * Quantum computers are post fusion tier control units
-  * Quantum circuits are made from a new alloy, BSCCO, which requires bismuth
-
 ## Changed
-* Updated russian localization
-* The mandatory washing step for bedrock ore byproducts now needs 4 items to complete (instead of just one)
-  * This should offset the exponentially increasing amount of byproduct created from processing bedrock ore which ends up being far greater than the primary product
-  * The step being mandatory means that byproducts cannot be centrifuged until they are washed
-  * To counteract the resulting sparsity of earlier byproducts due to the down-the-line duplication process, later acidizing steps now also yield byproducts of the previous steps
-* The sound extension is now configurable, and the amount of sound channels reserved is now 200 by default instead of 1000, this should fix an issue where OC's sound would not work
-* Logistics drones are now crafted with standard transport drones and not express ones, making them substantially cheaper
-* Added strontium to the rare earth bedrock ore chain
-* Electrolyzing primary bedrock ore fractions now yields more material, as well as crumbs
-* The Gerald recipe has been reworked
-  * Gerald no longer needs a ton of coins, instead it's just a single UFO coin (still requires the boss progression, may be changed in the future)
-  * Gerald now makes use of BSCCO wires
-  * A new microcrafting item has been added, heavy duty elements, these need to be mass-produced in the arc welder using cast bronze, welded CMB and fullerite, also using stellar flux for welding
-  * The recipe uses a stack of the brand new quantum computers
+* Changed bedrock ore processing time in the electrolyzer to 60 ticks
 
 ## Fixed
-* Added a write lock on cellular dungeons while generating, fixing a crash caused by dungeons that generate next to each other due to cascading worldgen
-* Added recipe caching to the arc furnace, fixing an issue where recipe detection and item IO are horribly inefficient
-* Fixed arc furnace state not properly saving after performing a recipe
-* Fixed crash regarding OC compat
-* Fixed a rare crash with the anvil GUI
-* Fixed potential world corruption caused by the RBMK console
+* Fixed issue where the NEI universal handler can not correctly display more than 4 outputs (now supports up to 8, which should cover all possible electrolyzer cases too)
+* Fixed the metal electrolysis duration variable not being part of the config

gradle.properties

@@ -1,6 +1,6 @@
 mod_version=1.0.27
 # Empty build number makes a release type
-mod_build_number=5012
+mod_build_number=5020
 
 credits=HbMinecraft,\
   \ rodolphito (explosion algorithms),\

src/main/java/com/hbm/handler/nei/NEIUniversalHandler.java

@@ -234,6 +234,28 @@ public abstract class NEIUniversalHandler extends TemplateRecipeHandler implemen
 			{102, 24 + 9},
 			{120, 24 + 9}
 		};
+		case 5: return new int[][] {
+			{102, 24 - 9}, {120, 24 - 9},
+			{102, 24 + 9}, {120, 24 + 9},
+			{138, 24},
+		};
+		case 6: return new int[][] {
+			{102, 6}, {120, 6},
+			{102, 24}, {120, 24},
+			{102, 32}, {120, 32},
+		};
+		case 7: return new int[][] {
+			{102, 6}, {120, 6},
+			{102, 24}, {120, 24},
+			{102, 32}, {120, 32},
+			{138, 24},
+		};
+		case 8: return new int[][] {
+			{102, 6}, {120, 6},
+			{102, 24}, {120, 24},
+			{102, 32}, {120, 32},
+			{138, 24}, {138, 32},
+		};
 		}
 		
 		return new int[count][2];

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

@@ -10,10 +10,8 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonWriter;
 import com.hbm.inventory.FluidStack;
-import com.hbm.inventory.RecipesCommon;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
-import com.hbm.inventory.material.Mats;
 import com.hbm.inventory.recipes.loader.SerializableRecipe;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemFluidIcon;
@@ -26,7 +24,7 @@ public class ElectrolyserFluidRecipes extends SerializableRecipe {
 
 	@Override
 	public void registerDefaults() {
-		recipes.put(Fluids.WATER, new ElectrolysisRecipe(2_000, new FluidStack(Fluids.HYDROGEN, 200), new FluidStack(Fluids.OXYGEN, 200),10));
+		recipes.put(Fluids.WATER, new ElectrolysisRecipe(2_000, new FluidStack(Fluids.HYDROGEN, 200), new FluidStack(Fluids.OXYGEN, 200), 10));
 		recipes.put(Fluids.HEAVYWATER, new ElectrolysisRecipe(2_000, new FluidStack(Fluids.DEUTERIUM, 200), new FluidStack(Fluids.OXYGEN, 200), 10));
 		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.SLOP, new ElectrolysisRecipe(1_000, new FluidStack(Fluids.MERCURY, 250), new FluidStack(Fluids.NONE, 0), new ItemStack(ModItems.niter, 2), new ItemStack(ModItems.powder_limestone, 2), new ItemStack(ModItems.sulfur)));
@@ -82,10 +80,13 @@ public class ElectrolyserFluidRecipes extends SerializableRecipe {
 		FluidStack output1 = this.readFluidStack(obj.get("output1").getAsJsonArray());
 		FluidStack output2 = this.readFluidStack(obj.get("output2").getAsJsonArray());
 		
+		int duration = 20;
+		if(obj.has("duraion")) duration = obj.get("duration").getAsInt();
+		
 		ItemStack[] byproducts = new ItemStack[0];
 		if(obj.has("byproducts")) byproducts = this.readItemStackArray(obj.get("byproducts").getAsJsonArray());
 		
-		recipes.put(input.type, new ElectrolysisRecipe(input.fill, output1, output2, byproducts));
+		recipes.put(input.type, new ElectrolysisRecipe(input.fill, output1, output2, duration, byproducts));
 	}
 
 	@Override
@@ -101,6 +102,8 @@ public class ElectrolyserFluidRecipes extends SerializableRecipe {
 			for(ItemStack stack : rec.getValue().byproduct) this.writeItemStack(stack, writer);
 			writer.endArray();
 		}
+		
+		writer.name("duration").value(rec.getValue().duration);
 	}
 
 	public static class ElectrolysisRecipe {
@@ -115,7 +118,7 @@ public class ElectrolyserFluidRecipes extends SerializableRecipe {
 			this.output2 = output2;
 			this.amount = amount;
 			this.byproduct = byproduct;
-			duration = 20;
+			this.duration = 20;
 		}
 		public ElectrolysisRecipe(int amount, FluidStack output1, FluidStack output2, int duration, ItemStack... byproduct) {
 			this.output1 = output1;

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

@@ -24,7 +24,6 @@ import com.hbm.items.machine.ItemScraps;
 import com.hbm.items.special.ItemBedrockOreNew;
 import com.hbm.items.special.ItemBedrockOreNew.BedrockOreGrade;
 import com.hbm.items.special.ItemBedrockOreNew.BedrockOreType;
-import com.hbm.util.BobMathUtil;
 import com.hbm.util.ItemStackUtil;
 
 import net.minecraft.item.ItemStack;
@@ -135,23 +134,23 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe {
 		
 		for(BedrockOreType type : BedrockOreType.values()) {
 
-			MaterialStack f0 = ItemBedrockOreNew.toFluid(type.primary1, MaterialShapes.INGOT.q(7));
-			MaterialStack f1 = ItemBedrockOreNew.toFluid(type.primary2, MaterialShapes.INGOT.q(4));
+			MaterialStack f0 = ItemBedrockOreNew.toFluid(type.primary1, MaterialShapes.INGOT.q(12));
+			MaterialStack f1 = ItemBedrockOreNew.toFluid(type.primary2, MaterialShapes.INGOT.q(6));
 			recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_FIRST, type)), new ElectrolysisMetalRecipe(
 					f0 != null ? f0 : new MaterialStack(Mats.MAT_SLAG, MaterialShapes.INGOT.q(1)),
 					f1 != null ? f1 : new MaterialStack(Mats.MAT_SLAG, MaterialShapes.INGOT.q(1)),
-					20,
-					f0 == null ? ItemBedrockOreNew.extract(type.primary1, 7) : new ItemStack(ModItems.dust),
-					f1 == null ? ItemBedrockOreNew.extract(type.primary2, 4) : new ItemStack(ModItems.dust),
+					60,
+					f0 == null ? ItemBedrockOreNew.extract(type.primary1, 12) : new ItemStack(ModItems.dust),
+					f1 == null ? ItemBedrockOreNew.extract(type.primary2, 6) : new ItemStack(ModItems.dust),
 					ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type)));
-			MaterialStack s0 = ItemBedrockOreNew.toFluid(type.primary1, MaterialShapes.INGOT.q(4));
-			MaterialStack s1 = ItemBedrockOreNew.toFluid(type.primary2, MaterialShapes.INGOT.q(7));
+			MaterialStack s0 = ItemBedrockOreNew.toFluid(type.primary1, MaterialShapes.INGOT.q(6));
+			MaterialStack s1 = ItemBedrockOreNew.toFluid(type.primary2, MaterialShapes.INGOT.q(12));
 			recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_SECOND, type)), new ElectrolysisMetalRecipe(
 					s0 != null ? s0 : new MaterialStack(Mats.MAT_SLAG, MaterialShapes.INGOT.q(1)),
 					s1 != null ? s1 : new MaterialStack(Mats.MAT_SLAG, MaterialShapes.INGOT.q(1)),
-					20,
-					s0 == null ? ItemBedrockOreNew.extract(type.primary1, 4) : new ItemStack(ModItems.dust),
-					s1 == null ? ItemBedrockOreNew.extract(type.primary2, 7) : new ItemStack(ModItems.dust),
+					60,
+					s0 == null ? ItemBedrockOreNew.extract(type.primary1, 6) : new ItemStack(ModItems.dust),
+					s1 == null ? ItemBedrockOreNew.extract(type.primary2, 12) : new ItemStack(ModItems.dust),
 					ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type)));
 
 			MaterialStack c0 = ItemBedrockOreNew.toFluid(type.primary1, MaterialShapes.INGOT.q(2));
@@ -159,7 +158,7 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe {
 			recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type)), new ElectrolysisMetalRecipe(
 					c0 != null ? c0 : new MaterialStack(Mats.MAT_SLAG, MaterialShapes.INGOT.q(1, 2)),
 					c1 != null ? c1 : new MaterialStack(Mats.MAT_SLAG, MaterialShapes.INGOT.q(1, 2)),
-					20,
+					60,
 					c0 == null ? ItemBedrockOreNew.extract(type.primary1, 2) : new ItemStack(ModItems.dust),
 					c1 == null ? ItemBedrockOreNew.extract(type.primary2, 2) : new ItemStack(ModItems.dust)));
 		}
@@ -185,7 +184,7 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe {
 
 	public static HashMap getRecipes() {
 		
-		HashMap<Object[], Object[]> recipes = new HashMap<>();
+		HashMap<Object[], Object[]> recipes = new HashMap<Object[], Object[]>();
 		
 		for(Entry<AStack, ElectrolysisMetalRecipe> entry : ElectrolyserMetalRecipes.recipes.entrySet()) {
 			
@@ -236,7 +235,10 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe {
 		ItemStack[] byproducts = new ItemStack[0];
 		if(obj.has("byproducts")) byproducts = this.readItemStackArray(obj.get("byproducts").getAsJsonArray());
 		
-		recipes.put(input, new ElectrolysisMetalRecipe(output1, output2, byproducts));
+		int duration = 600;
+		if(obj.has("duration")) duration = obj.get("duration").getAsInt();
+		
+		recipes.put(input, new ElectrolysisMetalRecipe(output1, output2, duration, byproducts));
 	}
 
 	@Override
@@ -264,6 +266,8 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe {
 			for(ItemStack stack : rec.getValue().byproduct) this.writeItemStack(stack, writer);
 			writer.endArray();
 		}
+		
+		writer.name("duration").value(rec.getValue().duration);
 	}
 	
 	public static class ElectrolysisMetalRecipe {
@@ -277,7 +281,7 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe {
 			this.output1 = output1;
 			this.output2 = output2;
 			this.byproduct = byproduct;
-			duration = 600;
+			this.duration = 600;
 		}
 		public ElectrolysisMetalRecipe(MaterialStack output1, MaterialStack output2, int duration, ItemStack... byproduct) {
 			this.output1 = output1;

src/main/java/com/hbm/items/special/ItemBedrockOreNew.java

@@ -120,10 +120,10 @@ public class ItemBedrockOreNew extends Item {
 		//												primary						sulfuric						solvent							radsolvent
 		LIGHT_METAL(	0xFFFFFF, 0x353535, "light",	IRON, CU,					TI, AL, AL,						CHLOROCALCITE, LI, NA,			CHLOROCALCITE, LI, NA),
 		HEAVY_METAL(	0x868686, 0x000000, "heavy",	W, PB,						GOLD, GOLD, BE,					W, PB, GOLD,					BI, BI, GOLD),
-		RARE_EARTH(		0xE6E6B6, 0x1C1C00, "rare",		CO, EnumChunkType.RARE,		B, LA, NB,						ND, SR, ZR,						CO, ND, SR),
+		RARE_EARTH(		0xE6E6B6, 0x1C1C00, "rare",		CO, EnumChunkType.RARE,		B, LA, NB,						ND, SR, ZR,						NB, ND, SR),
 		ACTINIDE(		0xC1C7BD, 0x2B3227, "actinide",	U, TH232,					RA226, RA226, PO210,			RA226, RA226, PO210,			TC99, TC99, U238),
 		NON_METAL(		0xAFAFAF, 0x0F0F0F, "nonmetal",	COAL, S,					LIGNITE, KNO, F,				P_RED, F, S,					CHLOROCALCITE, SI, SI),
-		CRYSTALLINE(	0xE2FFFA, 0x1E8A77, "crystal",	DIAMOND, SODALITE,			CINNABAR, ASBESTOS, REDSTONE,	CINNABAR, ASBESTOS, EMERALD,	BORAX, MOLYSITE, SODALITE);
+		CRYSTALLINE(	0xE2FFFA, 0x1E8A77, "crystal",	REDSTONE, CINNABAR,			SODALITE, ASBESTOS, DIAMOND,	CINNABAR, ASBESTOS, EMERALD,	BORAX, MOLYSITE, SODALITE);
 		//sediment
 		
 		public int light;

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 (5012)";
+	public static final String VERSION = "1.0.27 BETA (5020)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version