diff --git a/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java b/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java index e10788e..08276e3 100644 --- a/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java +++ b/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java @@ -9,7 +9,7 @@ import java.util.HashMap; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.Player; import net.minecraft.item.ItemInstance; -import net.minecraft.tile.Tile; +import net.minecraft.item.ItemType; public class WyHelper { @@ -90,8 +90,10 @@ public class WyHelper { } public static void cheatCommand(Player player) { - player.dropItem(new ItemInstance(Tile.LADDER, 64)); - player.dropItem(new ItemInstance(Tile.WOOD, 64)); + player.dropItem(new ItemInstance(ItemType.pickaxeIron, 1, 100)); + player.dropItem(new ItemInstance(ItemType.pickaxeIron, 1, 150)); + player.dropItem(new ItemInstance(ItemType.pickaxeDiamond, 1, 150)); +// player.dropItem(new ItemInstance(Tile.WOOD, 64)); // player.dropItem(new ItemInstance(ItemType.snowball, 60)); player.level.setLevelTime(0); diff --git a/src/main/java/xyz/pixelatedw/finalbeta/mixin/CraftingContainerMixin.java b/src/main/java/xyz/pixelatedw/finalbeta/mixin/CraftingContainerMixin.java index b61e3e9..2777923 100644 --- a/src/main/java/xyz/pixelatedw/finalbeta/mixin/CraftingContainerMixin.java +++ b/src/main/java/xyz/pixelatedw/finalbeta/mixin/CraftingContainerMixin.java @@ -26,7 +26,12 @@ public class CraftingContainerMixin { int damage = 0; for (int i = 0; i < inventory.getInvSize(); i++) { - ItemInstance item = inventory.getInvItem(i); + ItemInstance item = inventory.getInvItem(i); + if ((item != null && item.method_723() <= 0) || (item != null && resultItem != null && item.itemId != resultItem.itemId)) { + resultItem = null; + break; + } + if (item != null && item.method_723() > 0) { if (resultItem == null) { resultItem = new ItemInstance(item.itemId, 1, item.getDamage());