fix: not being able existing world

CHANGELOG.md

@@ -1,2 +1,3 @@
-## [84.0.0]
-- Ported to 1.20.4
+## [84.0.1]
+### Fixed
+- not being able existing world

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false
     id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 

common/src/main/resources/yeetusexperimentus-common.mixins.json

@@ -5,8 +5,7 @@
   "mixins": [
   ],
   "client": [
-    "CreateWorldScreenMixin",
-    "WorldOpenFlowsMixin"
+
   ],
   "injectors": {
     "defaultRequire": 1

common/src/main/java/com/sunekaer/yeetusexperimentus/mixin/CreateWorldScreenMixin.java → fabric/src/main/java/com/sunekaer/yeetusexperimentus/fabric/mixin/CreateWorldScreenMixin.java

@@ -1,9 +1,8 @@
-package com.sunekaer.yeetusexperimentus.mixin;
+package com.sunekaer.yeetusexperimentus.fabric.mixin;
 
 import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
 import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraft.world.level.WorldDataConfiguration;
-import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -14,7 +13,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-@Debug(export = true)
 @Mixin(CreateWorldScreen.class)
 public abstract class CreateWorldScreenMixin {
 
@@ -29,5 +27,4 @@ public void onTryApplyNewDataPacks(PackRepository packRepository, boolean bo, Co
         applyNewPackConfig(packRepository, worldDataConfiguration, consumer);
         callbackInfo.cancel();
     }
-
 }

common/src/main/java/com/sunekaer/yeetusexperimentus/mixin/WorldOpenFlowsMixin.java → fabric/src/main/java/com/sunekaer/yeetusexperimentus/fabric/mixin/WorldOpenFlowsMixin.java

@@ -1,25 +1,19 @@
-package com.sunekaer.yeetusexperimentus.mixin;
+package com.sunekaer.yeetusexperimentus.fabric.mixin;
 
-import com.mojang.serialization.Dynamic;
 import com.mojang.serialization.Lifecycle;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
 import net.minecraft.client.gui.screens.worldselection.WorldOpenFlows;
-import net.minecraft.world.level.storage.LevelStorageSource;
-import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Debug(export = true)
+
 @Mixin(WorldOpenFlows.class)
 public abstract class WorldOpenFlowsMixin {
 
-    @Shadow protected abstract void loadLevel(LevelStorageSource.LevelStorageAccess arg, Dynamic<?> dynamic, boolean bl, boolean bl2, Runnable runnable);
-
     @Inject(
             method = "confirmWorldCreation",
             at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V", ordinal = 0),
@@ -30,10 +24,12 @@ private static void beGone(Minecraft client, CreateWorldScreen parent, Lifecycle
         ci.cancel();
     }
 
-
-    @Inject(method = "loadLevel", at = @At("HEAD"), cancellable = true)
-    private void onLoadLevel(LevelStorageSource.LevelStorageAccess levelStorageAccess, Dynamic<?> dynamic, boolean bl, boolean bl2, Runnable runnable, CallbackInfo callbackInfo) {
-        loadLevel(levelStorageAccess, dynamic, false, false, runnable);
-        callbackInfo.cancel();
+    @ModifyVariable(
+            method = "loadLevel(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;Lcom/mojang/serialization/Dynamic;ZZLjava/lang/Runnable;)V",
+            at = @At("STORE"),
+            ordinal = 3
+    )
+    public boolean no(boolean a) {
+        return false;
     }
 }

fabric/src/main/resources/fabric.mod.json

@@ -19,7 +19,8 @@
   "environment": "*",
   "entrypoints": {},
   "mixins": [
-    "yeetusexperimentus-common.mixins.json"
+    "yeetusexperimentus-common.mixins.json",
+    "yeetusexperimentus-fabric.mixins.json"
   ],
   "depends": {
     "fabricloader": ">=0.14",

fabric/src/main/resources/yeetusexperimentus-fabric.mixins.json

@@ -0,0 +1,15 @@
+{
+  "required": true,
+  "package": "com.sunekaer.yeetusexperimentus.fabric.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "mixins": [
+  ],
+  "client": [
+    "CreateWorldScreenMixin",
+    "WorldOpenFlowsMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "minVersion": "0.8"
+}

forge/build.gradle

@@ -13,9 +13,9 @@ loom {
     forge {
         convertAccessWideners = true
         extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
-        mixinConfigs = [
-                "yeetusexperimentus-common.mixins.json"
-        ]
+
+        mixinConfigs "yeetusexperimentus-forge.mixins.json"
+        mixinConfigs "yeetusexperimentus-common.mixins.json"
     }
 }
 
@@ -35,6 +35,7 @@ dependencies {
 }
 
 processResources {
+    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
     inputs.property "version", project.version
 
     filesMatching("META-INF/mods.toml") {

forge/src/main/java/com/sunekaer/yeetusexperimentus/forge/mixin/PrimaryLevelDataMixinForge.java

@@ -0,0 +1,17 @@
+package com.sunekaer.yeetusexperimentus.forge.mixin;
+
+import net.minecraft.world.level.storage.PrimaryLevelData;
+import org.spongepowered.asm.mixin.Debug;
+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.CallbackInfoReturnable;
+
+@Mixin(value = PrimaryLevelData.class, remap = false)
+public class PrimaryLevelDataMixinForge {
+
+    @Inject(method = "hasConfirmedExperimentalWarning", at =@At("HEAD"), cancellable = true)
+    public void hasConfirmedExperimentalWarning(CallbackInfoReturnable<Boolean> cir) {
+        cir.setReturnValue(true);
+    }
+}

forge/src/main/resources/yeetusexperimentus-forge.mixins.json

@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "package": "com.sunekaer.yeetusexperimentus.forge.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "mixins": [
+  ],
+  "client": [
+    "PrimaryLevelDataMixinForge"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "minVersion": "0.8"
+}

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.daemon=false
 enabled_platforms=fabric,neoforge,forge
 
 # Project
-mod_version=84.0.0
+mod_version=84.0.1
 maven_group=com.sunekaer.mods
 mod_name=YeetusExperimentus
 mod_author=Sunekaer

neoforge/src/main/java/com/sunekaer/yeetusexperimentus/neo/mixin/PrimaryLevelDataMixinNeo.java

@@ -0,0 +1,16 @@
+package com.sunekaer.yeetusexperimentus.neo.mixin;
+
+import net.minecraft.world.level.storage.PrimaryLevelData;
+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.CallbackInfoReturnable;
+
+@Mixin(value = PrimaryLevelData.class, remap = false)
+public class PrimaryLevelDataMixinNeo {
+
+    @Inject(method = "hasConfirmedExperimentalWarning", at =@At("HEAD"), cancellable = true)
+    public void hasConfirmedExperimentalWarning(CallbackInfoReturnable<Boolean> cir) {
+        cir.setReturnValue(true);
+    }
+}

neoforge/src/main/resources/META-INF/mods.toml

@@ -27,4 +27,7 @@ ordering="NONE"
 side="BOTH"
 
 [[mixins]]
-config = "yeetusexperimentus-common.mixins.json"
+config = "yeetusexperimentus-common.mixins.json"
+
+[[mixins]]
+config = "yeetusexperimentus-neo.mixins.json"

neoforge/src/main/resources/yeetusexperimentus-neo.mixins.json

@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "package": "com.sunekaer.yeetusexperimentus.neo.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "mixins": [
+  ],
+  "client": [
+    "PrimaryLevelDataMixinNeo"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "minVersion": "0.8"
+}