From e3a672099c1b5d2c06f9fe4d8ccd024fef0873a2 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Wed, 23 Dec 2020 15:46:27 +0000 Subject: [PATCH] Fix JEI integration with turtle/pocket upgrades - Remove incorrect impostor recipes for pocket computers. We were generating them from the list of turtle upgrades instead! - Fix JEI plugin not blocking impostor recipes as of the data-generator rewrite. --- .../minecraft/crafting_table.json | 35 ------------------- .../minecraft/diamond_axe.json | 35 ------------------- .../minecraft/diamond_hoe.json | 35 ------------------- .../minecraft/diamond_pickaxe.json | 35 ------------------- .../minecraft/diamond_shovel.json | 35 ------------------- .../minecraft/diamond_sword.json | 35 ------------------- .../minecraft/crafting_table.json | 35 ------------------- .../pocket_normal/minecraft/diamond_axe.json | 35 ------------------- .../pocket_normal/minecraft/diamond_hoe.json | 35 ------------------- .../minecraft/diamond_pickaxe.json | 35 ------------------- .../minecraft/diamond_shovel.json | 35 ------------------- .../minecraft/diamond_sword.json | 35 ------------------- .../minecraft/crafting_table.json | 19 ---------- .../minecraft/diamond_axe.json | 19 ---------- .../minecraft/diamond_hoe.json | 19 ---------- .../minecraft/diamond_pickaxe.json | 19 ---------- .../minecraft/diamond_shovel.json | 19 ---------- .../minecraft/diamond_sword.json | 19 ---------- .../minecraft/crafting_table.json | 19 ---------- .../pocket_normal/minecraft/diamond_axe.json | 19 ---------- .../pocket_normal/minecraft/diamond_hoe.json | 19 ---------- .../minecraft/diamond_pickaxe.json | 19 ---------- .../minecraft/diamond_shovel.json | 19 ---------- .../minecraft/diamond_sword.json | 19 ---------- .../dan200/computercraft/data/Recipes.java | 3 +- .../integration/jei/JEIComputerCraft.java | 7 ++-- 26 files changed, 7 insertions(+), 651 deletions(-) delete mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/crafting_table.json delete mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_axe.json delete mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_hoe.json delete mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_pickaxe.json delete mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_shovel.json delete mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_sword.json delete mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/crafting_table.json delete mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_axe.json delete mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_hoe.json delete mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_pickaxe.json delete mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_shovel.json delete mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_sword.json delete mode 100644 src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/crafting_table.json delete mode 100644 src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_axe.json delete mode 100644 src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_hoe.json delete mode 100644 src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_pickaxe.json delete mode 100644 src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_shovel.json delete mode 100644 src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_sword.json delete mode 100644 src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/crafting_table.json delete mode 100644 src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_axe.json delete mode 100644 src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_hoe.json delete mode 100644 src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_pickaxe.json delete mode 100644 src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_shovel.json delete mode 100644 src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_sword.json diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/crafting_table.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/crafting_table.json deleted file mode 100644 index 112ba7081..000000000 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/crafting_table.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_advanced/minecraft/crafting_table" - ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "computercraft:pocket_computer_advanced" - }, - { - "item": "minecraft:crafting_table" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_advanced/minecraft/crafting_table" - } - } - }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_axe.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_axe.json deleted file mode 100644 index 7b5c315e4..000000000 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_axe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_advanced/minecraft/diamond_axe" - ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "computercraft:pocket_computer_advanced" - }, - { - "item": "minecraft:diamond_axe" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_advanced/minecraft/diamond_axe" - } - } - }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_hoe.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_hoe.json deleted file mode 100644 index 9f5872d9f..000000000 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_hoe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_advanced/minecraft/diamond_hoe" - ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "computercraft:pocket_computer_advanced" - }, - { - "item": "minecraft:diamond_hoe" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_advanced/minecraft/diamond_hoe" - } - } - }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_pickaxe.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_pickaxe.json deleted file mode 100644 index 7e1930b03..000000000 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_pickaxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_advanced/minecraft/diamond_pickaxe" - ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "computercraft:pocket_computer_advanced" - }, - { - "item": "minecraft:diamond_pickaxe" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_advanced/minecraft/diamond_pickaxe" - } - } - }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_shovel.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_shovel.json deleted file mode 100644 index 05222ce97..000000000 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_shovel.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_advanced/minecraft/diamond_shovel" - ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "computercraft:pocket_computer_advanced" - }, - { - "item": "minecraft:diamond_shovel" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_advanced/minecraft/diamond_shovel" - } - } - }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_sword.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_sword.json deleted file mode 100644 index 413e0375d..000000000 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_sword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_advanced/minecraft/diamond_sword" - ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "computercraft:pocket_computer_advanced" - }, - { - "item": "minecraft:diamond_sword" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_advanced/minecraft/diamond_sword" - } - } - }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/crafting_table.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/crafting_table.json deleted file mode 100644 index c507d2563..000000000 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/crafting_table.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_normal/minecraft/crafting_table" - ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "computercraft:pocket_computer_normal" - }, - { - "item": "minecraft:crafting_table" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_normal/minecraft/crafting_table" - } - } - }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_axe.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_axe.json deleted file mode 100644 index a14901a3e..000000000 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_axe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_normal/minecraft/diamond_axe" - ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "computercraft:pocket_computer_normal" - }, - { - "item": "minecraft:diamond_axe" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_normal/minecraft/diamond_axe" - } - } - }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_hoe.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_hoe.json deleted file mode 100644 index 5dba7dcd6..000000000 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_hoe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_normal/minecraft/diamond_hoe" - ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "computercraft:pocket_computer_normal" - }, - { - "item": "minecraft:diamond_hoe" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_normal/minecraft/diamond_hoe" - } - } - }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_pickaxe.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_pickaxe.json deleted file mode 100644 index 06a10b8ec..000000000 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_pickaxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_normal/minecraft/diamond_pickaxe" - ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "computercraft:pocket_computer_normal" - }, - { - "item": "minecraft:diamond_pickaxe" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_normal/minecraft/diamond_pickaxe" - } - } - }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_shovel.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_shovel.json deleted file mode 100644 index 22ccd7e60..000000000 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_shovel.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_normal/minecraft/diamond_shovel" - ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "computercraft:pocket_computer_normal" - }, - { - "item": "minecraft:diamond_shovel" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_normal/minecraft/diamond_shovel" - } - } - }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_sword.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_sword.json deleted file mode 100644 index 74378a20c..000000000 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_sword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_normal/minecraft/diamond_sword" - ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "computercraft:pocket_computer_normal" - }, - { - "item": "minecraft:diamond_sword" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_normal/minecraft/diamond_sword" - } - } - }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/crafting_table.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/crafting_table.json deleted file mode 100644 index 0cd065680..000000000 --- a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/crafting_table.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_advanced" - }, - "P": { - "item": "minecraft:crafting_table" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_axe.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_axe.json deleted file mode 100644 index 7b8fa8a24..000000000 --- a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_axe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_advanced" - }, - "P": { - "item": "minecraft:diamond_axe" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_hoe.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_hoe.json deleted file mode 100644 index 9514a59cd..000000000 --- a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_hoe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_advanced" - }, - "P": { - "item": "minecraft:diamond_hoe" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_pickaxe.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_pickaxe.json deleted file mode 100644 index e28008623..000000000 --- a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_pickaxe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_advanced" - }, - "P": { - "item": "minecraft:diamond_pickaxe" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_shovel.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_shovel.json deleted file mode 100644 index b0ddf3016..000000000 --- a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_shovel.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_advanced" - }, - "P": { - "item": "minecraft:diamond_shovel" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_sword.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_sword.json deleted file mode 100644 index cea0b2a0f..000000000 --- a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_sword.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_advanced" - }, - "P": { - "item": "minecraft:diamond_sword" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/crafting_table.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/crafting_table.json deleted file mode 100644 index dc1ddd884..000000000 --- a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/crafting_table.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_normal" - }, - "P": { - "item": "minecraft:crafting_table" - } - }, - "result": { - "item": "computercraft:pocket_computer_normal" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_axe.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_axe.json deleted file mode 100644 index 686d9d890..000000000 --- a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_axe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_normal" - }, - "P": { - "item": "minecraft:diamond_axe" - } - }, - "result": { - "item": "computercraft:pocket_computer_normal" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_hoe.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_hoe.json deleted file mode 100644 index 905a2640a..000000000 --- a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_hoe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_normal" - }, - "P": { - "item": "minecraft:diamond_hoe" - } - }, - "result": { - "item": "computercraft:pocket_computer_normal" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_pickaxe.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_pickaxe.json deleted file mode 100644 index 200d15862..000000000 --- a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_pickaxe.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_normal" - }, - "P": { - "item": "minecraft:diamond_pickaxe" - } - }, - "result": { - "item": "computercraft:pocket_computer_normal" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_shovel.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_shovel.json deleted file mode 100644 index fcae256c7..000000000 --- a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_shovel.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_normal" - }, - "P": { - "item": "minecraft:diamond_shovel" - } - }, - "result": { - "item": "computercraft:pocket_computer_normal" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_sword.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_sword.json deleted file mode 100644 index 564dbf7e5..000000000 --- a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_sword.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], - "key": { - "#": { - "item": "computercraft:pocket_computer_normal" - }, - "P": { - "item": "minecraft:diamond_sword" - } - }, - "result": { - "item": "computercraft:pocket_computer_normal" - } -} \ No newline at end of file diff --git a/src/main/java/dan200/computercraft/data/Recipes.java b/src/main/java/dan200/computercraft/data/Recipes.java index a86ac212e..d7dc75d78 100644 --- a/src/main/java/dan200/computercraft/data/Recipes.java +++ b/src/main/java/dan200/computercraft/data/Recipes.java @@ -8,6 +8,7 @@ import dan200.computercraft.ComputerCraft; import dan200.computercraft.data.Tags.CCTags; +import dan200.computercraft.shared.PocketUpgrades; import dan200.computercraft.shared.Registry; import dan200.computercraft.shared.TurtleUpgrades; import dan200.computercraft.shared.computer.core.ComputerFamily; @@ -117,7 +118,7 @@ private void pocketUpgrades( @Nonnull Consumer add ) String nameId = family.name().toLowerCase( Locale.ROOT ); - TurtleUpgrades.getVanillaUpgrades().forEach( upgrade -> { + PocketUpgrades.getVanillaUpgrades().forEach( upgrade -> { ItemStack result = PocketComputerItemFactory.create( -1, null, -1, family, null ); ShapedRecipeBuilder .shapedRecipe( result.getItem() ) diff --git a/src/main/java/dan200/computercraft/shared/integration/jei/JEIComputerCraft.java b/src/main/java/dan200/computercraft/shared/integration/jei/JEIComputerCraft.java index c7d99cebb..45e0e380b 100644 --- a/src/main/java/dan200/computercraft/shared/integration/jei/JEIComputerCraft.java +++ b/src/main/java/dan200/computercraft/shared/integration/jei/JEIComputerCraft.java @@ -97,8 +97,11 @@ public void onRuntimeAvailable( IJeiRuntime runtime ) { if( !(wrapper instanceof IRecipe) ) continue; ResourceLocation id = ((IRecipe) wrapper).getId(); - if( id.getNamespace().equals( ComputerCraft.MOD_ID ) - && (id.getPath().startsWith( "generated/turtle_" ) || id.getPath().startsWith( "generated/pocket_" )) ) + if( !id.getNamespace().equals( ComputerCraft.MOD_ID ) ) continue; + + String path = id.getPath(); + if( path.startsWith( "turtle_normal/" ) || path.startsWith( "turtle_advanced/" ) + || path.startsWith( "pocket_normal/" ) || path.startsWith( "pocket_advanced/" ) ) { registry.hideRecipe( wrapper, VanillaRecipeCategoryUid.CRAFTING ); }