diff --git a/src/main/java/techreborn/rei/ReiPlugin.java b/src/main/java/techreborn/rei/ReiPlugin.java index 5249b52ff..24c395c7e 100644 --- a/src/main/java/techreborn/rei/ReiPlugin.java +++ b/src/main/java/techreborn/rei/ReiPlugin.java @@ -49,10 +49,12 @@ public class ReiPlugin implements REIPluginEntry { public ReiPlugin() { iconMap.put(ModRecipes.ALLOY_SMELTER, Machine.ALLOY_SMELTER); - iconMap.put(ModRecipes.GRINDER, Machine.GRINDER); iconMap.put(ModRecipes.BLAST_FURNACE, Machine.INDUSTRIAL_BLAST_FURNACE); iconMap.put(ModRecipes.CENTRIFUGE, Machine.INDUSTRIAL_CENTRIFUGE); iconMap.put(ModRecipes.CHEMICAL_REACTOR, Machine.CHEMICAL_REACTOR); + iconMap.put(ModRecipes.COMPRESSOR, Machine.COMPRESSOR); + iconMap.put(ModRecipes.GRINDER, Machine.GRINDER); + //TODO add the others here } @@ -80,6 +82,7 @@ public class ReiPlugin implements REIPluginEntry { recipeHelper.registerWorkingStations(ModRecipes.BLAST_FURNACE.getName(), new ItemStack(Machine.INDUSTRIAL_BLAST_FURNACE.asItem())); recipeHelper.registerWorkingStations(ModRecipes.CENTRIFUGE.getName(), new ItemStack(Machine.INDUSTRIAL_CENTRIFUGE.asItem())); recipeHelper.registerWorkingStations(ModRecipes.CHEMICAL_REACTOR.getName(), new ItemStack(Machine.CHEMICAL_REACTOR.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.COMPRESSOR.getName(), new ItemStack(Machine.COMPRESSOR.asItem())); } private void registerMachineRecipe(RecipeHelper recipeHelper, RebornRecipeType recipeType){ diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/advanced_alloy_plate.json b/src/main/resources/data/techreborn/recipes/compressor/advanced_alloy_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/advanced_alloy_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/advanced_alloy_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate.json b/src/main/resources/data/techreborn/recipes/compressor/aluminum_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/aluminum_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/aluminum_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/aluminum_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate_1.json deleted file mode 100644 index 20ceaac85..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:aluminum_dust" - } - ], - "results": [ - { - "item": "techreborn:aluminum_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate_1.json deleted file mode 100644 index a10cfd7c9..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:brass_dust" - } - ], - "results": [ - { - "item": "techreborn:brass_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate_1.json deleted file mode 100644 index 014a8cff9..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:bronze_dust" - } - ], - "results": [ - { - "item": "techreborn:bronze_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate_1.json deleted file mode 100644 index ed5657c51..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:chrome_dust" - } - ], - "results": [ - { - "item": "techreborn:chrome_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate_1.json deleted file mode 100644 index b5cc70ab5..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:copper_dust" - } - ], - "results": [ - { - "item": "techreborn:copper_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate_1.json deleted file mode 100644 index 759606f60..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:electrum_dust" - } - ], - "results": [ - { - "item": "techreborn:electrum_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate_1.json deleted file mode 100644 index 4138c4d03..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:gold_dust" - } - ], - "results": [ - { - "item": "techreborn:gold_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate_1.json deleted file mode 100644 index b8a826f0b..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:invar_dust" - } - ], - "results": [ - { - "item": "techreborn:invar_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_alloy_plate.json b/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_alloy_plate.json deleted file mode 100644 index c7d47b950..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_alloy_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 300, - "ingredients": [ - { - "item": "techreborn:iridium_alloy_ingot" - } - ], - "results": [ - { - "item": "techreborn:iridium_alloy_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate.json b/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate.json deleted file mode 100644 index 158953919..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 300, - "ingredients": [ - { - "item": "techreborn:iridium_ingot" - } - ], - "results": [ - { - "item": "techreborn:iridium_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate_1.json deleted file mode 100644 index 1d908f61f..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate_1.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 300, - "ingredients": [ - { - "item": "techreborn:iridium_storage_block" - } - ], - "results": [ - { - "item": "techreborn:iridium_plate", - "count": 9 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate_1.json deleted file mode 100644 index 0873e6845..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:iron_dust" - } - ], - "results": [ - { - "item": "techreborn:iron_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate_1.json deleted file mode 100644 index 220e1212d..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:lead_dust" - } - ], - "results": [ - { - "item": "techreborn:lead_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate_1.json deleted file mode 100644 index 7d85048d3..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:nickel_dust" - } - ], - "results": [ - { - "item": "techreborn:nickel_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate_1.json deleted file mode 100644 index de445f232..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:platinum_dust" - } - ], - "results": [ - { - "item": "techreborn:platinum_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate_1.json deleted file mode 100644 index 450d3b4e6..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:silver_dust" - } - ], - "results": [ - { - "item": "techreborn:silver_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate_1.json deleted file mode 100644 index 844b086bf..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:steel_dust" - } - ], - "results": [ - { - "item": "techreborn:steel_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate_1.json deleted file mode 100644 index 99d340cad..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:tin_dust" - } - ], - "results": [ - { - "item": "techreborn:tin_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate_1.json deleted file mode 100644 index f05cf954d..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:titanium_dust" - } - ], - "results": [ - { - "item": "techreborn:titanium_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate_1.json deleted file mode 100644 index 199a827fd..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:tungsten_dust" - } - ], - "results": [ - { - "item": "techreborn:tungsten_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate_1.json deleted file mode 100644 index 317e4b859..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:zinc_dust" - } - ], - "results": [ - { - "item": "techreborn:zinc_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate.json b/src/main/resources/data/techreborn/recipes/compressor/brass_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/brass_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/brass_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/brass_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate.json b/src/main/resources/data/techreborn/recipes/compressor/bronze_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/bronze_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/bronze_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/bronze_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate.json b/src/main/resources/data/techreborn/recipes/compressor/chrome_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/chrome_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/chrome_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/chrome_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/coal_plate.json b/src/main/resources/data/techreborn/recipes/compressor/coal_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/coal_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/coal_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/coal_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/coal_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/coal_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/coal_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate.json b/src/main/resources/data/techreborn/recipes/compressor/copper_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/copper_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/copper_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/copper_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/diamond_plate.json b/src/main/resources/data/techreborn/recipes/compressor/diamond_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/diamond_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/diamond_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/diamond_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/diamond_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/diamond_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/diamond_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate.json b/src/main/resources/data/techreborn/recipes/compressor/electrum_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/electrum_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/electrum_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/electrum_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/emerald_plate.json b/src/main/resources/data/techreborn/recipes/compressor/emerald_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/emerald_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/emerald_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/emerald_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/emerald_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/emerald_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/emerald_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate.json b/src/main/resources/data/techreborn/recipes/compressor/gold_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/gold_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/gold_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/gold_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate.json b/src/main/resources/data/techreborn/recipes/compressor/invar_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/invar_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/invar_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/invar_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate.json b/src/main/resources/data/techreborn/recipes/compressor/iron_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/iron_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/iron_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/iron_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/lapis_plate.json b/src/main/resources/data/techreborn/recipes/compressor/lapis_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/lapis_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/lapis_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/lazurite_plate.json b/src/main/resources/data/techreborn/recipes/compressor/lazurite_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/lazurite_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/lazurite_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate.json b/src/main/resources/data/techreborn/recipes/compressor/lead_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/lead_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/lead_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/lead_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate.json b/src/main/resources/data/techreborn/recipes/compressor/nickel_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/nickel_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/nickel_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/nickel_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/obsidian_plate.json b/src/main/resources/data/techreborn/recipes/compressor/obsidian_plate_from_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/obsidian_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/obsidian_plate_from_dust.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/peridot_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/peridot_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/peridot_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/peridot_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/peridot_plate.json b/src/main/resources/data/techreborn/recipes/compressor/peridot_plate_from_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/peridot_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/peridot_plate_from_dust.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate.json b/src/main/resources/data/techreborn/recipes/compressor/platinum_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/platinum_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/platinum_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/platinum_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/red_garnet_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/red_garnet_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/red_garnet_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/red_garnet_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/red_garnet_plate.json b/src/main/resources/data/techreborn/recipes/compressor/red_garnet_plate_from_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/red_garnet_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/red_garnet_plate_from_dust.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/redstone_plate.json b/src/main/resources/data/techreborn/recipes/compressor/redstone_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/redstone_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/redstone_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/refined_iron_plate.json b/src/main/resources/data/techreborn/recipes/compressor/refined_iron_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/refined_iron_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/refined_iron_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/refined_iron_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/refined_iron_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/refined_iron_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/refined_iron_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/ruby_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/ruby_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/ruby_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/ruby_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/ruby_plate.json b/src/main/resources/data/techreborn/recipes/compressor/ruby_plate_from_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/ruby_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/ruby_plate_from_dust.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/sapphire_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/sapphire_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/sapphire_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/sapphire_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/sapphire_plate.json b/src/main/resources/data/techreborn/recipes/compressor/sapphire_plate_from_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/sapphire_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/sapphire_plate_from_dust.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate.json b/src/main/resources/data/techreborn/recipes/compressor/silver_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/silver_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/silver_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/silver_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate.json b/src/main/resources/data/techreborn/recipes/compressor/steel_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/steel_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/steel_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/steel_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate.json b/src/main/resources/data/techreborn/recipes/compressor/tin_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/tin_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/tin_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/tin_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate.json b/src/main/resources/data/techreborn/recipes/compressor/titanium_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/titanium_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/titanium_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/titanium_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate.json b/src/main/resources/data/techreborn/recipes/compressor/tungsten_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/tungsten_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/tungsten_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/tungsten_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tungstensteel_plate.json b/src/main/resources/data/techreborn/recipes/compressor/tungstensteel_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/tungstensteel_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/tungstensteel_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tungstensteel_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/tungstensteel_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/tungstensteel_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/tungstensteel_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/wood_plate.json b/src/main/resources/data/techreborn/recipes/compressor/wood_plate.json index 85d4826ca..4833f7ccb 100644 --- a/src/main/resources/data/techreborn/recipes/compressor/wood_plate.json +++ b/src/main/resources/data/techreborn/recipes/compressor/wood_plate.json @@ -4,7 +4,7 @@ "time": 300, "ingredients": [ { - "item": "minecraft:oak_planks" + "tag": "minecraft:planks" } ], "results": [ diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/yellow_garnet_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/yellow_garnet_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/yellow_garnet_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/yellow_garnet_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/yellow_garnet_plate.json b/src/main/resources/data/techreborn/recipes/compressor/yellow_garnet_plate_from_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/yellow_garnet_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/yellow_garnet_plate_from_dust.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate.json b/src/main/resources/data/techreborn/recipes/compressor/zinc_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/zinc_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/zinc_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/zinc_plate_from_block.json