Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
required: true
default: '1.0'
mc_upper:
description: 'Upper bound of Minecraft version range (exact version), e.g. "1.21.5". Leave empty to use the latest version from pack.mcmeta.'
description: 'Upper bound of Minecraft version range (exact version), e.g. "26.2". Leave empty to use the latest version from pack.mcmeta.'
required: false
mc_lower:
description: 'Lower bound of Minecraft version range (exact version), e.g. "1.14"'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
description: 'Version tag to build (if omitted, latest --describe tag from git is used)'
required: false
mc_upper:
description: 'Upper bound of Minecraft version range (exact version), e.g. "1.21.5"'
description: 'Upper bound of Minecraft version range (exact version), e.g. "26.2"'
required: false
mc_lower:
description: 'Lower bound of Minecraft version range (exact version), e.g. "1.14"'
Expand All @@ -23,7 +23,7 @@ env:
# Fallback Lower: when Spyglass API is unreachable
FALLBACK_MC_LOWER: "1.14"
# Fallback Upper: when Spyglass API and Mojang API are unreachable
FALLBACK_MC_UPPER: "26.1"
FALLBACK_MC_UPPER: "26.2"

jobs:
deploy:
Expand Down
2 changes: 1 addition & 1 deletion .spyglassrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"env": {
"gameVersion": "26.1"
"gameVersion": "26.2"
}
}
5 changes: 2 additions & 3 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
- **Added support for Minecraft 26.1.x** 🐤
- Updated night detection to use the new `minecraft:overworld` world clock
- Added router to handle [unobfuscated code](https://www.minecraft.net/en-us/article/removing-obfuscation-in-java-edition)
- **Added support for Minecraft 26.2.x** ♨️
- Bumped pack format and protocol version
- Added Russian language support (Thanks @itsrec0very, [#35](https://github.com/Tschipcraft/more_mobs/pull/35))
1 change: 1 addition & 0 deletions META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ No Resource pack needed!
Execute the command §o/function §omore_mobs:settings§r for a world-specific settings menu and/or install MidnightLib for global settings across all worlds.
'''
authors="Tschipcraft"
credits="Texaliuz, itsrec0very"
displayURL="https://modrinth.com/mod/HJR6V0I2"
issueTrackerURL="https://github.com/Tschipcraft/more_mobs/issues"
updateJSONURL="https://api.modrinth.com/updates/HJR6V0I2/forge_updates.json?forge=only"
Expand Down
1 change: 1 addition & 0 deletions META-INF/neoforge.mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ No Resource pack needed!
Execute the command §o/function §omore_mobs:settings§r for a world-specific settings menu and/or install MidnightLib for global settings across all worlds.
'''
authors="Tschipcraft"
credits="Texaliuz, itsrec0very"
displayURL="https://modrinth.com/mod/HJR6V0I2"
issueTrackerURL="https://github.com/Tschipcraft/more_mobs/issues"
updateJSONURL="https://api.modrinth.com/updates/HJR6V0I2/forge_updates.json?neoforge=only"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<a href="https://github.com/Tschipcraft/more_mobs/releases/latest"><img alt="GitHub Downloads" src="https://img.shields.io/github/downloads/Tschipcraft/more_mobs/total?logo=github&colorA=1b1b29&colorB=bd5216&style=for-the-badge"></a>
</p>

> A data pack/mod for Minecraft 1.14x-1.21x
> A data pack/mod for Minecraft 1.14.x-26.2.x

<details>
<summary>YouTube showcase</summary>
Expand Down
37 changes: 37 additions & 0 deletions assets/moremobs/lang/ru_ru.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"moremobs.midnightconfig.title": "Настройки More Mobs",
"moremobs.midnightconfig.empty": "",
"moremobs.midnightconfig.configure_ingame": "§dℹ Инфо:§r§f Чтобы настроить этот датапак для каждого мира отдельно,",
"moremobs.midnightconfig.configure_ingame2": "войдите в мир и выполните команду §o/function more_mobs:settings§r.",
"moremobs.midnightconfig.empty2": "",
"moremobs.midnightconfig.global_settings": "§n§l-=- Глобальные настройки -=-",
"moremobs.midnightconfig.info": "§dℹ Инфо:§r§f Эти настройки будут применены ко всем мирам.",
"moremobs.midnightconfig.info2": "Чтобы глобальные настройки вступили в силу, не забудьте перезайти в мир",
"moremobs.midnightconfig.empty3": "",
"moremobs.midnightconfig.empty4": "",

"moremobs.midnightconfig.enable_heads": "Включить кастомные головы",
"moremobs.midnightconfig.enable_heads.tooltip": "По умолчанию: §aДа§f\nЕсли включено, поддерживаемым гуманоидным мобам будут присваиваться кастомные головы.",
"moremobs.midnightconfig.enable_head_drops": " └ Выпадение кастомных голов",
"moremobs.midnightconfig.enable_head_drops.tooltip": "По умолчанию: §aДа§f\nЧтобы вступило в силу, необходимо включить кастомные головы",
"moremobs.midnightconfig.enable_additional_loot": "Добавить дополнительный лут у некоторых мобов",
"moremobs.midnightconfig.enable_additional_loot.tooltip": "По умолчанию: §aДа§f\nНапример, недорогие инструменты и недорогая рыбацкая добыча",
"moremobs.midnightconfig.enable_additional_valuable_loot": " └ Добавить ценный лут",
"moremobs.midnightconfig.enable_additional_valuable_loot.tooltip": "По умолчанию: §aДа§f\nНапример, Дыхание дракона, Тотем бессмертия и Элитры",
"moremobs.midnightconfig.enable_upside_down_spiders": "Добавить потолочных пауков",
"moremobs.midnightconfig.enable_upside_down_spiders.tooltip": "По умолчанию: §aДа§f\nЕсли включено, пауки будут переворачиваться вверх ногами, когда висят на потолке\nНедоступно на версиях 1.20.3-1.21.2 из-за MC-128225",
"moremobs.midnightconfig.enable_let_undead_mobs_burn_in_daylight": "Мобы с кастомными головами будут сгорать",
"moremobs.midnightconfig.enable_let_undead_mobs_burn_in_daylight.tooltip": "По умолчанию: §aДа§f\nЕсли включено, мобы с кастомными головами будут сгорать при дневном свете\nТолько на версиях 1.19.4+",

"moremobs.midnightconfig.enum.bool.WORLD": "§bДля каждого мира",
"moremobs.midnightconfig.enum.bool.YES": "§a[✔] Да",
"moremobs.midnightconfig.enum.bool.NO": "§c[❌] Нет",

"modmenu.summaryTranslation.moremobs": "Расширяет разнообразие гуманоидных мобов за счёт кастомных голов и добавления невышедших мобов!",
"modmenu.descriptionTranslation.moremobs": "В этом датапаке используется §lболее 85§r кастомных голов игроков, которые можно получить и разместить в вашем мире. \nРесурспак не требуется! \nПоддерживаемые существа: Зомби, кадавр, утопленник, скелет, зимогор, визер-скелет, муушрум, пиглин, разбойник, заклинатель и поборник \nИспользуйте команду §o/function §omore_mobs:settings§r, чтобы открыть меню настроек для конкретного мира, и/или установите MidnightLib для глобальных настроек во всех мирах.",
"modmenu.donate": "Поддержать",
"modmenu.modrinth": "Modrinth",
"modmenu.curseforge": "CurseForge",
"modmenu.youtube": "YouTube",
"modmenu.wiki": "Вики"
}
2 changes: 1 addition & 1 deletion data/more_mobs/function/version_checker.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

scoreboard objectives add ts.mm.version dummy
execute store result score $global ts.mm.version run data get entity @r DataVersion
execute unless score $global tvc_ignore matches 1 if score $global ts.mm.version matches 4800.. run tellraw @a [{"text":"[More Mobs] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 26.1 detected! This data pack/mod may not work correctly anymore! Please make sure to check for updates in the menu! (","color":"gold"},{"text":"/trigger tschipcraft.menu","underlined":true,"color":"gold","click_event":{"action":"run_command","command":"/trigger tschipcraft.menu"},"hover_event":{"action":"show_text","value":"Click here","text":"Click here"}},{"text":")","color":"gold"}]
execute unless score $global tvc_ignore matches 1 if score $global ts.mm.version matches 5000.. run tellraw @a [{"text":"[More Mobs] ","color":"gray"},{"text":"?","bold":true,"color":"gold"},{"text":" Future unknown Minecraft version above 26.2 detected! This data pack/mod may not work correctly anymore! Please make sure to check for updates! (","color":"gold"},{"text":"/trigger tschipcraft.menu","underlined":true,"color":"gold","click_event":{"action":"run_command","command":"/trigger tschipcraft.menu"},"hover_event":{"action":"show_text","value":"Click here to open the menu","text":"Click here to open the menu"}},{"text":")","color":"gold"}]
# Note: 1.14x-1.20x uses the old folder names (function -> functions)

# Announce version limitations
Expand Down
4 changes: 4 additions & 0 deletions fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
"authors": [
"Tschipcraft"
],
"contributors": [
"Texaliuz",
"itsrec0very"
],
"contact": {
"homepage": "https://tschipcraft.ddns.net/more_mobs.html",
"sources": "https://github.com/Tschipcraft/more_mobs",
Expand Down
4 changes: 2 additions & 2 deletions pack.mcmeta
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"id": "moremobs",
"pack": {
"pack_format": 15,
"supported_formats": [4,101],
"supported_formats": [4,107],
"min_format": 4,
"max_format": 101,
"max_format": 107,
"description": "Tschipcraft's More Mobs \n└ v${version} ● mc${mc_human_version_range}"
},
"overlays": {
Expand Down