Replace empty check with default entry comparison

Author: Virtuoel

patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinEnchantedBookItem.java

@@ -23,6 +23,7 @@
 import net.minecraftforge.common.extensions.IForgeItem;
 
 import net.minecraft.item.EnchantedBookItem;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.util.Identifier;
@@ -32,9 +33,11 @@
 public abstract class MixinEnchantedBookItem implements IForgeItem {
 	@Override
 	public String getCreatorModId(ItemStack itemStack) {
-		final Identifier id = Registry.ITEM.getId(itemStack.getItem());
+		final Item item = itemStack.getItem();
+		final Identifier defaultId = Registry.ITEM.getDefaultId();
+		final Identifier id = Registry.ITEM.getId(item);
 
-		if (!itemStack.isEmpty() && Registry.ITEM.getDefaultId().equals(id)) {
+		if (defaultId.equals(id) && item != Registry.ITEM.get(defaultId)) {
 			return null;
 		} else {
 			final String namespace = id.getNamespace();

patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinPotionItems.java

@@ -22,38 +22,38 @@
 import org.spongepowered.asm.mixin.Mixin;
 import net.minecraftforge.common.extensions.IForgeItem;
 
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.PotionItem;
 import net.minecraft.item.TippedArrowItem;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionUtil;
-import net.minecraft.potion.Potions;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
-@Mixin({ PotionItem.class, TippedArrowItem.class })
+@Mixin({PotionItem.class, TippedArrowItem.class})
 public abstract class MixinPotionItems implements IForgeItem {
 	@Override
 	public String getCreatorModId(ItemStack itemStack) {
-		Identifier id = Registry.ITEM.getId(itemStack.getItem());
+		final Item item = itemStack.getItem();
+		Identifier defaultId = Registry.ITEM.getDefaultId();
+		Identifier id = Registry.ITEM.getId(item);
 
-		if (!itemStack.isEmpty() && Registry.ITEM.getDefaultId().equals(id)) {
+		if (defaultId.equals(id) && item != Registry.ITEM.get(defaultId)) {
 			return null;
 		} else {
 			final String namespace = id.getNamespace();
 
 			if ("minecraft".equals(namespace)) {
 				final Potion potion = PotionUtil.getPotion(itemStack);
+				defaultId = Registry.POTION.getDefaultId();
+				id = Registry.POTION.getId(potion);
 
-				if (potion != Potions.EMPTY) {
-					id = Registry.POTION.getId(potion);
-
-					if (Registry.POTION.getDefaultId().equals(id)) {
-						return namespace;
-					}
-
-					return id.getNamespace();
+				if (defaultId.equals(id) && potion != Registry.POTION.get(defaultId)) {
+					return namespace;
 				}
+
+				return id.getNamespace();
 			}
 
 			return namespace;

patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinSpawnEggItem.java

@@ -34,20 +34,20 @@ public abstract class MixinSpawnEggItem implements IForgeItem {
 	@Override
 	public String getCreatorModId(ItemStack itemStack) {
 		final Item item = itemStack.getItem();
+		Identifier defaultId = Registry.ITEM.getDefaultId();
 		Identifier id = Registry.ITEM.getId(item);
 
-		if (!itemStack.isEmpty() && Registry.ITEM.getDefaultId().equals(id)) {
+		if (defaultId.equals(id) && item != Registry.ITEM.get(defaultId)) {
 			return null;
 		} else {
 			final String namespace = id.getNamespace();
 
 			if ("minecraft".equals(namespace)) {
-				final EntityType<?> type = ((SpawnEggItem) item).getEntityType(null);
+				final EntityType<?> type = ((SpawnEggItem) item).getEntityType(itemStack.getTag());
 				id = Registry.ENTITY_TYPE.getId(type);
+				defaultId = Registry.ENTITY_TYPE.getDefaultId();
 
-				final Identifier defaultId = Registry.ENTITY_TYPE.getDefaultId();
-
-				if (type != Registry.ENTITY_TYPE.get(defaultId) && defaultId.equals(id)) {
+				if (defaultId.equals(id) && type != Registry.ENTITY_TYPE.get(defaultId)) {
 					return namespace;
 				}
 

patchwork-extensions/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java

@@ -682,8 +682,11 @@ default boolean canContinueUsing(ItemStack oldStack, ItemStack newStack) {
 	 */
 	@Nullable
 	default String getCreatorModId(ItemStack itemStack) {
-		final Identifier id = Registry.ITEM.getId(itemStack.getItem());
-		return !itemStack.isEmpty() && Registry.ITEM.getDefaultId().equals(id) ? null : id.getNamespace();
+		final Item item = itemStack.getItem();
+		final Identifier defaultId = Registry.ITEM.getDefaultId();
+		final Identifier id = Registry.ITEM.getId(item);
+
+		return defaultId.equals(id) && item != Registry.ITEM.get(defaultId) ? null : id.getNamespace();
 	}
 
 	// TODO: Call locations: Patches: ItemStack