diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index 5a3aef236..e3ea74894 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -40,7 +40,7 @@ public class CraftingTableRecipes extends RecipeMethods { // registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "ingotTungstensteel"); registerShapeless(getStack(TRContent.RUBBER_PLANKS, 4), getStack(TRContent.RUBBER_LOG)); registerShaped(DynamicCell.getEmptyCell(16), " T ", "T T", " T ", 'T', "ingotTin"); - registerShaped(getStack(TRContent.REFINED_IRON_FENCE), "RRR", "RRR", 'R', "ingotRefinedIron"); + registerShaped(getStack(TRContent.REINFORCED_GLASS, 7), "GAG", "GGG", "GAG", 'A', "plateAdvancedAlloy", 'G', "blockGlass"); registerShaped(getStack(TRContent.REINFORCED_GLASS, 7), "GGG", "AGA", "GGG", 'A', "plateAdvancedAlloy", 'G', "blockGlass"); // registerShaped(getMaterial("iridium_alloy", Type.INGOT), "IAI", "ADA", "IAI", 'I', "ingotIridium", 'D', "dustDiamond", 'A', "plateAdvancedAlloy"); @@ -203,26 +203,12 @@ public class CraftingTableRecipes extends RecipeMethods { // registerShaped(getMaterial("advanced_circuit", Type.PART), "RGR", "LCL", "RGR", 'R', "dustRedstone", 'G', "dustGlowstone", 'L', "gemLapis", 'C', "circuitBasic"); // Cables - registerShaped(getMaterial("copper", 6, Type.CABLE), "CCC", 'C', "ingotCopper"); - registerShaped(getMaterial("tin", 9, Type.CABLE), "TTT", 'T', "ingotTin"); - registerShaped(getMaterial("gold", 12, Type.CABLE), "GGG", 'G', "ingotGold"); - registerShaped(getMaterial("hv", 12, Type.CABLE), "RRR", 'R', "ingotRefinedIron"); - registerShaped(getMaterial("insulatedcopper", 6, Type.CABLE), "RRR", "CCC", "RRR", 'R', "itemRubber", 'C', "ingotCopper"); - registerShaped(getMaterial("insulatedcopper", 6, Type.CABLE), "RCR", "RCR", "RCR", 'R', "itemRubber", 'C', "ingotCopper"); - registerShapeless(getMaterial("insulatedcopper", Type.CABLE), "itemRubber", getMaterial("copper", Type.CABLE)); - registerShaped(getMaterial("insulatedgold", 4, Type.CABLE), "RRR", "RGR", "RRR", 'R', "itemRubber", 'G', "ingotGold"); - registerShapeless(getMaterial("insulatedgold", Type.CABLE), "itemRubber", "itemRubber", getMaterial("gold", Type.CABLE)); - registerShaped(getMaterial("insulatedhv", 4, Type.CABLE), "RRR", "RIR", "RRR", 'R', "itemRubber", 'I', "ingotRefinedIron"); - registerShapeless(getMaterial("insulatedhv", Type.CABLE), "itemRubber", "itemRubber", getMaterial("hv", Type.CABLE)); - registerShaped(getMaterial("glassfiber", 4, Type.CABLE), "GGG", "RDR", "GGG", 'R', "dustRedstone", 'D', "gemDiamond", 'G', "blockGlass"); - registerShaped(getMaterial("glassfiber", 4, Type.CABLE), "GGG", "RDR", "GGG", 'R', "dustRedstone", 'D', "dustDiamond", 'G', "blockGlass"); - registerShaped(getMaterial("glassfiber", 3, Type.CABLE), "GGG", "RDR", "GGG", 'R', "dustRedstone", 'D', "gemRuby", 'G', "blockGlass"); - registerShaped(getMaterial("glassfiber", 3, Type.CABLE), "GGG", "RDR", "GGG", 'R', "dustRedstone", 'D', "dustRuby", 'G', "blockGlass"); - registerShaped(getMaterial("glassfiber", 6, Type.CABLE), "GGG", "RDR", "GGG", 'R', "ingotSilver", 'D', "gemDiamond", 'G', "blockGlass"); - registerShaped(getMaterial("glassfiber", 6, Type.CABLE), "GGG", "RDR", "GGG", 'R', "ingotSilver", 'D', "dustDiamond", 'G', "blockGlass"); - registerShaped(getMaterial("glassfiber", 8, Type.CABLE), "GGG", "RDR", "GGG", 'R', "ingotElectrum", 'D', "gemDiamond", 'G', "blockGlass"); - registerShaped(getMaterial("glassfiber", 8, Type.CABLE), "GGG", "RDR", "GGG", 'R', "ingotElectrum", 'D', "dustDiamond", 'G', "blockGlass"); + registerShapeless(getMaterial("insulatedcopper", Type.CABLE), "itemRubber", getMaterial("copper", Type.CABLE)); + + registerShapeless(getMaterial("insulatedgold", Type.CABLE), "itemRubber", "itemRubber", getMaterial("gold", Type.CABLE)); + + registerShapeless(getMaterial("insulatedhv", Type.CABLE), "itemRubber", "itemRubber", getMaterial("hv", Type.CABLE)); //UU-Matter diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/copper_cable.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/copper_cable.json new file mode 100644 index 000000000..2fd666468 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/copper_cable.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "III" + ], + "key": { + "I": { + "item": "techreborn:copper_ingot" + } + }, + "result": { + "item": "techreborn:copper_cable", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/electric_treetap.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/electric_treetap.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/electric_treetap.json rename to src/main/resources/data/techreborn/recipes/crafting_shaped/electric_treetap.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/glassfiber_cable_3.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/glassfiber_cable_3.json new file mode 100644 index 000000000..8dd0778be --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/glassfiber_cable_3.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "RUR", + "GGG" + ], + "key": { + "G": { + "item": "minecraft:glass" + }, + "R": { + "item": "minecraft:redstone" + }, + "U": { + "item": "techreborn:ruby_dust" + } + }, + "result": { + "item": "techreborn:glassfiber_cable", + "count": 3 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/glassfiber_cable_4.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/glassfiber_cable_4.json new file mode 100644 index 000000000..85a418c05 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/glassfiber_cable_4.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "RDR", + "GGG" + ], + "key": { + "G": { + "item": "minecraft:glass" + }, + "R": { + "item": "minecraft:redstone" + }, + "D": { + "item": "techreborn:diamond_dust" + } + }, + "result": { + "item": "techreborn:glassfiber_cable", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/glassfiber_cable_6.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/glassfiber_cable_6.json new file mode 100644 index 000000000..e31ac27aa --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/glassfiber_cable_6.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "SDS", + "GGG" + ], + "key": { + "G": { + "item": "minecraft:glass" + }, + "S": { + "item": "techreborn:silver_dust" + }, + "D": { + "item": "techreborn:diamond_dust" + } + }, + "result": { + "item": "techreborn:glassfiber_cable", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/glassfiber_cable_8.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/glassfiber_cable_8.json new file mode 100644 index 000000000..ce03b4b97 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/glassfiber_cable_8.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "EDE", + "GGG" + ], + "key": { + "G": { + "item": "minecraft:glass" + }, + "E": { + "item": "techreborn:electrum_dust" + }, + "D": { + "item": "techreborn:diamond_dust" + } + }, + "result": { + "item": "techreborn:glassfiber_cable", + "count": 8 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/gold_cable.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/gold_cable.json new file mode 100644 index 000000000..db191822b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/gold_cable.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "III" + ], + "key": { + "I": { + "item": "minecraft:gold_ingot" + } + }, + "result": { + "item": "techreborn:gold_cable", + "count": 12 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/hv_cable.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/hv_cable.json new file mode 100644 index 000000000..8aee37f8d --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/hv_cable.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "III" + ], + "key": { + "I": { + "item": "techreborn:refined_iron_ingot" + } + }, + "result": { + "item": "techreborn:hv_cable", + "count": 12 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/insulated_copper_cable.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/insulated_copper_cable.json new file mode 100644 index 000000000..018c2ed85 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/insulated_copper_cable.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "RRR", + "III", + "RRR" + ], + "key": { + "I": { + "item": "techreborn:copper_ingot" + }, + "R": { + "item": "techreborn:rubber" + } + }, + "result": { + "item": "techreborn:insulated_copper_cable", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/insulated_copper_cable_alt.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/insulated_copper_cable_alt.json new file mode 100644 index 000000000..59ac7a993 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/insulated_copper_cable_alt.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "RIR", + "RIR", + "RIR" + ], + "key": { + "I": { + "item": "techreborn:copper_ingot" + }, + "R": { + "item": "techreborn:rubber" + } + }, + "result": { + "item": "techreborn:insulated_copper_cable", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/insulated_gold_cable.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/insulated_gold_cable.json new file mode 100644 index 000000000..51a740a11 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/insulated_gold_cable.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "RRR", + "RIR", + "RRR" + ], + "key": { + "I": { + "item": "minecraft:gold_ingot" + }, + "R": { + "item": "techreborn:rubber" + } + }, + "result": { + "item": "techreborn:insulated_gold_cable", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/insulated_hv_cable.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/insulated_hv_cable.json new file mode 100644 index 000000000..7fadcca7d --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/insulated_hv_cable.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "RRR", + "RIR", + "RRR" + ], + "key": { + "I": { + "item": "techreborn:refined_iron_ingot" + }, + "R": { + "item": "techreborn:rubber" + } + }, + "result": { + "item": "techreborn:insulated_hv_cable", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/red_cell_battery.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/red_cell_battery.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/red_cell_battery.json rename to src/main/resources/data/techreborn/recipes/crafting_shaped/red_cell_battery.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/refined_iron_fence.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/refined_iron_fence.json new file mode 100644 index 000000000..0c8a1baae --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/refined_iron_fence.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "RRR", + "RRR", + " R " + ], + "key": { + "R": { + "item": "techreborn:refined_iron_ingot" + } + }, + "result": { + "item": "techreborn:refined_iron_fence" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/tin_cable.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/tin_cable.json new file mode 100644 index 000000000..115418707 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/tin_cable.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "III" + ], + "key": { + "I": { + "item": "techreborn:tin_ingot" + } + }, + "result": { + "item": "techreborn:tin_cable", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/treetap.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/treetap.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/treetap.json rename to src/main/resources/data/techreborn/recipes/crafting_shaped/treetap.json diff --git a/src/main/resources/data/techreborn/recipes/wrench.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/wrench.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/wrench.json rename to src/main/resources/data/techreborn/recipes/crafting_shaped/wrench.json