From a266a37606b3f8601bf984bab1c15be50e16c876 Mon Sep 17 00:00:00 2001 From: zenfyr Date: Thu, 4 Jun 2026 03:03:30 +0700 Subject: [PATCH] port: add missing translations, make boats use the same key, add tag translations. --- build.gradle | 1 + .../entities/boats/entities/FurnaceBoatEntity.java | 7 +++++++ .../entities/boats/entities/HopperBoatEntity.java | 7 +++++++ .../entities/boats/entities/JukeboxBoatEntity.java | 7 +++++++ .../entities/boats/entities/TNTBoatEntity.java | 7 +++++++ src/main/resources/assets/andromeda/lang/en_us.json | 13 +++++++++++++ 6 files changed, 42 insertions(+) diff --git a/build.gradle b/build.gradle index d2e530a8..09b7668e 100644 --- a/build.gradle +++ b/build.gradle @@ -81,6 +81,7 @@ loom { vmArg "-javaagent:${ configurations.compileClasspath.find { it.name.contains("sponge-mixin") } }" property("mixin.debug.export", "true") + property("fabric-tag-conventions-v2.missingTagTranslationWarning", "VERBOSE") } } } diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/FurnaceBoatEntity.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/FurnaceBoatEntity.java index 1d6a6cce..d716c440 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/FurnaceBoatEntity.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/FurnaceBoatEntity.java @@ -3,8 +3,10 @@ package dev.zenfyr.andromeda.modules.entities.boats.entities; import dev.zenfyr.andromeda.bootstrap.ModuleManager; import dev.zenfyr.andromeda.common.Andromeda; import dev.zenfyr.andromeda.modules.entities.furnace_minecart_tweaks.FurnaceMinecartTweaks; +import dev.zenfyr.pulsar.util.TextUtil; import java.util.function.Supplier; import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.network.chat.Component; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; @@ -32,6 +34,11 @@ public class FurnaceBoatEntity extends BoatEntityWithBlock { super(entityType, world, rideHeight, dropItem); } + @Override + protected Component getTypeName() { + return TextUtil.translatable("entity.andromeda.furnace_boat"); + } + @Override protected void defineSynchedData(SynchedEntityData.Builder builder) { super.defineSynchedData(builder); diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/HopperBoatEntity.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/HopperBoatEntity.java index 85730b0b..b00dada0 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/HopperBoatEntity.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/HopperBoatEntity.java @@ -3,9 +3,11 @@ package dev.zenfyr.andromeda.modules.entities.boats.entities; import static dev.zenfyr.andromeda.modules.entities.boats.entities.BoatEntityWithBlock.PIby180; import static dev.zenfyr.andromeda.modules.entities.boats.entities.BoatEntityWithBlock.PIby2; +import dev.zenfyr.pulsar.util.TextUtil; import java.util.List; import java.util.function.Supplier; import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityDimensions; import net.minecraft.world.entity.EntitySelector; import net.minecraft.world.entity.EntityType; @@ -38,6 +40,11 @@ public class HopperBoatEntity extends AbstractChestBoat implements Hopper { this.rideHeight = rideHeight; } + @Override + protected Component getTypeName() { + return TextUtil.translatable("entity.andromeda.hopper_boat"); + } + @Override protected double rideHeight(EntityDimensions dimensions) { return this.rideHeight.applyAsDouble(dimensions); diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/JukeboxBoatEntity.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/JukeboxBoatEntity.java index 7c29e400..7a5dd988 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/JukeboxBoatEntity.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/JukeboxBoatEntity.java @@ -2,9 +2,11 @@ package dev.zenfyr.andromeda.modules.entities.boats.entities; import dev.zenfyr.andromeda.modules.entities.boats.packets.RecordPlaybackS2CPayload; import dev.zenfyr.pulsar.itemstack.ItemStackUtil; +import dev.zenfyr.pulsar.util.TextUtil; import java.util.function.Supplier; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.core.component.DataComponents; +import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -36,6 +38,11 @@ public class JukeboxBoatEntity extends BoatEntityWithBlock implements Clearable super(entityType, world, rideHeight, dropItem); } + @Override + protected Component getTypeName() { + return TextUtil.translatable("entity.andromeda.jukebox_boat"); + } + @Override public boolean hurtServer(ServerLevel level, DamageSource source, float amount) { if (this.isInvulnerableToBase(source)) { diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/TNTBoatEntity.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/TNTBoatEntity.java index a44092a5..c5dff6b3 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/TNTBoatEntity.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/entities/TNTBoatEntity.java @@ -3,10 +3,12 @@ package dev.zenfyr.andromeda.modules.entities.boats.entities; import dev.zenfyr.andromeda.common.Andromeda; import dev.zenfyr.andromeda.modules.entities.boats.packets.ExplodeBoatC2SPayload; import dev.zenfyr.pulsar.util.SupportUtil; +import dev.zenfyr.pulsar.util.TextUtil; import java.util.function.Supplier; import net.fabricmc.api.EnvType; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvents; @@ -42,6 +44,11 @@ public class TNTBoatEntity extends BoatEntityWithBlock { super(entityType, world, rideHeight, dropItem); } + @Override + protected Component getTypeName() { + return TextUtil.translatable("entity.andromeda.tnt_boat"); + } + private final Runnable explode = SupportUtil.support( EnvType.CLIENT, () -> () -> ClientPlayNetworking.send(new ExplodeBoatC2SPayload(this.getUUID())), diff --git a/src/main/resources/assets/andromeda/lang/en_us.json b/src/main/resources/assets/andromeda/lang/en_us.json index 689b263e..a52ac59a 100644 --- a/src/main/resources/assets/andromeda/lang/en_us.json +++ b/src/main/resources/assets/andromeda/lang/en_us.json @@ -438,6 +438,7 @@ "config.andromeda.misc.unknown": "???", "tooltip.andromeda.rose_of_the_valley": "The smell reminds you of a valley...", "block.andromeda.rose_of_the_valley": "Rose of the Valley", + "item.andromeda.rose_of_the_valley": "Rose of the Valley", "config.andromeda.misc.tiny_storage": "[EXP] Tiny Storage", "config.andromeda.misc.tiny_storage.@Tooltip": "Store 4 more stacks of items in the 2x2 crafting space.\nCurrently experimental, so proceed with caution!", @@ -446,6 +447,18 @@ "config.andromeda.misc.tiny_storage.option.TransferMode.FOLLOW_GAMERULE": "Follow Gamerule", "config.andromeda.misc.tiny_storage.option.TransferMode.ALWAYS_TRANSFER": "Always Transfer", + "tag.item.andromeda.linkers": "Minecart Linkers", + "tag.item.andromeda.villager_gifts.minor_positive": "Great Villager Gift", + "tag.item.andromeda.villager_gifts.major_positive": "Good Villager Gift", + "tag.item.andromeda.villager_gifts.minor_negative": "Bad Villager Gift", + "tag.item.andromeda.villager_gifts.major_negative": "Awful Villager Gift", + "tag.item.andromeda.tempting_for_villagers": "Tempting for Villagers", + "tag.item.andromeda.zombies_pick_up": "Zombies Pick Up", + "tag.item.andromeda.tnt_boats": "TNT Boats", + "tag.item.andromeda.jukebox_boats": "Jukebox Boats", + "tag.item.andromeda.hopper_boats": "Hopper Boats", + "tag.item.andromeda.furnace_boats": "Furnace Boats", + "config.andromeda.base.option.sideOnlyMode": "Side-Only Mode", "config.andromeda.base.option.sideOnlyMode.@Tooltip": "Disable all modules which require Andromeda to be present on server.", "config.andromeda.base.option.itemGroup": "Item Group", -- 2.51.2