Add itemstack get potion effects & add mixin mob entity loot table

pisaiah · pisaiah · commit 786bf0f568eb · 2024-05-14T00:14:32.000-04:00
diff --git a/iCommon-API/build.gradle.kts b/iCommon-API/build.gradle.kts
@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id ("fabric-loom") version "1.3-SNAPSHOT"
+    id ("fabric-loom") version "1.6-SNAPSHOT"
     id ("java-library")
     id ("maven-publish")
 }
diff --git a/iCommon-API/src/main/java/me/isaiah/common/cmixin/IMixinItemStack.java b/iCommon-API/src/main/java/me/isaiah/common/cmixin/IMixinItemStack.java
@@ -1,6 +1,9 @@
 package me.isaiah.common.cmixin;
 
+import java.util.List;
+
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.util.Hand;
 
 /**
@@ -15,4 +18,8 @@ public interface IMixinItemStack {
 	 */
 	void IC$modify_arguments(String arguments);
 	
+	/**
+	 */
+	public List<StatusEffectInstance> IC$get_potion_status_effects();
+
 }
diff --git a/iCommon-API/src/main/java/me/isaiah/common/cmixin/IMixinMobEntity.java b/iCommon-API/src/main/java/me/isaiah/common/cmixin/IMixinMobEntity.java
@@ -0,0 +1,15 @@
+package me.isaiah.common.cmixin;
+
+import net.minecraft.util.Identifier;
+
+public interface IMixinMobEntity {
+
+	/**
+	 */
+	void IC$set_loot_table(Identifier id);
+	
+	/**
+	 */
+	Identifier IC$get_loot_table_id();
+
+}
diff --git a/iCommon-API/src/main/java/me/isaiah/common/cmixin/MixinList.java b/iCommon-API/src/main/java/me/isaiah/common/cmixin/MixinList.java
@@ -40,6 +40,7 @@ public class MixinList {
               "    TradeOffer",
               "    SkullBlockEntity",
               "    BeaconBlockEntity",
+              "    MobEntity",
               "MCVER=1.18,1.19,1.20",
               "    World_18"
             );
diff --git a/iCommon-Fabric-1.17/build.gradle.kts b/iCommon-Fabric-1.17/build.gradle.kts
@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id ("fabric-loom") version "1.3-SNAPSHOT"
+    id ("fabric-loom") version "1.6-SNAPSHOT"
     id ("maven-publish")
 	id ("java-library")
 }
diff --git a/iCommon-Fabric-1.18.2/build.gradle.kts b/iCommon-Fabric-1.18.2/build.gradle.kts
@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id ("fabric-loom") version "1.3-SNAPSHOT"
+    id ("fabric-loom") version "1.6-SNAPSHOT"
     id ("maven-publish")
 	id ("java-library")
 }
diff --git a/iCommon-Fabric-1.18.2/src/main/java/me/isaiah/common/mixin/R1_18/MixinItemStack.java b/iCommon-Fabric-1.18.2/src/main/java/me/isaiah/common/mixin/R1_18/MixinItemStack.java
@@ -1,15 +1,19 @@
 package me.isaiah.common.mixin.R1_18;
 
+import java.util.List;
+
 import org.spongepowered.asm.mixin.Mixin;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
 import me.isaiah.common.ICommonMod;
 import me.isaiah.common.cmixin.IMixinItemStack;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.StringNbtReader;
+import net.minecraft.potion.PotionUtil;
 import net.minecraft.util.Hand;
 
 @Mixin(ItemStack.class)
@@ -31,4 +35,9 @@ public class MixinItemStack implements IMixinItemStack {
         }
 	}
 
+	@Override
+	public List<StatusEffectInstance> IC$get_potion_status_effects() {
+		return PotionUtil.getPotionEffects(((ItemStack) (Object) this));
+	}
+
 }
