- fixed: some buckets of other mods did not appear in creative tab

- fixed: dublicated milk buckets in creative tab
cech12 · Aug 10, 2020 · dac66de · dac66de
1 parent 2c4409a
commit dac66de
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/...va/cech12/ceramicbucket/ClientEvents.java → ...12/ceramicbucket/client/ClientEvents.java b/...va/cech12/ceramicbucket/ClientEvents.java → ...12/ceramicbucket/client/ClientEvents.java
@@ -1,5 +1,6 @@
-package cech12.ceramicbucket;
+package cech12.ceramicbucket.client;
 
+import cech12.ceramicbucket.CeramicBucketMod;
 import cech12.ceramicbucket.client.model.CeramicBucketModel;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
@@ -8,7 +9,7 @@
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
-@Mod.EventBusSubscriber(modid=CeramicBucketMod.MOD_ID, bus= Mod.EventBusSubscriber.Bus.MOD, value= Dist.CLIENT)
+@Mod.EventBusSubscriber(modid= CeramicBucketMod.MOD_ID, bus= Mod.EventBusSubscriber.Bus.MOD, value= Dist.CLIENT)
 public class ClientEvents {
 
     @SubscribeEvent

diff --git a/src/main/java/cech12/ceramicbucket/item/FilledCeramicBucketItem.java b/src/main/java/cech12/ceramicbucket/item/FilledCeramicBucketItem.java
@@ -5,6 +5,8 @@
 import cech12.ceramicbucket.util.CeramicBucketUtils;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.fluid.Fluids;
+import net.minecraft.item.BucketItem;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
@@ -19,6 +21,7 @@
 import net.minecraftforge.registries.ForgeRegistries;
 
 import javax.annotation.Nonnull;
+import java.util.ArrayList;
 
 public class FilledCeramicBucketItem extends AbstractCeramicBucketItem {
 
@@ -48,10 +51,16 @@ public ItemStack getDefaultInstance() {
     @Override
     public void fillItemGroup(@Nonnull ItemGroup group, @Nonnull NonNullList<ItemStack> items) {
         if (this.isInGroup(group)) {
+            ArrayList<Fluid> addedFluids = new ArrayList<>();
             for (Fluid fluid : ForgeRegistries.FLUIDS) {
                 //only add non milk source fluids with a bucket item
-                if (fluid.getDefaultState().isSource() && !CeramicBucketUtils.isMilkFluid(fluid, false) && fluid.getFilledBucket() != null) {
-                    items.add(getFilledInstance(fluid));
+                Item bucket = fluid.getFilledBucket();
+                if (!CeramicBucketUtils.isMilkFluid(fluid, false) && bucket != null && bucket instanceof BucketItem) {
+                    Fluid bucketFluid = ((BucketItem) bucket).getFluid();
+                    if (!addedFluids.contains(bucketFluid)) {
+                        items.add(getFilledInstance(bucketFluid));
+                        addedFluids.add(bucketFluid);
+                    }
                 }
             }
         }

diff --git a/src/main/java/cech12/ceramicbucket/util/CeramicBucketUtils.java b/src/main/java/cech12/ceramicbucket/util/CeramicBucketUtils.java
@@ -6,6 +6,7 @@
 import cech12.ceramicbucket.item.FilledCeramicBucketItem;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.tags.ITag;
 import net.minecraft.util.ResourceLocation;
@@ -31,6 +32,10 @@ public static boolean isMilkFluid(@Nonnull Fluid fluid, boolean checkTag) {
         if (checkTag && fluid.isIn(MILK_TAG)) {
             return true;
         }
+        ResourceLocation location = fluid.getFilledBucket().getRegistryName();
+        if (location != null && location.equals(Items.MILK_BUCKET.getRegistryName())) {
+            return true;
+        }
         for (ResourceLocation name : MILK_FLUIDS) {
             if (name.equals(fluid.getRegistryName())) {
                 return true;