diff --git a/build.gradle b/build.gradle index 0785bf0c1..96947fc04 100755 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,10 @@ plugins { // id 'fabric-loom' version '1.6-SNAPSHOT' - id 'maven-publish' +// id 'maven-publish' id "com.modrinth.minotaur" version "2.+" id "architectury-plugin" version "3.4-SNAPSHOT" id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false - } architectury { @@ -22,9 +21,9 @@ subprojects { dependencies { minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" // The following line declares the mojmap mappings, you may use other mappings as well - mappings loom.officialMojangMappings() +// mappings loom.officialMojangMappings() // The following line declares the yarn mappings you may select this one as well. - // mappings "net.fabricmc:yarn:1.20.1+build.10:v2" + mappings "net.fabricmc:yarn:1.20.6+build.2:v2" } } diff --git a/common/build.gradle b/common/build.gradle index a09841ea4..4281b58e5 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -3,7 +3,7 @@ architectury { } loom { - accessWidenerPath = file("src/main/resources/examplemod.accesswidener") + accessWidenerPath = file("src/main/resources/fuji.accesswidener") } dependencies { diff --git a/common/src/main/java/net/examplemod/ExampleMod.java b/common/src/main/java/net/examplemod/ExampleMod.java index d769b8c5a..abf0f5e82 100644 --- a/common/src/main/java/net/examplemod/ExampleMod.java +++ b/common/src/main/java/net/examplemod/ExampleMod.java @@ -5,33 +5,17 @@ import dev.architectury.registry.registries.DeferredRegister; import dev.architectury.registry.registries.RegistrarManager; import dev.architectury.registry.registries.RegistrySupplier; -import net.minecraft.core.registries.Registries; -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; +import net.minecraft.item.ItemStack; +import net.minecraft.registry.Registries; import java.util.function.Supplier; public class ExampleMod { public static final String MOD_ID = "examplemod"; - // We can use this if we don't want to use DeferredRegister - public static final Supplier REGISTRIES = Suppliers.memoize(() -> RegistrarManager.get(MOD_ID)); - // Registering a new creative tab - public static final DeferredRegister TABS = DeferredRegister.create(MOD_ID, Registries.CREATIVE_MODE_TAB); - public static final RegistrySupplier EXAMPLE_TAB = TABS.register("example_tab", () -> - CreativeTabRegistry.create(Component.translatable("itemGroup." + MOD_ID + ".example_tab"), - () -> new ItemStack(ExampleMod.EXAMPLE_ITEM.get()))); - - public static final DeferredRegister ITEMS = DeferredRegister.create(MOD_ID, Registries.ITEM); - public static final RegistrySupplier EXAMPLE_ITEM = ITEMS.register("example_item", () -> - new Item(new Item.Properties().arch$tab(ExampleMod.EXAMPLE_TAB))); - public static void init() { - TABS.register(); - ITEMS.register(); - - System.out.println(ExampleExpectPlatform.getConfigDirectory().toAbsolutePath().normalize().toString()); + +// System.out.println(ExampleExpectPlatform.getConfigDirectory().toAbsolutePath().normalize().toString()); + System.out.println("hello"); } } diff --git a/common/src/main/java/net/examplemod/mixin/MixinTitleScreen.java b/common/src/main/java/net/examplemod/mixin/MixinTitleScreen.java deleted file mode 100644 index 5bd63d620..000000000 --- a/common/src/main/java/net/examplemod/mixin/MixinTitleScreen.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.examplemod.mixin; - -import net.minecraft.client.gui.screens.TitleScreen; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(TitleScreen.class) -public class MixinTitleScreen { - @Inject(at = @At("HEAD"), method = "init()V") - private void init(CallbackInfo info) { - System.out.println("Hello from example architectury common mixin!"); - } -} \ No newline at end of file diff --git a/common/src/main/resources/architectury.common.json b/common/src/main/resources/architectury.common.json deleted file mode 100644 index bca13fddc..000000000 --- a/common/src/main/resources/architectury.common.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "accessWidener": "examplemod.accesswidener" -} \ No newline at end of file diff --git a/common/src/main/resources/assets/examplemod/lang/en_us.json b/common/src/main/resources/assets/examplemod/lang/en_us.json deleted file mode 100644 index 6bcd60ee8..000000000 --- a/common/src/main/resources/assets/examplemod/lang/en_us.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "item.examplemod.example_item": "Example Item" -} \ No newline at end of file diff --git a/common/src/main/resources/examplemod-common.mixins.json b/common/src/main/resources/examplemod-common.mixins.json deleted file mode 100644 index 69b29a1c4..000000000 --- a/common/src/main/resources/examplemod-common.mixins.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "required": true, - "package": "net.examplemod.mixin", - "compatibilityLevel": "JAVA_17", - "minVersion": "0.8", - "client": [ - "MixinTitleScreen" - ], - "mixins": [ - ], - "injectors": { - "defaultRequire": 1 - } -} \ No newline at end of file diff --git a/common/src/main/resources/examplemod.accesswidener b/common/src/main/resources/examplemod.accesswidener deleted file mode 100644 index 13268c32e..000000000 --- a/common/src/main/resources/examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/fabric/src/main/resources/fuji.accesswidener b/common/src/main/resources/fuji.accesswidener similarity index 81% rename from fabric/src/main/resources/fuji.accesswidener rename to common/src/main/resources/fuji.accesswidener index 3b19631dd..2cbce809c 100755 --- a/fabric/src/main/resources/fuji.accesswidener +++ b/common/src/main/resources/fuji.accesswidener @@ -4,9 +4,9 @@ accessWidener v2 named accessible method net/minecraft/server/world/ServerChunkManager getChunkHolder (J)Lnet/minecraft/server/world/ChunkHolder; -accessible method net/minecraft/util/UserCache$Entry getProfile ()Lcom/mojang/authlib/GameProfile; +accessible class net/minecraft/util/UserCache$Entry accessible field net/minecraft/server/world/ChunkHolder UNLOADED_WORLD_CHUNK Lnet/minecraft/server/world/OptionalChunk; accessible field net/minecraft/server/world/ChunkHolder UNLOADED_WORLD_CHUNK_FUTURE Ljava/util/concurrent/CompletableFuture; -accessible field net/minecraft/registry/entry/RegistryEntry$Reference value Ljava/lang/Object; \ No newline at end of file +accessible field net/minecraft/registry/entry/RegistryEntry$Reference value Ljava/lang/Object; diff --git a/fabric/build.gradle b/fabric/build.gradle index 449074ba9..74464ac52 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -14,12 +14,11 @@ loom { // splitEnvironmentSourceSets() // accessWidenerPath = file("src/main/resources/fuji.accesswidener") - - mods { - "fuji" { - sourceSet sourceSets.main - } - } +// mods { +// "fuji" { +// sourceSet sourceSets.main +// } +// } runs { configureEach { @@ -46,6 +45,9 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } + + common(project(path: ":common", configuration: "namedElements")) { transitive false } + shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } // common(project(path: ":fabric-like", configuration: "namedElements")) { transitive false } // shadowCommon(project(path: ":fabric-like", configuration: "transformProductionFabric")) { transitive false } diff --git a/fabric/src/main/java/io/github/sakurawald/module/mixin/language/ServerPlayerMixin.java b/fabric/src/main/java/io/github/sakurawald/module/mixin/language/ServerPlayerMixin.java index 4e7f3109f..5f0a53e12 100644 --- a/fabric/src/main/java/io/github/sakurawald/module/mixin/language/ServerPlayerMixin.java +++ b/fabric/src/main/java/io/github/sakurawald/module/mixin/language/ServerPlayerMixin.java @@ -17,6 +17,6 @@ public abstract class ServerPlayerMixin implements ServerPlayerAccessor { @Inject(method = "setClientOptions", at = @At("HEAD")) public void $setClientOptions(SyncedClientOptions clientInformation, CallbackInfo ci) { ServerPlayerEntity player = (ServerPlayerEntity) (Object) this; - MessageUtil.getPlayer2lang().put(player.getGameProfile().getName(), clientInformation.comp_1951()); + MessageUtil.getPlayer2lang().put(player.getGameProfile().getName(), clientInformation.language()); } } diff --git a/fabric/src/main/java/io/github/sakurawald/module/mixin/motd/ServerStatusPacketListenerImplMixin.java b/fabric/src/main/java/io/github/sakurawald/module/mixin/motd/ServerStatusPacketListenerImplMixin.java index 9b9c2b5b4..a6b514ea5 100644 --- a/fabric/src/main/java/io/github/sakurawald/module/mixin/motd/ServerStatusPacketListenerImplMixin.java +++ b/fabric/src/main/java/io/github/sakurawald/module/mixin/motd/ServerStatusPacketListenerImplMixin.java @@ -50,6 +50,6 @@ abstract class ServerStatusPacketListenerImplMixin { return new ServerMetadata(module.getRandomDescription(), Optional.empty(), Optional.empty(), module.getRandomIcon(), false); } - return new ServerMetadata(module.getRandomDescription(), vanillaStatus.comp_1274(), vanillaStatus.comp_1275(), module.getRandomIcon(), vanillaStatus.secureChatEnforced()); + return new ServerMetadata(module.getRandomDescription(), vanillaStatus.players(), vanillaStatus.version(), module.getRandomIcon(), vanillaStatus.secureChatEnforced()); } } diff --git a/fabric/src/main/java/io/github/sakurawald/module/mixin/resource_world/registry/SimpleRegistryMixin.java b/fabric/src/main/java/io/github/sakurawald/module/mixin/resource_world/registry/SimpleRegistryMixin.java index 9bbd229dd..9a368ff90 100644 --- a/fabric/src/main/java/io/github/sakurawald/module/mixin/resource_world/registry/SimpleRegistryMixin.java +++ b/fabric/src/main/java/io/github/sakurawald/module/mixin/resource_world/registry/SimpleRegistryMixin.java @@ -75,7 +75,7 @@ public abstract class SimpleRegistryMixin implements SimpleRegistryMixinInter @Override public boolean fuji$remove(Identifier key) { var entry = this.idToEntry.get(key); - return entry != null && entry.hasKeyAndValue() && this.fuji$remove(entry.comp_349()); + return entry != null && entry.hasKeyAndValue() && this.fuji$remove(entry.value()); } @Override diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 948f2adb5..703ca34f0 100755 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -18,7 +18,6 @@ "io.github.sakurawald.Fuji" ] }, - "accessWidener": "fuji.accesswidener", "mixins": [ "fuji.mixins.json" ], diff --git a/forge/build.gradle b/forge/build.gradle index 60ded35c6..c4fc811db 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -30,7 +30,7 @@ configurations { dependencies { forge "net.minecraftforge:forge:${rootProject.forge_version}" // Remove the next line if you don't want to depend on the API - modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}" +// modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 471ae1819..5f1d12340 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -23,7 +23,7 @@ side = "BOTH" [[dependencies.examplemod]] modId = "minecraft" mandatory = true -versionRange = "[1.20.1,)" +versionRange = "[1.20.6,)" ordering = "NONE" side = "BOTH" diff --git a/gradle.properties b/gradle.properties index 116eac3dc..e289ef356 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ +# gradle org.gradle.jvmargs=-Xmx4G org.gradle.parallel=true @@ -6,9 +7,22 @@ mod_version=1.1.8 maven_group=io.github.sakurawald archives_base_name=fuji -# fabric deps -loader_version=0.15.11 +# mod framework +enabled_platforms=fabric,forge +minecraft_version=1.20.6 +architectury_version=12.0.27 + +# mod loader -> fabric yarn_mappings=1.20.6+build.1 +fabric_loader_version=0.15.11 +fabric_api_version=0.99.0+1.20.6 + +# mod loader -> forge +forge_version=1.20.6-50.0.22 + +# mod loader -> quilt +quilt_loader_version=0.21.2-beta.2 +quilt_fabric_api_version=7.4.0+0.90.0-1.20.1 # mod deps carpet_core_version=1.20.6-1.4.141+v240429 @@ -28,16 +42,3 @@ quartz_version=2.5.0-rc1 reflections_version=0.10.2 javaassist_version=3.29.2-GA -# arch -minecraft_version=1.20.1 -enabled_platforms=quilt,fabric,forge - -architectury_version=9.1.12 - -fabric_loader_version=0.14.23 -fabric_api_version=0.90.4+1.20.1 - -forge_version=1.20.1-47.2.1 - -quilt_loader_version=0.21.2-beta.2 -quilt_fabric_api_version=7.4.0+0.90.0-1.20.1