From 7fcaf716d8a72326d92d2d76ccc4353a14eaf371 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Wed, 2 Aug 2023 16:14:09 -0400 Subject: [PATCH] 23w31a --- .../mixin/perf/cache_strongholds/ServerLevelMixin.java | 4 ++-- .../modernfix/screen/ModernFixConfigScreen.java | 2 +- .../modernfix/screen/ModernFixOptionInfoScreen.java | 2 +- .../modernfix/world/StrongholdLocationCache.java | 7 +++++++ gradle.properties | 10 +++++----- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java index eba1767b..2aac7c47 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java @@ -48,8 +48,8 @@ public abstract class ServerLevelMixin extends Level implements IServerLevel { */ @Inject(method = "", at = @At("TAIL")) private void ensureGeneration(CallbackInfo ci) { - mfix$strongholdCache = this.getDataStorage().computeIfAbsent(StrongholdLocationCache::load, - StrongholdLocationCache::new, + mfix$strongholdCache = this.getDataStorage().computeIfAbsent( + StrongholdLocationCache.factory((ServerLevel)(Object)this), StrongholdLocationCache.getFileId(this.dimensionTypeRegistration())); this.chunkSource.getGeneratorState().ensureStructuresGenerated(); } diff --git a/common/src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java b/common/src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java index b428f23e..097d764f 100644 --- a/common/src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java +++ b/common/src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java @@ -34,7 +34,7 @@ public class ModernFixConfigScreen extends Screen { @Override public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { - this.renderBackground(guiGraphics); + this.renderBackground(guiGraphics, mouseX, mouseY, partialTicks); this.optionList.render(guiGraphics, mouseX, mouseY, partialTicks); guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 8, 16777215); this.doneButton.setMessage(madeChanges ? Component.translatable("modernfix.config.done_restart") : CommonComponents.GUI_DONE); diff --git a/common/src/main/java/org/embeddedt/modernfix/screen/ModernFixOptionInfoScreen.java b/common/src/main/java/org/embeddedt/modernfix/screen/ModernFixOptionInfoScreen.java index 0c5a665e..0aa0bd2f 100644 --- a/common/src/main/java/org/embeddedt/modernfix/screen/ModernFixOptionInfoScreen.java +++ b/common/src/main/java/org/embeddedt/modernfix/screen/ModernFixOptionInfoScreen.java @@ -41,7 +41,7 @@ public class ModernFixOptionInfoScreen extends Screen { @Override public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { - this.renderBackground(guiGraphics); + this.renderBackground(guiGraphics, mouseX, mouseY, partialTicks); guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 8, 16777215); this.drawMultilineString(guiGraphics, this.minecraft.font, description, 10, 50); super.render(guiGraphics, mouseX, mouseY, partialTicks); diff --git a/common/src/main/java/org/embeddedt/modernfix/world/StrongholdLocationCache.java b/common/src/main/java/org/embeddedt/modernfix/world/StrongholdLocationCache.java index 4ffafada..b435e79b 100644 --- a/common/src/main/java/org/embeddedt/modernfix/world/StrongholdLocationCache.java +++ b/common/src/main/java/org/embeddedt/modernfix/world/StrongholdLocationCache.java @@ -3,6 +3,8 @@ package org.embeddedt.modernfix.world; import net.minecraft.core.Holder; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.datafix.DataFixTypes; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.dimension.DimensionType; import net.minecraft.world.level.saveddata.SavedData; @@ -17,6 +19,11 @@ public class StrongholdLocationCache extends SavedData { chunkPosList = new ArrayList<>(); } + public static SavedData.Factory factory(ServerLevel serverLevel) { + // FIXME datafixer will probably throw on update + return new SavedData.Factory<>(StrongholdLocationCache::new, StrongholdLocationCache::load, DataFixTypes.SAVED_DATA_FORCED_CHUNKS); + } + public List getChunkPosList() { return new ArrayList<>(chunkPosList); } diff --git a/gradle.properties b/gradle.properties index e740a839..361dd306 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,19 +4,19 @@ org.gradle.jvmargs=-Xmx2G junit_version=5.10.0-M1 mod_id=modernfix -minecraft_version=1.20.1 -enabled_platforms=fabric,forge +minecraft_version=23w31a +enabled_platforms=fabric forge_version=1.20.1-47.0.14 -parchment_version=2023.07.09 +# parchment_version=2023.07.09 refined_storage_version=4392788 jei_version=13.1.0.2 rei_version=11.0.597 ctm_version=1.19.2-1.1.7+11 kubejs_version=1902.6.0-build.142 rhino_version=1902.2.2-build.268 -supported_minecraft_versions=1.20.1 +supported_minecraft_versions=23w31a -fabric_loader_version=0.14.21 +fabric_loader_version=0.14.22 fabric_api_version=0.86.0+1.20.1 continuity_version=3.0.0-beta.2+1.19.3