xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-02-22 22:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes, recipe changes

Browse Source
This commit is contained in:
Bob 2024-08-03 13:11:14 +02:00
parent f97076bb94
commit aaaaac92eb
3 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changelog
View File

@ -1,3 +1,8 @@
## Changed
* The fluid burner, heat exchanging heater and cooling tower now use the single steel pipe items instead of the larger steel pipes
* Reduced the amount of condensers needed for crafting the cooling towers
## Fixed ## Fixed
* Fixed crash caused by decontaminating items with the radiolysis machine * Fixed crash caused by decontaminating items with the radiolysis machine
* Fixed ICFs not forming correctly depending on the orientation * Fixed ICFs not forming correctly depending on the orientation
* Fixed electrolyzer metal recipe config not working

53
src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java
View File

@ -235,15 +235,22 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe {
AStack input = this.readAStack(obj.get("input").getAsJsonArray()); AStack input = this.readAStack(obj.get("input").getAsJsonArray());
JsonArray out1 = obj.get("output1").getAsJsonArray(); MaterialStack output1 = null;
String name1 = out1.get(0).getAsString(); MaterialStack output2 = null;
int amount1 = out1.get(1).getAsInt();
MaterialStack output1 = new MaterialStack(Mats.matByName.get(name1), amount1);
JsonArray out2 = obj.get("output2").getAsJsonArray(); if(obj.has("output1")) {
String name2 = out2.get(0).getAsString(); JsonArray out1 = obj.get("output1").getAsJsonArray();
int amount2 = out2.get(1).getAsInt(); String name1 = out1.get(0).getAsString();
MaterialStack output2 = new MaterialStack(Mats.matByName.get(name2), amount2); int amount1 = out1.get(1).getAsInt();
output1 = new MaterialStack(Mats.matByName.get(name1), amount1);
}
if(obj.has("output2")) {
JsonArray out2 = obj.get("output2").getAsJsonArray();
String name2 = out2.get(0).getAsString();
int amount2 = out2.get(1).getAsInt();
output2 = new MaterialStack(Mats.matByName.get(name2), amount2);
}
ItemStack[] byproducts = new ItemStack[0]; ItemStack[] byproducts = new ItemStack[0];
if(obj.has("byproducts")) byproducts = this.readItemStackArray(obj.get("byproducts").getAsJsonArray()); if(obj.has("byproducts")) byproducts = this.readItemStackArray(obj.get("byproducts").getAsJsonArray());
@ -260,19 +267,23 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe {
writer.name("input"); this.writeAStack(rec.getKey(), writer); writer.name("input"); this.writeAStack(rec.getKey(), writer);
writer.name("output1"); if(rec.getValue().output1 != null) {
writer.beginArray(); writer.name("output1");
writer.setIndent(""); writer.beginArray();
writer.value(rec.getValue().output1.material.names[0]).value(rec.getValue().output1.amount); writer.setIndent("");
writer.endArray(); writer.value(rec.getValue().output1.material.names[0]).value(rec.getValue().output1.amount);
writer.setIndent(" "); writer.endArray();
writer.setIndent(" ");
writer.name("output2"); }
writer.beginArray();
writer.setIndent(""); if(rec.getValue().output2 != null) {
writer.value(rec.getValue().output2.material.names[0]).value(rec.getValue().output2.amount); writer.name("output2");
writer.endArray(); writer.beginArray();
writer.setIndent(" "); writer.setIndent("");
writer.value(rec.getValue().output2.material.names[0]).value(rec.getValue().output2.amount);
writer.endArray();
writer.setIndent(" ");
}
if(rec.getValue().byproduct != null && rec.getValue().byproduct.length > 0) { if(rec.getValue().byproduct != null && rec.getValue().byproduct.length > 0) {
writer.name("byproducts").beginArray(); writer.name("byproducts").beginArray();

10
src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java
View File

@ -268,7 +268,7 @@ public class AnvilRecipes {
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(
new AStack[] { new AStack[] {
new ComparableStack(ModItems.tank_steel, 4), new ComparableStack(ModItems.tank_steel, 4),
new ComparableStack(ModItems.pipes_steel, 1), new OreDictStack(STEEL.pipe(), 3),
new OreDictStack(TI.ingot(), 12), new OreDictStack(TI.ingot(), 12),
new OreDictStack(CU.ingot(), 8) new OreDictStack(CU.ingot(), 8)
}, new AnvilOutput(new ItemStack(ModBlocks.heater_oilburner))).setTier(2)); }, new AnvilOutput(new ItemStack(ModBlocks.heater_oilburner))).setTier(2));
@ -287,7 +287,7 @@ public class AnvilRecipes {
new OreDictStack(RUBBER.ingot(), 4), new OreDictStack(RUBBER.ingot(), 4),
new OreDictStack(CU.ingot(), 16), new OreDictStack(CU.ingot(), 16),
new OreDictStack(STEEL.plate528(), 16), new OreDictStack(STEEL.plate528(), 16),
new ComparableStack(ModItems.pipes_steel, 1), new OreDictStack(STEEL.pipe(), 3),
}, new AnvilOutput(new ItemStack(ModBlocks.heater_heatex))).setTier(3)); }, new AnvilOutput(new ItemStack(ModBlocks.heater_heatex))).setTier(3));
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(
@ -406,14 +406,14 @@ public class AnvilRecipes {
new AStack[] { new AStack[] {
new ComparableStack(ModBlocks.brick_concrete, 64), new ComparableStack(ModBlocks.brick_concrete, 64),
new ComparableStack(Blocks.iron_bars, 128), new ComparableStack(Blocks.iron_bars, 128),
new ComparableStack(ModBlocks.machine_condenser, 5), new ComparableStack(ModBlocks.machine_condenser, 4),
}, new AnvilOutput(new ItemStack(ModBlocks.machine_tower_small))).setTier(3)); }, new AnvilOutput(new ItemStack(ModBlocks.machine_tower_small))).setTier(3));
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(
new AStack[] { new AStack[] {
new ComparableStack(ModBlocks.concrete_smooth, 128), new ComparableStack(ModBlocks.concrete_smooth, 128),
new ComparableStack(ModBlocks.steel_scaffold, 32), new ComparableStack(ModBlocks.steel_scaffold, 32),
new ComparableStack(ModBlocks.machine_condenser, 25), new ComparableStack(ModBlocks.machine_condenser, 16),
new ComparableStack(ModItems.pipes_steel, 2) new OreDictStack(STEEL.pipe(), 8),
}, new AnvilOutput(new ItemStack(ModBlocks.machine_tower_large))).setTier(4)); }, new AnvilOutput(new ItemStack(ModBlocks.machine_tower_large))).setTier(4));
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(