Fixed some stuff

Qzimyion · Aug 18, 2024 · e24babc · e24babc
1 parent 7a25585
commit e24babc
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 0 deletions.
diff --git a/src/main/java/com/qzimyion/bucketem/BucketemClient.java b/src/main/java/com/qzimyion/bucketem/BucketemClient.java
@@ -1,9 +1,15 @@
 package com.qzimyion.bucketem;
 
+import com.qzimyion.bucketem.mixin.EntityBucketItemAccessor;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.entity.Bucketable;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.passive.AxolotlEntity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.EntityBucketItem;
+import net.minecraft.item.Item;
 import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.util.Identifier;
@@ -12,6 +18,8 @@
 
 @SuppressWarnings("deprecation")
 public class BucketemClient implements ClientModInitializer {
+    private static final MinecraftClient MINECRAFT = MinecraftClient.getInstance();
+
 
     public static void itemPredicates(){
 
@@ -36,6 +44,30 @@ public static void itemPredicates(){
                 return 1;
             }
         });
+
+        FabricModelPredicateProviderRegistry.register(Items.AXOLOTL_BUCKET, new Identifier("variant"),
+                (itemStack, world, holder, seed) -> {
+                    Item item = itemStack.getItem();
+                    if (!(item instanceof EntityBucketItem)) {
+                        return 0f;
+                    }
+
+                    Entity entity = ((EntityBucketItemAccessor) item).getEntityType().create(MINECRAFT.world);
+                    if (!(entity instanceof AxolotlEntity) || entity == null) {
+                        return 0f;
+                    }
+
+                    ((Bucketable) entity).copyDataFromNbt(itemStack.getOrCreateNbt());
+
+                    return ((AxolotlEntity) entity).getVariant().ordinal() / 10f;
+                }
+        );
+
+        FabricModelPredicateProviderRegistry.register(GOLDEN_WATER_BUCKET, new Identifier("level"), (stack, level, entity, hash) -> stack.getOrCreateNbt().getInt("fluidlevel"));
+        FabricModelPredicateProviderRegistry.register(GOLDEN_LAVA_BUCKET, new Identifier("level"), (stack, level, entity, hash) -> stack.getOrCreateNbt().getInt("fluidlevel"));
+        FabricModelPredicateProviderRegistry.register(GOLDEN_MILK_BUCKET, new Identifier("level"), (stack, level, entity, hash) -> stack.getOrCreateNbt().getInt("fluidlevel"));
+        FabricModelPredicateProviderRegistry.register(GOLDEN_POWDER_SNOW_BUCKET, new Identifier("level"), (stack, level, entity, hash) -> stack.getOrCreateNbt().getInt("fluidlevel"));
+
     }
 
     public void onInitializeClient(){

diff --git a/src/main/java/com/qzimyion/bucketem/mixin/EntityBucketItemAccessor.java b/src/main/java/com/qzimyion/bucketem/mixin/EntityBucketItemAccessor.java
@@ -0,0 +1,12 @@
+package com.qzimyion.bucketem.mixin;
+
+import net.minecraft.entity.EntityType;
+import net.minecraft.item.EntityBucketItem;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(EntityBucketItem.class)
+public interface EntityBucketItemAccessor {
+    @Accessor
+    EntityType<?> getEntityType();
+}
diff --git a/src/main/resources/bucketem.mixins.json b/src/main/resources/bucketem.mixins.json
@@ -3,6 +3,7 @@
   "package": "com.qzimyion.bucketem.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
+    "EntityBucketItemAccessor",
     "BlockEntityMixins.ChiseledBookshelfMixin",
     "EntityMixins.BeeEntityMixin",
     "EntityMixins.EndermiteEntityMixin",