diff --git a/iCommon-Fabric-1.18.2/src/main/java/me/isaiah/common/mixin/R1_18/MixinMobEntity.java b/iCommon-Fabric-1.18.2/src/main/java/me/isaiah/common/mixin/R1_18/MixinMobEntity.java
@@ -0,0 +1,36 @@
+package me.isaiah.common.mixin.R1_18;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import me.isaiah.common.cmixin.IMixinMobEntity;
+import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.util.Identifier;
+
+@Mixin(MobEntity.class)
+public class MixinMobEntity implements IMixinMobEntity {
+
+	// <=1.20.4: Lnet/minecraft/entity/mob/MobEntity;lootTable:Lnet/minecraft/util/Identifier;
+	// >=1.20.5: Lnet/minecraft/entity/mob/MobEntity;lootTable:Lnet/minecraft/registry/RegistryKey;
+	
+	@Shadow
+	public Identifier lootTable;
+	
+	
+	@Override
+	public void IC$set_loot_table(Identifier id) {
+		this.lootTable = id;
+	}
+
+
+	@Override
+	public Identifier IC$get_loot_table_id() {
+		MobEntity e = ((MobEntity) (Object) this);
+		
+        if (lootTable == null) {
+            lootTable = e.getLootTable();
+        }
+		return lootTable;
+	}
+
+}
diff --git a/iCommon-Fabric-1.18/build.gradle.kts b/iCommon-Fabric-1.18/build.gradle.kts
@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id ("fabric-loom") version "1.3-SNAPSHOT"
+    id ("fabric-loom") version "1.6-SNAPSHOT"
     id ("maven-publish")
 	id ("java-library")
 }
diff --git a/iCommon-Fabric-1.19.4/build.gradle.kts b/iCommon-Fabric-1.19.4/build.gradle.kts
@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id ("fabric-loom") version "1.3-SNAPSHOT"
+    id ("fabric-loom") version "1.6-SNAPSHOT"
     id ("maven-publish")
 	id ("java-library")
 }
diff --git a/iCommon-Fabric-1.19.4/src/main/java/me/isaiah/common/mixin/R1_19/MixinItemStack.java b/iCommon-Fabric-1.19.4/src/main/java/me/isaiah/common/mixin/R1_19/MixinItemStack.java
@@ -1,15 +1,19 @@
 package me.isaiah.common.mixin.R1_19;
 
+import java.util.List;
+
 import org.spongepowered.asm.mixin.Mixin;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
 import me.isaiah.common.ICommonMod;
 import me.isaiah.common.cmixin.IMixinItemStack;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.StringNbtReader;
+import net.minecraft.potion.PotionUtil;
 import net.minecraft.util.Hand;
 
 @Mixin(ItemStack.class)
@@ -31,4 +35,9 @@ public class MixinItemStack implements IMixinItemStack {
         }
 	}
 	
+	@Override
+	public List<StatusEffectInstance> IC$get_potion_status_effects() {
+		return PotionUtil.getPotionEffects(((ItemStack) (Object) this));
+	}
+
 }
diff --git a/iCommon-Fabric-1.19.4/src/main/java/me/isaiah/common/mixin/R1_19/MixinMobEntity.java b/iCommon-Fabric-1.19.4/src/main/java/me/isaiah/common/mixin/R1_19/MixinMobEntity.java
@@ -0,0 +1,35 @@
+package me.isaiah.common.mixin.R1_19;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import me.isaiah.common.cmixin.IMixinMobEntity;
+import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.util.Identifier;
+
+@Mixin(MobEntity.class)
+public class MixinMobEntity implements IMixinMobEntity {
+
+	// <=1.20.4: Lnet/minecraft/entity/mob/MobEntity;lootTable:Lnet/minecraft/util/Identifier;
+	// >=1.20.5: Lnet/minecraft/entity/mob/MobEntity;lootTable:Lnet/minecraft/registry/RegistryKey;
+	
+	@Shadow
+	public Identifier lootTable;
+	
+	
+	@Override
+	public void IC$set_loot_table(Identifier id) {
+		this.lootTable = id;
+	}
+	
+	@Override
+	public Identifier IC$get_loot_table_id() {
+		MobEntity e = ((MobEntity) (Object) this);
+		
+        if (lootTable == null) {
+            lootTable = e.getLootTable();
+        }
+		return lootTable;
+	}
+
+}
diff --git a/iCommon-Fabric-1.19/build.gradle.kts b/iCommon-Fabric-1.19/build.gradle.kts
@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id ("fabric-loom") version "1.3-SNAPSHOT"
+    id ("fabric-loom") version "1.6-SNAPSHOT"
     id ("maven-publish")
 	id ("java-library")
 }
