From 2e3442aba4a9d8b4dd2e6fa526f052ba259cddd2 Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Fri, 23 Jan 2026 22:30:05 +0800 Subject: [PATCH 01/19] chore: port to v1.3.5 --- build.gradle | 7 +-- common/build.gradle | 3 +- .../renderer/entity/WaterfowlRenderer.java | 9 +++- .../common/config/UntitledConfig.java | 15 ++++++ .../common/entity/DuckEntity.java | 7 ++- .../common/entity/GooseEntity.java | 21 ++++---- .../common/entity/WaterfowlEntity.java | 40 ++++++++++++++++ .../common/entity/ai/goal/common/EatGoal.java | 11 ++--- .../compat/jade/JadePlugin.java | 5 ++ .../compat/jade/provider/LayEggProvider.java | 22 +++++---- .../compat/jade/provider/NextEatProvider.java | 48 +++++++++++++++++++ .../assets/untitledduckmod/lang/en_us.json | 10 +++- .../assets/untitledduckmod/lang/zh_cn.json | 10 +++- docs/CHANGELOG.md | 16 +++++++ docs/LATEST_CHANGES.md | 9 ++-- fabric/build.gradle | 2 +- .../config/fabric/UntitledConfigImpl.java | 21 +++++++- forge/build.gradle | 2 +- .../config/forge/UntitledConfigImpl.java | 24 ++++++++++ gradle.properties | 9 ++-- 20 files changed, 241 insertions(+), 50 deletions(-) create mode 100644 common/src/main/java/net/untitledduckmod/compat/jade/provider/NextEatProvider.java diff --git a/build.gradle b/build.gradle index a7902102..380c9218 100644 --- a/build.gradle +++ b/build.gradle @@ -23,11 +23,8 @@ subprojects { url 'https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/' } maven { - name = "Curse Maven" - url "https://www.cursemaven.com" - content { - includeGroup "curse.maven" - } + name = "Modrinth Maven" + url = "https://api.modrinth.com/maven" } } diff --git a/common/build.gradle b/common/build.gradle index f7834037..3c972c6a 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -5,7 +5,6 @@ architectury { dependencies { modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" modImplementation "software.bernie.geckolib:geckolib-fabric-${minecraft_version}:${geckolib_version}" - - modApi "curse.maven:jade-324717:${jade_id_fabric}" + modApi "maven.modrinth:jade:${jade_version}+fabric" } diff --git a/common/src/main/java/net/untitledduckmod/client/renderer/entity/WaterfowlRenderer.java b/common/src/main/java/net/untitledduckmod/client/renderer/entity/WaterfowlRenderer.java index 67757ca7..7f56b1b4 100644 --- a/common/src/main/java/net/untitledduckmod/client/renderer/entity/WaterfowlRenderer.java +++ b/common/src/main/java/net/untitledduckmod/client/renderer/entity/WaterfowlRenderer.java @@ -7,6 +7,7 @@ import net.minecraft.client.render.item.HeldItemRenderer; import net.minecraft.client.render.model.json.ModelTransformationMode; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.util.math.RotationAxis; import net.untitledduckmod.common.entity.DuckEntity; @@ -67,12 +68,16 @@ public void renderRecursively(MatrixStack poseStack, T animatable, GeoBone bone, if (bone.getName().equals("beak") && !mainHand.isEmpty()) { poseStack.push(); if (animatable instanceof DuckEntity) { - poseStack.translate(0.0, 0.50, -0.40); + poseStack.translate(-0.05, 0.50, -0.30); } else if (animatable instanceof GooseEntity) { - poseStack.translate(0.0, 1.15, -0.45); + poseStack.translate(0.15, 1.15, -0.40); + if (mainHand.getItem() instanceof BlockItem) { + poseStack.translate(-0.15, 0, 0.0); + } } poseStack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(-90f)); + poseStack.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(-45f)); poseStack.scale(0.7f, 0.7f, 0.7f); heldItemRenderer.renderItem(animatable, mainHand, ModelTransformationMode.GROUND, false, poseStack, bufferSource, packedLight); diff --git a/common/src/main/java/net/untitledduckmod/common/config/UntitledConfig.java b/common/src/main/java/net/untitledduckmod/common/config/UntitledConfig.java index af0bc264..ca04b759 100644 --- a/common/src/main/java/net/untitledduckmod/common/config/UntitledConfig.java +++ b/common/src/main/java/net/untitledduckmod/common/config/UntitledConfig.java @@ -61,6 +61,21 @@ public static boolean gooseBabyRandomSize() { throw new AssertionError(); } + @ExpectPlatform + public static boolean enableForceEat() { + throw new AssertionError(); + } + + @ExpectPlatform + public static int forceEatRandomMinTick() { + throw new AssertionError(); + } + + @ExpectPlatform + public static int forceEatRandomMaxTick() { + throw new AssertionError(); + } + @ExpectPlatform public static float foodHealingValue() { throw new AssertionError(); diff --git a/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java b/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java index 79dfb8ff..c874b825 100644 --- a/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java +++ b/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java @@ -86,6 +86,7 @@ public class DuckEntity extends WaterfowlEntity implements Vibrations, Animation private static final RawAnimation DIVE_ANIM = RawAnimation.begin().thenPlay("dive").thenPlay("idle_swim"); private static final RawAnimation DANCE_ANIM = RawAnimation.begin().thenPlay("dance"); + public static final Ingredient FOOD_INGREDIENT = Ingredient.fromTag(ModTags.ItemTags.DUCK_FOOD); public static final Ingredient BREEDING_INGREDIENT = Ingredient.fromTag(ModTags.ItemTags.DUCK_BREEDING_FOOD); public static final Ingredient TAMING_INGREDIENT = Ingredient.fromTag(ModTags.ItemTags.DUCK_TAMING_FOOD); private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); @@ -229,7 +230,7 @@ protected void initGoals() { this.goalSelector.add(2, new AnimalMateGoal(this, 1.0D)); this.goalSelector.add(2, new EatGoal(this)); this.goalSelector.add(3, new SitGoal(this)); - this.goalSelector.add(4, new TemptGoal(this, 1.0D, BREEDING_INGREDIENT, false)); + this.goalSelector.add(4, new TemptGoal(this, 1.0D, FOOD_INGREDIENT, false)); this.goalSelector.add(5, new WFollowParentGoal(this, 1.1D)); this.goalSelector.add(6, new WFollowOwnerGoal(this, 1.6D, 10.0F, 2.0F, false)); this.goalSelector.add(6, new CleanGoal(this)); @@ -239,6 +240,10 @@ protected void initGoals() { this.goalSelector.add(8, new LookAroundGoal(this)); } + public boolean isEdibleFood(ItemStack stack) { + return !stack.isEmpty() && FOOD_INGREDIENT.test(stack); + } + @Override public boolean isBreedingItem(ItemStack stack) { if (this.isTamed()) { diff --git a/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java b/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java index df5e7a2a..f103d29d 100644 --- a/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java +++ b/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java @@ -75,7 +75,7 @@ public class GooseEntity extends WaterfowlEntity implements Angerable, Animation private static final RawAnimation BITE_ANIM = RawAnimation.begin().thenPlay("bite"); private static final RawAnimation CHARGE_ANIM = RawAnimation.begin().thenPlay("charge"); - public static final Ingredient FOOD = Ingredient.fromTag(ModTags.ItemTags.GOOSE_FOOD); + public static final Ingredient FOOD_INGREDIENT = Ingredient.fromTag(ModTags.ItemTags.GOOSE_FOOD); private static final Ingredient BREEDING_INGREDIENT = Ingredient.fromTag(ModTags.ItemTags.GOOSE_BREEDING_FOOD); private static final Ingredient TAMING_INGREDIENT = Ingredient.fromTag(ModTags.ItemTags.GOOSE_TAMING_FOOD); @@ -182,7 +182,7 @@ protected void initGoals() { this.goalSelector.add(5, new PickupFoodGoal(this)); this.goalSelector.add(6, new GooseMeleeAttackGoal(this, 1.5D, true)); - this.goalSelector.add(7, new TemptGoal(this, 1.0D, BREEDING_INGREDIENT, false)); + this.goalSelector.add(7, new TemptGoal(this, 1.0D, FOOD_INGREDIENT, false)); this.goalSelector.add(8, new WFollowParentGoal(this, 1.1D)); this.goalSelector.add(9, new WFollowOwnerGoal(this, 1.6D, 10.0F, 2.0F, false)); @@ -199,6 +199,11 @@ protected void initGoals() { this.targetSelector.add(3, new GooseRevengeGoal(this).setGroupRevenge()); } + @Override + public boolean isEdibleFood(ItemStack stack) { + return !stack.isEmpty() && FOOD_INGREDIENT.test(stack); + } + @Override public boolean isBreedingItem(ItemStack stack) { return !isAngry() && BREEDING_INGREDIENT.test(stack); @@ -255,7 +260,7 @@ protected void handlePanicAnimation() { protected boolean tryTaming(PlayerEntity player, ItemStack stack) { if (isAngry()) { // Peace goose when angry with food - if (FOOD.test(stack)) { + if (TAMING_INGREDIENT.test(stack)) { ItemStack newStack = stack.copy(); newStack.setCount(1); if (!player.getAbilities().creativeMode) { @@ -295,7 +300,7 @@ public void stopAnger() { public ItemStack tryEquip(ItemStack equipment) { EquipmentSlot equipmentSlot = EquipmentSlot.MAINHAND; ItemStack itemStack = getMainHandStack(); - if (FOOD.test(equipment) || this.canPickupItem(equipment)) { + if (FOOD_INGREDIENT.test(equipment) || this.canPickupItem(equipment)) { if (!itemStack.isEmpty()) { ItemEntity itemEntity = this.dropStack(itemStack); if (itemEntity != null) { @@ -323,7 +328,7 @@ protected void loot(ItemEntity item) { public boolean canPickupItem(ItemStack stack) { ItemStack mainHandStack = getMainHandStack(); - if ((!FOOD.test(mainHandStack) && FOOD.test(stack))) { + if ((!FOOD_INGREDIENT.test(mainHandStack) && FOOD_INGREDIENT.test(stack))) { return true; } if (mainHandStack.isEmpty()) { @@ -704,7 +709,7 @@ public PickupFoodGoal(GooseEntity goose) { this.setControls(EnumSet.of(Goal.Control.MOVE)); } - private static final Predicate PICKABLE_DROP_FILTER = (itemEntity) -> !itemEntity.cannotPickup() && itemEntity.isAlive() && GooseEntity.FOOD.test(itemEntity.getStack()); + private static final Predicate PICKABLE_DROP_FILTER = (itemEntity) -> !itemEntity.cannotPickup() && itemEntity.isAlive() && GooseEntity.FOOD_INGREDIENT.test(itemEntity.getStack()); public boolean canStart() { if (goose.isBaby() || !goose.getEquippedStack(EquipmentSlot.MAINHAND).isEmpty()) { @@ -784,7 +789,7 @@ public boolean canStart() { } playerHandStack = targetPlayer.getMainHandStack(); - return GooseEntity.FOOD.test(playerHandStack); + return GooseEntity.FOOD_INGREDIENT.test(playerHandStack); } @Override @@ -794,7 +799,7 @@ public boolean shouldContinue() { } playerHandStack = targetPlayer.getMainHandStack(); - return GooseEntity.FOOD.test(playerHandStack); + return GooseEntity.FOOD_INGREDIENT.test(playerHandStack); } @Override diff --git a/common/src/main/java/net/untitledduckmod/common/entity/WaterfowlEntity.java b/common/src/main/java/net/untitledduckmod/common/entity/WaterfowlEntity.java index 959271ad..e936fc99 100644 --- a/common/src/main/java/net/untitledduckmod/common/entity/WaterfowlEntity.java +++ b/common/src/main/java/net/untitledduckmod/common/entity/WaterfowlEntity.java @@ -33,6 +33,8 @@ public abstract class WaterfowlEntity extends TameableEntity implements GeoAnima public static final float BABY_MIN_SCALE = 0.25f; public static final float BABY_MAX_SCALE = 0.7f; public static final String EGG_LAY_TIME_TAG = "EggLayTime"; + public static final String HELD_FOOD_TICK_TAG = "HeldFoodTick"; + public static final String RANDOM_FORCE_EAT_TICK_TAG = "RandomForceEatTick"; public static final String VARIANT_TAG = "Variant"; public static final String BABY_SCALE_TAG = "BabyScale"; public static final float SWIM_SPEED_MULTIPLIER = 3.0f; @@ -60,6 +62,8 @@ public abstract class WaterfowlEntity extends TameableEntity implements GeoAnima protected int maxVariant = 2; protected int eggLayTime; + private int heldFoodTick = 0; + private int randomForceEatTick = 0; protected boolean isFlapping; protected boolean panicked = false; protected WaterfowlEntity(EntityType entityType, World world) { @@ -92,6 +96,8 @@ public void writeCustomDataToNbt(NbtCompound tag) { tag.putByte(VARIANT_TAG, getVariant()); tag.putInt(EGG_LAY_TIME_TAG, eggLayTime); tag.putFloat(BABY_SCALE_TAG, getBabyScale()); + tag.putInt(HELD_FOOD_TICK_TAG, heldFoodTick); + tag.putInt(RANDOM_FORCE_EAT_TICK_TAG, randomForceEatTick); } @Override @@ -102,6 +108,8 @@ public void readCustomDataFromNbt(NbtCompound tag) { this.eggLayTime = tag.getInt(EGG_LAY_TIME_TAG); } setBabyScale(tag.getFloat(BABY_SCALE_TAG)); + this.heldFoodTick = tag.getInt(HELD_FOOD_TICK_TAG); + this.randomForceEatTick = tag.getInt(RANDOM_FORCE_EAT_TICK_TAG); } @Override @@ -120,6 +128,30 @@ public boolean handleFallDamage(float fallDistance, float damageMultiplier, Dama return false; } + @Override + public void tick() { + super.tick(); + if (isEdibleFood(getMainHandStack())) { + heldFoodTick++; + if (randomForceEatTick == 0) { + randomForceEatTick = generateRandomForceEatTick(); + } + } else { + heldFoodTick = 0; + randomForceEatTick = 0; + } + } + + private int generateRandomForceEatTick() { + int min = UntitledConfig.forceEatRandomMinTick(); + int max = UntitledConfig.forceEatRandomMaxTick(); + int actualMin = Math.min(min, max); + int actualMax = Math.max(min, max); + return random.nextBetweenExclusive(actualMin, actualMax); + } + + public abstract boolean isEdibleFood(ItemStack stack); + public byte getVariant() { return dataTracker.get(VARIANT); } @@ -303,6 +335,14 @@ public int getEggLayTime() { return this.eggLayTime; } + public int getHeldFoodTick() { + return this.heldFoodTick; + } + + public int getRandomForceEatTick() { + return randomForceEatTick; + } + public boolean tamedFollowOwner() { return true; } diff --git a/common/src/main/java/net/untitledduckmod/common/entity/ai/goal/common/EatGoal.java b/common/src/main/java/net/untitledduckmod/common/entity/ai/goal/common/EatGoal.java index 3e5663b8..3af974a4 100644 --- a/common/src/main/java/net/untitledduckmod/common/entity/ai/goal/common/EatGoal.java +++ b/common/src/main/java/net/untitledduckmod/common/entity/ai/goal/common/EatGoal.java @@ -2,6 +2,7 @@ import net.minecraft.entity.ai.goal.Goal; import net.minecraft.item.ItemStack; +import net.untitledduckmod.common.config.UntitledConfig; import net.untitledduckmod.common.entity.DuckEntity; import net.untitledduckmod.common.entity.GooseEntity; import net.untitledduckmod.common.entity.WaterfowlEntity; @@ -24,17 +25,15 @@ public EatGoal(WaterfowlEntity entity) { @Override public boolean canStart() { // TODO: Should throttle this? - if (!entity.isHungry()) { - return false; - } ItemStack stack = entity.getMainHandStack(); if (stack == null || stack.isEmpty()) { return false; } - if (entity instanceof DuckEntity) { - return DuckEntity.TAMING_INGREDIENT.test(stack) || DuckEntity.BREEDING_INGREDIENT.test(stack); + boolean isEdible = entity.isEdibleFood(stack); + if (!isEdible) { + return false; } - return GooseEntity.FOOD.test(stack); + return entity.isHungry() || (UntitledConfig.enableForceEat() && entity.getHeldFoodTick() >= entity.getRandomForceEatTick()); } @Override diff --git a/common/src/main/java/net/untitledduckmod/compat/jade/JadePlugin.java b/common/src/main/java/net/untitledduckmod/compat/jade/JadePlugin.java index 82c0ad54..d642d226 100644 --- a/common/src/main/java/net/untitledduckmod/compat/jade/JadePlugin.java +++ b/common/src/main/java/net/untitledduckmod/compat/jade/JadePlugin.java @@ -4,6 +4,7 @@ import net.untitledduckmod.common.entity.DuckEntity; import net.untitledduckmod.common.entity.GooseEntity; import net.untitledduckmod.compat.jade.provider.LayEggProvider; +import net.untitledduckmod.compat.jade.provider.NextEatProvider; import snownee.jade.api.IWailaClientRegistration; import snownee.jade.api.IWailaCommonRegistration; import snownee.jade.api.IWailaPlugin; @@ -16,12 +17,16 @@ public class JadePlugin implements IWailaPlugin { public void register(IWailaCommonRegistration registration) { registration.registerEntityDataProvider(LayEggProvider.INSTANCE, DuckEntity.class); registration.registerEntityDataProvider(LayEggProvider.INSTANCE, GooseEntity.class); + registration.registerEntityDataProvider(NextEatProvider.INSTANCE, DuckEntity.class); + registration.registerEntityDataProvider(NextEatProvider.INSTANCE, GooseEntity.class); } @Override public void registerClient(IWailaClientRegistration registration) { registration.registerEntityComponent(LayEggProvider.INSTANCE, DuckEntity.class); registration.registerEntityComponent(LayEggProvider.INSTANCE, GooseEntity.class); + registration.registerEntityComponent(NextEatProvider.INSTANCE, DuckEntity.class); + registration.registerEntityComponent(NextEatProvider.INSTANCE, GooseEntity.class); } } diff --git a/common/src/main/java/net/untitledduckmod/compat/jade/provider/LayEggProvider.java b/common/src/main/java/net/untitledduckmod/compat/jade/provider/LayEggProvider.java index b1a4a1d2..15ef815e 100644 --- a/common/src/main/java/net/untitledduckmod/compat/jade/provider/LayEggProvider.java +++ b/common/src/main/java/net/untitledduckmod/compat/jade/provider/LayEggProvider.java @@ -12,17 +12,11 @@ import snownee.jade.api.config.IPluginConfig; import snownee.jade.api.theme.IThemeHelper; -public enum LayEggProvider implements IEntityComponentProvider, IServerDataProvider { +public class LayEggProvider implements IEntityComponentProvider, IServerDataProvider { - INSTANCE; + public static final LayEggProvider INSTANCE = new LayEggProvider(); - @Override - public void appendTooltip(ITooltip tooltip, EntityAccessor accessor, IPluginConfig config) { - if (!accessor.getServerData().contains("NextEggIn")) { - return; - } - tooltip.add(Text.translatable("jade.nextEgg", IThemeHelper.get().seconds(accessor.getServerData().getInt("NextEggIn")))); - } + static final Identifier UID = DuckMod.id("lay_egg"); @Override public void appendServerData(NbtCompound tag, EntityAccessor accessor) { @@ -34,8 +28,16 @@ public void appendServerData(NbtCompound tag, EntityAccessor accessor) { } } + @Override + public void appendTooltip(ITooltip tooltip, EntityAccessor accessor, IPluginConfig config) { + if (!accessor.getServerData().contains("NextEggIn")) { + return; + } + tooltip.add(Text.translatable("jade.nextEgg", IThemeHelper.get().seconds(accessor.getServerData().getInt("NextEggIn")))); + } + @Override public Identifier getUid() { - return DuckMod.id("lay_egg"); + return UID; } } diff --git a/common/src/main/java/net/untitledduckmod/compat/jade/provider/NextEatProvider.java b/common/src/main/java/net/untitledduckmod/compat/jade/provider/NextEatProvider.java new file mode 100644 index 00000000..9b815305 --- /dev/null +++ b/common/src/main/java/net/untitledduckmod/compat/jade/provider/NextEatProvider.java @@ -0,0 +1,48 @@ +package net.untitledduckmod.compat.jade.provider; + +import net.minecraft.nbt.NbtCompound; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.untitledduckmod.DuckMod; +import net.untitledduckmod.common.config.UntitledConfig; +import net.untitledduckmod.common.entity.WaterfowlEntity; +import snownee.jade.api.EntityAccessor; +import snownee.jade.api.IEntityComponentProvider; +import snownee.jade.api.IServerDataProvider; +import snownee.jade.api.ITooltip; +import snownee.jade.api.config.IPluginConfig; +import snownee.jade.api.theme.IThemeHelper; + +public class NextEatProvider implements IEntityComponentProvider, IServerDataProvider { + + public static final NextEatProvider INSTANCE = new NextEatProvider(); + + static final Identifier UID = DuckMod.id("next_eat"); + + @Override + public void appendServerData(NbtCompound tag, EntityAccessor accessor) { + if (accessor.getEntity() instanceof WaterfowlEntity entity) { + if (entity.isEdibleFood(entity.getMainHandStack()) && UntitledConfig.enableForceEat()) { + var next = entity.getRandomForceEatTick() - entity.getHeldFoodTick() + 20; + if (next >= 0) { + tag.putInt("NextEat", next); + } + } + } + } + + @Override + public void appendTooltip(ITooltip tooltip, EntityAccessor accessor, IPluginConfig config) { + if (!accessor.getServerData().contains("NextEat")) { + return; + } + var nextEat = accessor.getServerData().getInt("NextEat"); + + tooltip.add(Text.translatable("untitledduckmod.jade.nextEat", IThemeHelper.get().seconds(nextEat))); + } + + @Override + public Identifier getUid() { + return UID; + } +} diff --git a/common/src/main/resources/assets/untitledduckmod/lang/en_us.json b/common/src/main/resources/assets/untitledduckmod/lang/en_us.json index a9de954b..347a6378 100644 --- a/common/src/main/resources/assets/untitledduckmod/lang/en_us.json +++ b/common/src/main/resources/assets/untitledduckmod/lang/en_us.json @@ -61,7 +61,13 @@ "untitledduckmod.config.goose_tamed_not_follow": "Goose Tamed Not Follow", "untitledduckmod.config.goose_baby_random_size": "Goose Baby Random Size", "untitledduckmod.config.intimidation_blacklist": "Intimidate Blacklist", + "untitledduckmod.config.enable_force_eat": "Enable Force Eat", + "untitledduckmod.config.force_eat_random_min_tick": "Force Eat Random Min Tick", + "untitledduckmod.config.force_eat_random_max_tick": "Force Eat Random Max Tick", "untitledduckmod.config.food_healing_value": "Food Healing value", + "untitledduckmod.config.enable_force_eat.tooltip": "Enable/disable automatic force-eating for duck/goose", + "untitledduckmod.config.force_eat_random_min_tick.tooltip": "Min tick before duck/goose auto-eat held food", + "untitledduckmod.config.force_eat_random_max_tick.tooltip": "Max tick before duck/goose auto-eat held food", "untitledduckmod.config.food_healing_value.tooltip": "Food can heal the health value of duck & goose", "untitledduckmod.config.duck_spawn_weight.tooltip": "How often ducks spawn (the higher, the more often)", "untitledduckmod.config.goose_spawn_weight.tooltip": "How often geese spawn (the higher, the more often)", @@ -76,5 +82,7 @@ "untitledduckmod.config.goose_tamed_not_follow.tooltip": "No more following behavior when tamed (wander)", "untitledduckmod.config.intimidation_blacklist.tooltip": "Intimidate effects don't work on mobs in the list", - "config.jade.plugin_untitledduckmod.lay_egg": "Egg laying time" + "untitledduckmod.jade.nextEat": "Next auto-eat: %s", + "config.jade.plugin_untitledduckmod.lay_egg": "Egg laying time", + "config.jade.plugin_untitledduckmod.next_eat": "Next auto-eat time" } \ No newline at end of file diff --git a/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json b/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json index 7187ee47..479b4a53 100644 --- a/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json +++ b/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json @@ -64,7 +64,13 @@ "untitledduckmod.config.goose_tamed_not_follow": "鹅驯服后不跟随", "untitledduckmod.config.goose_baby_random_size": "小鹅随机大小", "untitledduckmod.config.intimidation_blacklist": "恐吓黑名单", + "untitledduckmod.config.enable_force_eat": "自动进食", + "untitledduckmod.config.force_eat_random_min_tick": "自动进食最小游戏刻", + "untitledduckmod.config.force_eat_random_max_tick": "自动进食最大游戏刻", "untitledduckmod.config.food_healing_value": "食物治疗值", + "untitledduckmod.config.enable_force_eat.tooltip": "是否为鸭/鹅开启自动进食", + "untitledduckmod.config.force_eat_random_min_tick.tooltip": "鸭/鹅自动进食食物的最小游戏刻", + "untitledduckmod.config.force_eat_random_max_tick.tooltip": "鸭/鹅自动进食食物的最大游戏刻", "untitledduckmod.config.duck_spawn_weight.tooltip": "鸭生成频率(越高,越频繁)", "untitledduckmod.config.goose_spawn_weight.tooltip": "鹅生成频率(越高,越频繁)", "untitledduckmod.config.duck_min_group_size.tooltip": "每次生成的最少鸭数量", @@ -78,5 +84,7 @@ "untitledduckmod.config.goose_tamed_not_follow.tooltip": "鹅驯服后不跟随而是游荡", "untitledduckmod.config.intimidation_blacklist.tooltip": "恐吓效果对列表中的生物无效", - "config.jade.plugin_untitledduckmod.lay_egg": "产卵时间" + "untitledduckmod.jade.nextEat": "下次进食: %s", + "config.jade.plugin_untitledduckmod.lay_egg": "产卵时间", + "config.jade.plugin_untitledduckmod.next_eat": "进食时间" } \ No newline at end of file diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 144450ef..f0d76009 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,3 +1,19 @@ +## Version ["v1.3.5"] - 2026-1-22 + +### Bug fixes +- Supplement config translation +#### Forge +- Fix the initial value of force_eat_random_min_tick + +## Version ["v1.3.0"] - 2026-1-22 + +### Features +Ducks and geese will auto-eat their held food within a configured tick. + +### Bug fixes +- Fix [#131](https://github.com/UntitledDuckDevs/UntitledDuckMod/issues/131) + + ## Version ["v1.2.0"] - 2025-8-19 ### Features diff --git a/docs/LATEST_CHANGES.md b/docs/LATEST_CHANGES.md index 871728f0..64d786a8 100644 --- a/docs/LATEST_CHANGES.md +++ b/docs/LATEST_CHANGES.md @@ -1,9 +1,6 @@ -## Version ["v1.2.0"] - 2025-8-19 - -### Features -Update the goose's pickup logic: once tamed, it only picks up items given by its owner. +## Version ["v1.3.5"] - 2026-1-22 ### Bug fixes -- Fix [#123](https://github.com/UntitledDuckDevs/UntitledDuckMod/issues/123) +- Supplement config translation #### Forge -- Fix [#124](https://github.com/UntitledDuckDevs/UntitledDuckMod/issues/124) +- Fix the initial value of force_eat_random_min_tick diff --git a/fabric/build.gradle b/fabric/build.gradle index 96ca6822..a18829bd 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -32,7 +32,7 @@ dependencies { modApi "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}" modApi "com.terraformersmc:modmenu:${modmenu_version}" - modApi "curse.maven:jade-324717:${jade_id_fabric}" + modApi "maven.modrinth:jade:${jade_version}+fabric" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } diff --git a/fabric/src/main/java/net/untitledduckmod/common/config/fabric/UntitledConfigImpl.java b/fabric/src/main/java/net/untitledduckmod/common/config/fabric/UntitledConfigImpl.java index db90cb9b..99756f82 100644 --- a/fabric/src/main/java/net/untitledduckmod/common/config/fabric/UntitledConfigImpl.java +++ b/fabric/src/main/java/net/untitledduckmod/common/config/fabric/UntitledConfigImpl.java @@ -6,6 +6,13 @@ import java.util.List; public class UntitledConfigImpl extends TinyConfig { + @Entry(category = "common") + public static boolean enable_force_eat = false; + @Entry(category = "common") + public static int force_eat_random_min_tick = 500; + @Entry(category = "common") + public static int force_eat_random_max_tick = 1000; + @Entry(category = "common", min = 0F, max = 100F) public static float food_healing_value = 0.5F; @@ -80,7 +87,19 @@ public static boolean gooseBabyRandomSize() { return goose_baby_random_size; } - public static float foodHealingValue() { + public boolean enableForceEat() { + return enable_force_eat; + } + + public int forceEatRandomMinTick() { + return force_eat_random_min_tick; + } + + public int forceEatRandomMaxTick() { + return force_eat_random_max_tick; + } + + public static float foodHealingValue() { return food_healing_value; } diff --git a/forge/build.gradle b/forge/build.gradle index b935e608..3c7110fe 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -25,7 +25,7 @@ configurations { dependencies { forge "net.minecraftforge:forge:${forge_version}" - modApi "curse.maven:jade-324717:${jade_id_forge}" + modApi "maven.modrinth:jade:${jade_version}+forge" modImplementation "software.bernie.geckolib:geckolib-forge-${minecraft_version}:${geckolib_version}" diff --git a/forge/src/main/java/net/untitledduckmod/common/config/forge/UntitledConfigImpl.java b/forge/src/main/java/net/untitledduckmod/common/config/forge/UntitledConfigImpl.java index 9d3a8828..e6bee5d4 100644 --- a/forge/src/main/java/net/untitledduckmod/common/config/forge/UntitledConfigImpl.java +++ b/forge/src/main/java/net/untitledduckmod/common/config/forge/UntitledConfigImpl.java @@ -23,6 +23,9 @@ public class UntitledConfigImpl { public static final ForgeConfigSpec.BooleanValue GOOSE_TAMED_NOT_FOLLOW; public static final ForgeConfigSpec.BooleanValue GOOSE_BABY_RANDOM_SIZE; + public static final ForgeConfigSpec.BooleanValue ENABLE_FORCE_EAT; + public static final ForgeConfigSpec.IntValue FORCE_EAT_RANDOM_MIN_TICK; + public static final ForgeConfigSpec.IntValue FORCE_EAT_RANDOM_MAX_TICK; public static final ForgeConfigSpec.DoubleValue FOOD_HEALING_VALUE; public static final ForgeConfigSpec.ConfigValue> INTIMIDATION_BLACKLIST; @@ -76,6 +79,15 @@ public class UntitledConfigImpl { builder.pop(); builder.push("common"); + ENABLE_FORCE_EAT = builder.comment("Enable/disable automatic force-eating for duck/goose") + .worldRestart() + .define("enable_force_eat", false); + FORCE_EAT_RANDOM_MIN_TICK = builder.comment("Min tick before duck/goose auto-eat held food") + .worldRestart() + .defineInRange("force_eat_random_min_tick", 500, 0, Integer.MAX_VALUE); + FORCE_EAT_RANDOM_MAX_TICK = builder.comment("Max tick before duck/goose auto-eat held food") + .worldRestart() + .defineInRange("force_eat_random_max_tick", 1000, 0, Integer.MAX_VALUE); FOOD_HEALING_VALUE = builder.comment("Food can heal the health value of duck & goose") .worldRestart() .defineInRange("food_healing_value", 0.5D, 0D, 100D); @@ -134,6 +146,18 @@ public static boolean gooseBabyRandomSize() { return GOOSE_BABY_RANDOM_SIZE.get(); } + public static boolean enableForceEat() { + return ENABLE_FORCE_EAT.get(); + } + + public static int forceEatRandomMinTick() { + return FORCE_EAT_RANDOM_MIN_TICK.get(); + } + + public static int forceEatRandomMaxTick() { + return FORCE_EAT_RANDOM_MAX_TICK.get(); + } + public static float foodHealingValue() { try { return FOOD_HEALING_VALUE.get().floatValue(); diff --git a/gradle.properties b/gradle.properties index 01e689bf..4e019489 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,17 +5,16 @@ enabled_platforms=fabric,forge minecraft_version=1.20.1 fabric_loader_version=0.16.14 fabric_api_version=0.92.6+1.20.1 -forge_version=1.20.1-47.4.3 +forge_version=1.20.1-47.4.10 yarn_mappings=1.20.1+build.10 # Mod Properties archives_base_name=untitledduckmod -mod_version=1.2.0 +mod_version=1.3.5 mod_id=untitledduckmod maven_group=net.untitledduckmod # Dependencies Properties modmenu_version=7.2.2 -geckolib_version=4.7.2 -jade_id_fabric=6291330 -jade_id_forge=6271651 +geckolib_version=4.8.2 +jade_version=11.12.3 From b4e13e408ff97461ff30d749affd6ff86ddb1ffa Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Sat, 24 Jan 2026 00:15:43 +0800 Subject: [PATCH 02/19] fix: fix expected static method --- .../common/config/fabric/UntitledConfigImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fabric/src/main/java/net/untitledduckmod/common/config/fabric/UntitledConfigImpl.java b/fabric/src/main/java/net/untitledduckmod/common/config/fabric/UntitledConfigImpl.java index 99756f82..69c598d3 100644 --- a/fabric/src/main/java/net/untitledduckmod/common/config/fabric/UntitledConfigImpl.java +++ b/fabric/src/main/java/net/untitledduckmod/common/config/fabric/UntitledConfigImpl.java @@ -87,19 +87,19 @@ public static boolean gooseBabyRandomSize() { return goose_baby_random_size; } - public boolean enableForceEat() { + public static boolean enableForceEat() { return enable_force_eat; } - public int forceEatRandomMinTick() { + public static int forceEatRandomMinTick() { return force_eat_random_min_tick; } - public int forceEatRandomMaxTick() { + public static int forceEatRandomMaxTick() { return force_eat_random_max_tick; } - public static float foodHealingValue() { + public static float foodHealingValue() { return food_healing_value; } From 5f3cb688192a950c67e44e0c3550dce94325f697 Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Tue, 3 Feb 2026 13:58:32 +0800 Subject: [PATCH 03/19] feat: refine loot logic and item pickup filtering --- .../common/entity/GooseEntity.java | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java b/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java index f103d29d..a824fbed 100644 --- a/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java +++ b/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java @@ -26,6 +26,7 @@ import net.minecraft.particle.ParticleTypes; import net.minecraft.recipe.Ingredient; import net.minecraft.registry.tag.FluidTags; +import net.minecraft.registry.tag.ItemTags; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Hand; @@ -224,6 +225,7 @@ public void onEquipStack(EquipmentSlot slot, ItemStack oldStack, ItemStack newSt super.onEquipStack(slot, oldStack, newStack); } + @Nullable private UUID getThrower(ItemEntity ie) { NbtCompound nbt = new NbtCompound(); ie.writeCustomDataToNbt(nbt); @@ -317,17 +319,33 @@ public ItemStack tryEquip(ItemStack equipment) { @Override protected void loot(ItemEntity item) { - // Don't pick up threw/spat items - if (this.getThrower(item) == this.getUuid()) { + UUID entityUuid = this.getUuid(); + UUID throwerId = this.getThrower(item); + + if (Objects.equals(entityUuid,throwerId)) { return; } + + if (this.isTamed()) { + UUID ownerId = this.getOwnerUuid(); + if (!Objects.equals(ownerId, throwerId)) { + return; + } + } + super.loot(item); } + private boolean isWeapon(ItemStack stack) { + return stack.isIn(ItemTags.SWORDS) || stack.isIn(ItemTags.AXES); + } + @Override public boolean canPickupItem(ItemStack stack) { ItemStack mainHandStack = getMainHandStack(); - + if (isWeapon(stack) && isTamed()) { + return getOwner() != null && this.getHealth() == this.getMaxHealth(); + } if ((!FOOD_INGREDIENT.test(mainHandStack) && FOOD_INGREDIENT.test(stack))) { return true; } From 788cf3a7cabc76a33b6a79c454fc294771234aa5 Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Tue, 3 Feb 2026 13:59:07 +0800 Subject: [PATCH 04/19] fix: Missing the name of intimidation arrow (#138) --- common/src/main/resources/assets/untitledduckmod/lang/en_us.json | 1 + common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json | 1 + 2 files changed, 2 insertions(+) diff --git a/common/src/main/resources/assets/untitledduckmod/lang/en_us.json b/common/src/main/resources/assets/untitledduckmod/lang/en_us.json index 347a6378..0d84411e 100644 --- a/common/src/main/resources/assets/untitledduckmod/lang/en_us.json +++ b/common/src/main/resources/assets/untitledduckmod/lang/en_us.json @@ -34,6 +34,7 @@ "item.minecraft.potion.effect.intimidation": "Potion of Intimidation", "item.minecraft.lingering_potion.effect.intimidation": "Lingering Potion of Intimidation", "item.minecraft.splash_potion.effect.intimidation": "Splash Potion of Intimidation", + "item.minecraft.tipped_arrow.effect.intimidation": "Splash Potion of Intimidation", "tag.item.untitledduckmod.goose_food": "Goose Food", "tag.item.untitledduckmod.goose_breeding_food": "Goose Breeding Food", diff --git a/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json b/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json index 479b4a53..e09d03e0 100644 --- a/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json +++ b/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json @@ -34,6 +34,7 @@ "item.minecraft.potion.effect.intimidation": "恐吓药水", "item.minecraft.lingering_potion.effect.intimidation": "滞留型恐吓药水", "item.minecraft.splash_potion.effect.intimidation": "喷溅型恐吓药水", + "item.minecraft.tipped_arrow.effect.intimidation": "恐吓之箭", "modmenu.nameTranslation.untitledduckmod": "无题鸭", "modmenu.descriptionTranslation.untitledduckmod": "添加了鸭和鹅", From 66f8acc57d9017a60dbdd151963e75e90750037c Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Tue, 3 Feb 2026 14:01:01 +0800 Subject: [PATCH 05/19] feat: add new variants for Duck and Goose --- .../client/model/DuckModel.java | 10 +--------- .../client/model/GooseModel.java | 15 ++++++++++----- .../client/model/ModelIdentifiers.java | 1 + .../common/entity/DuckEntity.java | 2 +- .../common/entity/WaterfowlEntity.java | 2 +- .../textures/entity/duck_pekin.png | Bin 848 -> 1410 bytes .../textures/entity/greylag_goose.png | Bin 0 -> 3195 bytes docs/LATEST_CHANGES.md | 9 +++++---- 8 files changed, 19 insertions(+), 20 deletions(-) create mode 100644 common/src/main/resources/assets/untitledduckmod/textures/entity/greylag_goose.png diff --git a/common/src/main/java/net/untitledduckmod/client/model/DuckModel.java b/common/src/main/java/net/untitledduckmod/client/model/DuckModel.java index 43b313de..7729a943 100644 --- a/common/src/main/java/net/untitledduckmod/client/model/DuckModel.java +++ b/common/src/main/java/net/untitledduckmod/client/model/DuckModel.java @@ -21,21 +21,13 @@ public Identifier getModelResource(DuckEntity object) { public Identifier getTextureResource(DuckEntity animatable) { if (animatable.isBaby()) { return ModelIdentifiers.DUCKLING_TEXTURE; - } else { - if (animatable.hasCustomName()) { - String name = Objects.requireNonNull(animatable.getCustomName()).getString().toLowerCase(); - switch (name) { - case "pekin" -> { - return ModelIdentifiers.PEKIN_TEXTURE; - } - } - } } var variant = animatable.getVariant(); return switch (variant) { case 1 -> ModelIdentifiers.FEMALE_TEXTURE; case 2 -> ModelIdentifiers.CAMPBELL_TEXTURE; + case 3 -> ModelIdentifiers.PEKIN_TEXTURE; default -> ModelIdentifiers.NORMAL_TEXTURE; }; } diff --git a/common/src/main/java/net/untitledduckmod/client/model/GooseModel.java b/common/src/main/java/net/untitledduckmod/client/model/GooseModel.java index c7e6e53b..f82737d5 100644 --- a/common/src/main/java/net/untitledduckmod/client/model/GooseModel.java +++ b/common/src/main/java/net/untitledduckmod/client/model/GooseModel.java @@ -18,12 +18,12 @@ public Identifier getModelResource(GooseEntity object) { } @Override - public Identifier getTextureResource(GooseEntity entity) { - if (entity.isBaby()) { + public Identifier getTextureResource(GooseEntity animatable) { + if (animatable.isBaby()) { return ModelIdentifiers.GOSLING_TEXTURE; } else { - if (entity.hasCustomName()) { - String name = Objects.requireNonNull(entity.getCustomName()).getString().toLowerCase(); + if (animatable.hasCustomName()) { + String name = Objects.requireNonNull(animatable.getCustomName()).getString().toLowerCase(); switch (name) { case "ping" -> { return ModelIdentifiers.PING_GOOSE_TEXTURE; @@ -37,8 +37,13 @@ public Identifier getTextureResource(GooseEntity entity) { } } } + var variant = animatable.getVariant(); - return entity.getVariant() == 0 ? ModelIdentifiers.GOOSE_TEXTURE : ModelIdentifiers.CANADIAN_GOOSE_TEXTURE; + return switch (variant) { + case 1 -> ModelIdentifiers.CANADIAN_GOOSE_TEXTURE; + case 2 -> ModelIdentifiers.GREYLAG_GOOSE_TEXTURE; + default -> ModelIdentifiers.GOOSE_TEXTURE; + }; } @Override diff --git a/common/src/main/java/net/untitledduckmod/client/model/ModelIdentifiers.java b/common/src/main/java/net/untitledduckmod/client/model/ModelIdentifiers.java index da00843f..edefdf52 100644 --- a/common/src/main/java/net/untitledduckmod/client/model/ModelIdentifiers.java +++ b/common/src/main/java/net/untitledduckmod/client/model/ModelIdentifiers.java @@ -16,6 +16,7 @@ public class ModelIdentifiers { public static final Identifier GOOSE_ANIMATION_FILE_LOCATION = DuckMod.id("animations/goose.animation.json"); public static final Identifier GOOSE_TEXTURE = DuckMod.id("textures/entity/goose.png"); public static final Identifier CANADIAN_GOOSE_TEXTURE = DuckMod.id("textures/entity/canadian_goose.png"); + public static final Identifier GREYLAG_GOOSE_TEXTURE = DuckMod.id("textures/entity/greylag_goose.png"); public static final Identifier GOSLING_TEXTURE = DuckMod.id("textures/entity/gosling.png"); public static final Identifier PING_GOOSE_TEXTURE = DuckMod.id("textures/entity/ping_goose.png"); diff --git a/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java b/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java index c874b825..78a30955 100644 --- a/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java +++ b/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java @@ -99,7 +99,7 @@ public class DuckEntity extends WaterfowlEntity implements Vibrations, Animation public DuckEntity(EntityType entityType, World world) { super(entityType, world); - this.maxVariant = 3; + this.maxVariant = 4; this.vibrationCallback = new VibrationCallback(); this.vibrationListenerData = new Vibrations.ListenerData(); this.jukeboxEventHandler = new EntityGameEventHandler<>(new DuckEntity.JukeboxEventListener(this.vibrationCallback.getPositionSource(), GameEvent.JUKEBOX_PLAY.getRange())); diff --git a/common/src/main/java/net/untitledduckmod/common/entity/WaterfowlEntity.java b/common/src/main/java/net/untitledduckmod/common/entity/WaterfowlEntity.java index e936fc99..b4bcb74b 100644 --- a/common/src/main/java/net/untitledduckmod/common/entity/WaterfowlEntity.java +++ b/common/src/main/java/net/untitledduckmod/common/entity/WaterfowlEntity.java @@ -60,7 +60,7 @@ public abstract class WaterfowlEntity extends TameableEntity implements GeoAnima private static final int MIN_EGG_LAY_TIME = 6000; private static final int MAX_EGG_LAY_TIME = 12000; - protected int maxVariant = 2; + protected int maxVariant = 3; protected int eggLayTime; private int heldFoodTick = 0; private int randomForceEatTick = 0; diff --git a/common/src/main/resources/assets/untitledduckmod/textures/entity/duck_pekin.png b/common/src/main/resources/assets/untitledduckmod/textures/entity/duck_pekin.png index bf8c70df1c41fcf480bab5cf52f8840eae9f6bd7..708dfc5a5d13e1ee6ee499bb7868494802b4256d 100644 GIT binary patch delta 1402 zcmbW%{Xf$Q0KoCDVdQZ{a?CuIP{N(b(0QDvu+GELgNKZSB#Mb`hDfopySCvxbsoy| zLzuNZO;nynWjIe+#zhnB%;T>67w)&u>-`6OM!^K>hpIR*007S-VrKzB9PZ*^>z!D* z>hBq|=%9ql?avi5J@UtD1LPX)_=Nc;6)QfA-9pm_1pg=9!Yh@HuJ(>L zk5=rzy?5MXGt8=Pkv%Ep_3`(8Qq9(@&B8SvJZ5&!A9Mn{2g(b#$Ezf~IJsAk?Fd=h zKFJ%!xyyQw4@~_-(h|f;l%bhZyujpRwsMOsbeSr6lU&q~)0wb2)5*@7gJ<1%xK4d_ z(oXPMAABdVFlDrP=X7TQo=Xq9~|*4Ml@dO16r1-3gd$ zMfQXz`+MBARx^g{I#dx2tAd6-dNG9xHpTW% zS=LH-l-q+$s|99t_o$0&ihJ^gsripybq0ZFM@U8?uoZ6EI z4k)pl;VX0U3rp|ayy)Qg=cnRBsfVt}61y}CyOWcKI$1Q}C=rq}JY#*|Q30Yaxi(!5 zFtzETNB9aHt#7xUj|?P^tLhj-jL7^$6k|zK8BC*6H0wBa!hp{^%t@jlN{~nx(z;j# z;xy0FbARYqLiES`GM6$8TXAngvcK-)l`tf+abJ{@egOBn%)OdXyH>U!t4gYwQ6%m( z!rmFaa6>z`oi;dWucovpDEW+42!-~Sb69yAfjdzy6%mNVgA#dDXav(B%kXu*9a#!Z zNU_3O%*Pdf=$|SjG2N;ZMeeKE5UfD^>A6NWP|L@CJdQ`^BcwB~rM>YDk-4(?px+A) z8QEMJuIV)wYtluBuFE^k(E_7VT4X?@9haPZnTzyWEg|L})eJea^-}q-1nK2FTJL0| zWF?ndeIE-f>nX`*Is^R&w}X2Uenp_fN|1QGVqpEmiS3Ih`<~gO@%FWP7>5Yk{LXEJ zh+VU0#cKMw1q3c$wIy)@VY9o85?}iiW31TQO63i42bZQ{*p1bojK-TPT}$!m=pz~H zym4<2NBuMe!^NpyNFbiwx6;W7CFb5$i#56fc?!w2qXEA~r9Ulfrik~FNJgPw+}+M9 z(>ts-IIJz}q&%yo0vKf#w@E@i1^QUwt-2L5?SK4)b5}bMd?Sm&&v_OVUhiAJd+3Q@ z{p2fdTBWB}fP2$g``9$krgW3tWzgdo1fEB!Mv5uEU@#`LyA#-%CYfOBMIlwcqx(Fx zR`XdTf55dr!%MA_t5;mNqAe#Bd~CaFBC3lK=SeyH=ouS^5k;=oR>n6o&Ce_U0?aiI zT6E!NJG0*Sl+;i@rGiS)1)38g{_iQUv9!Eke(4;J=qVaw%TuT|ni=YjU<`wNpk)-F z;FU9fl}-dWW0g0qlvC`SkIn_dcKnlv8q7qQ<>9JjT{Bk=IjM;nghZ2l0T}~ z0;4xtKtK1gqySl@A@IK-M`a%NeWgO-)oX6|z6bcfnTi5j#^2DbY01Oi1#ofnaHz8j GBK!;VVWhhN literal 848 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1!1o(uwZnkE4=F9N^|NlRK{`~v*@8{2-zkdDtAIk9i_wT=d|9%Pts$=;6 z{rk6X-+uh~anpn0b0EVDKZXxrao69IcLAkEN`m}?fhM2>27mwOf&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s&q6x$)e4}RZK)BSX`Y^1 z3>-iXD}xjxD+42tkOkFcXkY-6UEQE4 z96ZlL18CcHPZ!6K2=}*BPFJ-k@U$u}a>zgM;otjP`r<6X$F1&`9Nu4Wz?1K|fWcO& z>>kq%77iaGv)3|c=NRofbR}!=)_Y7W5sFsgvmICpKK32jU#G8c;Pdf)iZdCBwdSxub{`e&`(B2A|6+qZzz<&K4AM=ZnXMM5UN z3IW&G`#wlspYh|V!$ybo3ckO0-dS-t^jzaY{tcDNaV|!THl5?~|5GfAdA%ls&>5q?fV(NsIVeKD*@iF8fXeExKB~OMgN9o>L+- fm`)($|J*gq{f#XBzZHMVf}+dQ)z4*}Q$iB}URE{$ diff --git a/common/src/main/resources/assets/untitledduckmod/textures/entity/greylag_goose.png b/common/src/main/resources/assets/untitledduckmod/textures/entity/greylag_goose.png new file mode 100644 index 0000000000000000000000000000000000000000..b984ea2845c310bcc45d070e12289deb5a2e65c1 GIT binary patch literal 3195 zcmV->421KEP)mDFGtW?LYD%7WRaTO#qJm=4sI=kU>tAf6JUDXb9o=R_mrgdj-FPn2!ci5@z&HvCVyZ%h)G&M?FduJEjeDl|+VM!AW4fK(&rOdD8zPshT&{or@*n8h8?KXQe)Hms zShfv7>;Yd-$%dR@hc$~{Wz-wOi*nlW5DrDAhhnw zx$_Q*7Ez8s7?*;yA=YAVWtNKuqc5$80xQUHq5fQRqD zOP`z=mFrv$sOPX)=_H;=jDmG_)Wnm9Dz|qWCKrdz;o)KN+Eyo~92sCG9+<0N_1*Z5 zuTzSN)tp-1^SP@pIWBz~6#)>hA^@Br03RS{)_~>BjpT*od{yN3R7%2VD5X%9aO>Iz9vvjNe+RwWPrw5N-3|0g25n_xhg1JS1ZH=D_68o zZ%-c$$KrGU}(lQh-}rMkcSW#u1P5%5&$XA8LE7qypzghLO!gyR__ViM* zkeOma>uyhk9tAw|JAs7 zhguUfH8;;nd@vNsVL(KfpqK&ps;g-cM;&B;_Dl`IH;;9Jrk1b3#)lu3^R~ygQn1p< z^^=laP0<*Kx&}^gklhUq4Rc6zu?OdDjLo8(IUna}5a&WkIVU|%mW=iPYFq`Z5!S3* zOK<#pcV08Ne*F!!<;mwvf_wUUsh+|nGk_{~%+sl9(jB^J12R8nSs4}0fULqrX32^P zg9#u6M=TyACwu;AEQ+L?ixWB-VcyQm<1_`>G~Vys&;O5cl}2YKXj#Ooajg|1;P$&W zh}Q6smH5}Qq9N1b5poTOr5dd#t_Da+gXcV?%_*L?9Z z>HpoXzh|{8FRko!&pU5ZXi=^74Gi_u&tBS9kXPRJ*aI?7z7!bOVY5(Tq|?3q17?3A zMUjn*(Zi|8xYUPs%1!V8}9W2z3~p#}Fmut}az@bWhrnWFi^HdiSeP#SR0Z8yk71OC8_ zn5>W+uk*$4+)VAhJJ!p%&prS1EPpgtX)f14od`5YIbZq9yw7MrxZda+>NlkN$kX4a z$G-JVxmH9fl~;Z0{#gG^FP+b{6tULp?76j3si2|itJtY4$@5F4Kx)y1nngx(^4{Ke z2r6zR&-Sz1LNHt~si6siEaprQzZ5SB=ArFLSR z<1v@X$*BJy;i9S2iA|DP)BdeY$mbKB9Ls?})wS=|?`);Hpv+4n$ec= zOQnGJ)h~TsZ*C0Hs`EZY2j1UHEuT1##z)6EZFR}=cZx$ygpZL?V;TG8L-*>Hyy`<5 ziqzM~X|Vd=KK2hCT}HhA?W=z+NK=$)S?&L1LNvf(cgWJS|1l=)zR3zRJOL3wyff;%O#5zJ(VDT^|9q;#FA{F z9sPI?&*OjiKgKB*Fs+Zuyb6I$nLzW>7TWh-8?V!s^Cm|ptza$a;w@?vDV5aKd5Twa zjhvExz|V&pny9nmplD6Up#!D~0EL*A6)312&%6pXtwLd6))bb3yE+ch`4_IC{=ROJ z=(}(KmpybH+y00-*(vb_Bhrq3JcsA;Kl~r#U_2avGA(SLz*Jx|FfGMQcg~?0jAxX2 z;lJ}WuYwrxVP~&Q7-w)B5>w2;xrOWc$iLj;3(|6L?N<`Ej)Maz)U=8*uja+I7gGt5 zrB0jgxmB;^jSaUu`)iJk4?jIa?PjYVG&R=VV$*5wMd!EfF4VMuLe1;VJ#A|{y8BBO zF|syCgIuHpB9SP~7oA=G+cCjnOsg34DmAhaArPJ`{ah4UKd_nvpiBh>iDO%_l7@K$ z#BGLI!@SxL>^GmuXI`a-?ePci)~!S_j@7>NAPW<|R`=Gv(+OIx-LGE#Nhv!;qf^2Z><8++!vpmP zBdqlU6epkwGwKPa5j3mHE7UU46BCo-2Na_t{1{PX`mi;ac)|+;sG4gbrpNGMwOveUNyn!VdKZ@fw%1qAY!UWrY+J zpP_j;MnfwmctaFSI1@F&jyn9vnDOOTC96GBRHk0;gTWecgn(kgnFhNeehI$C Date: Tue, 3 Feb 2026 14:22:33 +0800 Subject: [PATCH 06/19] docs: update changelog --- docs/CHANGELOG.md | 12 ++++++++++++ docs/LATEST_CHANGES.md | 6 +++++- docs/images/greylag_goose.png | Bin 0 -> 58622 bytes docs/images/pekin_duck.png | Bin 0 -> 47310 bytes 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 docs/images/greylag_goose.png create mode 100644 docs/images/pekin_duck.png diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index f0d76009..ba9fb854 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,3 +1,15 @@ +## Version ["v1.5.0"] - 2026-2-3 + +### Features +- Tamed geese now only pick up items from their owners +- Added a new Pekin Duck variant. + ![Pekin Duck](docs/images/pekin_duck.png) +- Added a new Greylag Goose variant. + ![Greylag Goose](docs/images/greylag_goose.png) + +### Bug fixes +- Missing the name of intimidation arrow [#138](https://github.com/UntitledDuckDevs/UntitledDuckMod/issues/138) + ## Version ["v1.3.5"] - 2026-1-22 ### Bug fixes diff --git a/docs/LATEST_CHANGES.md b/docs/LATEST_CHANGES.md index a78e8a31..4bcc2262 100644 --- a/docs/LATEST_CHANGES.md +++ b/docs/LATEST_CHANGES.md @@ -1,7 +1,11 @@ ## Version ["v1.5.0"] - 2026-2-3 ### Features -- goose can pickup weapons when tamed and at full health +- Tamed geese now only pick up items from their owners +- Added a new Pekin Duck variant. +![Pekin Duck](docs/images/pekin_duck.png) +- Added a new Greylag Goose variant. +![Greylag Goose](docs/images/greylag_goose.png) ### Bug fixes - Missing the name of intimidation arrow [#138](https://github.com/UntitledDuckDevs/UntitledDuckMod/issues/138) diff --git a/docs/images/greylag_goose.png b/docs/images/greylag_goose.png new file mode 100644 index 0000000000000000000000000000000000000000..732242bc36d2ed5d4012e429537a7811379f4b96 GIT binary patch literal 58622 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ΝMg^8 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 literal 0 HcmV?d00001 diff --git a/docs/images/pekin_duck.png b/docs/images/pekin_duck.png new file mode 100644 index 0000000000000000000000000000000000000000..20ff85a94bffc2313df9965be2c376aafb359cdb GIT binary patch literal 47310 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 DvGmV< literal 0 HcmV?d00001 From 1a71ebacc2248abcafe6d46e5d30b3d744da7446 Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Tue, 3 Feb 2026 14:25:50 +0800 Subject: [PATCH 07/19] docs: update changelog --- docs/CHANGELOG.md | 12 ++++++++++++ docs/LATEST_CHANGES.md | 6 +++++- docs/images/greylag_goose.png | Bin 0 -> 58622 bytes docs/images/pekin_duck.png | Bin 0 -> 47310 bytes 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 docs/images/greylag_goose.png create mode 100644 docs/images/pekin_duck.png diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index f0d76009..ff4a07ff 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,3 +1,15 @@ +## Version ["v1.5.0"] - 2026-2-3 + +### Features +- Tamed geese now only pick up items from their owners +- Added a new Pekin Duck variant. + ![Pekin Duck](images/pekin_duck.png) +- Added a new Greylag Goose variant. + ![Greylag Goose](images/greylag_goose.png) + +### Bug fixes +- Missing the name of intimidation arrow [#138](https://github.com/UntitledDuckDevs/UntitledDuckMod/issues/138) + ## Version ["v1.3.5"] - 2026-1-22 ### Bug fixes diff --git a/docs/LATEST_CHANGES.md b/docs/LATEST_CHANGES.md index a78e8a31..7f91b43a 100644 --- a/docs/LATEST_CHANGES.md +++ b/docs/LATEST_CHANGES.md @@ -1,7 +1,11 @@ ## Version ["v1.5.0"] - 2026-2-3 ### Features -- goose can pickup weapons when tamed and at full health +- Tamed geese now only pick up items from their owners +- Added a new Pekin Duck variant. + ![Pekin Duck](images/pekin_duck.png) +- Added a new Greylag Goose variant. + ![Greylag Goose](images/greylag_goose.png) ### Bug fixes - Missing the name of intimidation arrow [#138](https://github.com/UntitledDuckDevs/UntitledDuckMod/issues/138) diff --git a/docs/images/greylag_goose.png b/docs/images/greylag_goose.png new file mode 100644 index 0000000000000000000000000000000000000000..732242bc36d2ed5d4012e429537a7811379f4b96 GIT binary patch literal 58622 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ΝMg^8 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 literal 0 HcmV?d00001 diff --git a/docs/images/pekin_duck.png b/docs/images/pekin_duck.png new file mode 100644 index 0000000000000000000000000000000000000000..20ff85a94bffc2313df9965be2c376aafb359cdb GIT binary patch literal 47310 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 DvGmV< literal 0 HcmV?d00001 From c76bd32a9d13801bf7694df28b381a75630433d6 Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Tue, 3 Feb 2026 14:28:09 +0800 Subject: [PATCH 08/19] chore: update version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4e019489..7569fe38 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ yarn_mappings=1.20.1+build.10 # Mod Properties archives_base_name=untitledduckmod -mod_version=1.3.5 +mod_version=1.5.0 mod_id=untitledduckmod maven_group=net.untitledduckmod From 17ecfd1766c4797e9d9e66e0bffafabab5134481 Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Tue, 3 Feb 2026 14:43:04 +0800 Subject: [PATCH 09/19] docs: update credits to acknowledge Practise40hrs --- docs/CHANGELOG.md | 4 ++++ docs/LATEST_CHANGES.md | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index ff4a07ff..5775acdb 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,9 @@ ## Version ["v1.5.0"] - 2026-2-3 +### Credits +Special thanks to: +[Practise40hrs](https://github.com/Practise40hrs) - For providing the beautiful new textures for the **Pekin Duck** and **Greylag Goose** variants. + ### Features - Tamed geese now only pick up items from their owners - Added a new Pekin Duck variant. diff --git a/docs/LATEST_CHANGES.md b/docs/LATEST_CHANGES.md index 7f91b43a..d062796b 100644 --- a/docs/LATEST_CHANGES.md +++ b/docs/LATEST_CHANGES.md @@ -1,11 +1,16 @@ ## Version ["v1.5.0"] - 2026-2-3 +### Credits +Special thanks to: +[Practise40hrs](https://github.com/Practise40hrs) - For providing the beautiful new textures for the **Pekin Duck** and **Greylag Goose** variants. + ### Features - Tamed geese now only pick up items from their owners - Added a new Pekin Duck variant. ![Pekin Duck](images/pekin_duck.png) - Added a new Greylag Goose variant. ![Greylag Goose](images/greylag_goose.png) +- ### Bug fixes - Missing the name of intimidation arrow [#138](https://github.com/UntitledDuckDevs/UntitledDuckMod/issues/138) From cf187d870474c9398cf45d77b466394765969f3e Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Tue, 3 Feb 2026 17:20:41 +0800 Subject: [PATCH 10/19] chore: 1.5.2 --- .../assets/untitledduckmod/lang/en_us.json | 2 +- docs/CHANGELOG.md | 11 +++++++++++ docs/LATEST_CHANGES.md | 16 ++-------------- gradle.properties | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/common/src/main/resources/assets/untitledduckmod/lang/en_us.json b/common/src/main/resources/assets/untitledduckmod/lang/en_us.json index 0d84411e..35772f47 100644 --- a/common/src/main/resources/assets/untitledduckmod/lang/en_us.json +++ b/common/src/main/resources/assets/untitledduckmod/lang/en_us.json @@ -34,7 +34,7 @@ "item.minecraft.potion.effect.intimidation": "Potion of Intimidation", "item.minecraft.lingering_potion.effect.intimidation": "Lingering Potion of Intimidation", "item.minecraft.splash_potion.effect.intimidation": "Splash Potion of Intimidation", - "item.minecraft.tipped_arrow.effect.intimidation": "Splash Potion of Intimidation", + "item.minecraft.tipped_arrow.effect.intimidation": "Arrow of Intimidation", "tag.item.untitledduckmod.goose_food": "Goose Food", "tag.item.untitledduckmod.goose_breeding_food": "Goose Breeding Food", diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 5775acdb..97b4c260 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,3 +1,14 @@ +## Version ["v1.5.2"] - 2026-2-3 + +### Bug fixes +- Incorrect translation of tipped_arrow + +## Version ["v1.5.1"] - 2026-2-3 + +### Bug fixes +- [#139](https://github.com/UntitledDuckDevs/UntitledDuckMod/issues/#139) + + ## Version ["v1.5.0"] - 2026-2-3 ### Credits diff --git a/docs/LATEST_CHANGES.md b/docs/LATEST_CHANGES.md index d062796b..55613897 100644 --- a/docs/LATEST_CHANGES.md +++ b/docs/LATEST_CHANGES.md @@ -1,16 +1,4 @@ -## Version ["v1.5.0"] - 2026-2-3 - -### Credits -Special thanks to: -[Practise40hrs](https://github.com/Practise40hrs) - For providing the beautiful new textures for the **Pekin Duck** and **Greylag Goose** variants. - -### Features -- Tamed geese now only pick up items from their owners -- Added a new Pekin Duck variant. - ![Pekin Duck](images/pekin_duck.png) -- Added a new Greylag Goose variant. - ![Greylag Goose](images/greylag_goose.png) -- +## Version ["v1.5.2"] - 2026-2-3 ### Bug fixes -- Missing the name of intimidation arrow [#138](https://github.com/UntitledDuckDevs/UntitledDuckMod/issues/138) +- Incorrect translation of tipped_arrow diff --git a/gradle.properties b/gradle.properties index 7569fe38..621099ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ yarn_mappings=1.20.1+build.10 # Mod Properties archives_base_name=untitledduckmod -mod_version=1.5.0 +mod_version=1.5.2 mod_id=untitledduckmod maven_group=net.untitledduckmod From 19b3bae060195695861add4222c74d9816c5a699 Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Thu, 25 Jun 2026 12:55:43 +0800 Subject: [PATCH 11/19] fix: Ducks and geese spawn endlessly, causing TPS to drop #132 --- .../net/untitledduckmod/common/entity/CustomSpawnGroup.java | 4 ++-- .../untitledduckmod/common/init/forge/ModEntityTypesImpl.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/net/untitledduckmod/common/entity/CustomSpawnGroup.java b/common/src/main/java/net/untitledduckmod/common/entity/CustomSpawnGroup.java index 772a5f87..03cf6320 100644 --- a/common/src/main/java/net/untitledduckmod/common/entity/CustomSpawnGroup.java +++ b/common/src/main/java/net/untitledduckmod/common/entity/CustomSpawnGroup.java @@ -3,7 +3,7 @@ import net.minecraft.entity.SpawnGroup; public enum CustomSpawnGroup { - WATERFOWL("waterfowl", 10, true, false, 128); + WATERFOWL("waterfowl", 10, true, true, 128); public SpawnGroup spawnGroup; public final String name; @@ -15,7 +15,7 @@ public enum CustomSpawnGroup { public static final String WATERFOWL_NAME = "waterfowl"; public static final int WATERFOWL_SPAWN_CAP = 10; public static final boolean WATERFOWL_PEACEFUL = true; - public static final boolean WATERFOWL_RARE = false; + public static final boolean WATERFOWL_RARE = true; public static final int WATERFOWL_IMMEDIATE_DESPAWN_RANGE = 128; CustomSpawnGroup(String name, int spawnCap, boolean peaceful, boolean rare, int immediateDespawnRange) { diff --git a/forge/src/main/java/net/untitledduckmod/common/init/forge/ModEntityTypesImpl.java b/forge/src/main/java/net/untitledduckmod/common/init/forge/ModEntityTypesImpl.java index 6ef09953..42d94660 100644 --- a/forge/src/main/java/net/untitledduckmod/common/init/forge/ModEntityTypesImpl.java +++ b/forge/src/main/java/net/untitledduckmod/common/init/forge/ModEntityTypesImpl.java @@ -1,6 +1,5 @@ package net.untitledduckmod.common.init.forge; -import net.minecraft.entity.SpawnGroup; import net.minecraft.entity.SpawnRestriction; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.world.Heightmap; From 53440d3d26c2a769d808daa12bb9407f3835a2d5 Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Thu, 25 Jun 2026 12:58:03 +0800 Subject: [PATCH 12/19] feat: interaction gui for tamed ducks and geese --- .../java/net/untitledduckmod/DuckMod.java | 1 + .../renderer/entity/WaterfowlRenderer.java | 2 +- .../client/screen/MouthScreen.java | 48 ++++++++ .../common/entity/DuckEntity.java | 5 + .../common/entity/GooseEntity.java | 6 +- .../common/entity/MouthHoldable.java | 12 ++ .../common/entity/WaterfowlEntity.java | 52 ++++++-- .../common/helper/MouthGuiHelper.java | 12 ++ .../common/init/ModScreenHandlers.java | 21 ++++ .../common/platform/RegistryHelper.java | 15 +++ .../common/screen/ExtendedFactory.java | 8 ++ .../common/screen/MouthScreenHandler.java | 111 ++++++++++++++++++ .../fabric/DuckModFabricClientSetup.java | 4 + .../helper/fabric/MouthGuiHelperImpl.java | 33 ++++++ .../platform/fabric/RegistryHelperImpl.java | 13 ++ .../client/forge/DuckModForgeClientSetup.java | 11 ++ .../common/forge/DuckModForge.java | 1 + .../helper/forge/MouthGuiHelperImpl.java | 32 +++++ .../platform/forge/RegistryHelperImpl.java | 14 ++- 19 files changed, 390 insertions(+), 11 deletions(-) create mode 100644 common/src/main/java/net/untitledduckmod/client/screen/MouthScreen.java create mode 100644 common/src/main/java/net/untitledduckmod/common/entity/MouthHoldable.java create mode 100644 common/src/main/java/net/untitledduckmod/common/helper/MouthGuiHelper.java create mode 100644 common/src/main/java/net/untitledduckmod/common/init/ModScreenHandlers.java create mode 100644 common/src/main/java/net/untitledduckmod/common/screen/ExtendedFactory.java create mode 100644 common/src/main/java/net/untitledduckmod/common/screen/MouthScreenHandler.java create mode 100644 fabric/src/main/java/net/untitledduckmod/common/helper/fabric/MouthGuiHelperImpl.java create mode 100644 forge/src/main/java/net/untitledduckmod/common/helper/forge/MouthGuiHelperImpl.java diff --git a/common/src/main/java/net/untitledduckmod/DuckMod.java b/common/src/main/java/net/untitledduckmod/DuckMod.java index 128887f5..5323b5ee 100644 --- a/common/src/main/java/net/untitledduckmod/DuckMod.java +++ b/common/src/main/java/net/untitledduckmod/DuckMod.java @@ -15,6 +15,7 @@ public static void preInit() { ModSoundEvents.init(); ModStatusEffects.init(); ModPotions.init(); + ModScreenHandlers.init(); } public static void postInit() { diff --git a/common/src/main/java/net/untitledduckmod/client/renderer/entity/WaterfowlRenderer.java b/common/src/main/java/net/untitledduckmod/client/renderer/entity/WaterfowlRenderer.java index 7f56b1b4..105e8891 100644 --- a/common/src/main/java/net/untitledduckmod/client/renderer/entity/WaterfowlRenderer.java +++ b/common/src/main/java/net/untitledduckmod/client/renderer/entity/WaterfowlRenderer.java @@ -83,7 +83,7 @@ public void renderRecursively(MatrixStack poseStack, T animatable, GeoBone bone, heldItemRenderer.renderItem(animatable, mainHand, ModelTransformationMode.GROUND, false, poseStack, bufferSource, packedLight); poseStack.pop(); - buffer = bufferSource.getBuffer(RenderLayer.getEntityCutout(this.getTexture(animatable))); + buffer = bufferSource.getBuffer(renderType); } super.renderRecursively(poseStack, animatable, bone, renderType, bufferSource, buffer, isReRender, partialTick, packedLight, packedOverlay, red, green, blue, alpha); } diff --git a/common/src/main/java/net/untitledduckmod/client/screen/MouthScreen.java b/common/src/main/java/net/untitledduckmod/client/screen/MouthScreen.java new file mode 100644 index 00000000..d6a6c9e3 --- /dev/null +++ b/common/src/main/java/net/untitledduckmod/client/screen/MouthScreen.java @@ -0,0 +1,48 @@ +package net.untitledduckmod.client.screen; + +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.screen.ingame.InventoryScreen; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.untitledduckmod.common.entity.WaterfowlEntity; +import net.untitledduckmod.common.screen.MouthScreenHandler; + +public class MouthScreen extends HandledScreen { + private static final Identifier TEXTURE = new Identifier("textures/gui/container/horse.png"); + private WaterfowlEntity renderEntity; + private float mouseX; + private float mouseY; + + public MouthScreen(MouthScreenHandler handler, PlayerInventory inventory, Text title) { + super(handler, inventory, title); + Entity entity = inventory.player.getEntityWorld().getEntityById(handler.getEntityId()); + if (entity instanceof WaterfowlEntity waterfowl) { + renderEntity = waterfowl; + } + } + + @Override + protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) { + int x = (this.width - this.backgroundWidth) / 2; + int y = (this.height - this.backgroundHeight) / 2; + + context.drawTexture(TEXTURE, x, y, 0, 0, this.backgroundWidth, this.backgroundHeight); + + context.drawTexture(TEXTURE, x + 7, y + 17, 0, this.backgroundHeight, 18, 18); + + if (this.renderEntity != null) { + InventoryScreen.drawEntity(context, x + 51, y + 60, 30, (float)(x + 51) - this.mouseX, (float)(y + 75 - 50) - this.mouseY, this.renderEntity); + } + } + + public void render(DrawContext context, int mouseX, int mouseY, float delta) { + this.renderBackground(context); + this.mouseX = (float)mouseX; + this.mouseY = (float)mouseY; + super.render(context, mouseX, mouseY, delta); + this.drawMouseoverTooltip(context, mouseX, mouseY); + } +} diff --git a/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java b/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java index 78a30955..7426755e 100644 --- a/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java +++ b/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java @@ -223,6 +223,11 @@ public void updateEventHandler(BiConsumer, ServerWorld } } + @Override + public int getMouthHolderType() { + return 2; + } + @Override protected void initGoals() { this.goalSelector.add(0, new SwimGoal(this)); diff --git a/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java b/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java index a824fbed..7002106d 100644 --- a/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java +++ b/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java @@ -108,7 +108,6 @@ public static boolean checkGooseSpawnRules(EntityType goose, WorldA return isValidSurface && hasEnoughSpace; } - public static DefaultAttributeContainer.Builder getDefaultAttributes() { return MobEntity.createMobAttributes() .add(EntityAttributes.GENERIC_MAX_HEALTH, 7.0D) @@ -298,6 +297,11 @@ public void stopAnger() { this.getWorld().sendEntityStatus(this, (byte) 100); } + @Override + public int getMouthHolderType() { + return 1; + } + @Override public ItemStack tryEquip(ItemStack equipment) { EquipmentSlot equipmentSlot = EquipmentSlot.MAINHAND; diff --git a/common/src/main/java/net/untitledduckmod/common/entity/MouthHoldable.java b/common/src/main/java/net/untitledduckmod/common/entity/MouthHoldable.java new file mode 100644 index 00000000..f806d3e5 --- /dev/null +++ b/common/src/main/java/net/untitledduckmod/common/entity/MouthHoldable.java @@ -0,0 +1,12 @@ +package net.untitledduckmod.common.entity; + +import net.minecraft.inventory.SimpleInventory; +import net.minecraft.text.Text; + +public interface MouthHoldable { + SimpleInventory getMouthInventory(); + + Text getDisplayName(); + + int getMouthHolderType(); +} diff --git a/common/src/main/java/net/untitledduckmod/common/entity/WaterfowlEntity.java b/common/src/main/java/net/untitledduckmod/common/entity/WaterfowlEntity.java index b4bcb74b..b28a4e61 100644 --- a/common/src/main/java/net/untitledduckmod/common/entity/WaterfowlEntity.java +++ b/common/src/main/java/net/untitledduckmod/common/entity/WaterfowlEntity.java @@ -1,9 +1,6 @@ package net.untitledduckmod.common.entity; -import net.minecraft.entity.EntityData; -import net.minecraft.entity.EntityStatuses; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.SpawnReason; +import net.minecraft.entity.*; import net.minecraft.entity.ai.pathing.PathNodeType; import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.damage.DamageSource; @@ -13,28 +10,32 @@ import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; +import net.minecraft.inventory.SimpleInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.registry.tag.TagKey; import net.minecraft.sound.SoundEvent; +import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.Vec3d; import net.minecraft.world.*; import net.untitledduckmod.common.config.UntitledConfig; +import net.untitledduckmod.common.helper.MouthGuiHelper; import org.jetbrains.annotations.Nullable; import software.bernie.geckolib.core.animatable.GeoAnimatable; import software.bernie.geckolib.core.animation.RawAnimation; import java.util.Objects; -public abstract class WaterfowlEntity extends TameableEntity implements GeoAnimatable { +public abstract class WaterfowlEntity extends TameableEntity implements GeoAnimatable, MouthHoldable { public static final float BABY_MIN_SCALE = 0.25f; public static final float BABY_MAX_SCALE = 0.7f; public static final String EGG_LAY_TIME_TAG = "EggLayTime"; public static final String HELD_FOOD_TICK_TAG = "HeldFoodTick"; public static final String RANDOM_FORCE_EAT_TICK_TAG = "RandomForceEatTick"; + public static final String MOUTH_ITEM_TAG = "MouthItem"; public static final String VARIANT_TAG = "Variant"; public static final String BABY_SCALE_TAG = "BabyScale"; public static final float SWIM_SPEED_MULTIPLIER = 3.0f; @@ -57,8 +58,7 @@ public abstract class WaterfowlEntity extends TameableEntity implements GeoAnima protected static final RawAnimation EAT_ANIM = RawAnimation.begin().thenPlay("eat"); protected static final RawAnimation SIT_ANIM = RawAnimation.begin().thenPlay("sit"); - private static final int MIN_EGG_LAY_TIME = 6000; - private static final int MAX_EGG_LAY_TIME = 12000; + public final SimpleInventory mouthInventory = new SimpleInventory(1); protected int maxVariant = 3; protected int eggLayTime; @@ -70,6 +70,11 @@ protected WaterfowlEntity(EntityType entityType, World super(entityType, world); eggLayTime = getRandomLayTime(); this.setPathfindingPenalty(PathNodeType.WATER, 0.0f); + + this.mouthInventory.addListener(inventory -> { + ItemStack stackInGui = inventory.getStack(0); + this.equipStack(EquipmentSlot.MAINHAND, stackInGui); + }); } @Override @@ -98,6 +103,7 @@ public void writeCustomDataToNbt(NbtCompound tag) { tag.putFloat(BABY_SCALE_TAG, getBabyScale()); tag.putInt(HELD_FOOD_TICK_TAG, heldFoodTick); tag.putInt(RANDOM_FORCE_EAT_TICK_TAG, randomForceEatTick); + tag.put(MOUTH_ITEM_TAG, this.mouthInventory.getStack(0).writeNbt(new NbtCompound())); } @Override @@ -110,6 +116,27 @@ public void readCustomDataFromNbt(NbtCompound tag) { setBabyScale(tag.getFloat(BABY_SCALE_TAG)); this.heldFoodTick = tag.getInt(HELD_FOOD_TICK_TAG); this.randomForceEatTick = tag.getInt(RANDOM_FORCE_EAT_TICK_TAG); + if (tag.contains(MOUTH_ITEM_TAG, NbtCompound.COMPOUND_TYPE)) { + this.mouthInventory.setStack(0, ItemStack.fromNbt(tag.getCompound(MOUTH_ITEM_TAG))); + } + } + + @Override + public SimpleInventory getMouthInventory() { + return this.mouthInventory; + } + + @Override + public Text getDisplayName() { + return super.getDisplayName(); + } + + @Override + public void equipStack(EquipmentSlot slot, ItemStack stack) { + super.equipStack(slot, stack); + if (slot == EquipmentSlot.MAINHAND && this.mouthInventory.getStack(0) != stack) { + this.mouthInventory.setStack(0, stack); + } } @Override @@ -177,7 +204,9 @@ public byte getRandomVariant() { } public int getRandomLayTime() { - return random.nextInt(MIN_EGG_LAY_TIME) + (MAX_EGG_LAY_TIME - MIN_EGG_LAY_TIME); + int min = UntitledConfig.minEggLayTime(); + int max = UntitledConfig.maxEggLayTime(); + return this.random.nextInt(min) + (max - min); } public byte getAnimation() { @@ -246,6 +275,13 @@ public void tickMovement() { @Override public ActionResult interactMob(PlayerEntity player, Hand hand) { // TODO: Cleanup + if (player.isSneaking() && this.isTamed() && this.isOwner(player)) { + if (!this.getWorld().isClient) { + MouthGuiHelper.openMouthGui(player, this); + } + return ActionResult.success(this.getWorld().isClient); + } + ItemStack stack = player.getStackInHand(hand); Item item = stack.getItem(); if (this.getWorld().isClient && (!this.isBaby() || !this.isBreedingItem(stack))) { diff --git a/common/src/main/java/net/untitledduckmod/common/helper/MouthGuiHelper.java b/common/src/main/java/net/untitledduckmod/common/helper/MouthGuiHelper.java new file mode 100644 index 00000000..ef3052b3 --- /dev/null +++ b/common/src/main/java/net/untitledduckmod/common/helper/MouthGuiHelper.java @@ -0,0 +1,12 @@ +package net.untitledduckmod.common.helper; + +import dev.architectury.injectables.annotations.ExpectPlatform; +import net.minecraft.entity.player.PlayerEntity; +import net.untitledduckmod.common.entity.WaterfowlEntity; + +public class MouthGuiHelper { + @ExpectPlatform + public static void openMouthGui(PlayerEntity player, WaterfowlEntity entity) { + throw new AssertionError(); + } +} diff --git a/common/src/main/java/net/untitledduckmod/common/init/ModScreenHandlers.java b/common/src/main/java/net/untitledduckmod/common/init/ModScreenHandlers.java new file mode 100644 index 00000000..8e869949 --- /dev/null +++ b/common/src/main/java/net/untitledduckmod/common/init/ModScreenHandlers.java @@ -0,0 +1,21 @@ +package net.untitledduckmod.common.init; + +import net.minecraft.screen.ScreenHandlerType; +import net.untitledduckmod.common.platform.RegistryHelper; +import net.untitledduckmod.common.screen.MouthScreenHandler; + +import java.util.function.Supplier; + +public class ModScreenHandlers { + public final static Supplier> MOUTH; + + static { + MOUTH = RegistryHelper.registerScreenHandler("mouth", () -> + RegistryHelper.createExtendedScreenHandler(MouthScreenHandler::new) + ); + } + + // Call during mod initialization to ensure registration + public static void init() { + } +} diff --git a/common/src/main/java/net/untitledduckmod/common/platform/RegistryHelper.java b/common/src/main/java/net/untitledduckmod/common/platform/RegistryHelper.java index f9cdc97f..d4f2c705 100644 --- a/common/src/main/java/net/untitledduckmod/common/platform/RegistryHelper.java +++ b/common/src/main/java/net/untitledduckmod/common/platform/RegistryHelper.java @@ -4,9 +4,14 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.mob.MobEntity; +import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.Item; +import net.minecraft.network.PacketByteBuf; import net.minecraft.potion.Potion; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sound.SoundEvent; +import net.untitledduckmod.common.screen.ExtendedFactory; import java.util.function.Supplier; @@ -43,4 +48,14 @@ public static Supplier registerPotion(String name, Supplie public static Supplier registerStatusEffect(String name, Supplier statusEffect) { throw new AssertionError(); } + + @ExpectPlatform + public static > Supplier registerScreenHandler(String name, Supplier screenHandler) { + throw new AssertionError(); + } + + @ExpectPlatform + public static ScreenHandlerType createExtendedScreenHandler(ExtendedFactory factory) { + throw new AssertionError(); + } } diff --git a/common/src/main/java/net/untitledduckmod/common/screen/ExtendedFactory.java b/common/src/main/java/net/untitledduckmod/common/screen/ExtendedFactory.java new file mode 100644 index 00000000..29859c8b --- /dev/null +++ b/common/src/main/java/net/untitledduckmod/common/screen/ExtendedFactory.java @@ -0,0 +1,8 @@ +package net.untitledduckmod.common.screen; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.network.PacketByteBuf; + +public interface ExtendedFactory { + T create(int syncId, PlayerInventory inventory, PacketByteBuf buf); +} \ No newline at end of file diff --git a/common/src/main/java/net/untitledduckmod/common/screen/MouthScreenHandler.java b/common/src/main/java/net/untitledduckmod/common/screen/MouthScreenHandler.java new file mode 100644 index 00000000..4767507b --- /dev/null +++ b/common/src/main/java/net/untitledduckmod/common/screen/MouthScreenHandler.java @@ -0,0 +1,111 @@ +package net.untitledduckmod.common.screen; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.Inventory; +import net.minecraft.inventory.SimpleInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.slot.Slot; +import net.untitledduckmod.common.entity.DuckEntity; +import net.untitledduckmod.common.entity.WaterfowlEntity; +import net.untitledduckmod.common.init.ModItems; +import net.untitledduckmod.common.init.ModScreenHandlers; + +public class MouthScreenHandler extends ScreenHandler implements ExtendedFactory { + private final Inventory entityInventory; + private final int entityId; + private WaterfowlEntity entity; + + public MouthScreenHandler(int syncId, PlayerInventory inventory, PacketByteBuf buf) { + this(syncId, inventory, new SimpleInventory(1), buf.readInt(), buf.readInt()); + } + + public MouthScreenHandler(int syncId, PlayerInventory playerInventory, Inventory entityInventory, int holderType, int entityId) { + super(ModScreenHandlers.MOUTH.get(), syncId); + checkSize(entityInventory, 1); + this.entityInventory = entityInventory; + this.entityId = entityId; + Entity e = playerInventory.player.getWorld().getEntityById(entityId); + if (e instanceof WaterfowlEntity waterfowl) { + entity = waterfowl; + } + entityInventory.onOpen(playerInventory.player); + + this.addSlot(new Slot(entityInventory, 0, 8, 18) { + @Override + public boolean canInsert(ItemStack stack) { + if (holderType == 1 && stack.isOf(ModItems.GOOSE_EGG.get())) return false; + if (holderType == 2 && (stack.isOf(ModItems.DUCK_EGG.get()) || !DuckEntity.FOOD_INGREDIENT.test(stack))) return false; + return super.canInsert(stack); + } + @Override + public int getMaxItemCount() { + return 1; + } + }); + + for (int row = 0; row < 3; ++row) { + for (int col = 0; col < 9; ++col) { + this.addSlot(new Slot(playerInventory, col + row * 9 + 9, 8 + col * 18, 84 + row * 18)); + } + } + + for (int col = 0; col < 9; ++col) { + this.addSlot(new Slot(playerInventory, col, 8 + col * 18, 142)); + } + } + + public int getEntityId() { + return this.entityId; + } + + @Override + public boolean canUse(PlayerEntity player) { + return this.entityInventory.canPlayerUse(player) && this.entity.isAlive() && this.entity.distanceTo(player) < 8.0F; + } + + @Override + public ItemStack quickMove(PlayerEntity player, int invSlot) { + ItemStack itemStack = ItemStack.EMPTY; + Slot slot = this.slots.get(invSlot); + if (slot != null && slot.hasStack()) { + ItemStack itemStack2 = slot.getStack(); + itemStack = itemStack2.copy(); + + if (invSlot == 0) { + if (!this.insertItem(itemStack2, 1, 37, true)) { + return ItemStack.EMPTY; + } + } else { + if (this.getSlot(0).canInsert(itemStack2)) { + if (!this.insertItem(itemStack2, 0, 1, false)) { + return ItemStack.EMPTY; + } + } else { + return ItemStack.EMPTY; + } + } + + if (itemStack2.isEmpty()) { + slot.setStack(ItemStack.EMPTY); + } else { + slot.markDirty(); + } + } + return itemStack; + } + + @Override + public void onClosed(PlayerEntity player) { + super.onClosed(player); + this.entityInventory.onClose(player); + } + + @Override + public MouthScreenHandler create(int syncId, PlayerInventory inventory, PacketByteBuf buf) { + return new MouthScreenHandler(syncId, inventory, buf); + } +} diff --git a/fabric/src/main/java/net/untitledduckmod/client/fabric/DuckModFabricClientSetup.java b/fabric/src/main/java/net/untitledduckmod/client/fabric/DuckModFabricClientSetup.java index 386b66ce..4b91a65c 100644 --- a/fabric/src/main/java/net/untitledduckmod/client/fabric/DuckModFabricClientSetup.java +++ b/fabric/src/main/java/net/untitledduckmod/client/fabric/DuckModFabricClientSetup.java @@ -2,10 +2,13 @@ import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; +import net.minecraft.client.gui.screen.ingame.HandledScreens; import net.minecraft.client.render.entity.FlyingItemEntityRenderer; import net.untitledduckmod.client.renderer.entity.DuckRenderer; import net.untitledduckmod.client.renderer.entity.GooseRenderer; +import net.untitledduckmod.client.screen.MouthScreen; import net.untitledduckmod.common.init.ModEntityTypes; +import net.untitledduckmod.common.init.ModScreenHandlers; public class DuckModFabricClientSetup implements ClientModInitializer { @Override @@ -14,5 +17,6 @@ public void onInitializeClient() { EntityRendererRegistry.register(ModEntityTypes.getDuckEgg(), FlyingItemEntityRenderer::new); EntityRendererRegistry.register(ModEntityTypes.getGoose(), GooseRenderer::new); EntityRendererRegistry.register(ModEntityTypes.getGooseEgg(), FlyingItemEntityRenderer::new); + HandledScreens.register(ModScreenHandlers.MOUTH.get(), MouthScreen::new); } } \ No newline at end of file diff --git a/fabric/src/main/java/net/untitledduckmod/common/helper/fabric/MouthGuiHelperImpl.java b/fabric/src/main/java/net/untitledduckmod/common/helper/fabric/MouthGuiHelperImpl.java new file mode 100644 index 00000000..025a9ff2 --- /dev/null +++ b/fabric/src/main/java/net/untitledduckmod/common/helper/fabric/MouthGuiHelperImpl.java @@ -0,0 +1,33 @@ +package net.untitledduckmod.common.helper.fabric; + +import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.untitledduckmod.common.entity.WaterfowlEntity; +import net.untitledduckmod.common.screen.MouthScreenHandler; + +public class MouthGuiHelperImpl { + public static void openMouthGui(PlayerEntity player, WaterfowlEntity entity) { + player.openHandledScreen(new ExtendedScreenHandlerFactory() { + @Override + public void writeScreenOpeningData(ServerPlayerEntity player, PacketByteBuf buf) { + buf.writeInt(entity.getMouthHolderType()); + buf.writeInt(entity.getId()); + } + + @Override + public Text getDisplayName() { + return entity.getDisplayName(); + } + + @Override + public ScreenHandler createMenu(int syncId, PlayerInventory inv, PlayerEntity p) { + return new MouthScreenHandler(syncId, inv, entity.getMouthInventory(), entity.getMouthHolderType(), entity.getId()); + } + }); + } +} diff --git a/fabric/src/main/java/net/untitledduckmod/common/platform/fabric/RegistryHelperImpl.java b/fabric/src/main/java/net/untitledduckmod/common/platform/fabric/RegistryHelperImpl.java index d41fb742..873c3953 100644 --- a/fabric/src/main/java/net/untitledduckmod/common/platform/fabric/RegistryHelperImpl.java +++ b/fabric/src/main/java/net/untitledduckmod/common/platform/fabric/RegistryHelperImpl.java @@ -1,5 +1,6 @@ package net.untitledduckmod.common.platform.fabric; +import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType; import net.minecraft.entity.EntityType; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.mob.MobEntity; @@ -8,8 +9,11 @@ import net.minecraft.potion.Potion; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sound.SoundEvent; import net.untitledduckmod.DuckMod; +import net.untitledduckmod.common.screen.ExtendedFactory; import java.util.function.Supplier; @@ -46,4 +50,13 @@ public static Supplier registerStatusEffect(String n var registry = Registry.register(Registries.STATUS_EFFECT, DuckMod.id(name), statusEffect.get()); return () -> registry; } + + public static ScreenHandlerType createExtendedScreenHandler(ExtendedFactory factory) { + return new ExtendedScreenHandlerType<>(factory::create); + } + + public static > Supplier registerScreenHandler(String name, Supplier screenHandler) { + var registry = Registry.register(Registries.SCREEN_HANDLER, DuckMod.id(name), screenHandler.get()); + return () -> registry; + } } diff --git a/forge/src/main/java/net/untitledduckmod/client/forge/DuckModForgeClientSetup.java b/forge/src/main/java/net/untitledduckmod/client/forge/DuckModForgeClientSetup.java index 7a345c0e..9666b234 100644 --- a/forge/src/main/java/net/untitledduckmod/client/forge/DuckModForgeClientSetup.java +++ b/forge/src/main/java/net/untitledduckmod/client/forge/DuckModForgeClientSetup.java @@ -1,13 +1,17 @@ package net.untitledduckmod.client.forge; +import net.minecraft.client.gui.screen.ingame.HandledScreens; import net.minecraft.client.render.entity.FlyingItemEntityRenderer; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.EntityRenderersEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.untitledduckmod.client.renderer.entity.DuckRenderer; import net.untitledduckmod.client.renderer.entity.GooseRenderer; +import net.untitledduckmod.client.screen.MouthScreen; import net.untitledduckmod.common.init.ModEntityTypes; +import net.untitledduckmod.common.init.ModScreenHandlers; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class DuckModForgeClientSetup { @@ -19,4 +23,11 @@ public static void registerRenderers(final EntityRenderersEvent.RegisterRenderer event.registerEntityRenderer(ModEntityTypes.getGoose(), GooseRenderer::new); event.registerEntityRenderer(ModEntityTypes.getGooseEgg(), FlyingItemEntityRenderer::new); } + + @SubscribeEvent + public static void onClientSetup(FMLClientSetupEvent event) { + event.enqueueWork(() -> { + HandledScreens.register(ModScreenHandlers.MOUTH.get(), MouthScreen::new); + }); + } } \ No newline at end of file diff --git a/forge/src/main/java/net/untitledduckmod/common/forge/DuckModForge.java b/forge/src/main/java/net/untitledduckmod/common/forge/DuckModForge.java index 92851e21..287f413e 100644 --- a/forge/src/main/java/net/untitledduckmod/common/forge/DuckModForge.java +++ b/forge/src/main/java/net/untitledduckmod/common/forge/DuckModForge.java @@ -27,6 +27,7 @@ public DuckModForge() { RegistryHelperImpl.BIOME_MODIFIERS.register(bus); RegistryHelperImpl.STATUS_EFFECTS.register(bus); RegistryHelperImpl.POTIONS.register(bus); + RegistryHelperImpl.MENU_TYPES.register(bus); } @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) diff --git a/forge/src/main/java/net/untitledduckmod/common/helper/forge/MouthGuiHelperImpl.java b/forge/src/main/java/net/untitledduckmod/common/helper/forge/MouthGuiHelperImpl.java new file mode 100644 index 00000000..c5ac7b15 --- /dev/null +++ b/forge/src/main/java/net/untitledduckmod/common/helper/forge/MouthGuiHelperImpl.java @@ -0,0 +1,32 @@ +package net.untitledduckmod.common.helper.forge; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.NamedScreenHandlerFactory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraftforge.network.NetworkHooks; +import net.untitledduckmod.common.entity.WaterfowlEntity; +import net.untitledduckmod.common.screen.MouthScreenHandler; + +public class MouthGuiHelperImpl { + public static void openMouthGui(PlayerEntity player, WaterfowlEntity entity) { + if (player instanceof ServerPlayerEntity serverPlayer) { + NetworkHooks.openScreen(serverPlayer, new NamedScreenHandlerFactory() { + @Override + public Text getDisplayName() { + return entity.getDisplayName(); + } + + @Override + public ScreenHandler createMenu(int syncId, PlayerInventory inv, PlayerEntity p) { + return new MouthScreenHandler(syncId, inv, entity.getMouthInventory(), entity.getMouthHolderType(), entity.getId()); + } + }, buf -> { + buf.writeInt(entity.getMouthHolderType()); + buf.writeInt(entity.getId()); + }); + } + } +} diff --git a/forge/src/main/java/net/untitledduckmod/common/platform/forge/RegistryHelperImpl.java b/forge/src/main/java/net/untitledduckmod/common/platform/forge/RegistryHelperImpl.java index c3b0a81e..64ac4d6f 100644 --- a/forge/src/main/java/net/untitledduckmod/common/platform/forge/RegistryHelperImpl.java +++ b/forge/src/main/java/net/untitledduckmod/common/platform/forge/RegistryHelperImpl.java @@ -2,13 +2,15 @@ import com.mojang.serialization.Codec; import net.minecraft.entity.EntityType; -import net.minecraft.entity.SpawnGroup; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.mob.MobEntity; import net.minecraft.item.Item; import net.minecraft.potion.Potion; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sound.SoundEvent; import net.minecraftforge.common.ForgeSpawnEggItem; +import net.minecraftforge.common.extensions.IForgeMenuType; import net.minecraftforge.common.world.BiomeModifier; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -16,6 +18,7 @@ import net.untitledduckmod.common.entity.CustomSpawnGroup; import net.untitledduckmod.common.entity.forge.DuckEntityForge; import net.untitledduckmod.common.entity.forge.GooseEntityForge; +import net.untitledduckmod.common.screen.ExtendedFactory; import java.util.function.Supplier; @@ -26,6 +29,7 @@ public class RegistryHelperImpl { public static final DeferredRegister POTIONS = DeferredRegister.create(ForgeRegistries.POTIONS, DuckMod.MOD_ID); public static final DeferredRegister STATUS_EFFECTS = DeferredRegister.create(ForgeRegistries.MOB_EFFECTS, DuckMod.MOD_ID); public static final DeferredRegister> BIOME_MODIFIERS = DeferredRegister.create(ForgeRegistries.Keys.BIOME_MODIFIER_SERIALIZERS, DuckMod.MOD_ID); + public static final DeferredRegister> MENU_TYPES = DeferredRegister.create(ForgeRegistries.MENU_TYPES, DuckMod.MOD_ID); public static Supplier registerItem(String name, Supplier item) { return ITEMS.register(name, item); @@ -62,4 +66,12 @@ public static Supplier registerStatusEffect(String n public static > void registerBiomeModifier(String name, Supplier biomeModifier) { BIOME_MODIFIERS.register(name, biomeModifier); } + + public static ScreenHandlerType createExtendedScreenHandler(ExtendedFactory factory) { + return IForgeMenuType.create(factory::create); + } + + public static > Supplier registerScreenHandler(String name, Supplier screenHandler) { + return MENU_TYPES.register(name, screenHandler); + } } From 9d49fcb943190e71b33d9322399ec5a2a2a1b9d4 Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Thu, 25 Jun 2026 13:00:17 +0800 Subject: [PATCH 13/19] feat: custom egg laying time --- .../common/config/UntitledConfig.java | 10 ++++++++ .../compat/jade/provider/LayEggProvider.java | 3 +-- .../assets/untitledduckmod/lang/en_us.json | 4 ++++ .../assets/untitledduckmod/lang/zh_cn.json | 4 ++++ .../config/fabric/UntitledConfigImpl.java | 12 ++++++++++ .../config/forge/UntitledConfigImpl.java | 23 ++++++++++++++++--- 6 files changed, 51 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/net/untitledduckmod/common/config/UntitledConfig.java b/common/src/main/java/net/untitledduckmod/common/config/UntitledConfig.java index ca04b759..6017cffb 100644 --- a/common/src/main/java/net/untitledduckmod/common/config/UntitledConfig.java +++ b/common/src/main/java/net/untitledduckmod/common/config/UntitledConfig.java @@ -76,6 +76,16 @@ public static int forceEatRandomMaxTick() { throw new AssertionError(); } + @ExpectPlatform + public static int minEggLayTime() { + throw new AssertionError(); + } + + @ExpectPlatform + public static int maxEggLayTime() { + throw new AssertionError(); + } + @ExpectPlatform public static float foodHealingValue() { throw new AssertionError(); diff --git a/common/src/main/java/net/untitledduckmod/compat/jade/provider/LayEggProvider.java b/common/src/main/java/net/untitledduckmod/compat/jade/provider/LayEggProvider.java index 15ef815e..e0fa5fec 100644 --- a/common/src/main/java/net/untitledduckmod/compat/jade/provider/LayEggProvider.java +++ b/common/src/main/java/net/untitledduckmod/compat/jade/provider/LayEggProvider.java @@ -20,9 +20,8 @@ public class LayEggProvider implements IEntityComponentProvider, IServerDataProv @Override public void appendServerData(NbtCompound tag, EntityAccessor accessor) { - int max = 24000 * 2; if (accessor.getEntity() instanceof WaterfowlEntity entity) { - if (!entity.isBaby() && entity.getEggLayTime() < max) { + if (!entity.isBaby() && entity.getEggLayTime() > 0) { tag.putInt("NextEggIn", entity.getEggLayTime()); } } diff --git a/common/src/main/resources/assets/untitledduckmod/lang/en_us.json b/common/src/main/resources/assets/untitledduckmod/lang/en_us.json index 35772f47..93c35304 100644 --- a/common/src/main/resources/assets/untitledduckmod/lang/en_us.json +++ b/common/src/main/resources/assets/untitledduckmod/lang/en_us.json @@ -65,10 +65,14 @@ "untitledduckmod.config.enable_force_eat": "Enable Force Eat", "untitledduckmod.config.force_eat_random_min_tick": "Force Eat Random Min Tick", "untitledduckmod.config.force_eat_random_max_tick": "Force Eat Random Max Tick", + "untitledduckmod.config.min_egg_lay_time": "Min Egg Lay Time", + "untitledduckmod.config.max_egg_lay_time": "Max Egg Lay Time", "untitledduckmod.config.food_healing_value": "Food Healing value", "untitledduckmod.config.enable_force_eat.tooltip": "Enable/disable automatic force-eating for duck/goose", "untitledduckmod.config.force_eat_random_min_tick.tooltip": "Min tick before duck/goose auto-eat held food", "untitledduckmod.config.force_eat_random_max_tick.tooltip": "Max tick before duck/goose auto-eat held food", + "untitledduckmod.config.min_egg_lay_time.tooltip": "Min egg lay time (Ticks)", + "untitledduckmod.config.max_egg_lay_time.tooltip": "Max egg lay time (Ticks)", "untitledduckmod.config.food_healing_value.tooltip": "Food can heal the health value of duck & goose", "untitledduckmod.config.duck_spawn_weight.tooltip": "How often ducks spawn (the higher, the more often)", "untitledduckmod.config.goose_spawn_weight.tooltip": "How often geese spawn (the higher, the more often)", diff --git a/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json b/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json index e09d03e0..e00d1a35 100644 --- a/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json +++ b/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json @@ -68,10 +68,14 @@ "untitledduckmod.config.enable_force_eat": "自动进食", "untitledduckmod.config.force_eat_random_min_tick": "自动进食最小游戏刻", "untitledduckmod.config.force_eat_random_max_tick": "自动进食最大游戏刻", + "untitledduckmod.config.min_egg_lay_time": "最小下蛋时间", + "untitledduckmod.config.max_egg_lay_time": "最大下蛋时间", "untitledduckmod.config.food_healing_value": "食物治疗值", "untitledduckmod.config.enable_force_eat.tooltip": "是否为鸭/鹅开启自动进食", "untitledduckmod.config.force_eat_random_min_tick.tooltip": "鸭/鹅自动进食食物的最小游戏刻", "untitledduckmod.config.force_eat_random_max_tick.tooltip": "鸭/鹅自动进食食物的最大游戏刻", + "untitledduckmod.config.min_egg_lay_time.tooltip": "下蛋所需的最小游戏刻", + "untitledduckmod.config.max_egg_lay_time.tooltip": "下蛋所需的最大游戏刻", "untitledduckmod.config.duck_spawn_weight.tooltip": "鸭生成频率(越高,越频繁)", "untitledduckmod.config.goose_spawn_weight.tooltip": "鹅生成频率(越高,越频繁)", "untitledduckmod.config.duck_min_group_size.tooltip": "每次生成的最少鸭数量", diff --git a/fabric/src/main/java/net/untitledduckmod/common/config/fabric/UntitledConfigImpl.java b/fabric/src/main/java/net/untitledduckmod/common/config/fabric/UntitledConfigImpl.java index 69c598d3..3c62eef0 100644 --- a/fabric/src/main/java/net/untitledduckmod/common/config/fabric/UntitledConfigImpl.java +++ b/fabric/src/main/java/net/untitledduckmod/common/config/fabric/UntitledConfigImpl.java @@ -12,6 +12,10 @@ public class UntitledConfigImpl extends TinyConfig { public static int force_eat_random_min_tick = 500; @Entry(category = "common") public static int force_eat_random_max_tick = 1000; + @Entry(category = "common") + public static int min_egg_lay_time = 6000; + @Entry(category = "common") + public static int max_egg_lay_time = 12000; @Entry(category = "common", min = 0F, max = 100F) public static float food_healing_value = 0.5F; @@ -99,6 +103,14 @@ public static int forceEatRandomMaxTick() { return force_eat_random_max_tick; } + public static int minEggLayTime() { + return min_egg_lay_time; + } + + public static int maxEggLayTime() { + return max_egg_lay_time; + } + public static float foodHealingValue() { return food_healing_value; } diff --git a/forge/src/main/java/net/untitledduckmod/common/config/forge/UntitledConfigImpl.java b/forge/src/main/java/net/untitledduckmod/common/config/forge/UntitledConfigImpl.java index e6bee5d4..bff616fe 100644 --- a/forge/src/main/java/net/untitledduckmod/common/config/forge/UntitledConfigImpl.java +++ b/forge/src/main/java/net/untitledduckmod/common/config/forge/UntitledConfigImpl.java @@ -8,7 +8,7 @@ import java.util.List; public class UntitledConfigImpl { - public static final ForgeConfigSpec SERVER_SPEC; + public static final ForgeConfigSpec COMMON_SPEC; public static final ForgeConfigSpec.IntValue DUCK_WEIGHT; public static final ForgeConfigSpec.IntValue DUCK_MIN_GROUP_SIZE; @@ -26,6 +26,8 @@ public class UntitledConfigImpl { public static final ForgeConfigSpec.BooleanValue ENABLE_FORCE_EAT; public static final ForgeConfigSpec.IntValue FORCE_EAT_RANDOM_MIN_TICK; public static final ForgeConfigSpec.IntValue FORCE_EAT_RANDOM_MAX_TICK; + public static final ForgeConfigSpec.IntValue MIN_EGG_LAY_TIME; + public static final ForgeConfigSpec.IntValue MAX_EGG_LAY_TIME; public static final ForgeConfigSpec.DoubleValue FOOD_HEALING_VALUE; public static final ForgeConfigSpec.ConfigValue> INTIMIDATION_BLACKLIST; @@ -88,6 +90,12 @@ public class UntitledConfigImpl { FORCE_EAT_RANDOM_MAX_TICK = builder.comment("Max tick before duck/goose auto-eat held food") .worldRestart() .defineInRange("force_eat_random_max_tick", 1000, 0, Integer.MAX_VALUE); + MIN_EGG_LAY_TIME = builder.comment("Min egg lay time (Ticks)") + .worldRestart() + .defineInRange("min_egg_lay_time", 6000, 0, Integer.MAX_VALUE); + MAX_EGG_LAY_TIME = builder.comment("Max egg lay time (Ticks)") + .worldRestart() + .defineInRange("max_egg_lay_time", 12000, 0, Integer.MAX_VALUE); FOOD_HEALING_VALUE = builder.comment("Food can heal the health value of duck & goose") .worldRestart() .defineInRange("food_healing_value", 0.5D, 0D, 100D); @@ -99,7 +107,7 @@ public class UntitledConfigImpl { .defineList("intimidation_blacklist", Lists.newArrayList("modid:test"), s -> s instanceof String); builder.pop(); - SERVER_SPEC = builder.build(); + COMMON_SPEC = builder.build(); } public static int duckWeight() { @@ -158,6 +166,15 @@ public static int forceEatRandomMaxTick() { return FORCE_EAT_RANDOM_MAX_TICK.get(); } + public static int minEggLayTime() { + return MIN_EGG_LAY_TIME.get(); + } + + public static int maxEggLayTime() { + return MAX_EGG_LAY_TIME.get(); + } + + public static float foodHealingValue() { try { return FOOD_HEALING_VALUE.get().floatValue(); @@ -171,6 +188,6 @@ public static List intimidationBlacklist() { } public static void setup() { - ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, SERVER_SPEC); + ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, COMMON_SPEC); } } From 4616243d860821e7c55f9b4e6a871f732ea466a4 Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Thu, 25 Jun 2026 13:00:31 +0800 Subject: [PATCH 14/19] chore: v1.6.0 --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 621099ac..59b2ac5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,17 @@ org.gradle.jvmargs=-Xmx4G enabled_platforms=fabric,forge minecraft_version=1.20.1 fabric_loader_version=0.16.14 -fabric_api_version=0.92.6+1.20.1 +fabric_api_version=0.92.9+1.20.1 forge_version=1.20.1-47.4.10 yarn_mappings=1.20.1+build.10 # Mod Properties archives_base_name=untitledduckmod -mod_version=1.5.2 +mod_version=1.6.0 mod_id=untitledduckmod maven_group=net.untitledduckmod # Dependencies Properties modmenu_version=7.2.2 -geckolib_version=4.8.2 +geckolib_version=4.8.4 jade_version=11.12.3 From 88a1592efe4a23bd243643c6753235f4cc5173bf Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Sun, 30 Aug 2026 16:59:06 +0800 Subject: [PATCH 15/19] feat: Incubation compat --- .../assets/untitledduckmod/lang/en_us.json | 7 +- .../assets/untitledduckmod/lang/zh_cn.json | 7 +- forge/build.gradle | 3 + forge/gradle.properties | 4 +- .../common/forge/DuckModForge.java | 2 + .../forge/incubation/IncubationCompat.java | 65 +++++++++++++++++++ .../forge/ForgeMixinPlugin.java | 53 +++++++++++++++ .../incubation/WaterfowlEggLayerMixin.java | 46 +++++++++++++ .../blockstates/hay_duck_nest.json | 57 ++++++++++++++++ .../blockstates/hay_goose_nest.json | 57 ++++++++++++++++ .../blockstates/twig_duck_nest.json | 57 ++++++++++++++++ .../blockstates/twig_goose_nest.json | 57 ++++++++++++++++ .../incubation/tags/blocks/hay_nests.json | 7 ++ .../incubation/tags/blocks/twig_nests.json | 7 ++ .../loot_tables/blocks/hay_duck_nest.json | 21 ++++++ .../loot_tables/blocks/hay_goose_nest.json | 21 ++++++ .../loot_tables/blocks/twig_duck_nest.json | 21 ++++++ .../loot_tables/blocks/twig_goose_nest.json | 21 ++++++ .../untitledduckmod_forge.mixins.json | 4 +- 19 files changed, 513 insertions(+), 4 deletions(-) create mode 100644 forge/src/main/java/net/untitledduckmod/compat/forge/incubation/IncubationCompat.java create mode 100644 forge/src/main/java/net/untitledduckmod/forge/ForgeMixinPlugin.java create mode 100644 forge/src/main/java/net/untitledduckmod/mixin/forge/compat/incubation/WaterfowlEggLayerMixin.java create mode 100644 forge/src/main/resources/assets/untitledduckmod/blockstates/hay_duck_nest.json create mode 100644 forge/src/main/resources/assets/untitledduckmod/blockstates/hay_goose_nest.json create mode 100644 forge/src/main/resources/assets/untitledduckmod/blockstates/twig_duck_nest.json create mode 100644 forge/src/main/resources/assets/untitledduckmod/blockstates/twig_goose_nest.json create mode 100644 forge/src/main/resources/data/incubation/tags/blocks/hay_nests.json create mode 100644 forge/src/main/resources/data/incubation/tags/blocks/twig_nests.json create mode 100644 forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/hay_duck_nest.json create mode 100644 forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/hay_goose_nest.json create mode 100644 forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/twig_duck_nest.json create mode 100644 forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/twig_goose_nest.json diff --git a/common/src/main/resources/assets/untitledduckmod/lang/en_us.json b/common/src/main/resources/assets/untitledduckmod/lang/en_us.json index 93c35304..1c98a068 100644 --- a/common/src/main/resources/assets/untitledduckmod/lang/en_us.json +++ b/common/src/main/resources/assets/untitledduckmod/lang/en_us.json @@ -89,5 +89,10 @@ "untitledduckmod.jade.nextEat": "Next auto-eat: %s", "config.jade.plugin_untitledduckmod.lay_egg": "Egg laying time", - "config.jade.plugin_untitledduckmod.next_eat": "Next auto-eat time" + "config.jade.plugin_untitledduckmod.next_eat": "Next auto-eat time", + + "block.untitledduckmod.twig_duck_nest": "Twig Duck Nest", + "block.untitledduckmod.hay_duck_nest": "Hay Duck Nest", + "block.untitledduckmod.twig_goose_nest": "Twig Goose Nest", + "block.untitledduckmod.hay_goose_nest": "Hay Goose Nest" } \ No newline at end of file diff --git a/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json b/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json index e00d1a35..764482df 100644 --- a/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json +++ b/common/src/main/resources/assets/untitledduckmod/lang/zh_cn.json @@ -91,5 +91,10 @@ "untitledduckmod.jade.nextEat": "下次进食: %s", "config.jade.plugin_untitledduckmod.lay_egg": "产卵时间", - "config.jade.plugin_untitledduckmod.next_eat": "进食时间" + "config.jade.plugin_untitledduckmod.next_eat": "进食时间", + + "block.untitledduckmod.twig_duck_nest": "树枝鸭窝", + "block.untitledduckmod.hay_duck_nest": "干草鸭窝", + "block.untitledduckmod.twig_goose_nest": "树枝鹅窝", + "block.untitledduckmod.hay_goose_nest": "干草鹅窝" } \ No newline at end of file diff --git a/forge/build.gradle b/forge/build.gradle index 3c7110fe..9c1886d1 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -29,6 +29,9 @@ dependencies { modImplementation "software.bernie.geckolib:geckolib-forge-${minecraft_version}:${geckolib_version}" + modCompileOnly "maven.modrinth:incubation:${incubation_version}" + modCompileOnly "maven.modrinth:blueprint:${blueprint_version}" + forgeRuntimeLibrary("com.eliotlash.mclib:mclib:20") common(project(path: ":common", configuration: "namedElements")) { transitive false } diff --git a/forge/gradle.properties b/forge/gradle.properties index 37f3cc52..45842e15 100644 --- a/forge/gradle.properties +++ b/forge/gradle.properties @@ -1 +1,3 @@ -loom.platform = forge \ No newline at end of file +loom.platform = forge +incubation_version=4.0.4 +blueprint_version=7.1.0 \ No newline at end of file diff --git a/forge/src/main/java/net/untitledduckmod/common/forge/DuckModForge.java b/forge/src/main/java/net/untitledduckmod/common/forge/DuckModForge.java index 287f413e..c042f879 100644 --- a/forge/src/main/java/net/untitledduckmod/common/forge/DuckModForge.java +++ b/forge/src/main/java/net/untitledduckmod/common/forge/DuckModForge.java @@ -14,6 +14,7 @@ import net.untitledduckmod.common.init.ModItems; import net.untitledduckmod.common.init.forge.ModBiomeModifier; import net.untitledduckmod.common.platform.forge.RegistryHelperImpl; +import net.untitledduckmod.compat.forge.incubation.IncubationCompat; @Mod(DuckMod.MOD_ID) public class DuckModForge { @@ -28,6 +29,7 @@ public DuckModForge() { RegistryHelperImpl.STATUS_EFFECTS.register(bus); RegistryHelperImpl.POTIONS.register(bus); RegistryHelperImpl.MENU_TYPES.register(bus); + new IncubationCompat(bus); } @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) diff --git a/forge/src/main/java/net/untitledduckmod/compat/forge/incubation/IncubationCompat.java b/forge/src/main/java/net/untitledduckmod/compat/forge/incubation/IncubationCompat.java new file mode 100644 index 00000000..2ea5e86d --- /dev/null +++ b/forge/src/main/java/net/untitledduckmod/compat/forge/incubation/IncubationCompat.java @@ -0,0 +1,65 @@ +package net.untitledduckmod.compat.forge.incubation; + +import com.teamabnormals.blueprint.core.util.DataUtil; +import com.teamabnormals.incubation.common.block.BirdNestBlock; +import com.teamabnormals.incubation.common.block.EmptyNestBlock; +import com.teamabnormals.incubation.core.registry.IncubationBlocks; +import net.minecraft.block.Block; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.ModList; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; +import net.untitledduckmod.DuckMod; +import net.untitledduckmod.common.init.ModItems; + +public final class IncubationCompat { + + public static final String INCUBATION = "incubation"; + + public IncubationCompat(IEventBus bus) { + if (isLoaded()) { + Holder.BLOCKS.register(bus); + bus.register(IncubationCompat.Holder.class); + } + } + + public static boolean isLoaded() { + return ModList.get().isLoaded(INCUBATION); + } + + static class Holder { + private static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, DuckMod.MOD_ID); + + private static final RegistryObject TWIG_DUCK_NEST = BLOCKS.register("twig_duck_nest", + () -> new BirdNestBlock(ModItems.DUCK_EGG, (EmptyNestBlock) IncubationBlocks.TWIG_NEST.get(), IncubationBlocks.IncubationProperties.HAY_NEST)); + private static final RegistryObject HAY_DUCK_NEST = BLOCKS.register("hay_duck_nest", + () -> new BirdNestBlock(ModItems.DUCK_EGG, (EmptyNestBlock) IncubationBlocks.HAY_NEST.get(), IncubationBlocks.IncubationProperties.HAY_NEST)); + private static final RegistryObject TWIG_GOOSE_NEST = BLOCKS.register("twig_goose_nest", + () -> new BirdNestBlock(ModItems.GOOSE_EGG, (EmptyNestBlock) IncubationBlocks.TWIG_NEST.get(), IncubationBlocks.IncubationProperties.HAY_NEST)); + private static final RegistryObject HAY_GOOSE_NEST = BLOCKS.register("hay_goose_nest", + () -> new BirdNestBlock(ModItems.GOOSE_EGG, (EmptyNestBlock) IncubationBlocks.HAY_NEST.get(), IncubationBlocks.IncubationProperties.HAY_NEST)); + + private static void registerFlammables() { + DataUtil.registerFlammable(TWIG_DUCK_NEST.get(), 60, 20); + DataUtil.registerFlammable(TWIG_GOOSE_NEST.get(), 60, 20); + DataUtil.registerFlammable(HAY_DUCK_NEST.get(), 60, 20); + DataUtil.registerFlammable(HAY_GOOSE_NEST.get(), 60, 20); + } + + @SubscribeEvent + public static void commonSetup(FMLCommonSetupEvent event) { + event.enqueueWork(() -> { + EmptyNestBlock twigNest = (EmptyNestBlock) IncubationBlocks.TWIG_NEST.get(); + EmptyNestBlock hayNest = (EmptyNestBlock) IncubationBlocks.HAY_NEST.get(); + twigNest.addNest(ModItems.DUCK_EGG, TWIG_DUCK_NEST.get()); + twigNest.addNest(ModItems.GOOSE_EGG, TWIG_GOOSE_NEST.get()); + hayNest.addNest(ModItems.DUCK_EGG, HAY_DUCK_NEST.get()); + hayNest.addNest(ModItems.GOOSE_EGG, HAY_GOOSE_NEST.get()); + registerFlammables(); + }); + } + } +} diff --git a/forge/src/main/java/net/untitledduckmod/forge/ForgeMixinPlugin.java b/forge/src/main/java/net/untitledduckmod/forge/ForgeMixinPlugin.java new file mode 100644 index 00000000..63403a17 --- /dev/null +++ b/forge/src/main/java/net/untitledduckmod/forge/ForgeMixinPlugin.java @@ -0,0 +1,53 @@ +package net.untitledduckmod.forge; + +import org.objectweb.asm.tree.ClassNode; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +import java.util.List; +import java.util.Set; + +public class ForgeMixinPlugin implements IMixinConfigPlugin { + + private boolean isIncubationLoaded = false; + + @Override + public void onLoad(String mixinPackage) { + try { + Class.forName("com.teamabnormals.blueprint.core.api.EggLayer", false, this.getClass().getClassLoader()); + isIncubationLoaded = true; + } catch (ClassNotFoundException e) { + isIncubationLoaded = false; + } + } + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + if (mixinClassName.contains(".compat.incubation.")) { + return isIncubationLoaded; + } + return true; + } + + @Override + public void acceptTargets(Set myTargets, Set otherTargets) { + } + + @Override + public List getMixins() { + return null; + } + + @Override + public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + + @Override + public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } +} diff --git a/forge/src/main/java/net/untitledduckmod/mixin/forge/compat/incubation/WaterfowlEggLayerMixin.java b/forge/src/main/java/net/untitledduckmod/mixin/forge/compat/incubation/WaterfowlEggLayerMixin.java new file mode 100644 index 00000000..5e2c5c61 --- /dev/null +++ b/forge/src/main/java/net/untitledduckmod/mixin/forge/compat/incubation/WaterfowlEggLayerMixin.java @@ -0,0 +1,46 @@ +package net.untitledduckmod.mixin.forge.compat.incubation; + +import com.teamabnormals.blueprint.core.api.EggLayer; +import net.minecraft.item.Item; +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.math.random.Random; +import net.untitledduckmod.common.entity.WaterfowlEntity; +import org.spongepowered.asm.mixin.Implements; +import org.spongepowered.asm.mixin.Interface; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(WaterfowlEntity.class) +@Implements(@Interface(iface = EggLayer.class, prefix = "egg$")) +public abstract class WaterfowlEggLayerMixin { + + @Shadow(remap = false) + protected int eggLayTime; + + @Shadow(remap = false) + protected abstract SoundEvent getLayEggSound(); + + public Item egg$getEggItem() { + return ((WaterfowlEntity) (Object) this).getEggItem(); + } + + public boolean egg$isBirdJockey() { + return false; + } + + public int egg$getEggTimer() { + return this.eggLayTime; + } + + public void egg$setEggTimer(int timer) { + this.eggLayTime = timer; + } + + public SoundEvent egg$getEggLayingSound() { + return this.getLayEggSound(); + } + + public int egg$getNextEggTime(Random random) { + return ((WaterfowlEntity) (Object) this).getRandomLayTime(); + } +} diff --git a/forge/src/main/resources/assets/untitledduckmod/blockstates/hay_duck_nest.json b/forge/src/main/resources/assets/untitledduckmod/blockstates/hay_duck_nest.json new file mode 100644 index 00000000..8ae546fb --- /dev/null +++ b/forge/src/main/resources/assets/untitledduckmod/blockstates/hay_duck_nest.json @@ -0,0 +1,57 @@ +{ + "multipart": [ + { + "apply": { + "model": "incubation:block/hay_nest" + } + }, + { + "apply": { + "model": "incubation:block/one_duck_egg" + }, + "when": { + "eggs": "1" + } + }, + { + "apply": { + "model": "incubation:block/two_duck_eggs" + }, + "when": { + "eggs": "2" + } + }, + { + "apply": { + "model": "incubation:block/three_duck_eggs" + }, + "when": { + "eggs": "3" + } + }, + { + "apply": { + "model": "incubation:block/four_duck_eggs" + }, + "when": { + "eggs": "4" + } + }, + { + "apply": { + "model": "incubation:block/five_duck_eggs" + }, + "when": { + "eggs": "5" + } + }, + { + "apply": { + "model": "incubation:block/six_duck_eggs" + }, + "when": { + "eggs": "6" + } + } + ] +} diff --git a/forge/src/main/resources/assets/untitledduckmod/blockstates/hay_goose_nest.json b/forge/src/main/resources/assets/untitledduckmod/blockstates/hay_goose_nest.json new file mode 100644 index 00000000..8ae546fb --- /dev/null +++ b/forge/src/main/resources/assets/untitledduckmod/blockstates/hay_goose_nest.json @@ -0,0 +1,57 @@ +{ + "multipart": [ + { + "apply": { + "model": "incubation:block/hay_nest" + } + }, + { + "apply": { + "model": "incubation:block/one_duck_egg" + }, + "when": { + "eggs": "1" + } + }, + { + "apply": { + "model": "incubation:block/two_duck_eggs" + }, + "when": { + "eggs": "2" + } + }, + { + "apply": { + "model": "incubation:block/three_duck_eggs" + }, + "when": { + "eggs": "3" + } + }, + { + "apply": { + "model": "incubation:block/four_duck_eggs" + }, + "when": { + "eggs": "4" + } + }, + { + "apply": { + "model": "incubation:block/five_duck_eggs" + }, + "when": { + "eggs": "5" + } + }, + { + "apply": { + "model": "incubation:block/six_duck_eggs" + }, + "when": { + "eggs": "6" + } + } + ] +} diff --git a/forge/src/main/resources/assets/untitledduckmod/blockstates/twig_duck_nest.json b/forge/src/main/resources/assets/untitledduckmod/blockstates/twig_duck_nest.json new file mode 100644 index 00000000..2e5387de --- /dev/null +++ b/forge/src/main/resources/assets/untitledduckmod/blockstates/twig_duck_nest.json @@ -0,0 +1,57 @@ +{ + "multipart": [ + { + "apply": { + "model": "incubation:block/twig_nest" + } + }, + { + "apply": { + "model": "incubation:block/one_duck_egg" + }, + "when": { + "eggs": "1" + } + }, + { + "apply": { + "model": "incubation:block/two_duck_eggs" + }, + "when": { + "eggs": "2" + } + }, + { + "apply": { + "model": "incubation:block/three_duck_eggs" + }, + "when": { + "eggs": "3" + } + }, + { + "apply": { + "model": "incubation:block/four_duck_eggs" + }, + "when": { + "eggs": "4" + } + }, + { + "apply": { + "model": "incubation:block/five_duck_eggs" + }, + "when": { + "eggs": "5" + } + }, + { + "apply": { + "model": "incubation:block/six_duck_eggs" + }, + "when": { + "eggs": "6" + } + } + ] +} diff --git a/forge/src/main/resources/assets/untitledduckmod/blockstates/twig_goose_nest.json b/forge/src/main/resources/assets/untitledduckmod/blockstates/twig_goose_nest.json new file mode 100644 index 00000000..2e5387de --- /dev/null +++ b/forge/src/main/resources/assets/untitledduckmod/blockstates/twig_goose_nest.json @@ -0,0 +1,57 @@ +{ + "multipart": [ + { + "apply": { + "model": "incubation:block/twig_nest" + } + }, + { + "apply": { + "model": "incubation:block/one_duck_egg" + }, + "when": { + "eggs": "1" + } + }, + { + "apply": { + "model": "incubation:block/two_duck_eggs" + }, + "when": { + "eggs": "2" + } + }, + { + "apply": { + "model": "incubation:block/three_duck_eggs" + }, + "when": { + "eggs": "3" + } + }, + { + "apply": { + "model": "incubation:block/four_duck_eggs" + }, + "when": { + "eggs": "4" + } + }, + { + "apply": { + "model": "incubation:block/five_duck_eggs" + }, + "when": { + "eggs": "5" + } + }, + { + "apply": { + "model": "incubation:block/six_duck_eggs" + }, + "when": { + "eggs": "6" + } + } + ] +} diff --git a/forge/src/main/resources/data/incubation/tags/blocks/hay_nests.json b/forge/src/main/resources/data/incubation/tags/blocks/hay_nests.json new file mode 100644 index 00000000..4b3c7c6c --- /dev/null +++ b/forge/src/main/resources/data/incubation/tags/blocks/hay_nests.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "untitledduckmod:hay_duck_nest", + "untitledduckmod:hay_goose_nest" + ] +} diff --git a/forge/src/main/resources/data/incubation/tags/blocks/twig_nests.json b/forge/src/main/resources/data/incubation/tags/blocks/twig_nests.json new file mode 100644 index 00000000..87d3fb0c --- /dev/null +++ b/forge/src/main/resources/data/incubation/tags/blocks/twig_nests.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "untitledduckmod:twig_duck_nest", + "untitledduckmod:twig_goose_nest" + ] +} diff --git a/forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/hay_duck_nest.json b/forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/hay_duck_nest.json new file mode 100644 index 00000000..9e975944 --- /dev/null +++ b/forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/hay_duck_nest.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "incubation:hay_nest" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "untitledduckmod:blocks/hay_duck_nest" +} diff --git a/forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/hay_goose_nest.json b/forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/hay_goose_nest.json new file mode 100644 index 00000000..4530a402 --- /dev/null +++ b/forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/hay_goose_nest.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "incubation:hay_nest" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "untitledduckmod:blocks/hay_goose_nest" +} diff --git a/forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/twig_duck_nest.json b/forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/twig_duck_nest.json new file mode 100644 index 00000000..54a1a385 --- /dev/null +++ b/forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/twig_duck_nest.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "incubation:twig_nest" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "untitledduckmod:blocks/twig_duck_nest" +} diff --git a/forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/twig_goose_nest.json b/forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/twig_goose_nest.json new file mode 100644 index 00000000..bb42f177 --- /dev/null +++ b/forge/src/main/resources/data/untitledduckmod/loot_tables/blocks/twig_goose_nest.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "incubation:twig_nest" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "untitledduckmod:blocks/twig_goose_nest" +} diff --git a/forge/src/main/resources/untitledduckmod_forge.mixins.json b/forge/src/main/resources/untitledduckmod_forge.mixins.json index 5db7da90..ecda8659 100644 --- a/forge/src/main/resources/untitledduckmod_forge.mixins.json +++ b/forge/src/main/resources/untitledduckmod_forge.mixins.json @@ -4,9 +4,11 @@ "package": "net.untitledduckmod.mixin.forge", "compatibilityLevel": "JAVA_17", "mixins": [ - "SpawnGroupMixin" + "SpawnGroupMixin", + "compat.incubation.WaterfowlEggLayerMixin" ], "client": [], + "plugin": "net.untitledduckmod.forge.ForgeMixinPlugin", "injectors": { "defaultRequire": 1 } From 525b1d3705bb43a1a3fd0fc0ff473099696223fb Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Sun, 30 Aug 2026 18:22:11 +0800 Subject: [PATCH 16/19] feat: geese and ducks cannot pick up their own meat --- .../java/net/untitledduckmod/common/entity/DuckEntity.java | 6 +++++- .../net/untitledduckmod/common/entity/GooseEntity.java | 3 +++ .../main/java/net/untitledduckmod/common/init/ModTags.java | 7 +++++++ .../untitledduckmod/common/screen/MouthScreenHandler.java | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java b/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java index 7426755e..10637f2d 100644 --- a/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java +++ b/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java @@ -137,7 +137,6 @@ public static boolean checkDuckSpawnRules(EntityType duck, WorldAcce return isValidSurface && hasEnoughSpace; } - @Override protected void initDataTracker() { super.initDataTracker(); @@ -485,7 +484,12 @@ protected void loot(ItemEntity item) { @Override public boolean canPickupItem(ItemStack stack) { + if (stack.isIn(ModTags.ItemTags.COOKED_MEAT) || stack.isIn(ModTags.ItemTags.RAW_MEAT)) { + return false; + } + ItemStack mainHandStack = getMainHandStack(); + // If the main hand is empty, allow pickup if it's a breeding or fish item if (mainHandStack.isEmpty()) { return isBreedingItem(stack) || isTamableItem(stack); diff --git a/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java b/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java index 7002106d..594b42a9 100644 --- a/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java +++ b/common/src/main/java/net/untitledduckmod/common/entity/GooseEntity.java @@ -347,6 +347,9 @@ private boolean isWeapon(ItemStack stack) { @Override public boolean canPickupItem(ItemStack stack) { ItemStack mainHandStack = getMainHandStack(); + if (stack.isIn(ModTags.ItemTags.COOKED_MEAT) || stack.isIn(ModTags.ItemTags.RAW_MEAT)) { + return false; + } if (isWeapon(stack) && isTamed()) { return getOwner() != null && this.getHealth() == this.getMaxHealth(); } diff --git a/common/src/main/java/net/untitledduckmod/common/init/ModTags.java b/common/src/main/java/net/untitledduckmod/common/init/ModTags.java index c73df4d5..dae41a1f 100644 --- a/common/src/main/java/net/untitledduckmod/common/init/ModTags.java +++ b/common/src/main/java/net/untitledduckmod/common/init/ModTags.java @@ -4,6 +4,7 @@ import net.minecraft.item.Item; import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; import net.minecraft.world.biome.Biome; import net.untitledduckmod.DuckMod; @@ -36,6 +37,12 @@ public static class ItemTags { public static final TagKey GOOSE_FOOD = create("goose_food"); public static final TagKey GOOSE_BREEDING_FOOD = create("goose_breeding_food"); public static final TagKey GOOSE_TAMING_FOOD = create("goose_taming_food"); + public static final TagKey RAW_MEAT = createC("foods/raw_meat"); + public static final TagKey COOKED_MEAT = createC("foods/cooked_meat"); + + private static TagKey createC(String name) { + return TagKey.of(RegistryKeys.ITEM, Identifier.of("c", name)); + } private static TagKey create(String name) { return TagKey.of(RegistryKeys.ITEM, DuckMod.id(name)); diff --git a/common/src/main/java/net/untitledduckmod/common/screen/MouthScreenHandler.java b/common/src/main/java/net/untitledduckmod/common/screen/MouthScreenHandler.java index 4767507b..57ab6fb6 100644 --- a/common/src/main/java/net/untitledduckmod/common/screen/MouthScreenHandler.java +++ b/common/src/main/java/net/untitledduckmod/common/screen/MouthScreenHandler.java @@ -13,6 +13,7 @@ import net.untitledduckmod.common.entity.WaterfowlEntity; import net.untitledduckmod.common.init.ModItems; import net.untitledduckmod.common.init.ModScreenHandlers; +import net.untitledduckmod.common.init.ModTags; public class MouthScreenHandler extends ScreenHandler implements ExtendedFactory { private final Inventory entityInventory; @@ -37,6 +38,7 @@ public MouthScreenHandler(int syncId, PlayerInventory playerInventory, Inventory this.addSlot(new Slot(entityInventory, 0, 8, 18) { @Override public boolean canInsert(ItemStack stack) { + if (stack.isIn(ModTags.ItemTags.COOKED_MEAT) || stack.isIn(ModTags.ItemTags.RAW_MEAT)) return false; if (holderType == 1 && stack.isOf(ModItems.GOOSE_EGG.get())) return false; if (holderType == 2 && (stack.isOf(ModItems.DUCK_EGG.get()) || !DuckEntity.FOOD_INGREDIENT.test(stack))) return false; return super.canInsert(stack); From 406f6c65cb86f093c7342a3eaf84a137ad9a54ec Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Sun, 30 Aug 2026 18:24:51 +0800 Subject: [PATCH 17/19] chore: bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 59b2ac5e..365235d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ yarn_mappings=1.20.1+build.10 # Mod Properties archives_base_name=untitledduckmod -mod_version=1.6.0 +mod_version=1.7.0 mod_id=untitledduckmod maven_group=net.untitledduckmod From 313cd95bac89ab0f1c04a9754692e79d1360ad4a Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Sun, 30 Aug 2026 18:28:45 +0800 Subject: [PATCH 18/19] docs: update --- docs/CHANGELOG.md | 7 +++++++ docs/LATEST_CHANGES.md | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 97b4c260..d01c1c07 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,3 +1,10 @@ +## Version ["v1.7.0"] - 2026-08-30 + +### Features +- Geese and ducks cannot pick up their own meat +#### Forge +- Incubation compat + ## Version ["v1.5.2"] - 2026-2-3 ### Bug fixes diff --git a/docs/LATEST_CHANGES.md b/docs/LATEST_CHANGES.md index 55613897..22563206 100644 --- a/docs/LATEST_CHANGES.md +++ b/docs/LATEST_CHANGES.md @@ -1,4 +1,6 @@ -## Version ["v1.5.2"] - 2026-2-3 +## Version ["v1.7.0"] - 2026-08-30 -### Bug fixes -- Incorrect translation of tipped_arrow +### Features +- Geese and ducks cannot pick up their own meat +#### Forge +- Incubation compat From eedbd4d1d84267bc9b23223fa4db75776a611703 Mon Sep 17 00:00:00 2001 From: Suel_ki <1829446054@qq.com> Date: Sun, 20 Sep 2026 15:48:16 +0800 Subject: [PATCH 19/19] fix(forge): make mod load after incubation #148 --- forge/src/main/resources/META-INF/mods.toml | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index f05f0ffa..cff7dbdf 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -35,3 +35,10 @@ versionRange = "[4.4.4,)" ordering = "AFTER" side = "BOTH" +[[dependencies.untitledduckmod]] +modId = "incubation" +mandatory = false +versionRange = "[4.0,)" +ordering = "AFTER" +side = "BOTH" + diff --git a/gradle.properties b/gradle.properties index 365235d8..6c7c4ae3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ yarn_mappings=1.20.1+build.10 # Mod Properties archives_base_name=untitledduckmod -mod_version=1.7.0 +mod_version=1.7.0-fix mod_id=untitledduckmod maven_group=net.untitledduckmod