fix some mixins

isXander · isXander · commit ee90a2eab26b · 2022-06-08T16:20:59.000+01:00
diff --git a/common/src/main/java/dev/isxander/debugify/client/utils/ConfigGuiHelper.java b/common/src/main/java/dev/isxander/debugify/client/utils/ConfigGuiHelper.java
@@ -10,7 +10,7 @@
 import me.shedaniel.clothconfig2.impl.builders.BooleanToggleBuilder;
 import me.shedaniel.clothconfig2.impl.builders.SubCategoryBuilder;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.text.LiteralText;
+import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
 import java.util.HashMap;
@@ -21,21 +21,21 @@
 public class ConfigGuiHelper {
     public static Screen createConfigGui(DebugifyConfig config, Screen parent) {
         ConfigBuilder builder = ConfigBuilder.create()
-                .setTitle(new LiteralText("Debugify"))
+                .setTitle(Text.literal("Debugify"))
                 .setSavingRunnable(config::save)
                 .setParentScreen(parent);
 
         Map<FixCategory, ConfigCategory> fixCategories = new HashMap<>();
         Map<ConfigCategory, Map<BugFix.Env, SubCategoryBuilder>> fixSubCategories = new HashMap<>();
         for (FixCategory fixCategory : FixCategory.values()) {
-            var configCategory = builder.getOrCreateCategory(new LiteralText(fixCategory.getDisplayName()));
+            var configCategory = builder.getOrCreateCategory(Text.literal(fixCategory.getDisplayName()));
             if (fixCategory == FixCategory.GAMEPLAY) {
                 configCategory.addEntry(builder.entryBuilder()
-                        .startTextDescription(new LiteralText("WARNING: This category contains fixes that may be an unfair advantage!").formatted(Formatting.RED))
+                        .startTextDescription(Text.literal("WARNING: This category contains fixes that may be an unfair advantage!").formatted(Formatting.RED))
                         .build()
                 );
                 configCategory.addEntry(builder.entryBuilder()
-                        .startBooleanToggle(new LiteralText("Enable In Multiplayer"), config.gameplayFixesInMultiplayer)
+                        .startBooleanToggle(Text.literal("Enable In Multiplayer"), config.gameplayFixesInMultiplayer)
                         .setSaveConsumer((enabled) -> config.gameplayFixesInMultiplayer = enabled)
                         .build()
                 );
@@ -45,7 +45,7 @@ public static Screen createConfigGui(DebugifyConfig config, Screen parent) {
 
             Map<BugFix.Env, SubCategoryBuilder> subCategories = new HashMap<>();
             for (BugFix.Env env : BugFix.Env.values()) {
-                var subCategoryBuilder = builder.entryBuilder().startSubCategory(new LiteralText(env.getDisplayName()));
+                var subCategoryBuilder = builder.entryBuilder().startSubCategory(Text.literal(env.getDisplayName()));
                 subCategories.put(env, subCategoryBuilder);
             }
             fixSubCategories.put(configCategory, subCategories);
@@ -55,38 +55,38 @@ public static Screen createConfigGui(DebugifyConfig config, Screen parent) {
             SubCategoryBuilder subcategory = fixSubCategories.get(fixCategories.get(bug.category())).get(bug.env());
 
             BooleanToggleBuilder entry = builder.entryBuilder()
-                    .startBooleanToggle(new LiteralText(bug.bugId()), enabled)
+                    .startBooleanToggle(Text.literal(bug.bugId()), enabled)
                     .setSaveConsumer((toggled) -> config.getBugFixes().replace(bug, toggled))
                     .setDefaultValue(true)
                     .setErrorSupplier((b) -> {
                         List<String> conflicts = bug.getActiveConflicts();
                         if (!b || conflicts.isEmpty())
                             return Optional.empty();
 
-                        return Optional.of(new LiteralText(bug.bugId() + " is conflicting with " + (conflicts.size() == 1 ? conflicts.get(0) : "mods " + String.join(", ", conflicts))));
+                        return Optional.of(Text.literal(bug.bugId() + " is conflicting with " + (conflicts.size() == 1 ? conflicts.get(0) : "mods " + String.join(", ", conflicts))));
                     })
                     .requireRestart();
 
             if (DebugifyClient.bugFixDescriptionCache.has(bug.bugId()))
-                entry.setTooltip(new LiteralText(DebugifyClient.bugFixDescriptionCache.get(bug.bugId())));
+                entry.setTooltip(Text.literal(DebugifyClient.bugFixDescriptionCache.get(bug.bugId())));
 
             subcategory.add(entry.build());
         });
         fixSubCategories.forEach((category, subCategories) ->
                 subCategories.forEach((env, subCategoryBuilder) -> category.addEntry(subCategoryBuilder.build())));
 
-        ConfigCategory miscCategory = builder.getOrCreateCategory(new LiteralText("Misc"));
+        ConfigCategory miscCategory = builder.getOrCreateCategory(Text.literal("Misc"));
         AbstractConfigListEntry<?> optOutUpdaterEntry = builder.entryBuilder()
-                .startBooleanToggle(new LiteralText("Opt Out Updater"), config.optOutUpdater)
-                .setTooltip(new LiteralText("Stop Debugify checking for updates on launch."))
+                .startBooleanToggle(Text.literal("Opt Out Updater"), config.optOutUpdater)
+                .setTooltip(Text.literal("Stop Debugify checking for updates on launch."))
                 .setSaveConsumer((toggled) -> config.optOutUpdater = toggled)
                 .setDefaultValue(false)
                 .build();
         miscCategory.addEntry(optOutUpdaterEntry);
 
         AbstractConfigListEntry<?> defaultDisabledEntry = builder.entryBuilder()
-                .startBooleanToggle(new LiteralText("Default to Disabled"), config.defaultDisabled)
-                .setTooltip(new LiteralText("Default new bug fixes to be disabled rather than enabled."))
+                .startBooleanToggle(Text.literal("Default to Disabled"), config.defaultDisabled)
+                .setTooltip(Text.literal("Default new bug fixes to be disabled rather than enabled."))
                 .setSaveConsumer((toggled) -> config.defaultDisabled = toggled)
                 .setDefaultValue(false)
                 .build();
diff --git a/common/src/main/java/dev/isxander/debugify/mixins/basic/server/mc119417/ServerPlayerEntityMixin.java b/common/src/main/java/dev/isxander/debugify/mixins/basic/server/mc119417/ServerPlayerEntityMixin.java
@@ -4,10 +4,12 @@
 import dev.isxander.debugify.fixes.FixCategory;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.encryption.PlayerPublicKey;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.GameMode;
 import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -16,8 +18,8 @@
 @BugFix(id = "MC-119417", category = FixCategory.BASIC, env = BugFix.Env.SERVER)
 @Mixin(ServerPlayerEntity.class)
 public abstract class ServerPlayerEntityMixin extends PlayerEntity {
-    public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile profile) {
-        super(world, pos, yaw, profile);
+    public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile gameProfile, @Nullable PlayerPublicKey publicKey) {
+        super(world, pos, yaw, gameProfile, publicKey);
     }
 
     @Inject(method = "changeGameMode", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;stopRiding()V"))
diff --git a/common/src/main/java/dev/isxander/debugify/mixins/basic/server/mc124177/ServerPlayerEntityMixin.java b/common/src/main/java/dev/isxander/debugify/mixins/basic/server/mc124177/ServerPlayerEntityMixin.java
@@ -5,13 +5,15 @@
 import com.mojang.authlib.GameProfile;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.encryption.PlayerPublicKey;
 import net.minecraft.network.packet.s2c.play.EntityStatusEffectS2CPacket;
 import net.minecraft.network.packet.s2c.play.ExperienceBarUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.PlayerAbilitiesS2CPacket;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -23,8 +25,8 @@
 public abstract class ServerPlayerEntityMixin extends PlayerEntity {
     @Shadow public ServerPlayNetworkHandler networkHandler;
 
-    public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile profile) {
-        super(world, pos, yaw, profile);
+    public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile gameProfile, @Nullable PlayerPublicKey publicKey) {
+        super(world, pos, yaw, gameProfile, publicKey);
     }
 
     @Inject(method = "teleport", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/server/PlayerManager;sendPlayerStatus(Lnet/minecraft/server/network/ServerPlayerEntity;)V"))
diff --git a/common/src/main/java/dev/isxander/debugify/mixins/basic/server/mc129909/ServerPlayerEntityMixin.java b/common/src/main/java/dev/isxander/debugify/mixins/basic/server/mc129909/ServerPlayerEntityMixin.java
@@ -4,10 +4,12 @@
 import dev.isxander.debugify.fixes.FixCategory;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.encryption.PlayerPublicKey;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.GameMode;
 import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -16,8 +18,8 @@
 @BugFix(id = "MC-129909", category = FixCategory.BASIC, env = BugFix.Env.SERVER)
 @Mixin(ServerPlayerEntity.class)
 public abstract class ServerPlayerEntityMixin extends PlayerEntity {
-    public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile profile) {
-        super(world, pos, yaw, profile);
+    public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile gameProfile, @Nullable PlayerPublicKey publicKey) {
+        super(world, pos, yaw, gameProfile, publicKey);
     }
 
     /**
diff --git a/common/src/main/java/dev/isxander/debugify/mixins/basic/server/mc14923/ServerPlayNetworkHandlerMixin.java b/common/src/main/java/dev/isxander/debugify/mixins/basic/server/mc14923/ServerPlayNetworkHandlerMixin.java
@@ -1,5 +1,6 @@
 package dev.isxander.debugify.mixins.basic.server.mc14923;
 
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import dev.isxander.debugify.fixes.BugFix;
 import dev.isxander.debugify.fixes.FixCategory;
 import net.minecraft.server.MinecraftServer;
@@ -25,10 +26,8 @@ public class ServerPlayNetworkHandlerMixin {
      * but in singleplayer, with cheats off, you are not opped.
      * This mixin also checks if the user is the host.
      */
-    @Inject(method = "handleMessage", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayNetworkHandler;disconnect(Lnet/minecraft/text/Text;)V"), cancellable = true)
-    public void onMessage(TextStream.Message message, CallbackInfo ci){
-        if (this.server.isHost(this.player.getGameProfile())) {
-            ci.cancel();
-        }
+    @ModifyExpressionValue(method = "checkForSpam", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;isOperator(Lcom/mojang/authlib/GameProfile;)Z"))
+    public boolean onMessage(boolean operator){
+        return operator || this.server.isHost(this.player.getGameProfile());
     }
 }
diff --git a/common/src/main/java/dev/isxander/debugify/mixins/basic/server/mc215530/ServerPlayerEntityMixin.java b/common/src/main/java/dev/isxander/debugify/mixins/basic/server/mc215530/ServerPlayerEntityMixin.java
@@ -4,10 +4,12 @@
 import dev.isxander.debugify.fixes.FixCategory;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.encryption.PlayerPublicKey;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.GameMode;
 import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -16,8 +18,8 @@
 @BugFix(id = "MC-215530", category = FixCategory.BASIC, env = BugFix.Env.SERVER)
 @Mixin(ServerPlayerEntity.class)
 public abstract class ServerPlayerEntityMixin extends PlayerEntity {
-    public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile profile) {
-        super(world, pos, yaw, profile);
+    public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile gameProfile, @Nullable PlayerPublicKey publicKey) {
+        super(world, pos, yaw, gameProfile, publicKey);
     }
 
     @Inject(method = "changeGameMode", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;stopRiding()V"))
diff --git a/common/src/main/java/dev/isxander/debugify/mixins/basic/server/mc69216/ServerPlayerEntityMixin.java b/common/src/main/java/dev/isxander/debugify/mixins/basic/server/mc69216/ServerPlayerEntityMixin.java
@@ -4,10 +4,12 @@
 import dev.isxander.debugify.fixes.FixCategory;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.encryption.PlayerPublicKey;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.GameMode;
 import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -16,8 +18,8 @@
 @BugFix(id = "MC-69216", category = FixCategory.BASIC, env = BugFix.Env.SERVER)
 @Mixin(ServerPlayerEntity.class)
 public abstract class ServerPlayerEntityMixin extends PlayerEntity {
-    public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile profile) {
-        super(world, pos, yaw, profile);
+    public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile gameProfile, @Nullable PlayerPublicKey publicKey) {
+        super(world, pos, yaw, gameProfile, publicKey);
     }
 
     @Inject(method = "changeGameMode", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;stopRiding()V"))
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -47,7 +47,11 @@ dependencies {
         exclude(module = "fabric-api")
     }
 
-    modImplementation("com.terraformersmc:modmenu:3.+")
+    modImplementation("com.terraformersmc:modmenu:4.+") {
+        exclude(module = "fabric-api")
+    }
+
+    modRuntimeOnly("net.fabricmc.fabric-api:fabric-api:0.55.0+1.19")
 }
 
 tasks {
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -37,7 +37,7 @@
     "java": ">=17"
   },
   "recommends": {
-    "cloth-config2": "6.x.x",
+    "cloth-config2": "7.x.x",
     "modmenu": "*"
   },
   "conflicts": {
diff --git a/forge/src/main/java/dev/isxander/debugify/forge/mixins/basic/client/mc215531/ForgeIngameGuiMixin.java b/forge/src/main/java/dev/isxander/debugify/forge/mixins/basic/client/mc215531/ForgeIngameGuiMixin.java
@@ -5,15 +5,16 @@
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.InGameHud;
+import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraftforge.client.gui.ForgeIngameGui;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
 @BugFix(id = "MC-215531", category = FixCategory.BASIC, env = BugFix.Env.CLIENT)
 @Mixin(ForgeIngameGui.class)
 public class ForgeIngameGuiMixin extends InGameHud {
-    public ForgeIngameGuiMixin(MinecraftClient client) {
-        super(client);
+    public ForgeIngameGuiMixin(MinecraftClient client, ItemRenderer itemRenderer) {
+        super(client, itemRenderer);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,11 @@ dependencies {`
`47`	`47`	`exclude(module = "fabric-api")`
`48`	`48`	`}`
`49`	`49`
`50`		`- modImplementation("com.terraformersmc:modmenu:3.+")`
	`50`	`+ modImplementation("com.terraformersmc:modmenu:4.+") {`
	`51`	`+ exclude(module = "fabric-api")`
	`52`	`+ }`
	`53`	`+`
	`54`	`+ modRuntimeOnly("net.fabricmc.fabric-api:fabric-api:0.55.0+1.19")`
`51`	`55`	`}`
`52`	`56`
`53`	`57`	`tasks {`