Fixed 1.19.3 crashes and potentially #8

mattymatty97 · May 21, 2023 · d52a2df · d52a2df
1 parent f8dc8bc
commit d52a2df
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 40 deletions.
diff --git a/build.properties b/build.properties
@@ -1,3 +1,3 @@
-#Sat Feb 25 18:23:10 CET 2023
+#Sat May 20 13:16:10 CEST 2023
 mod_version=1.9.7
-mod_buildnumber=2
+mod_buildnumber=5
diff --git a/src/main/java/com/carpet_shadow/CarpetShadow.java b/src/main/java/com/carpet_shadow/CarpetShadow.java
@@ -4,7 +4,6 @@
 import carpet.CarpetServer;
 import com.carpet_shadow.utility.RandomString;
 import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;

diff --git a/src/main/java/com/carpet_shadow/CarpetShadowServerSettings.java b/src/main/java/com/carpet_shadow/CarpetShadowServerSettings.java
@@ -2,9 +2,11 @@
 
 import carpet.settings.Rule;
 
-import static carpet.settings.RuleCategory.*;
-import static com.carpet_shadow.CarpetShadowSettings.*;
+import static carpet.settings.RuleCategory.FEATURE;
+import static carpet.settings.RuleCategory.OPTIMIZATION;
+import static com.carpet_shadow.CarpetShadowSettings.SHADOW;
 
+@SuppressWarnings({"removal"})
 public class CarpetShadowServerSettings {
     @Rule(desc = "Prevents desync betwen client and server when using a fast refilling shadow stack", category = {SHADOW, OPTIMIZATION, FEATURE})
     public static boolean shadowItemUseFix = false;

diff --git a/src/main/java/com/carpet_shadow/CarpetShadowSettings.java b/src/main/java/com/carpet_shadow/CarpetShadowSettings.java
@@ -8,6 +8,7 @@
 
 import static carpet.settings.RuleCategory.*;
 
+@SuppressWarnings({"removal"})
 public class CarpetShadowSettings {
     public static final String SHADOW = "shadow_items";
     @Rule(desc = "Shadow Items Action over Unloading ( Unlink is default vanilla )", category = {SHADOW, BUGFIX})

diff --git a/src/main/java/com/carpet_shadow/mixins/fragility/DropperBlockMixin.java b/src/main/java/com/carpet_shadow/mixins/fragility/DropperBlockMixin.java
@@ -1,6 +1,5 @@
 package com.carpet_shadow.mixins.fragility;
 
-import com.carpet_shadow.CarpetShadow;
 import com.carpet_shadow.CarpetShadowSettings;
 import com.carpet_shadow.interfaces.ShadowItem;
 import net.minecraft.block.DropperBlock;
@@ -12,7 +11,8 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 

diff --git a/src/main/java/com/carpet_shadow/mixins/fragility/PlayerInventoryMixin.java b/src/main/java/com/carpet_shadow/mixins/fragility/PlayerInventoryMixin.java
@@ -6,16 +6,15 @@
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.collection.DefaultedList;
-import net.minecraft.util.crash.CrashException;
-import net.minecraft.util.crash.CrashReport;
-import net.minecraft.util.crash.CrashReportSection;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PlayerInventory.class)

diff --git a/src/main/java/com/carpet_shadow/mixins/general/ScreenHandlerMixin.java b/src/main/java/com/carpet_shadow/mixins/general/ScreenHandlerMixin.java
@@ -4,27 +4,15 @@
 import com.carpet_shadow.CarpetShadowSettings;
 import com.carpet_shadow.Globals;
 import com.carpet_shadow.interfaces.ShadowItem;
-import com.carpet_shadow.utility.ShadowingException;
-import com.carpet_shadow.utility.SlotException;
-import de.cronn.reflection.util.ClassUtils;
-import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.MappingResolver;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.screen.slot.SlotActionType;
-import net.minecraft.util.crash.CrashException;
 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.Redirect;
-import org.spongepowered.asm.mixin.injection.Slice;
-
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Method;
-import java.util.Arrays;
 
 @Mixin(ScreenHandler.class)
 public abstract class ScreenHandlerMixin {

diff --git a/...in/java/com/carpet_shadow/mixins/hand_update_fix/ServerPlayerInteractionManagerMixin.java b/...in/java/com/carpet_shadow/mixins/hand_update_fix/ServerPlayerInteractionManagerMixin.java
@@ -4,10 +4,7 @@
 import com.carpet_shadow.interfaces.ShadowItem;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -18,8 +15,6 @@
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import org.apache.logging.log4j.Logger;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;

diff --git a/src/main/java/com/carpet_shadow/mixins/inv_updates/MinecraftServerMixin.java b/src/main/java/com/carpet_shadow/mixins/inv_updates/MinecraftServerMixin.java
@@ -5,10 +5,7 @@
 import com.carpet_shadow.Globals;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.server.MinecraftServer;
-import org.apache.logging.log4j.Logger;
-import org.spongepowered.asm.mixin.Final;
 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.callback.CallbackInfo;

diff --git a/src/main/java/com/carpet_shadow/mixins/inv_updates/SlotMixin.java b/src/main/java/com/carpet_shadow/mixins/inv_updates/SlotMixin.java
@@ -1,7 +1,7 @@
 package com.carpet_shadow.mixins.inv_updates;
 
-import com.carpet_shadow.interfaces.ShadowItem;
 import com.carpet_shadow.interfaces.InventoryItem;
+import com.carpet_shadow.interfaces.ShadowItem;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.slot.Slot;

diff --git a/src/main/java/com/carpet_shadow/mixins/inv_updates/loaders/BlockEntityMixin.java b/src/main/java/com/carpet_shadow/mixins/inv_updates/loaders/BlockEntityMixin.java
@@ -5,15 +5,13 @@
 import com.carpet_shadow.interfaces.ShadowItem;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.command.BlockDataObject;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.util.math.BlockPos;
 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(BlockEntity.class)

diff --git a/src/main/java/com/carpet_shadow/mixins/tooltip/PacketByteBufMixin.java b/src/main/java/com/carpet_shadow/mixins/tooltip/PacketByteBufMixin.java
@@ -20,8 +20,6 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.Objects;
-
 @Mixin(PacketByteBuf.class)
 public abstract class PacketByteBufMixin {
 
@@ -59,10 +57,11 @@ public void filter_shadow_lore(CallbackInfoReturnable<ItemStack> cir) {
         String string;
         MutableText mutableText2;
         NbtCompound nbt = stack.getNbt();
-        if (nbt != null && nbt.contains(ItemStack.DISPLAY_KEY)) {
+        if (nbt != null && (nbt.contains(ItemStack.DISPLAY_KEY) || nbt.contains(ShadowItem.SHADOW_KEY))) {
             String shadow_id = nbt.getString(ShadowItem.SHADOW_KEY);
             if (!shadow_id.equals("")){
                 ((ShadowItem) (Object) stack).setShadowId(shadow_id);
+                nbt.remove(ShadowItem.SHADOW_KEY);
             }
             NbtCompound display = nbt.getCompound(ItemStack.DISPLAY_KEY);
             if (display.contains(ItemStack.LORE_KEY)) {
@@ -84,9 +83,9 @@ public void filter_shadow_lore(CallbackInfoReturnable<ItemStack> cir) {
                     display.remove(ItemStack.LORE_KEY);
                 if (display.isEmpty())
                     nbt.remove(ItemStack.DISPLAY_KEY);
-                if (nbt.isEmpty())
-                    stack.setNbt(null);
             }
+            if (nbt.isEmpty())
+                stack.setNbt(null);
         }
 
     }