Fix Enchantment command

TangyKiwi · May 30, 2023 · 0b49feb · 0b49feb
1 parent 0b2ec97
commit 0b49feb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/src/main/java/com/tangykiwi/kiwiclient/command/commands/Enchant.java b/src/main/java/com/tangykiwi/kiwiclient/command/commands/Enchant.java
@@ -15,6 +15,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.text.Text;
 
 import java.util.function.Function;
@@ -95,8 +96,8 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
     private void one(CommandContext<CommandSource> context, Function<Enchantment, Integer> level) throws CommandSyntaxException {
         ItemStack itemStack = tryGetItemStack();
 
-        Enchantment enchantment = context.getArgument("enchantment", Enchantment.class);
-        Utils.addEnchantment(itemStack, enchantment, level.apply(enchantment));
+        RegistryEntry.Reference<Enchantment> enchantment = context.getArgument("enchantment", RegistryEntry.Reference.class);
+        Utils.addEnchantment(itemStack, enchantment.value(), level.apply(enchantment.value()));
 
         syncItem();
     }

diff --git a/src/main/java/com/tangykiwi/kiwiclient/mixin/EntityBucketItemAccessor.java b/src/main/java/com/tangykiwi/kiwiclient/mixin/EntityBucketItemAccessor.java
diff --git a/src/main/java/com/tangykiwi/kiwiclient/util/tooltip/EntityTooltipComponent.java b/src/main/java/com/tangykiwi/kiwiclient/util/tooltip/EntityTooltipComponent.java
@@ -7,6 +7,7 @@
 import net.minecraft.client.gui.tooltip.TooltipComponent;
 import net.minecraft.client.item.TooltipData;
 import net.minecraft.client.render.DiffuseLighting;
+import net.minecraft.client.render.LightmapTextureManager;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.render.item.ItemRenderer;
@@ -140,7 +141,7 @@ protected static void adjustEntity(Entity entity, NbtCompound itemNbt) {
                 pufferfish.setPuffState(2);
             } else if (entity instanceof TropicalFishEntity tropicalFish) {
                 if (itemNbt.contains("BucketVariantTag", NbtElement.INT_TYPE)) {
-                    tropicalFish.setVariant(TropicalFishEntity.Variety.fromId(itemNbt.getInt("BucketVariantTag")));
+                    tropicalFish.setVariant(TropicalFishEntity.getVariety(itemNbt.getInt(TropicalFishEntity.BUCKET_VARIANT_TAG_KEY)));
                 }
             }
         }

diff --git a/src/main/resources/kiwiclient.mixins.json b/src/main/resources/kiwiclient.mixins.json
@@ -27,7 +27,6 @@
     "CreativeInventoryScreenAccessor",
     "CustomPayloadC2SPacketAccessor",
     "EntityAccessor",
-    "EntityBucketItemAccessor",
     "EntityBucketItemMixin",
     "EntityMixin",
     "EntityRendererMixin",