diff --git a/iCommon-Fabric-1.19/src/main/java/me/isaiah/common/mixin/R1_19/MixinItemStack.java b/iCommon-Fabric-1.19/src/main/java/me/isaiah/common/mixin/R1_19/MixinItemStack.java
@@ -1,15 +1,19 @@
 package me.isaiah.common.mixin.R1_19;
 
+import java.util.List;
+
 import org.spongepowered.asm.mixin.Mixin;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
 import me.isaiah.common.ICommonMod;
 import me.isaiah.common.cmixin.IMixinItemStack;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.StringNbtReader;
+import net.minecraft.potion.PotionUtil;
 import net.minecraft.util.Hand;
 
 @Mixin(ItemStack.class)
@@ -31,4 +35,9 @@ public class MixinItemStack implements IMixinItemStack {
         }
 	}
 	
+	@Override
+	public List<StatusEffectInstance> IC$get_potion_status_effects() {
+		return PotionUtil.getPotionEffects(((ItemStack) (Object) this));
+	}
+	
 }
diff --git a/iCommon-Fabric-1.19/src/main/java/me/isaiah/common/mixin/R1_19/MixinMobEntity.java b/iCommon-Fabric-1.19/src/main/java/me/isaiah/common/mixin/R1_19/MixinMobEntity.java
@@ -0,0 +1,35 @@
+package me.isaiah.common.mixin.R1_19;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import me.isaiah.common.cmixin.IMixinMobEntity;
+import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.util.Identifier;
+
+@Mixin(MobEntity.class)
+public class MixinMobEntity implements IMixinMobEntity {
+
+	// <=1.20.4: Lnet/minecraft/entity/mob/MobEntity;lootTable:Lnet/minecraft/util/Identifier;
+	// >=1.20.5: Lnet/minecraft/entity/mob/MobEntity;lootTable:Lnet/minecraft/registry/RegistryKey;
+	
+	@Shadow
+	public Identifier lootTable;
+	
+	
+	@Override
+	public void IC$set_loot_table(Identifier id) {
+		this.lootTable = id;
+	}
+	
+	@Override
+	public Identifier IC$get_loot_table_id() {
+		MobEntity e = ((MobEntity) (Object) this);
+		
+        if (lootTable == null) {
+            lootTable = e.getLootTable();
+        }
+		return lootTable;
+	}
+
+}
diff --git a/iCommon-Fabric-1.20.1/build.gradle.kts b/iCommon-Fabric-1.20.1/build.gradle.kts
@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id ("fabric-loom") version "1.3-SNAPSHOT"
+    id ("fabric-loom") version "1.6-SNAPSHOT"
     id ("maven-publish")
 	id ("java-library")
 }
diff --git a/iCommon-Fabric-1.20.1/src/main/java/me/isaiah/common/mixin/R1_20/MixinItemStack.java b/iCommon-Fabric-1.20.1/src/main/java/me/isaiah/common/mixin/R1_20/MixinItemStack.java
@@ -1,15 +1,19 @@
 package me.isaiah.common.mixin.R1_20;
 
+import java.util.List;
+
 import org.spongepowered.asm.mixin.Mixin;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
 import me.isaiah.common.ICommonMod;
 import me.isaiah.common.cmixin.IMixinItemStack;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.StringNbtReader;
