diff --git a/src/main/java/techreborn/init/ModFluids.java b/src/main/java/techreborn/init/ModFluids.java index 153e5d79e..142a96c53 100644 --- a/src/main/java/techreborn/init/ModFluids.java +++ b/src/main/java/techreborn/init/ModFluids.java @@ -26,7 +26,6 @@ package techreborn.init; import net.fabricmc.fabric.api.block.FabricBlockSettings; import net.minecraft.block.Material; -import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index a2aa1b144..5057ddca3 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -68,7 +68,6 @@ public class ModRecipes { /* - SmeltingRecipes.init(); ExtractorRecipes.init(); RollingMachineRecipes.init(); FluidGeneratorRecipes.init(); diff --git a/src/main/java/techreborn/init/recipes/SmeltingRecipes.java b/src/main/java/techreborn/init/recipes/SmeltingRecipes.java deleted file mode 100644 index 9cfcb5642..000000000 --- a/src/main/java/techreborn/init/recipes/SmeltingRecipes.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.init.recipes; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import techreborn.init.TRContent; - -/** - * Created by Prospector - */ -public class SmeltingRecipes extends RecipeMethods { - public static void init() { - - - register(TRContent.Ingots.MIXED_METAL.getStack(), TRContent.Ingots.ADVANCED_ALLOY.getStack()); -// register(BlockOre.getOreByName("silver"), TRIngredients.Ingots.SILVER.getStack()); -// register(BlockOre2.getOreByName("tin"), TRIngredients.Ingots.TIN.getStack()); - -// TODO: Fix recipe -// register(BlockOre2.getOreByName("copper"), getMaterial("copper", Type.INGOT)); -// register(BlockOre.getOreByName("lead"), getMaterial("lead", Type.INGOT)); -// register(BlockOre.getOreByName("sheldonite"), getMaterial("platinum", Type.INGOT)); - - // Dust smelting -// register(getMaterial("iron", Type.DUST), getStack(Items.IRON_INGOT)); -// register(getMaterial("gold", Type.DUST), getStack(Items.GOLD_INGOT)); -// register(getMaterial("copper", Type.DUST), getMaterial("copper", Type.INGOT)); -// register(getMaterial("tin", Type.DUST), getMaterial("tin", Type.INGOT)); -// register(getMaterial("bronze", Type.DUST), getMaterial("bronze", Type.INGOT)); -// register(getMaterial("lead", Type.DUST), getMaterial("lead", Type.INGOT)); -// register(getMaterial("silver", Type.DUST), getMaterial("silver", Type.INGOT)); -// register(getMaterial("nickel", Type.DUST), getMaterial("nickel", Type.INGOT)); -// register(getMaterial("platinum", Type.DUST), getMaterial("platinum", Type.INGOT)); -// register(getMaterial("zinc", Type.DUST), getMaterial("zinc", Type.INGOT)); -// register(getMaterial("brass", Type.DUST), getMaterial("brass", Type.INGOT)); -// register(getMaterial("electrum", Type.DUST), getMaterial("electrum", Type.INGOT)); -// register(getMaterial("invar", Type.DUST), getMaterial("invar", Type.INGOT)); - - - - } - - static void register(ItemStack input, ItemStack output) { - //RebornCraftingHelper.addSmelting(input, output); - } -} diff --git a/src/main/resources/data/techreborn/recipes/smelting/advanced_alloy_ingot.json b/src/main/resources/data/techreborn/recipes/smelting/advanced_alloy_ingot.json new file mode 100644 index 000000000..79a91a342 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/advanced_alloy_ingot.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:mixed_metal_ingot" + }, + "result": "techreborn:advanced_alloy_ingot", + "experience": 0.5, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/smelting/brass_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/brass_ingot_from_dust.json new file mode 100644 index 000000000..e86345c12 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/brass_ingot_from_dust.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:brass_dust" + }, + "result": "techreborn:brass_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/bronze_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/bronze_ingot_from_dust.json new file mode 100644 index 000000000..7b60aac8d --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/bronze_ingot_from_dust.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:bronze_dust" + }, + "result": "techreborn:bronze_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/copper_ingot.json b/src/main/resources/data/techreborn/recipes/smelting/copper_ingot.json new file mode 100644 index 000000000..668a2ed0f --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/copper_ingot.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:copper_ore" + }, + "result": "techreborn:copper_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/copper_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/copper_ingot_from_dust.json new file mode 100644 index 000000000..cf80797e8 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/copper_ingot_from_dust.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:copper_dust" + }, + "result": "techreborn:copper_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/electrum_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/electrum_ingot_from_dust.json new file mode 100644 index 000000000..ef0507f6e --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/electrum_ingot_from_dust.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:electrum_dust" + }, + "result": "techreborn:electrum_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/gold_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/gold_ingot_from_dust.json new file mode 100644 index 000000000..30a077ad2 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/gold_ingot_from_dust.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:gold_dust" + }, + "result": "minecraft:gold_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/invar_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/invar_ingot_from_dust.json new file mode 100644 index 000000000..eff3fa963 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/invar_ingot_from_dust.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:invar_dust" + }, + "result": "techreborn:invar_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/iron_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/iron_ingot_from_dust.json new file mode 100644 index 000000000..d4b24a4b3 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/iron_ingot_from_dust.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:iron_dust" + }, + "result": "minecraft:iron_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/lead_ingot.json b/src/main/resources/data/techreborn/recipes/smelting/lead_ingot.json new file mode 100644 index 000000000..0732b5ee5 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/lead_ingot.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:lead_ore" + }, + "result": "techreborn:lead_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/lead_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/lead_ingot_from_dust.json new file mode 100644 index 000000000..548f2a63e --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/lead_ingot_from_dust.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:lead_dust" + }, + "result": "techreborn:lead_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/nickel_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/nickel_ingot_from_dust.json new file mode 100644 index 000000000..694d33cb6 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/nickel_ingot_from_dust.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:nickel_dust" + }, + "result": "techreborn:nickel_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/platinum_ingot.json b/src/main/resources/data/techreborn/recipes/smelting/platinum_ingot.json new file mode 100644 index 000000000..e185bbabd --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/platinum_ingot.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:sheldonite_ore" + }, + "result": "techreborn:platinum_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/platinum_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/platinum_ingot_from_dust.json new file mode 100644 index 000000000..b4ea74763 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/platinum_ingot_from_dust.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:platinum_dust" + }, + "result": "techreborn:platinum_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/silver_ingot.json b/src/main/resources/data/techreborn/recipes/smelting/silver_ingot.json new file mode 100644 index 000000000..1c5272c05 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/silver_ingot.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:silver_ore" + }, + "result": "techreborn:silver_ingot", + "experience": 0.5, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/smelting/silver_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/silver_ingot_from_dust.json new file mode 100644 index 000000000..5c99243f5 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/silver_ingot_from_dust.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:silver_dust" + }, + "result": "techreborn:silver_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/tin_ingot.json b/src/main/resources/data/techreborn/recipes/smelting/tin_ingot.json new file mode 100644 index 000000000..208d2d63a --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/tin_ingot.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:tin_ore" + }, + "result": "techreborn:tin_ingot", + "experience": 0.5, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/smelting/tin_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/tin_ingot_from_dust.json new file mode 100644 index 000000000..1fc7a68dd --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/tin_ingot_from_dust.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:tin_dust" + }, + "result": "techreborn:tin_ingot", + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/techreborn/recipes/smelting/zinc_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/smelting/zinc_ingot_from_dust.json new file mode 100644 index 000000000..a21aa67ce --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/smelting/zinc_ingot_from_dust.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "techreborn:zinc_dust" + }, + "result": "techreborn:zinc_ingot", + "experience": 0.5, + "cookingtime": 200 +}