Merge pull request 'Safe-cast to ServerPlayerEntity in MixinSlot' (#1) from videogame-hacker/EasyAuth:architectury into architectury

Reviewed-on: #1

build.gradle

@@ -10,7 +10,7 @@ buildscript {
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "0.11.0-SNAPSHOT" apply false
 }
 
 architectury {

common/src/main/java/org/samo_lego/simpleauth/mixin/MixinServerPlayerEntity.java

@@ -161,7 +161,9 @@ public class MixinServerPlayerEntity implements PlayerAuth {
      */
     @Override
     public boolean canSkipAuth() {
-        return PlatformSpecific.isPlayerFake(this.player) || (isUsingMojangAccount() && config.main.premiumAutologin);
+        return PlatformSpecific.isPlayerFake(this.player) ||
+        this.player.server.isSingleplayer() ||
+        (isUsingMojangAccount() && config.main.premiumAutologin);
     }
 
     /**

common/src/main/java/org/samo_lego/simpleauth/mixin/MixinSlot.java

@@ -16,19 +16,20 @@ public abstract class MixinSlot {
     // Denying item moving etc.
     @Inject(method = "canTakeItems(Lnet/minecraft/entity/player/PlayerEntity;)Z", at = @At(value = "HEAD"), cancellable = true)
     private void canTakeItems(PlayerEntity playerEntity, CallbackInfoReturnable<Boolean> cir) {
-        ServerPlayerEntity player = (ServerPlayerEntity) playerEntity;
+        if (playerEntity instanceof ServerPlayerEntity player) {
-        ActionResult result = AuthEventHandler.onTakeItem(player);
+            ActionResult result = AuthEventHandler.onTakeItem(player);
 
-        if (result == ActionResult.FAIL) {
+            if (result == ActionResult.FAIL) {
-            // Canceling the item taking
+                // Canceling the item taking
-            player.networkHandler.sendPacket(
+                player.networkHandler.sendPacket(
-                    new ScreenHandlerSlotUpdateS2CPacket(
+                        new ScreenHandlerSlotUpdateS2CPacket(
-                            -2,
+                                -2,
-                            0,
+                                0,
-                            player.getInventory().selectedSlot,
+                                player.getInventory().selectedSlot,
-                            player.getInventory().getStack(player.getInventory().selectedSlot))
+                                player.getInventory().getStack(player.getInventory().selectedSlot))
-            );
+                );
-            cir.setReturnValue(false);
+                cir.setReturnValue(false);
+            }
         }
     }
 }

common/src/main/java/org/samo_lego/simpleauth/mixin/MixinWorldSaveHandler.java

@@ -4,7 +4,7 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.world.WorldSaveHandler;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

common/src/main/java/org/samo_lego/simpleauth/utils/PlayerAuth.java

@@ -54,7 +54,7 @@ public interface PlayerAuth {
     /**
      * Checks whether player is a fake player (from CarpetMod).
      *
-     * @return true if player is fake (can skip authentication process), otherwise false
+     * @return true if player is fake or in singleplayer (can skip authentication process), otherwise false
      * @see <a href="https://samolego.github.io/SimpleAuth/org/samo_lego/simpleauth/mixin/MixinPlayerEntity.html">See implementation</a>
      */
     boolean canSkipAuth();

fabric/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id "com.github.johnrengelman.shadow" version "7.1.0"
+	id "com.github.johnrengelman.shadow" version "7.1.2"
 }
 
 repositories {
@@ -40,7 +40,7 @@ dependencies {
 	// from masa's maven
 	//modImplementation "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_version}"
 	// jitpack for quicker updating
-	modImplementation "carpet:fabric-carpet:1.18-${project.carpet_core_version}"
+	modImplementation "carpet:fabric-carpet:1.18.2-${project.carpet_core_version}"
 
 	// Password hashing
 	// Argon2

forge/src/main/java/org/samo_lego/simpleauth/SimpleAuthForge.java

@@ -2,9 +2,11 @@ package org.samo_lego.simpleauth;
 
 import com.mojang.brigadier.CommandDispatcher;
 import net.minecraft.server.command.ServerCommandSource;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.fml.loading.FMLPaths;
@@ -15,7 +17,7 @@ import org.samo_lego.simpleauth.commands.*;
 public class SimpleAuthForge {
     public SimpleAuthForge() {
         SimpleAuth.init(FMLPaths.GAMEDIR.get());
-        MinecraftForge.EVENT_BUS.register(this);
+        DistExecutor.safeRunWhenOn(Dist.DEDICATED_SERVER, () -> () -> MinecraftForge.EVENT_BUS.register(this));
     }
 
     @SubscribeEvent

forge/src/main/java/org/samo_lego/simpleauth/event/AuthEventHandlerForge.java

@@ -2,6 +2,7 @@ package org.samo_lego.simpleauth.event;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.ActionResult;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.event.entity.player.AttackEntityEvent;
 import net.minecraftforge.event.entity.player.PlayerContainerEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
@@ -15,7 +16,7 @@ import static org.samo_lego.simpleauth.SimpleAuth.MOD_ID;
  * This class will take care of actions players try to do,
  * and cancel them if they aren't authenticated
  */
-@Mod.EventBusSubscriber(modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE)
+@Mod.EventBusSubscriber(value = Dist.DEDICATED_SERVER, modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE)
 public class AuthEventHandlerForge {
     @SubscribeEvent(priority = HIGHEST)
     public static void onContainerOpen(PlayerContainerEvent.Open event) {

gradle.properties

@@ -2,21 +2,21 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric properties
-minecraft_version=1.18.1
+minecraft_version=1.18.2
-yarn_mappings=1.18.1+build.2
+yarn_mappings=1.18.2+build.2
-loader_version=0.12.11
+loader_version=0.13.3
 
 #Fabric api
-fabric_version=0.44.0+1.18
+fabric_version=0.48.0+1.18.2
 
 # Forge
-forge_version=39.0.8
+forge_version=40.0.41
 
 # Architectury
-architectury_version=3.2.57
+architectury_version=4.1.39
 
 # Mod Properties
-mod_version = 1.8.4-agatha
+mod_version = 1.8.5-agatha
 maven_group = org.samo_lego
 archives_base_name = simpleauth
 
@@ -27,5 +27,7 @@ bytes_version = 1.3.0
 
 
 # Carpet for debugging
-carpet_core_version = 1.4.56+v211130
+carpet_core_version = 1.4.69+v220331
 carpet_branch = master
+
+org.gradle.jvmargs=-Xmx4G