From acccaaa84c5558f8717e302e2b32f9dae992713c Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 1 Feb 2023 21:09:48 +0000 Subject: [PATCH] Update to loom 1.1 --- build.gradle | 2 +- gradle.properties | 1 + .../recipes/alloy_smelter/brass_ingot.json | 43 ------------------- .../recipes/alloy_smelter/bronze_ingot.json | 43 ------------------- .../recipes/alloy_smelter/electrum_ingot.json | 43 ------------------- .../recipes/alloy_smelter/invar_ingot.json | 43 ------------------- .../alloy_smelter/netherite_ingot.json | 43 ------------------- 7 files changed, 2 insertions(+), 216 deletions(-) delete mode 100644 src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/brass_ingot.json delete mode 100644 src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/bronze_ingot.json delete mode 100644 src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/electrum_ingot.json delete mode 100644 src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/invar_ingot.json delete mode 100644 src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/netherite_ingot.json diff --git a/build.gradle b/build.gradle index 23cbb442a..74fee424d 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ plugins { id 'eclipse' id 'maven-publish' id 'com.diffplug.spotless' version '6.12.0' - id 'fabric-loom' version '1.0-SNAPSHOT' + id 'fabric-loom' version '1.1-SNAPSHOT' id 'com.matthewprenger.cursegradle' version '1.4.0' id 'de.undercouch.download' version '4.1.1' } diff --git a/gradle.properties b/gradle.properties index 1596beb49..36b0b8520 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,6 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx2G +fabric.loom.multiProjectOptimisation=true # Mod properties mod_version=5.5.0 diff --git a/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/brass_ingot.json b/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/brass_ingot.json deleted file mode 100644 index c9b39998c..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/brass_ingot.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:alloy_smelter/brass_ingot" - ] - }, - "criteria": { - "has_copper": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["minecraft:copper_ingot"] - } - ] - } - }, - "has_zinc": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:zinc_ingots" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:alloy_smelter/brass_ingot" - } - } - }, - "requirements": [ - [ - "has_copper", - "has_zinc", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/bronze_ingot.json b/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/bronze_ingot.json deleted file mode 100644 index f91067a65..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/bronze_ingot.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:alloy_smelter/bronze_ingot" - ] - }, - "criteria": { - "has_copper": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["minecraft:copper_ingot"] - } - ] - } - }, - "has_tin": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:tin_ingots" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:alloy_smelter/bronze_ingot" - } - } - }, - "requirements": [ - [ - "has_copper", - "has_tin", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/electrum_ingot.json b/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/electrum_ingot.json deleted file mode 100644 index 855132a3c..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/electrum_ingot.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:alloy_smelter/electrum_ingot" - ] - }, - "criteria": { - "has_gold": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["minecraft:gold_ingot"] - } - ] - } - }, - "has_silver": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:silver_ingots" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:alloy_smelter/electrum_ingot" - } - } - }, - "requirements": [ - [ - "has_gold", - "has_silver", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/invar_ingot.json b/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/invar_ingot.json deleted file mode 100644 index d747fc234..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/invar_ingot.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:alloy_smelter/invar_ingot" - ] - }, - "criteria": { - "has_iron": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["minecraft:iron_ingot"] - } - ] - } - }, - "has_nickel": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:nickel_ingots" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:alloy_smelter/invar_ingot" - } - } - }, - "requirements": [ - [ - "has_iron", - "has_nickel", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/netherite_ingot.json b/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/netherite_ingot.json deleted file mode 100644 index e28f33687..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/alloy_smelter/netherite_ingot.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:alloy_smelter/netherite_ingot" - ] - }, - "criteria": { - "has_gold": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["minecraft:gold_ingot"] - } - ] - } - }, - "has_scrap": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["minecraft:netherite_scrap"] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:alloy_smelter/netherite_ingot" - } - } - }, - "requirements": [ - [ - "has_gold", - "has_scrap", - "has_the_recipe" - ] - ] -} \ No newline at end of file