diff --git a/src/main/java/techreborn/init/ModFluids.java b/src/main/java/techreborn/init/ModFluids.java index 142a96c53..edd701743 100644 --- a/src/main/java/techreborn/init/ModFluids.java +++ b/src/main/java/techreborn/init/ModFluids.java @@ -97,7 +97,6 @@ public enum ModFluids { RebornFluidManager.register(flowingFluid, new Identifier("techreborn", identifier.getPath() + "_flowing")); Registry.register(Registry.BLOCK, identifier, block); - Registry.register(Registry.ITEM, identifier, bucket); } public RebornFluid getFluid() { diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 5057ddca3..eab955fa8 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -79,7 +79,7 @@ public class ModRecipes { ChemicalReactorRecipes.init(); FusionReactorRecipes.init(); DistillationTowerRecipes.init(); - AlloySmelterRecipes.init(); + FluidReplicatorRecipes.init(); addBlastFurnaceRecipes(); diff --git a/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java b/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java index e5b3cc2e8..6a0879388 100644 --- a/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java +++ b/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java @@ -34,25 +34,6 @@ public class AlloySmelterRecipes extends RecipeMethods { /* -// -// // Brass -// if (OreUtil.doesOreExistAndValid("ingotBrass")) { -// ItemStack brassStack = getOre("ingotBrass"); -// brassStack.setCount(4); -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe(ingotCopper3, "ingotZinc", -// brassStack, 200, 16)); -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe(ingotCopper3, "dustZinc", -// brassStack, 200, 16)); -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe(dustCopper3, "ingotZinc", -// brassStack, 200, 16)); -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe(dustCopper3, "dustZinc", -// brassStack, 200, 16)); -// } - // Red Alloy // if (OreUtil.doesOreExistAndValid("ingotRedAlloy")) { ItemStack redAlloyStack = getOre("ingotRedAlloy"); diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot.json new file mode 100644 index 000000000..1409639a7 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "techreborn:copper_ingot", + "count": 3 + }, + { + "item": "techreborn:zinc_ingot" + } + ], + "results" : [ + { + "item": "techreborn:brass_ingot", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust.json new file mode 100644 index 000000000..b8587aee0 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "techreborn:copper_dust", + "count": 3 + }, + { + "item": "techreborn:zinc_dust" + } + ], + "results" : [ + { + "item": "techreborn:brass_ingot", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust_alt.json new file mode 100644 index 000000000..24a51e499 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust_alt.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "techreborn:copper_ingot", + "count": 3 + }, + { + "item": "techreborn:zinc_dust" + } + ], + "results" : [ + { + "item": "techreborn:brass_ingot", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust_alt_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust_alt_alt.json new file mode 100644 index 000000000..fa8d0e7e2 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/brass_ingot_from_dust_alt_alt.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "techreborn:copper_dust", + "count": 3 + }, + { + "item": "techreborn:zinc_ingot" + } + ], + "results" : [ + { + "item": "techreborn:brass_ingot", + "count": 4 + } + ] +} \ No newline at end of file