diff --git a/common/src/main/java/dev/architectury/registry/registries/RegistrarBuilder.java b/common/src/main/java/dev/architectury/registry/registries/RegistrarBuilder.java index 0234918b..59c67530 100644 --- a/common/src/main/java/dev/architectury/registry/registries/RegistrarBuilder.java +++ b/common/src/main/java/dev/architectury/registry/registries/RegistrarBuilder.java @@ -27,10 +27,6 @@ public interface RegistrarBuilder { RegistrarBuilder option(RegistrarOption option); - default RegistrarBuilder saveToDisc() { - return option(StandardRegistrarOption.SAVE_TO_DISC); - } - default RegistrarBuilder syncToClients() { return option(StandardRegistrarOption.SYNC_TO_CLIENTS); } diff --git a/common/src/main/java/dev/architectury/registry/registries/options/StandardRegistrarOption.java b/common/src/main/java/dev/architectury/registry/registries/options/StandardRegistrarOption.java index e6a0ad5c..71df083d 100644 --- a/common/src/main/java/dev/architectury/registry/registries/options/StandardRegistrarOption.java +++ b/common/src/main/java/dev/architectury/registry/registries/options/StandardRegistrarOption.java @@ -20,10 +20,6 @@ package dev.architectury.registry.registries.options; public enum StandardRegistrarOption implements RegistrarOption { - /** - * Denote that the registry should save to disc and persist. Defaulted false. - */ - SAVE_TO_DISC, /** * Denote that the registry should sync its contents to clients. Defaulted false. */ diff --git a/fabric/build.gradle b/fabric/build.gradle index 3aed75c5..d5b79c1e 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -113,7 +113,7 @@ unifiedPublishing { displayName = "[Fabric $rootProject.supported_version] v$project.version" releaseType = "$rootProject.artifact_type" changelog = releaseChangelog() - gameVersions = ["1.20", "1.20.1"] + gameVersions = [] gameLoaders = ["fabric", "quilt"] mainPublication renameJarForPublication relations { @@ -128,7 +128,7 @@ unifiedPublishing { curseforge { token = CURSE_API_KEY id = rootProject.curseforge_id - gameVersions.addAll "Java 17", "1.20-Snapshot" + gameVersions.addAll "Java 17", "1.20.2-Snapshot" } } @@ -138,7 +138,7 @@ unifiedPublishing { token = MODRINTH_TOKEN id = rootProject.modrinth_id version = "$project.version+$project.name" - // gameVersions.addAll project.minecraft_version + gameVersions.addAll project.minecraft_version } } } diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGameRenderer.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGameRenderer.java index e8cf8f51..2f899d17 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGameRenderer.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGameRenderer.java @@ -51,7 +51,7 @@ public abstract class MixinGameRenderer { @Inject(method = "render(FJZ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;renderWithTooltip(Lnet/minecraft/client/gui/GuiGraphics;IIF)V", ordinal = 0), locals = LocalCapture.CAPTURE_FAILEXCEPTION, cancellable = true) - public void renderScreenPre(float tickDelta, long startTime, boolean tick, CallbackInfo ci, int mouseX, int mouseY, Window window, Matrix4f matrix, PoseStack matrices, GuiGraphics graphics) { + public void renderScreenPre(float tickDelta, long startTime, boolean tick, CallbackInfo ci, boolean isGameLoadFinished, int mouseX, int mouseY, Window window, Matrix4f matrix, PoseStack matrices, GuiGraphics graphics) { if (ClientGuiEvent.RENDER_PRE.invoker().render(minecraft.screen, graphics, mouseX, mouseY, minecraft.getDeltaFrameTime()).isFalse()) { ci.cancel(); } @@ -60,7 +60,7 @@ public abstract class MixinGameRenderer { @Inject(method = "render(FJZ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;renderWithTooltip(Lnet/minecraft/client/gui/GuiGraphics;IIF)V", shift = At.Shift.AFTER, ordinal = 0), locals = LocalCapture.CAPTURE_FAILEXCEPTION) - public void renderScreenPost(float tickDelta, long startTime, boolean tick, CallbackInfo ci, int mouseX, int mouseY, Window window, Matrix4f matrix, PoseStack matrices, GuiGraphics graphics) { + public void renderScreenPost(float tickDelta, long startTime, boolean tick, CallbackInfo ci, boolean isGameLoadFinished, int mouseX, int mouseY, Window window, Matrix4f matrix, PoseStack matrices, GuiGraphics graphics) { ClientGuiEvent.RENDER_POST.invoker().render(minecraft.screen, graphics, mouseX, mouseY, minecraft.getDeltaFrameTime()); } diff --git a/fabric/src/main/java/dev/architectury/registry/registries/fabric/RegistrarManagerImpl.java b/fabric/src/main/java/dev/architectury/registry/registries/fabric/RegistrarManagerImpl.java index bf0851ba..4a42c09b 100644 --- a/fabric/src/main/java/dev/architectury/registry/registries/fabric/RegistrarManagerImpl.java +++ b/fabric/src/main/java/dev/architectury/registry/registries/fabric/RegistrarManagerImpl.java @@ -133,9 +133,7 @@ public class RegistrarManagerImpl { @Override public RegistrarBuilder option(RegistrarOption option) { - if (option == StandardRegistrarOption.SAVE_TO_DISC) { - this.builder.attribute(RegistryAttribute.PERSISTED); - } else if (option == StandardRegistrarOption.SYNC_TO_CLIENTS) { + if (option == StandardRegistrarOption.SYNC_TO_CLIENTS) { this.builder.attribute(RegistryAttribute.SYNCED); } return this; diff --git a/gradle.properties b/gradle.properties index 1e5fa5ca..a8a668ed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.daemon=false platforms=fabric -minecraft_version=23w31a -supported_version=23w31a +minecraft_version=23w32a +supported_version=23w32a artifact_type=beta @@ -14,7 +14,7 @@ base_version=10.0 maven_group=dev.architectury fabric_loader_version=0.14.22 -fabric_api_version=0.86.1+1.20.2 +fabric_api_version=0.86.3+1.20.2 mod_menu_version=7.0.0 forge_version=46.0.1