diff --git a/src/main/resources/data/librecomponents/recipes/cpu_tier_1.json b/src/main/resources/data/librecomponents/recipes/cpu_tier_1.json deleted file mode 100644 index 64a47f9..0000000 --- a/src/main/resources/data/librecomponents/recipes/cpu_tier_1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "III", - "TST", - "CBC" - ], - "key": { - "I": { - "tag": "forge:ingots/iron" - }, - "C": { - "tag": "forge:ingots/copper" - }, - "T": { - "item": "oc2:cpu_tier_4" - }, - "S": { - "item": "oc2:silicon_wafer" - }, - "B": { - "item": "oc2:circuit_board" - } - }, - "result": { - "item": "librecomponents:cpu_tier_1" - } -} diff --git a/src/main/resources/data/librecomponents/recipes/cpu_tier_2.json b/src/main/resources/data/librecomponents/recipes/cpu_tier_2.json deleted file mode 100644 index e3326fc..0000000 --- a/src/main/resources/data/librecomponents/recipes/cpu_tier_2.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GGG", - "TST", - "CBC" - ], - "key": { - "G": { - "tag": "forge:ingots/gold" - }, - "C": { - "tag": "forge:ingots/copper" - }, - "T": { - "item": "librecomponents:cpu_tier_1" - }, - "S": { - "item": "oc2:silicon_wafer" - }, - "B": { - "item": "oc2:circuit_board" - } - }, - "result": { - "item": "librecomponents:cpu_tier_2" - } -} diff --git a/src/main/resources/data/librecomponents/recipes/cpu_tier_3.json b/src/main/resources/data/librecomponents/recipes/cpu_tier_3.json deleted file mode 100644 index a77fb2e..0000000 --- a/src/main/resources/data/librecomponents/recipes/cpu_tier_3.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "DDD", - "TST", - "GBG" - ], - "key": { - "D": { - "tag": "forge:gems/diamond" - }, - "G": { - "tag": "forge:ingots/gold" - }, - "T": { - "item": "librecomponents:cpu_tier_2" - }, - "S": { - "item": "oc2:silicon_wafer" - }, - "B": { - "item": "oc2:circuit_board" - } - }, - "result": { - "item": "librecomponents:cpu_tier_3" - } -} diff --git a/src/main/resources/data/librecomponents/recipes/cpu_tier_4.json b/src/main/resources/data/librecomponents/recipes/cpu_tier_4.json deleted file mode 100644 index 5ee897f..0000000 --- a/src/main/resources/data/librecomponents/recipes/cpu_tier_4.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "NNN", - "TST", - "GBG" - ], - "key": { - "N": { - "tag": "forge:gems/emerald" - }, - "G": { - "tag": "forge:ingots/gold" - }, - "T": { - "item": "librecomponents:cpu_tier_3" - }, - "S": { - "item": "oc2:silicon_wafer" - }, - "B": { - "item": "oc2:circuit_board" - } - }, - "result": { - "item": "librecomponents:cpu_tier_4" - } -} diff --git a/src/main/resources/data/oc2/tags/items/device_needs_reboot.json b/src/main/resources/data/oc2/tags/items/device_needs_reboot.json index f77bb27..0926430 100644 --- a/src/main/resources/data/oc2/tags/items/device_needs_reboot.json +++ b/src/main/resources/data/oc2/tags/items/device_needs_reboot.json @@ -8,10 +8,6 @@ "librecomponents:memory_small", "librecomponents:memory_medium", "librecomponents:memory_large", - "librecomponents:memory_extra_large", - "librecomponents:cpu_tier_1", - "librecomponents:cpu_tier_2", - "librecomponents:cpu_tier_3", - "librecomponents:cpu_tier_4" + "librecomponents:memory_extra_large" ] } diff --git a/src/main/resources/data/oc2/tags/items/devices/cpu.json b/src/main/resources/data/oc2/tags/items/devices/cpu.json deleted file mode 100644 index c1afc28..0000000 --- a/src/main/resources/data/oc2/tags/items/devices/cpu.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "librecomponents:cpu_tier_1", - "librecomponents:cpu_tier_2", - "librecomponents:cpu_tier_3", - "librecomponents:cpu_tier_4" - ] -}