Merge branch '1.21' into future/1.21.3

.github/ISSUE_TEMPLATE/bug_report.md

@@ -22,6 +22,7 @@ If applicable, add screenshots to help explain your problem.
 **Version Information:**
  - Minecraft Version: [e.g. 1.20.5]
  - Mine Little Pony Version:
+ - Unicopia Version:
 
 **Mod Loader:**
  - [ ] Fabric

src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/CuttingBoardRecipeJsonBuilder.java

@@ -115,7 +115,7 @@ public void offerTo(RecipeExporter exporter, String recipePath) {
     public record Tool(Identifier type, TagKey<Item> tag) {
         static final Codec<Tool> CODEC = RecordCodecBuilder.create(ii -> ii.group(
                 Identifier.CODEC.fieldOf("type").forGetter(Tool::type),
-                TagKey.codec(RegistryKeys.ITEM).fieldOf("tag").forGetter(Tool::tag)
+                TagKey.unprefixedCodec(RegistryKeys.ITEM).fieldOf("tag").forGetter(Tool::tag)
         ).apply(ii, Tool::new));
     }
     public record Result(Identifier item, int count) {

src/main/java/com/minelittlepony/unicopia/server/world/Tree.java

@@ -131,7 +131,7 @@ public Builder dimensions(int yLevel, int sizeBelowY, int sizeAboveY) {
 
         public Tree build() {
             RegistryKey<ConfiguredFeature<?, ?>> configuredFeatureId = RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, id);
-            Optional<Block> sapling = saplingId.map(id -> UBlocks.register(id, saplingConstructor.apply(new SaplingGenerator(id.toString(), Optional.of(configuredFeatureId), Optional.empty(), Optional.empty()), Block.Settings.copy(Blocks.OAK_SAPLING).registryKey(RegistryKey.of(RegistryKeys.BLOCK, id))), ItemGroups.NATURAL));
+            Optional<Block> sapling = saplingId.map(id -> UBlocks.register(id, saplingConstructor.apply(new SaplingGenerator(id.toString(), Optional.empty(), Optional.of(configuredFeatureId), Optional.empty()), Block.Settings.copy(Blocks.OAK_SAPLING).registryKey(RegistryKey.of(RegistryKeys.BLOCK, id))), ItemGroups.NATURAL));
             Tree tree = new Tree(id, configParameters.apply(new TreeFeatureConfig.Builder(
                     BlockStateProvider.of(logType),
                     trunkPlacer,

src/main/resources/assets/unicopia/lang/de_de.json

@@ -1,4 +1,5 @@
 {
+  "resourcepack.unicopia.programmer_art": "Programmer Art (Unicopia)",
   "block.unicopia.bed.not_safe": "Du kannst jetzt nicht schlafen, es sind Monster in der Nähe",
   "block.unicopia.bed.not_tired": "Du bist noch nicht müde",
   "block.unicopia.bed.no_sleep.nocturnal": "Du kannst nur tagsüber oder bei Gewittern schlafen",
@@ -1488,6 +1489,8 @@
   "death.attack.unicopia.bat_screech.self": "%1$s hat sich geschockt",
   "death.attack.unicopia.bat_screech.player": "%2$s geschockt %1$s",
   "death.attack.unicopia.bat_screech.item": "%1$s wurde von %2$s mit %3$s erschreckt",
+  "death.attack.unicopia.rainboom": "%1$s's eardrums were shattered",
+  "death.attack.unicopia.rainboom.player": "%2$s's shattered %1$s's eardrums",
   "death.attack.unicopia.gravity_well_recoil": "%1$s wurde in Spaghetti verwandelt",
   "death.attack.unicopia.gravity_well_recoil.player": "%1$s wurde durch einen Zauberspruch von %2$s in Spaghetti umgewandelt",
   "death.attack.unicopia.gravity_well_recoil.item": "%1$s wurde durch einen Zauberspruch %2$s mit %3$s in Spaghetti umgewandelt",

src/main/resources/assets/unicopia/lang/en_gb.json

@@ -1,4 +1,5 @@
 {
+  "resourcepack.unicopia.programmer_art": "Programmer Art (Unicopia)",
   "block.unicopia.bed.not_safe": "You may not rest here, there are enemies nearby",
   "block.unicopia.bed.not_tired": "You do not feel tired right now",
   "block.unicopia.bed.no_sleep.nocturnal": "You can only sleep in the day or during thunderstorms",
@@ -1488,6 +1489,8 @@
   "death.attack.unicopia.bat_screech.self": "%1$s spooked themselves",
   "death.attack.unicopia.bat_screech.player": "%2$s spooked %1$s",
   "death.attack.unicopia.bat_screech.item": "%1$s was spooked by %2$s using %3$s",
+  "death.attack.unicopia.rainboom": "%1$s's eardrums were shattered",
+  "death.attack.unicopia.rainboom.player": "%2$s's shattered %1$s's eardrums",
   "death.attack.unicopia.gravity_well_recoil": "%1$s turned into spaghetti",
   "death.attack.unicopia.gravity_well_recoil.player": "%1$s turned into spaghetti by a spell cast by %2$s",
   "death.attack.unicopia.gravity_well_recoil.item": "%1$s turned into spaghetti by a spell cast by %2$s using %3$s",

src/main/resources/assets/unicopia/lang/en_ud.json

@@ -1,4 +1,5 @@
 {
+  "resourcepack.unicopia.programmer_art": "Programmer Art (Unicopia)",
   "block.unicopia.bed.not_safe": "ʎqɹɐǝu sǝᴉɯǝuǝ ǝɹɐ ǝɹǝɥʇ `ǝɹǝɥ ʇsǝɹ ʇou ʎɐɯ no⅄",
   "block.unicopia.bed.not_tired": "ʍou ʇɥƃᴉɹ pǝɹᴉʇ lǝǝɟ ʇou op no⅄",
   "block.unicopia.bed.no_sleep.nocturnal": "sɯɹoʇsɹǝpunɥʇ ƃuᴉɹnp ɹo ʎɐp ǝɥʇ uᴉ dǝǝls ʎluo uɐɔ no⅄",
@@ -1488,6 +1489,8 @@
   "death.attack.unicopia.bat_screech.self": "sǝʌlǝsɯǝɥʇ pǝʞoods %1$s",
   "death.attack.unicopia.bat_screech.player": "%1$s pǝʞoods %2$s",
   "death.attack.unicopia.bat_screech.item": "%3$s ƃuᴉsn %2$s ʎq pǝʞoods sɐʍ %1$s",
+  "death.attack.unicopia.rainboom": "%1$s's eardrums were shattered",
+  "death.attack.unicopia.rainboom.player": "%2$s's shattered %1$s's eardrums",
   "death.attack.unicopia.gravity_well_recoil": "ᴉʇʇǝɥƃɐds oʇuᴉ pǝuɹnʇ %1$s",
   "death.attack.unicopia.gravity_well_recoil.player": "%2$s ʎq ʇsɐɔ llǝds ɐ ʎq ᴉʇʇǝɥƃɐds oʇuᴉ pǝuɹnʇ %1$s",
   "death.attack.unicopia.gravity_well_recoil.item": "%3$s ƃuᴉsn %2$s ʎq ʇsɐɔ llǝds ɐ ʎq ᴉʇʇǝɥƃɐds oʇuᴉ pǝuɹnʇ %1$s",

src/main/resources/assets/unicopia/lang/fr_fr.json

@@ -1,4 +1,5 @@
 {
+  "resourcepack.unicopia.programmer_art": "Programmer Art (Unicopia)",
   "block.unicopia.bed.not_safe": "Vous ne pouvez pas vous reposer ici, les ennemis sont proches",
   "block.unicopia.bed.not_tired": "Tu ne te sens pas fatigué en ce moment",
   "block.unicopia.bed.no_sleep.nocturnal": "Vous ne pouvez dormir que dans la journée, ou dans les orages",
@@ -41,7 +42,7 @@
   "tla.category.unicopia.spellbook": "Livre de sortilèges",
   "tla.category.unicopia.cloud_shaping": "Façonnage",
   "tla.category.unicopia.growing": "Croissance",
-  "tla.category.unicopia.altar": "Sombre Rituel",
+  "tla.category.unicopia.altar": "Rituel sombre",
   "recipe.unicopia.altar.instruction": "Placer l'objet dans les flammes",
   "recipe.unicopia.growing.instruction": "Se concentrez la magie de poney de terre",
   "item.unicopia.alicorn_badge": "Emblème d'alicorne",
@@ -59,7 +60,7 @@
   "item.unicopia.sweet_apple": "Pomme sucrée",
   "item.unicopia.sour_apple": "Pomme aigre",
   "item.unicopia.rotten_apple": "Pomme putréfiée",
-  "item.unicopia.cooked_zap_apple": "Zap apple cuite",
+  "item.unicopia.cooked_zap_apple": "Pomme zap cuite",
   "item.unicopia.zap_apple": "Pomme zap",
   "item.unicopia.zap_bulb": "Pomme zap inégal",
   "item.unicopia.rotten_cod": "Morue Pourrie",
@@ -86,7 +87,7 @@
   "item.unicopia.lightning_jar": "Foudre dans un bocal",
   "block.unicopia.lightning_jar": "Foudre dans un bocal",
   "item.unicopia.zap_apple_jam_jar": "Confiture de pomme zap",
-  "block.unicopia.zap_jar": "Jar de Confiture de Zap Apple",
+  "block.unicopia.zap_jar": "Bocal de confiture de pomme zap",
   "item.unicopia.toast": "Pain grillé",
   "item.unicopia.burned_toast": "Pain brûlé",
   "item.unicopia.jam_toast": "Pain grillé à la confiture de pomme zap",
@@ -185,7 +186,7 @@
   "jukebox_song.unicopia.pet": "Daniel Ingram - pet",
   "jukebox_song.unicopia.popular": "Daniel Ingram - popular",
   "jukebox_song.unicopia.crusade": "Daniel Ingram - crusade",
-  "jukebox_song.unicopia.funk": "funk, juste funk",
+  "jukebox_song.unicopia.funk": "funk, just funk",
   "item.unicopia.cloud_lump": "Morceau du Nuage",
   "item.unicopia.white_bed_sheets": "Lits Blancs",
   "item.unicopia.light_gray_bed_sheets": "Lits de lit gris clair",
@@ -219,28 +220,28 @@
   "block.unicopia.bananas": "Bananes",
   "block.unicopia.zapling": "Zapling",
   "block.unicopia.potted_zapling": "Zapling en pot",
-  "block.unicopia.zap_log": "Confiture de Zap Apple",
-  "block.unicopia.zap_wood": "Zap Bois de Pomme",
-  "block.unicopia.stripped_zap_log": "Journal d'Apple Zap Stripped",
-  "block.unicopia.stripped_zap_wood": "Bois de pomme Zap rayé",
-  "block.unicopia.zap_planks": "Planches de pomme Zap",
-  "block.unicopia.zap_stairs": "Escalier de Pomme Zap",
-  "block.unicopia.zap_slab": "Dalle de Pomme Zap",
-  "block.unicopia.zap_fence": "Barrière en Zap Pomme",
-  "block.unicopia.zap_fence_gate": "Portillon en Zap Pomme",
-  "block.unicopia.waxed_zap_log": "Journal d'Pomme Zap Caxé",
-  "block.unicopia.waxed_zap_wood": "Bois de Pomme Zap Ciré",
-  "block.unicopia.waxed_stripped_zap_log": "Journal d'Pomme Zap Ciré",
-  "block.unicopia.waxed_stripped_zap_wood": "Pomme Zap en Bois de Pomme Ciré",
-  "block.unicopia.waxed_zap_planks": "Planches de Pomme Zap Ciré",
+  "block.unicopia.zap_log": "Bûche de pomme zap",
+  "block.unicopia.zap_wood": "Bois de pomme zap",
+  "block.unicopia.stripped_zap_log": "Bûche de pomme zap écorcé",
+  "block.unicopia.stripped_zap_wood": "Bois de pomme zap écorcé",
+  "block.unicopia.zap_planks": "Planches de pomme zap",
+  "block.unicopia.zap_stairs": "Escalier en pomme zap",
+  "block.unicopia.zap_slab": "Dalle en pomme zap",
+  "block.unicopia.zap_fence": "Barrière en pomme zap",
+  "block.unicopia.zap_fence_gate": "Portillon en pomme zap",
+  "block.unicopia.waxed_zap_log": "Bûche de pomme zap ciré",
+  "block.unicopia.waxed_zap_wood": "Bois de pomme zap ciré",
+  "block.unicopia.waxed_stripped_zap_log": "Bûche de pomme zap écorcé ciré",
+  "block.unicopia.waxed_stripped_zap_wood": "Bois de pomme zap écorcé ciré",
+  "block.unicopia.waxed_zap_planks": "Planches de pomme zap ciré",
   "block.unicopia.waxed_zap_stairs": "Escaliers de Pomme Zap Ciré",
-  "block.unicopia.waxed_zap_slab": "Dalle de pomme Zap Ciré",
-  "block.unicopia.waxed_zap_fence": "Clôture de Pomme Zap Cirée",
-  "block.unicopia.waxed_zap_fence_gate": "Portail de Clôture de Pomme Zap en Cire",
-  "block.unicopia.zap_leaves": "Zap Feuilles de Pomme",
-  "block.unicopia.flowering_zap_leaves": "Feuilles d'Pomme Zap Florissantes",
-  "block.unicopia.zap_apple": "Zap Pomme",
-  "block.unicopia.zap_bulb": "Zap Pomme Inégal",
+  "block.unicopia.waxed_zap_slab": "Dalle en pomme zap ciré",
+  "block.unicopia.waxed_zap_fence": "Barrière en pomme zap ciré",
+  "block.unicopia.waxed_zap_fence_gate": "Portillon en pomme zap ciré",
+  "block.unicopia.zap_leaves": "Feuilles de pomme zap",
+  "block.unicopia.flowering_zap_leaves": "Feuilles de pomme zap fleurie",
+  "block.unicopia.zap_apple": "Pomme zap",
+  "block.unicopia.zap_bulb": "Pomme zap inégale",
   "block.unicopia.palm_sapling": "Pousse de Palmier",
   "block.unicopia.potted_palm_sapling": "Pousse de Paume en Pot",
   "block.unicopia.palm_log": "Bûche de Palme",
@@ -369,7 +370,7 @@
   "effect.unicopia.fortification": "Fortification",
   "effect.unicopia.broken_wings": "Ailes cassées",
   "effect.unicopia.seaponys_ire": "Ire de Saponies",
-  "effect.unicopia.seaponys_grace": "Grâce des armes",
+  "effect.unicopia.seaponys_grace": "Grâce de l'océan",
   "effect.unicopia.change_race_earth": "Métamorphose de poney de terre",
   "effect.unicopia.change_race_unicorn": "Métamorphose de licorne",
   "effect.unicopia.change_race_pegasus": "Métamorphose de pégase",
@@ -481,7 +482,7 @@
   "spell.unicopia.flame": "Flamme",
   "spell.unicopia.flame.lore": "Cette gemme brûle chaudement avec une flamme magique",
   "spell.unicopia.infernal": "Incendie",
-  "spell.unicopia.infernal.lore": "Conjure l'essence même du Néant pour infuser ce monde",
+  "spell.unicopia.infernal.lore": "Conjurez l'essence même du Nether pour infuser ce monde",
   "spell.unicopia.fire_bolt": "Trait de feu",
   "spell.unicopia.fire_bolt.lore": "Produit plusieurs projectiles brûlants",
   "spell.unicopia.shield": "Protéger",
@@ -531,16 +532,16 @@
   "spell_attribute.unicopia.affects.blocks": "Affecte uniquement les blocs",
   "spell_attribute.unicopia.follows_target": "S'abonner à la cible",
   "spell_attribute.unicopia.causes_levitation": "Cause lévitation",
-  "spell_attribute.unicopia.permit_items": "Permits Items",
+  "spell_attribute.unicopia.permit_items": " Permettez d'objets",
   "spell_attribute.unicopia.permit_passive": "Autorise les monstres passifs",
   "spell_attribute.unicopia.permit_hostile": "Permettre les monstres hostiles",
-  "spell_attribute.unicopia.permit_player": "Permits Other Players",
+  "spell_attribute.unicopia.permit_player": " Permettez d'autres joueurs",
   "spell_attribute.unicopia.range": "Portée de l'effet",
   "spell_attribute.unicopia.duration": "Durée de l'effet",
   "spell_attribute.unicopia.strength": "Force de l'effet",
   "spell_attribute.unicopia.soapiness": "Sévérité",
   "spell_attribute.unicopia.velocity": "Vitesse",
-  "spell_attribute.unicopia.vertical_velocity": "Launch Speed",
+  "spell_attribute.unicopia.vertical_velocity": "Vitesse initiale de lancement",
   "spell_attribute.unicopia.hang_time": "Temps de suspension",
   "spell_attribute.unicopia.pushing_power": "Pousser",
   "spell_attribute.unicopia.damage_to_target": "Dégâts sur la cible",
@@ -696,7 +697,7 @@
   "affinity.unicopia.bad": "Mauvais",
   "affinity.unicopia.neutral": "Neutre",
   "affinity.unicopia.when_cast": "Quand lancé:",
-  "affinity.unicopia.corruption": " %s%.2f Corruption",
+  "affinity.unicopia.corruption": "Corruption",
   "gui.unicopia.trait.label": "Élément de %s",
   "gui.unicopia.trait.group": "\n %s",
   "gui.unicopia.trait.corruption": "\nCorruption de %s",
@@ -710,7 +711,7 @@
   "respawn.reason.joined_new_tribe": "%1$s est renaissé comme %2$s",
   "respawn.reason.illegal_race": "La course %s n'est pas autorisée par la configuration de votre serveur.",
   "tag.item.unicopia.groups.foraging": "Onglets créatifs : Foraging",
-  "tag.item.unicopia.groups.sea_pony": "Onglets créatifs : Seapony",
+  "tag.item.unicopia.groups.sea_pony": "Onglets créatifs : Poney de mer",
   "tag.item.unicopia.groups.earth_pony": "Onglets créatifs : Pony de la terre",
   "tag.item.unicopia.groups.bat_pony": "Onglets créatifs : Chauve-souris",
   "tag.item.unicopia.groups.changeling": "Onglets créatifs : Changement",
@@ -736,7 +737,7 @@
   "tag.item.unicopia.baskets": "Paniers",
   "tag.item.unicopia.shades": "Nuances",
   "tag.item.unicopia.shells": "Obus",
-  "tag.item.unicopia.zap_logs": "Apple Apple Logs",
+  "tag.item.unicopia.zap_logs": "Bûches de pomme zap",
   "tag.item.unicopia.spooked_mob_drops": "Lâché par les créatures effrayées",
   "tag.item.unicopia.wool_bed_sheets": "Linge de lit en laine",
   "tag.item.unicopia.is_delivered_aggressively": "Délivré de manière agressive",
@@ -1453,8 +1454,8 @@
   "race.unicopia.kirin.alt": "Kirins",
   "race.unicopia.hippogriff": "Hippogriff",
   "race.unicopia.hippogriff.alt": "Hippogriffs",
-  "race.unicopia.seapony": "Pony de la mer",
-  "race.unicopia.seapony.alt": "Ponies de la mer",
+  "race.unicopia.seapony": "Poney de mer",
+  "race.unicopia.seapony.alt": "Poneys de mer",
   "death.attack.unicopia.generic.and_also": "%1$s et %2$s",
   "death.attack.unicopia.generic.whilst_flying": "%1$s en volant",
   "death.attack.unicopia.tribe_swap": "%1$s was reborn into a different tribe",
@@ -1488,6 +1489,8 @@
   "death.attack.unicopia.bat_screech.self": "%1$s s'est effrayé",
   "death.attack.unicopia.bat_screech.player": "%2$s a effrayé %1$s",
   "death.attack.unicopia.bat_screech.item": "%1$s a été effrayé par %2$s en utilisant %3$s",
+  "death.attack.unicopia.rainboom": "%1$s's eardrums were shattered",
+  "death.attack.unicopia.rainboom.player": "%2$s's shattered %1$s's eardrums",
   "death.attack.unicopia.gravity_well_recoil": "%1$s turned into spaghetti",
   "death.attack.unicopia.gravity_well_recoil.player": "%1$s turned into spaghetti by a spell cast by %2$s",
   "death.attack.unicopia.gravity_well_recoil.item": "%1$s transformé en spaghetti par un sort lancé par %2$s en utilisant %3$s",
@@ -1748,17 +1751,17 @@
   "advancements.unicopia.deter_phantom.title": "Ce qui vole autour",
   "advancements.unicopia.deter_phantom.description": "Montez là-haut et donnez à ces fantômes un goût de leur propre médicament",
   "advancements.unicopia.unicorn_route.title": "Corne de la Licorne",
-  "advancements.unicopia.unicorn_route.description": "Plongez dans le monde des arc-en-ciel et des éclaireurs",
-  "advancements.unicopia.books.title": "Livres!",
+  "advancements.unicopia.unicorn_route.description": "Plongez dans le monde des arcs-en-ciel et des éclaireurs",
+  "advancements.unicopia.books.title": "Livres !",
   "advancements.unicopia.books.description": "C'est MON livre de sorts et je vais le lire !",
-  "advancements.unicopia.books_books_books.title": "Livres! Livres! Livres!",
+  "advancements.unicopia.books_books_books.title": "Livres ! Livres ! Livres !",
   "advancements.unicopia.books_books_books.description": "Ayez un inventaire rempli de livres",
   "advancements.unicopia.tempted.title": "Tentative...",
   "advancements.unicopia.tempted.description": "Mettre sur l'amulette d'amulette de la licorne",
   "advancements.unicopia.hello_darkness_my_old_friend.title": "Bonjour les ténèbres...",
   "advancements.unicopia.hello_darkness_my_old_friend.description": "Plongez plus loin dans les puissances du côté sombre",
   "advancements.unicopia.a_falling_wizard.title": "Un sorcier en chute libre",
-  "advancements.unicopia.a_falling_wizard.description": "Une licorne a tenté de lancer un sort de vol infructueux",
+  "advancements.unicopia.a_falling_wizard.description": "Un(e) licorne a tenté d'effectuer sans succès un sort de vol",
   "advancements.unicopia.split_the_sea.title": "Qui êtes-vous? Moïse?",
   "advancements.unicopia.split_the_sea.description": "Utilisez la magie pour déplacer plus de 100 blocs d'eau en une seule fois",
   "advancements.unicopia.save_the_day.title": "Enregistrer le jour",
@@ -1775,7 +1778,7 @@
   "advancements.unicopia.love_is_power.description": "Bannir le Roi Sombra avec un cœur de cristal",
   "advancements.unicopia.hippogriff_route.title": "éclaboussure de Seaquestria",
   "advancements.unicopia.hippogriff_route.description": "Rejoignez le nid d'Hippogriff",
-  "advancements.unicopia.shoo_be_doo.title": "Shoo Be Doo!",
+  "advancements.unicopia.shoo_be_doo.title": "Shou Be Dou !",
   "advancements.unicopia.shoo_be_doo.description": "Utilisez un collier de perles pour vous transformer en créature marine.",
   "advancements.unicopia.shoo_be_done.title": "Le Shoo est fait !",
   "advancements.unicopia.shoo_be_done.description": "Utilisez un collier de perles pour revenir à la normale",

src/main/resources/assets/unicopia/lang/ru_ru.json

@@ -1,4 +1,5 @@
 {
+  "resourcepack.unicopia.programmer_art": "Programmer Art (Unicopia)",
   "block.unicopia.bed.not_safe": "Вы не можете уснуть, пока рядом есть враги",
   "block.unicopia.bed.not_tired": "Сейчас вы не чувствуете усталости",
   "block.unicopia.bed.no_sleep.nocturnal": "Вы можете спать только днём или во время грозы",
@@ -1488,6 +1489,8 @@
   "death.attack.unicopia.bat_screech.self": "%1$ напугали себя до смерти",
   "death.attack.unicopia.bat_screech.player": "%2$s напугал %1$s",
   "death.attack.unicopia.bat_screech.item": "%1$s был напуган до смерти %2$s с помощью %3$s",
+  "death.attack.unicopia.rainboom": "%1$s's eardrums were shattered",
+  "death.attack.unicopia.rainboom.player": "%2$s's shattered %1$s's eardrums",
   "death.attack.unicopia.gravity_well_recoil": "%1$ превратился в спагетти",
   "death.attack.unicopia.gravity_well_recoil.player": "%1$s превращён в спагетти заклинанием, созданным %2$s",
   "death.attack.unicopia.gravity_well_recoil.item": "%1$s превращён в спагетти заклинанием, созданным %2$s с помощью %3$s",