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/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/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/client/renderer/entity/WaterfowlRenderer.java b/common/src/main/java/net/untitledduckmod/client/renderer/entity/WaterfowlRenderer.java index 67757ca7..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 @@ -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,18 +68,22 @@ 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); 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/config/UntitledConfig.java b/common/src/main/java/net/untitledduckmod/common/config/UntitledConfig.java index af0bc264..6017cffb 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,31 @@ 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 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/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/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java b/common/src/main/java/net/untitledduckmod/common/entity/DuckEntity.java index 79dfb8ff..10637f2d 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); @@ -98,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())); @@ -136,7 +137,6 @@ public static boolean checkDuckSpawnRules(EntityType duck, WorldAcce return isValidSurface && hasEnoughSpace; } - @Override protected void initDataTracker() { super.initDataTracker(); @@ -222,6 +222,11 @@ public void updateEventHandler(BiConsumer, ServerWorld } } + @Override + public int getMouthHolderType() { + return 2; + } + @Override protected void initGoals() { this.goalSelector.add(0, new SwimGoal(this)); @@ -229,7 +234,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 +244,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()) { @@ -475,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 df5e7a2a..594b42a9 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; @@ -75,7 +76,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); @@ -107,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) @@ -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); @@ -219,6 +224,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); @@ -255,7 +261,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) { @@ -291,11 +297,16 @@ 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; 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) { @@ -312,18 +323,37 @@ 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 ((!FOOD.test(mainHandStack) && FOOD.test(stack))) { + 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(); + } + if ((!FOOD_INGREDIENT.test(mainHandStack) && FOOD_INGREDIENT.test(stack))) { return true; } if (mainHandStack.isEmpty()) { @@ -704,7 +734,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 +814,7 @@ public boolean canStart() { } playerHandStack = targetPlayer.getMainHandStack(); - return GooseEntity.FOOD.test(playerHandStack); + return GooseEntity.FOOD_INGREDIENT.test(playerHandStack); } @Override @@ -794,7 +824,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/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 959271ad..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,26 +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; @@ -55,17 +58,23 @@ 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 = 2; + protected int maxVariant = 3; protected int eggLayTime; + private int heldFoodTick = 0; + private int randomForceEatTick = 0; protected boolean isFlapping; protected boolean panicked = false; protected WaterfowlEntity(EntityType entityType, World 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 @@ -92,6 +101,9 @@ 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); + tag.put(MOUTH_ITEM_TAG, this.mouthInventory.getStack(0).writeNbt(new NbtCompound())); } @Override @@ -102,6 +114,29 @@ 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); + 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 @@ -120,6 +155,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); } @@ -145,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() { @@ -214,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))) { @@ -303,6 +371,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/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/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/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..57ab6fb6 --- /dev/null +++ b/common/src/main/java/net/untitledduckmod/common/screen/MouthScreenHandler.java @@ -0,0 +1,113 @@ +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; +import net.untitledduckmod.common.init.ModTags; + +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 (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); + } + @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/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..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 @@ -12,30 +12,31 @@ 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) { - 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()); } } } + @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..1c98a068 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": "Arrow of Intimidation", "tag.item.untitledduckmod.goose_food": "Goose Food", "tag.item.untitledduckmod.goose_breeding_food": "Goose Breeding Food", @@ -61,7 +62,17 @@ "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.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)", @@ -76,5 +87,12 @@ "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", + + "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 7187ee47..764482df 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": "添加了鸭和鹅", @@ -64,7 +65,17 @@ "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.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": "每次生成的最少鸭数量", @@ -78,5 +89,12 @@ "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": "进食时间", + + "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/common/src/main/resources/assets/untitledduckmod/textures/entity/duck_pekin.png b/common/src/main/resources/assets/untitledduckmod/textures/entity/duck_pekin.png index bf8c70df..708dfc5a 100644 Binary files a/common/src/main/resources/assets/untitledduckmod/textures/entity/duck_pekin.png and b/common/src/main/resources/assets/untitledduckmod/textures/entity/duck_pekin.png differ 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 00000000..b984ea28 Binary files /dev/null and b/common/src/main/resources/assets/untitledduckmod/textures/entity/greylag_goose.png differ diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 144450ef..d01c1c07 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,3 +1,53 @@ +## 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 +- 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 +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) + +## 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..22563206 100644 --- a/docs/LATEST_CHANGES.md +++ b/docs/LATEST_CHANGES.md @@ -1,9 +1,6 @@ -## Version ["v1.2.0"] - 2025-8-19 +## Version ["v1.7.0"] - 2026-08-30 ### Features -Update the goose's pickup logic: once tamed, it only picks up items given by its owner. - -### Bug fixes -- Fix [#123](https://github.com/UntitledDuckDevs/UntitledDuckMod/issues/123) +- Geese and ducks cannot pick up their own meat #### Forge -- Fix [#124](https://github.com/UntitledDuckDevs/UntitledDuckMod/issues/124) +- Incubation compat diff --git a/docs/images/greylag_goose.png b/docs/images/greylag_goose.png new file mode 100644 index 00000000..732242bc Binary files /dev/null and b/docs/images/greylag_goose.png differ diff --git a/docs/images/pekin_duck.png b/docs/images/pekin_duck.png new file mode 100644 index 00000000..20ff85a9 Binary files /dev/null and b/docs/images/pekin_duck.png differ 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/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/config/fabric/UntitledConfigImpl.java b/fabric/src/main/java/net/untitledduckmod/common/config/fabric/UntitledConfigImpl.java index db90cb9b..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 @@ -6,6 +6,17 @@ 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") + 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; @@ -80,6 +91,26 @@ public static boolean gooseBabyRandomSize() { return goose_baby_random_size; } + public static boolean enableForceEat() { + return enable_force_eat; + } + + public static int forceEatRandomMinTick() { + return force_eat_random_min_tick; + } + + 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/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/build.gradle b/forge/build.gradle index b935e608..9c1886d1 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -25,10 +25,13 @@ 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}" + 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/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/config/forge/UntitledConfigImpl.java b/forge/src/main/java/net/untitledduckmod/common/config/forge/UntitledConfigImpl.java index 9d3a8828..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; @@ -23,6 +23,11 @@ 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.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; @@ -76,6 +81,21 @@ 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); + 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); @@ -87,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() { @@ -134,6 +154,27 @@ 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 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(); @@ -147,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); } } 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..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 { @@ -27,6 +28,8 @@ public DuckModForge() { RegistryHelperImpl.BIOME_MODIFIERS.register(bus); 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/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/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; 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); + } } 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/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/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 } diff --git a/gradle.properties b/gradle.properties index 01e689bf..6c7c4ae3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,18 +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 -forge_version=1.20.1-47.4.3 +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.2.0 +mod_version=1.7.0-fix 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.4 +jade_version=11.12.3