From 8fc8f86e27de27234c26a88fc899088ffae12b7f Mon Sep 17 00:00:00 2001 From: Leclowndu93150 Date: Sat, 5 Oct 2024 23:26:39 +0200 Subject: [PATCH] good shit --- .../recipes/misc/bronze_plate.json | 32 ------------------- .../recipes/misc/copper_plate.json | 32 ------------------- .../advancement/recipes/misc/gold_plate.json | 32 ------------------- .../advancement/recipes/misc/iron_plate.json | 32 ------------------- .../advancement/recipes/misc/lead_plate.json | 32 ------------------- .../recipes/misc/netherite_plate.json | 32 ------------------- .../recipes/misc/osmium_plate.json | 32 ------------------- .../recipes/misc/refined_glowstone_plate.json | 32 ------------------- .../recipes/misc/refined_obsidian_plate.json | 32 ------------------- .../advancement/recipes/misc/steel_plate.json | 32 ------------------- .../advancement/recipes/misc/tin_plate.json | 32 ------------------- .../recipes/misc/uranium_plate.json | 32 ------------------- .../moreplates/datagen/DynamicDataPack.java | 5 ++- 13 files changed, 2 insertions(+), 387 deletions(-) delete mode 100644 src/generated/resources/data/moreplates/advancement/recipes/misc/bronze_plate.json delete mode 100644 src/generated/resources/data/moreplates/advancement/recipes/misc/copper_plate.json delete mode 100644 src/generated/resources/data/moreplates/advancement/recipes/misc/gold_plate.json delete mode 100644 src/generated/resources/data/moreplates/advancement/recipes/misc/iron_plate.json delete mode 100644 src/generated/resources/data/moreplates/advancement/recipes/misc/lead_plate.json delete mode 100644 src/generated/resources/data/moreplates/advancement/recipes/misc/netherite_plate.json delete mode 100644 src/generated/resources/data/moreplates/advancement/recipes/misc/osmium_plate.json delete mode 100644 src/generated/resources/data/moreplates/advancement/recipes/misc/refined_glowstone_plate.json delete mode 100644 src/generated/resources/data/moreplates/advancement/recipes/misc/refined_obsidian_plate.json delete mode 100644 src/generated/resources/data/moreplates/advancement/recipes/misc/steel_plate.json delete mode 100644 src/generated/resources/data/moreplates/advancement/recipes/misc/tin_plate.json delete mode 100644 src/generated/resources/data/moreplates/advancement/recipes/misc/uranium_plate.json diff --git a/src/generated/resources/data/moreplates/advancement/recipes/misc/bronze_plate.json b/src/generated/resources/data/moreplates/advancement/recipes/misc/bronze_plate.json deleted file mode 100644 index 68d04c0..0000000 --- a/src/generated/resources/data/moreplates/advancement/recipes/misc/bronze_plate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": "mekanism:ingot_bronze" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "moreplates:bronze_plate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_item" - ] - ], - "rewards": { - "recipes": [ - "moreplates:bronze_plate" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/moreplates/advancement/recipes/misc/copper_plate.json b/src/generated/resources/data/moreplates/advancement/recipes/misc/copper_plate.json deleted file mode 100644 index b9cf673..0000000 --- a/src/generated/resources/data/moreplates/advancement/recipes/misc/copper_plate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": "minecraft:copper_ingot" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "moreplates:copper_plate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_item" - ] - ], - "rewards": { - "recipes": [ - "moreplates:copper_plate" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/moreplates/advancement/recipes/misc/gold_plate.json b/src/generated/resources/data/moreplates/advancement/recipes/misc/gold_plate.json deleted file mode 100644 index bc3cd3c..0000000 --- a/src/generated/resources/data/moreplates/advancement/recipes/misc/gold_plate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": "minecraft:gold_ingot" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "moreplates:gold_plate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_item" - ] - ], - "rewards": { - "recipes": [ - "moreplates:gold_plate" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/moreplates/advancement/recipes/misc/iron_plate.json b/src/generated/resources/data/moreplates/advancement/recipes/misc/iron_plate.json deleted file mode 100644 index 18b63cb..0000000 --- a/src/generated/resources/data/moreplates/advancement/recipes/misc/iron_plate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": "minecraft:iron_ingot" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "moreplates:iron_plate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_item" - ] - ], - "rewards": { - "recipes": [ - "moreplates:iron_plate" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/moreplates/advancement/recipes/misc/lead_plate.json b/src/generated/resources/data/moreplates/advancement/recipes/misc/lead_plate.json deleted file mode 100644 index b640d85..0000000 --- a/src/generated/resources/data/moreplates/advancement/recipes/misc/lead_plate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": "mekanism:ingot_lead" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "moreplates:lead_plate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_item" - ] - ], - "rewards": { - "recipes": [ - "moreplates:lead_plate" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/moreplates/advancement/recipes/misc/netherite_plate.json b/src/generated/resources/data/moreplates/advancement/recipes/misc/netherite_plate.json deleted file mode 100644 index 48f01b8..0000000 --- a/src/generated/resources/data/moreplates/advancement/recipes/misc/netherite_plate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": "minecraft:netherite_ingot" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "moreplates:netherite_plate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_item" - ] - ], - "rewards": { - "recipes": [ - "moreplates:netherite_plate" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/moreplates/advancement/recipes/misc/osmium_plate.json b/src/generated/resources/data/moreplates/advancement/recipes/misc/osmium_plate.json deleted file mode 100644 index e20d2b4..0000000 --- a/src/generated/resources/data/moreplates/advancement/recipes/misc/osmium_plate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": "mekanism:ingot_osmium" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "moreplates:osmium_plate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_item" - ] - ], - "rewards": { - "recipes": [ - "moreplates:osmium_plate" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/moreplates/advancement/recipes/misc/refined_glowstone_plate.json b/src/generated/resources/data/moreplates/advancement/recipes/misc/refined_glowstone_plate.json deleted file mode 100644 index 1748893..0000000 --- a/src/generated/resources/data/moreplates/advancement/recipes/misc/refined_glowstone_plate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": "mekanism:ingot_refined_glowstone" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "moreplates:refined_glowstone_plate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_item" - ] - ], - "rewards": { - "recipes": [ - "moreplates:refined_glowstone_plate" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/moreplates/advancement/recipes/misc/refined_obsidian_plate.json b/src/generated/resources/data/moreplates/advancement/recipes/misc/refined_obsidian_plate.json deleted file mode 100644 index 6eb0c09..0000000 --- a/src/generated/resources/data/moreplates/advancement/recipes/misc/refined_obsidian_plate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": "mekanism:ingot_refined_obsidian" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "moreplates:refined_obsidian_plate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_item" - ] - ], - "rewards": { - "recipes": [ - "moreplates:refined_obsidian_plate" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/moreplates/advancement/recipes/misc/steel_plate.json b/src/generated/resources/data/moreplates/advancement/recipes/misc/steel_plate.json deleted file mode 100644 index fa2c35a..0000000 --- a/src/generated/resources/data/moreplates/advancement/recipes/misc/steel_plate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": "mekanism:ingot_steel" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "moreplates:steel_plate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_item" - ] - ], - "rewards": { - "recipes": [ - "moreplates:steel_plate" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/moreplates/advancement/recipes/misc/tin_plate.json b/src/generated/resources/data/moreplates/advancement/recipes/misc/tin_plate.json deleted file mode 100644 index 8376567..0000000 --- a/src/generated/resources/data/moreplates/advancement/recipes/misc/tin_plate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": "mekanism:ingot_tin" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "moreplates:tin_plate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_item" - ] - ], - "rewards": { - "recipes": [ - "moreplates:tin_plate" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/moreplates/advancement/recipes/misc/uranium_plate.json b/src/generated/resources/data/moreplates/advancement/recipes/misc/uranium_plate.json deleted file mode 100644 index 85d5a1a..0000000 --- a/src/generated/resources/data/moreplates/advancement/recipes/misc/uranium_plate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": "mekanism:ingot_uranium" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "moreplates:uranium_plate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_item" - ] - ], - "rewards": { - "recipes": [ - "moreplates:uranium_plate" - ] - } -} \ No newline at end of file diff --git a/src/main/java/com/portingdeadmods/moreplates/datagen/DynamicDataPack.java b/src/main/java/com/portingdeadmods/moreplates/datagen/DynamicDataPack.java index 0ae0602..fb4990a 100644 --- a/src/main/java/com/portingdeadmods/moreplates/datagen/DynamicDataPack.java +++ b/src/main/java/com/portingdeadmods/moreplates/datagen/DynamicDataPack.java @@ -7,7 +7,6 @@ import com.portingdeadmods.moreplates.config.MPConfig; import net.mehvahdjukaar.moonlight.api.platform.PlatHelper; import net.mehvahdjukaar.moonlight.api.resources.pack.DynServerResourcesGenerator; -import net.mehvahdjukaar.moonlight.api.resources.pack.DynamicTexturePack; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementHolder; import net.minecraft.advancements.critereon.InventoryChangeTrigger; @@ -68,7 +67,7 @@ public void regenerateDynamicAssets(ResourceManager manager) { Item ingot = inputItem.getItem(); ShapedRecipeBuilder recipeBuilder = ShapedRecipeBuilder.shaped(RecipeCategory.MISC, item) .pattern("AB") - .pattern("A ") + .pattern("B ") .define('A', Items.STICK) .define('B', ingot) .unlockedBy("has_item", InventoryChangeTrigger.TriggerInstance.hasItems(ingot)); @@ -81,7 +80,7 @@ public void regenerateDynamicAssets(ResourceManager manager) { @Override public void accept(ResourceLocation resourceLocation, Recipe recipe, @Nullable AdvancementHolder advancementHolder, ICondition... iConditions) { - dynamicPack.addRecipe(recipe); + dynamicPack.addRecipe(recipe, resourceLocation); } });