+import net.minecraft.potion.PotionUtil;
 import net.minecraft.util.Hand;
 
 @Mixin(ItemStack.class)
@@ -31,4 +35,9 @@ public class MixinItemStack implements IMixinItemStack {
         }
 	}
 	
+	@Override
+	public List<StatusEffectInstance> IC$get_potion_status_effects() {
+		return PotionUtil.getPotionEffects(((ItemStack) (Object) this));
+	}
+	
 }
diff --git a/iCommon-Fabric-1.20.1/src/main/java/me/isaiah/common/mixin/R1_20/MixinMobEntity.java b/iCommon-Fabric-1.20.1/src/main/java/me/isaiah/common/mixin/R1_20/MixinMobEntity.java
@@ -0,0 +1,35 @@
+package me.isaiah.common.mixin.R1_20;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import me.isaiah.common.cmixin.IMixinMobEntity;
+import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.util.Identifier;
+
+@Mixin(MobEntity.class)
+public class MixinMobEntity implements IMixinMobEntity {
+
+	// <=1.20.4: Lnet/minecraft/entity/mob/MobEntity;lootTable:Lnet/minecraft/util/Identifier;
+	// >=1.20.5: Lnet/minecraft/entity/mob/MobEntity;lootTable:Lnet/minecraft/registry/RegistryKey;
+	
+	@Shadow
+	public Identifier lootTable;
+	
+	
+	@Override
+	public void IC$set_loot_table(Identifier id) {
+		this.lootTable = id;
+	}
+	
+	@Override
+	public Identifier IC$get_loot_table_id() {
+		MobEntity e = ((MobEntity) (Object) this);
+		
+        if (lootTable == null) {
+            lootTable = e.getLootTable();
+        }
+		return lootTable;
+	}
+
+}
diff --git a/iCommon-Fabric-1.20.2/build.gradle.kts b/iCommon-Fabric-1.20.2/build.gradle.kts
@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id ("fabric-loom") version "1.3-SNAPSHOT"
+    id ("fabric-loom") version "1.6-SNAPSHOT"
     id ("maven-publish")
 	id ("java-library")
 }
diff --git a/iCommon-Fabric-1.20.2/src/main/java/me/isaiah/common/mixin/R1_20/MixinItemStack.java b/iCommon-Fabric-1.20.2/src/main/java/me/isaiah/common/mixin/R1_20/MixinItemStack.java
diff --git a/iCommon-Fabric-1.20.2/src/main/java/me/isaiah/common/mixin/R1_20/MixinMobEntity.java b/iCommon-Fabric-1.20.2/src/main/java/me/isaiah/common/mixin/R1_20/MixinMobEntity.java
diff --git a/iCommon-Fabric-1.20.5/build.gradle.kts b/iCommon-Fabric-1.20.5/build.gradle.kts
diff --git a/iCommon-Fabric-1.20.5/src/main/java/me/isaiah/common/mixin/R1_20/MixinItemStack.java b/iCommon-Fabric-1.20.5/src/main/java/me/isaiah/common/mixin/R1_20/MixinItemStack.java
diff --git a/iCommon-Fabric-1.20.5/src/main/java/me/isaiah/common/mixin/R1_20/MixinMobEntity.java b/iCommon-Fabric-1.20.5/src/main/java/me/isaiah/common/mixin/R1_20/MixinMobEntity.java
diff --git a/iCommon-Fabric-bundle/build.gradle.kts b/iCommon-Fabric-bundle/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import net.fabricmc.loom.task.RemapJarTask`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- id ("fabric-loom") version "1.3-SNAPSHOT"`
	`4`	`+ id ("fabric-loom") version "1.6-SNAPSHOT"`
`5`	`5`	`id ("java-library")`
`6`	`6`	`id ("maven-publish")`
`7`	`7`	`}`