port to 1.20.3-1.20.4, with parts for 1.20.5+

tildejustin · Nov 20, 2024 · 2e8888c · 2e8888c
1 parent af297fa
commit 2e8888c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G
 # More versions available at: https://grayray75.github.io/LegacyFabric-Versions/
 # Fabric Properties
 minecraft_version = 1.20.4
-minecraft_version_range = 1.20.3-1.21.1
+minecraft_version_range = 1.20.3-1.20.4
 yarn_mappings=1.20.4+build.3
 loader_version=0.14.24
 

diff --git a/src/main/java/xyz/tildejustin/custommapresetter/mixin/TitleScreenMixin.java b/src/main/java/xyz/tildejustin/custommapresetter/mixin/TitleScreenMixin.java
@@ -8,7 +8,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.text.Text;
-import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -22,8 +22,9 @@ protected TitleScreenMixin(Text title) {
         super(title);
     }
 
-
-    @Inject(method = "initWidgetsNormal", at = @At(value = "TAIL"))
+    // method_25423 -> init
+    @Dynamic
+    @Inject(method = {"initWidgetsNormal", "Lnet/minecraft/client/gui/screen/TitleScreen;method_25426()V"}, at = @At(value = "TAIL"), require = 1)
     private void custommapresetter$addTitleScreenButton(CallbackInfo ci) {
         if (!CustomMapResetter.autoreset) {
             CustomMapResetter.running = false;

diff --git a/src/main/resources/custom-map-resetter.accesswidener b/src/main/resources/custom-map-resetter.accesswidener
@@ -3,4 +3,5 @@ accessible method net/minecraft/client/MinecraftClient render (Z)V
 accessible field net/minecraft/client/gui/widget/ButtonWidget DEFAULT_NARRATION_SUPPLIER Lnet/minecraft/client/gui/widget/ButtonWidget$NarrationSupplier;
 accessible method net/minecraft/client/gui/widget/ButtonWidget <init> (IIIILnet/minecraft/text/Text;Lnet/minecraft/client/gui/widget/ButtonWidget$PressAction;Lnet/minecraft/client/gui/widget/ButtonWidget$NarrationSupplier;)V
 accessible method net/minecraft/client/gui/screen/world/WorldListWidget load ()V
-accessible field net/minecraft/client/gui/screen/world/WorldListWidget$WorldEntry level Lnet/minecraft/world/level/storage/LevelSummary;
+accessible field net/minecraft/client/gui/screen/world/WorldListWidget$WorldEntry level Lnet/minecraft/world/level/storage/LevelSummary;
+accessible method net/minecraft/server/integrated/IntegratedServerLoader createSession (Ljava/lang/String;)Lnet/minecraft/world/level/storage/LevelStorage$Session;