fixed: MobBucketItems with non-bucketable entities were added to crea…

…tive menu

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/).
 
+## [1.20.1-2.3.0.3] - 2023-11-04
+### Fixed
+- MobBucketItems with non-bucketable entities were added to creative menu (found in Naturalist mod 4.0)
+
 ## [1.20.1-2.3.0.2] - 2023-10-30
 ### Fixed
 - Milk string was not translated correctly https://github.com/cech12/CeramicBucket/issues/74

gradle.properties

@@ -13,7 +13,7 @@ mixin_version=0.8.5
 
 ## Mod Properties
 mod_id=bucketlib
-mod_version=2.3.0.2
+mod_version=2.3.0.3
 mod_group_id=cech12.bucketlib
 mod_name=BucketLib
 mod_authors=Cech12

src/main/java/cech12/bucketlib/util/RegistryUtil.java

@@ -1,6 +1,8 @@
 package cech12.bucketlib.util;
 
+import net.minecraft.client.Minecraft;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.animal.Bucketable;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.MobBucketItem;
 import net.minecraft.world.item.SolidBucketItem;
@@ -32,7 +34,7 @@ private static void readRegistry() {
                     Method method = MobBucketItem.class.getDeclaredMethod("getFishType");
                     method.setAccessible(true);
                     EntityType<?> entityType = (EntityType<?>) method.invoke(bucket);
-                    if (entityType != null) {
+                    if (entityType != null && Minecraft.getInstance().level != null && entityType.create(Minecraft.getInstance().level) instanceof Bucketable) {
                         bucketEntities.add(new BucketEntity(entityType, bucket.getFluid(), bucket));
                     }
                 } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {}