From 65a89f5f83a713e4295ff7e11e4035b8a0348d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Fabi=C3=A1nek?= Date: Thu, 11 Jul 2024 16:49:40 +0200 Subject: [PATCH] Port --- common/build.gradle | 2 -- .../friendsandfoes/beekeeperhut/BeekeeperHut.java | 2 +- .../barrels/beekeeper_hut.json | 0 .../beekeeper_hut/base_plate1.nbt | Bin .../beekeeper_hut/entity/bee.nbt | Bin .../beekeeper_hut/entity/moobloom.nbt | Bin .../beekeeper_hut/entity/villager.nbt | Bin .../beekeeper_hut/hut/hut1.nbt | Bin .../beekeeper_hut/hut/wall/wall1.nbt | Bin .../beekeeper_hut/hut/wall/wall2.nbt | Bin .../beekeeper_hut/hut/wall/wall3.nbt | Bin .../beekeeper_hut/hut/wall/wall4.nbt | Bin .../moobloom_fence/moobloom_fence_big1.nbt | Bin .../moobloom_fence/moobloom_fence_big2.nbt | Bin .../moobloom_fence/moobloom_fence_small1.nbt | Bin .../moobloom_fence/moobloom_fence_small2.nbt | Bin .../beekeeper_hut/tree/birch_tree.nbt | Bin .../beekeeper_hut/tree/oak_tree.nbt | Bin .../beekeeper_hut/tree/tall_birch_tree.nbt | Bin .../beekeeper_hut/tree/tall_oak_tree.nbt | Bin fabric/build.gradle | 3 --- gradle.properties | 13 ++++++------- neoforge/build.gradle | 9 --------- 23 files changed, 7 insertions(+), 22 deletions(-) rename common/src/main/resources/data/friendsandfoes/{loot_tables => loot_table}/barrels/beekeeper_hut.json (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/base_plate1.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/entity/bee.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/entity/moobloom.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/entity/villager.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/hut/hut1.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/hut/wall/wall1.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/hut/wall/wall2.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/hut/wall/wall3.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/hut/wall/wall4.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/moobloom_fence/moobloom_fence_big1.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/moobloom_fence/moobloom_fence_big2.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/moobloom_fence/moobloom_fence_small1.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/moobloom_fence/moobloom_fence_small2.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/tree/birch_tree.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/tree/oak_tree.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/tree/tall_birch_tree.nbt (100%) rename common/src/main/resources/data/friendsandfoes/{structures => structure}/beekeeper_hut/tree/tall_oak_tree.nbt (100%) diff --git a/common/build.gradle b/common/build.gradle index 331db6a..b03c26a 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -4,6 +4,4 @@ architectury { dependencies { modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" - - implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixin_extras_version}")) } \ No newline at end of file diff --git a/common/src/main/java/com/faboslav/friendsandfoes/beekeeperhut/BeekeeperHut.java b/common/src/main/java/com/faboslav/friendsandfoes/beekeeperhut/BeekeeperHut.java index ea9f9e2..07dd5ec 100644 --- a/common/src/main/java/com/faboslav/friendsandfoes/beekeeperhut/BeekeeperHut.java +++ b/common/src/main/java/com/faboslav/friendsandfoes/beekeeperhut/BeekeeperHut.java @@ -11,7 +11,7 @@ public final class BeekeeperHut private static final Logger LOGGER = LoggerFactory.getLogger(BeekeeperHut.MOD_ID); public static Identifier makeID(String path) { - return new Identifier( + return Identifier.of( MOD_ID, path ); diff --git a/common/src/main/resources/data/friendsandfoes/loot_tables/barrels/beekeeper_hut.json b/common/src/main/resources/data/friendsandfoes/loot_table/barrels/beekeeper_hut.json similarity index 100% rename from common/src/main/resources/data/friendsandfoes/loot_tables/barrels/beekeeper_hut.json rename to common/src/main/resources/data/friendsandfoes/loot_table/barrels/beekeeper_hut.json diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/base_plate1.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/base_plate1.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/base_plate1.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/base_plate1.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/entity/bee.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/entity/bee.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/entity/bee.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/entity/bee.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/entity/moobloom.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/entity/moobloom.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/entity/moobloom.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/entity/moobloom.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/entity/villager.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/entity/villager.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/entity/villager.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/entity/villager.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/hut/hut1.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/hut/hut1.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/hut/hut1.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/hut/hut1.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/hut/wall/wall1.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/hut/wall/wall1.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/hut/wall/wall1.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/hut/wall/wall1.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/hut/wall/wall2.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/hut/wall/wall2.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/hut/wall/wall2.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/hut/wall/wall2.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/hut/wall/wall3.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/hut/wall/wall3.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/hut/wall/wall3.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/hut/wall/wall3.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/hut/wall/wall4.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/hut/wall/wall4.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/hut/wall/wall4.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/hut/wall/wall4.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/moobloom_fence/moobloom_fence_big1.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/moobloom_fence/moobloom_fence_big1.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/moobloom_fence/moobloom_fence_big1.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/moobloom_fence/moobloom_fence_big1.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/moobloom_fence/moobloom_fence_big2.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/moobloom_fence/moobloom_fence_big2.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/moobloom_fence/moobloom_fence_big2.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/moobloom_fence/moobloom_fence_big2.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/moobloom_fence/moobloom_fence_small1.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/moobloom_fence/moobloom_fence_small1.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/moobloom_fence/moobloom_fence_small1.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/moobloom_fence/moobloom_fence_small1.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/moobloom_fence/moobloom_fence_small2.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/moobloom_fence/moobloom_fence_small2.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/moobloom_fence/moobloom_fence_small2.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/moobloom_fence/moobloom_fence_small2.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/tree/birch_tree.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/tree/birch_tree.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/tree/birch_tree.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/tree/birch_tree.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/tree/oak_tree.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/tree/oak_tree.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/tree/oak_tree.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/tree/oak_tree.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/tree/tall_birch_tree.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/tree/tall_birch_tree.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/tree/tall_birch_tree.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/tree/tall_birch_tree.nbt diff --git a/common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/tree/tall_oak_tree.nbt b/common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/tree/tall_oak_tree.nbt similarity index 100% rename from common/src/main/resources/data/friendsandfoes/structures/beekeeper_hut/tree/tall_oak_tree.nbt rename to common/src/main/resources/data/friendsandfoes/structure/beekeeper_hut/tree/tall_oak_tree.nbt diff --git a/fabric/build.gradle b/fabric/build.gradle index 673f79c..dba41da 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -28,9 +28,6 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" modApi "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}" - // Mixin extras (https://github.com/LlamaLad7/MixinExtras) - include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${mixin_extras_version}"))) - modRuntimeOnly(modrinth("friends-and-foes", "fabric-mc${minecraft_version}-${friendsandfoes_version}")) common(project(path: ":common", configuration: "namedElements")) { transitive false } diff --git a/gradle.properties b/gradle.properties index a184299..d4097ef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,23 +12,22 @@ mod_description=An addon for the Friends&Foes mod, adding a beekeeper hut struct maven_group=com.faboslav.friendsandfoes.beekeeperhut # Minecraft -minecraft_version=1.20.6 -min_minecraft_version=1.20.5 +minecraft_version=1.21 +min_minecraft_version=1.21 #Mappings -yarn_mappings=1.20.6+build.1:v2 -yarn_mappings_patch=1.20.5+build.3 +yarn_mappings=1.21+build.4:v2 +yarn_mappings_patch=1.21+build.4 # Architectury enabled_platforms=fabric,neoforge # Common -mixin_extras_version=0.3.6 friendsandfoes_version=2.0.11 # Fabric https://fabricmc.net/versions.html fabric_loader_version=0.15.11 -fabric_api_version=0.98.0+1.20.6 +fabric_api_version=0.100.4+1.21 # Neoforge https://projects.neoforged.net/neoforged/neoforge -neoforge_version=20.6.119 +neoforge_version=21.0.86-beta \ No newline at end of file diff --git a/neoforge/build.gradle b/neoforge/build.gradle index e5270e2..21b8b4e 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -23,11 +23,6 @@ configurations { developmentNeoForge.extendsFrom common } - -loom { - accessWidenerPath = project(":common").loom.accessWidenerPath -} - dependencies { neoForge "net.neoforged:neoforge:${neoforge_version}" @@ -35,10 +30,6 @@ dependencies { shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false } modRuntimeOnly(modrinth("friends-and-foes-forge", "neoforge-mc${minecraft_version}-${friendsandfoes_version}")) - - // Mixin extras (https://github.com/LlamaLad7/MixinExtras) - implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixin_extras_version}")) - implementation(include("io.github.llamalad7:mixinextras-neoforge:${mixin_extras_version}")) } shadowJar {