From e84c17a63981734f5d423166f1a0f83b9e892ba9 Mon Sep 17 00:00:00 2001 From: Autovw <68228006+Autovw@users.noreply.github.com> Date: Sun, 10 Dec 2023 13:46:13 +0100 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20mod=20to=20Minecr?= =?UTF-8?q?aft=201.20.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autovw/advancednetherite/core/ModBlocks.java | 8 ++++---- Fabric/build.gradle | 2 +- .../building_blocks/netherite_diamond_block.json | 3 +-- .../building_blocks/netherite_emerald_block.json | 3 +-- .../building_blocks/netherite_gold_block.json | 3 +-- .../building_blocks/netherite_iron_block.json | 3 +-- .../advancements/recipes/misc/lodestone.json | 3 +-- .../misc/netherite_diamond_axe_smithing.json | 3 +-- .../misc/netherite_diamond_boots_smithing.json | 3 +-- .../netherite_diamond_chestplate_smithing.json | 3 +-- .../misc/netherite_diamond_helmet_smithing.json | 3 +-- .../misc/netherite_diamond_hoe_smithing.json | 3 +-- .../recipes/misc/netherite_diamond_ingot.json | 3 +-- .../misc/netherite_diamond_ingot_from_block.json | 3 +-- .../netherite_diamond_leggings_smithing.json | 3 +-- .../misc/netherite_diamond_pickaxe_smithing.json | 3 +-- .../misc/netherite_diamond_shovel_smithing.json | 3 +-- .../misc/netherite_diamond_sword_smithing.json | 3 +-- .../misc/netherite_emerald_axe_smithing.json | 3 +-- .../misc/netherite_emerald_boots_smithing.json | 3 +-- .../netherite_emerald_chestplate_smithing.json | 3 +-- .../misc/netherite_emerald_helmet_smithing.json | 3 +-- .../misc/netherite_emerald_hoe_smithing.json | 3 +-- .../recipes/misc/netherite_emerald_ingot.json | 3 +-- .../misc/netherite_emerald_ingot_from_block.json | 3 +-- .../netherite_emerald_leggings_smithing.json | 3 +-- .../misc/netherite_emerald_pickaxe_smithing.json | 3 +-- .../misc/netherite_emerald_shovel_smithing.json | 3 +-- .../misc/netherite_emerald_sword_smithing.json | 3 +-- .../misc/netherite_gold_axe_smithing.json | 3 +-- .../misc/netherite_gold_boots_smithing.json | 3 +-- .../misc/netherite_gold_chestplate_smithing.json | 3 +-- .../misc/netherite_gold_helmet_smithing.json | 3 +-- .../misc/netherite_gold_hoe_smithing.json | 3 +-- .../recipes/misc/netherite_gold_ingot.json | 3 +-- .../misc/netherite_gold_ingot_from_block.json | 3 +-- .../misc/netherite_gold_leggings_smithing.json | 3 +-- .../misc/netherite_gold_pickaxe_smithing.json | 3 +-- .../misc/netherite_gold_shovel_smithing.json | 3 +-- .../misc/netherite_gold_sword_smithing.json | 3 +-- .../misc/netherite_iron_axe_smithing.json | 3 +-- .../misc/netherite_iron_boots_smithing.json | 3 +-- .../misc/netherite_iron_chestplate_smithing.json | 3 +-- .../misc/netherite_iron_helmet_smithing.json | 3 +-- .../misc/netherite_iron_hoe_smithing.json | 3 +-- .../recipes/misc/netherite_iron_ingot.json | 3 +-- .../misc/netherite_iron_ingot_from_block.json | 3 +-- .../misc/netherite_iron_leggings_smithing.json | 3 +-- .../misc/netherite_iron_pickaxe_smithing.json | 3 +-- .../misc/netherite_iron_shovel_smithing.json | 3 +-- .../misc/netherite_iron_sword_smithing.json | 3 +-- .../advancednetherite/recipes/lodestone.json | 3 +-- .../recipes/netherite_diamond_block.json | 3 +-- .../recipes/netherite_emerald_block.json | 3 +-- .../recipes/netherite_gold_block.json | 3 +-- .../recipes/netherite_iron_block.json | 3 +-- Fabric/src/main/resources/fabric.mod.json | 4 ++-- Forge/build.gradle | 4 ++-- .../providers/ModAdvancementProvider.java | 16 ++++++++-------- Forge/src/main/resources/META-INF/mods.toml | 6 +++--- Forge/src/main/resources/pack.mcmeta | 2 +- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 63 files changed, 81 insertions(+), 135 deletions(-) diff --git a/Common/src/main/java/com/autovw/advancednetherite/core/ModBlocks.java b/Common/src/main/java/com/autovw/advancednetherite/core/ModBlocks.java index e8a54a79..c7037d76 100644 --- a/Common/src/main/java/com/autovw/advancednetherite/core/ModBlocks.java +++ b/Common/src/main/java/com/autovw/advancednetherite/core/ModBlocks.java @@ -9,8 +9,8 @@ */ public final class ModBlocks { - public static final Block NETHERITE_IRON_BLOCK = new Block(BlockBehaviour.Properties.copy(Blocks.NETHERITE_BLOCK)); - public static final Block NETHERITE_GOLD_BLOCK = new Block(BlockBehaviour.Properties.copy(Blocks.NETHERITE_BLOCK)); - public static final Block NETHERITE_EMERALD_BLOCK = new Block(BlockBehaviour.Properties.copy(Blocks.NETHERITE_BLOCK)); - public static final Block NETHERITE_DIAMOND_BLOCK = new Block(BlockBehaviour.Properties.copy(Blocks.NETHERITE_BLOCK)); + public static final Block NETHERITE_IRON_BLOCK = new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.NETHERITE_BLOCK)); + public static final Block NETHERITE_GOLD_BLOCK = new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.NETHERITE_BLOCK)); + public static final Block NETHERITE_EMERALD_BLOCK = new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.NETHERITE_BLOCK)); + public static final Block NETHERITE_DIAMOND_BLOCK = new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.NETHERITE_BLOCK)); } diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 44dce5d3..7b62d038 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -43,7 +43,7 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}" //modImplementation "curse.maven:detailab-506898:${detailab_fabric_version}" //modRuntimeOnly "curse.maven:catalogue-667377:${catalogue_fabric_version}" - modRuntimeOnly "curse.maven:jei-238222:${jei_fabric_version}" + //modRuntimeOnly "curse.maven:jei-238222:${jei_fabric_version}" implementation project(":Common") } diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_diamond_block.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_diamond_block.json index d9b9eb96..221b1592 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_diamond_block.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_diamond_block.json @@ -30,6 +30,5 @@ "recipes": [ "advancednetherite:netherite_diamond_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_emerald_block.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_emerald_block.json index fc0f2d13..ad86edd6 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_emerald_block.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_emerald_block.json @@ -30,6 +30,5 @@ "recipes": [ "advancednetherite:netherite_emerald_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_gold_block.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_gold_block.json index af04ed2b..bdb1aec7 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_gold_block.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_gold_block.json @@ -30,6 +30,5 @@ "recipes": [ "advancednetherite:netherite_gold_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_iron_block.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_iron_block.json index a4a99ea2..557132e9 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_iron_block.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/building_blocks/netherite_iron_block.json @@ -30,6 +30,5 @@ "recipes": [ "advancednetherite:netherite_iron_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/lodestone.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/lodestone.json index b8a108ca..4dcbee13 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/lodestone.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/lodestone.json @@ -41,6 +41,5 @@ "recipes": [ "advancednetherite:lodestone" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_axe_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_axe_smithing.json index cff1b867..26ecadfa 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_axe_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_axe_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_diamond_axe_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_boots_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_boots_smithing.json index 51bb2a89..8479ddad 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_boots_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_boots_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_diamond_boots_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_chestplate_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_chestplate_smithing.json index 76c4975a..be1c733b 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_chestplate_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_chestplate_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_diamond_chestplate_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_helmet_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_helmet_smithing.json index a71f0f43..4bd0b248 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_helmet_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_helmet_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_diamond_helmet_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_hoe_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_hoe_smithing.json index 2cb3e3c1..acc2e265 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_hoe_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_hoe_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_diamond_hoe_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_ingot.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_ingot.json index 05f82f49..df3b9a66 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_ingot.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_ingot.json @@ -30,6 +30,5 @@ "recipes": [ "advancednetherite:netherite_diamond_ingot" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_ingot_from_block.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_ingot_from_block.json index d3058b5f..d35e1e82 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_ingot_from_block.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_ingot_from_block.json @@ -30,6 +30,5 @@ "recipes": [ "advancednetherite:netherite_diamond_ingot_from_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_leggings_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_leggings_smithing.json index 9750d9a4..c36ee343 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_leggings_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_leggings_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_diamond_leggings_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_pickaxe_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_pickaxe_smithing.json index 38dbfde1..8b3cd1d1 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_pickaxe_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_pickaxe_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_diamond_pickaxe_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_shovel_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_shovel_smithing.json index 125a1fe0..8f2062eb 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_shovel_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_shovel_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_diamond_shovel_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_sword_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_sword_smithing.json index 8f6a11c8..a867b1c4 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_sword_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_diamond_sword_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_diamond_sword_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_axe_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_axe_smithing.json index 6f6982d5..f700bf8e 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_axe_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_axe_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_emerald_axe_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_boots_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_boots_smithing.json index 95070178..a4e9a153 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_boots_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_boots_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_emerald_boots_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_chestplate_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_chestplate_smithing.json index b77a978a..20485e03 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_chestplate_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_chestplate_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_emerald_chestplate_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_helmet_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_helmet_smithing.json index b896b1dd..a5859147 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_helmet_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_helmet_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_emerald_helmet_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_hoe_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_hoe_smithing.json index 5dce81e9..e17f943d 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_hoe_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_hoe_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_emerald_hoe_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_ingot.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_ingot.json index 78b1e9c8..9eb1bcad 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_ingot.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_ingot.json @@ -30,6 +30,5 @@ "recipes": [ "advancednetherite:netherite_emerald_ingot" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_ingot_from_block.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_ingot_from_block.json index a2e9a296..fd6a96a3 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_ingot_from_block.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_ingot_from_block.json @@ -30,6 +30,5 @@ "recipes": [ "advancednetherite:netherite_emerald_ingot_from_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_leggings_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_leggings_smithing.json index c4a3ee1e..d0ca9a96 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_leggings_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_leggings_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_emerald_leggings_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_pickaxe_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_pickaxe_smithing.json index 04c84dbe..cd964877 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_pickaxe_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_pickaxe_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_emerald_pickaxe_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_shovel_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_shovel_smithing.json index 73cdf44f..62f6e9f3 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_shovel_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_shovel_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_emerald_shovel_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_sword_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_sword_smithing.json index 9b8e2a5e..8d85a232 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_sword_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_emerald_sword_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_emerald_sword_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_axe_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_axe_smithing.json index 4e930655..8b76c40c 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_axe_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_axe_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_gold_axe_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_boots_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_boots_smithing.json index 4a4d13de..14f313aa 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_boots_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_boots_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_gold_boots_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_chestplate_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_chestplate_smithing.json index c7c22779..4027ffab 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_chestplate_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_chestplate_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_gold_chestplate_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_helmet_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_helmet_smithing.json index d1c23966..8228f800 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_helmet_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_helmet_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_gold_helmet_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_hoe_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_hoe_smithing.json index 485692ea..886041e4 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_hoe_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_hoe_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_gold_hoe_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_ingot.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_ingot.json index ee8f7293..5a1030c3 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_ingot.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_ingot.json @@ -30,6 +30,5 @@ "recipes": [ "advancednetherite:netherite_gold_ingot" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_ingot_from_block.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_ingot_from_block.json index a3f7f45c..7c6ebfe4 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_ingot_from_block.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_ingot_from_block.json @@ -30,6 +30,5 @@ "recipes": [ "advancednetherite:netherite_gold_ingot_from_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_leggings_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_leggings_smithing.json index 88fdbc72..247740fd 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_leggings_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_leggings_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_gold_leggings_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_pickaxe_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_pickaxe_smithing.json index c0a5c740..4299508a 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_pickaxe_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_pickaxe_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_gold_pickaxe_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_shovel_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_shovel_smithing.json index 7f13b112..1ea32d2a 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_shovel_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_shovel_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_gold_shovel_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_sword_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_sword_smithing.json index f9cc0d7d..94ce9a7f 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_sword_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_gold_sword_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_gold_sword_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_axe_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_axe_smithing.json index 9392e3bc..2769c913 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_axe_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_axe_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_iron_axe_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_boots_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_boots_smithing.json index 03a6b4ba..9dba8efd 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_boots_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_boots_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_iron_boots_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_chestplate_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_chestplate_smithing.json index c4156378..8add0d0b 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_chestplate_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_chestplate_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_iron_chestplate_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_helmet_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_helmet_smithing.json index 9226be95..4c0ab1c6 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_helmet_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_helmet_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_iron_helmet_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_hoe_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_hoe_smithing.json index 32cfbf3f..bfc0a1c1 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_hoe_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_hoe_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_iron_hoe_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_ingot.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_ingot.json index 65bcbdc9..aa8ab78d 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_ingot.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_ingot.json @@ -30,6 +30,5 @@ "recipes": [ "advancednetherite:netherite_iron_ingot" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_ingot_from_block.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_ingot_from_block.json index c577c6b8..cb403330 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_ingot_from_block.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_ingot_from_block.json @@ -30,6 +30,5 @@ "recipes": [ "advancednetherite:netherite_iron_ingot_from_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_leggings_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_leggings_smithing.json index 6ff4dfe6..6e7c7089 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_leggings_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_leggings_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_iron_leggings_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_pickaxe_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_pickaxe_smithing.json index 9f914a95..28ec2e5f 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_pickaxe_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_pickaxe_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_iron_pickaxe_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_shovel_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_shovel_smithing.json index 5a1bb4b9..3b7b1917 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_shovel_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_shovel_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_iron_shovel_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_sword_smithing.json b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_sword_smithing.json index eec81951..31562f4f 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_sword_smithing.json +++ b/Fabric/src/generated/resources/data/advancednetherite/advancements/recipes/misc/netherite_iron_sword_smithing.json @@ -28,6 +28,5 @@ "recipes": [ "advancednetherite:netherite_iron_sword_smithing" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/recipes/lodestone.json b/Fabric/src/generated/resources/data/advancednetherite/recipes/lodestone.json index 606ed6dc..43828cac 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/recipes/lodestone.json +++ b/Fabric/src/generated/resources/data/advancednetherite/recipes/lodestone.json @@ -16,6 +16,5 @@ ], "result": { "item": "minecraft:lodestone" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_diamond_block.json b/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_diamond_block.json index 25bc5db2..0069768e 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_diamond_block.json +++ b/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_diamond_block.json @@ -13,6 +13,5 @@ ], "result": { "item": "advancednetherite:netherite_diamond_block" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_emerald_block.json b/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_emerald_block.json index cd89c11a..dc7c6510 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_emerald_block.json +++ b/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_emerald_block.json @@ -13,6 +13,5 @@ ], "result": { "item": "advancednetherite:netherite_emerald_block" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_gold_block.json b/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_gold_block.json index 8857241f..c257bfb0 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_gold_block.json +++ b/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_gold_block.json @@ -13,6 +13,5 @@ ], "result": { "item": "advancednetherite:netherite_gold_block" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_iron_block.json b/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_iron_block.json index 502dad25..c4e8c831 100644 --- a/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_iron_block.json +++ b/Fabric/src/generated/resources/data/advancednetherite/recipes/netherite_iron_block.json @@ -13,6 +13,5 @@ ], "result": { "item": "advancednetherite:netherite_iron_block" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index f38934b8..c1472412 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -37,9 +37,9 @@ ], "depends": { - "fabricloader": ">=0.14.22", + "fabricloader": ">=0.14.25", "fabric-api": "*", - "minecraft": "1.20.2", + "minecraft": "1.20.3", "java": ">=17" }, "suggests": { diff --git a/Forge/build.gradle b/Forge/build.gradle index 77ea0f30..7d193262 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'java' + id 'idea' id 'net.minecraftforge.gradle' version '[6.0,6.2)' } @@ -71,7 +71,7 @@ dependencies { //runtimeOnly fg.deobf("curse.maven:catalogue-459701:${catalogue_forge_version}") //runtimeOnly fg.deobf("curse.maven:configured-457570:${configured_forge_version}") - runtimeOnly fg.deobf("curse.maven:jei-238222:${jei_forge_version}") + //runtimeOnly fg.deobf("curse.maven:jei-238222:${jei_forge_version}") //implementation fg.deobf("curse.maven:detailarmorbar-520755:${detailab_forge_version}") } diff --git a/Forge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModAdvancementProvider.java b/Forge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModAdvancementProvider.java index 8168dee2..72c17771 100644 --- a/Forge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModAdvancementProvider.java +++ b/Forge/src/main/java/com/autovw/advancednetherite/datagen/providers/ModAdvancementProvider.java @@ -5,7 +5,7 @@ import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementHolder; import net.minecraft.advancements.AdvancementRewards; -import net.minecraft.advancements.FrameType; +import net.minecraft.advancements.AdvancementType; import net.minecraft.advancements.critereon.InventoryChangeTrigger; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; @@ -35,49 +35,49 @@ public void generate(HolderLookup.Provider registries, Consumer