diff options
Diffstat (limited to 'src/main')
17 files changed, 10 insertions, 24 deletions
diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java index 85980f8c1..79bbe802e 100644 --- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java +++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java @@ -119,9 +119,9 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer { ServerSidePacketRegistry.INSTANCE.sendToPlayer(player, NOT_ENOUGH_ITEMS_PACKET, buf); } } catch (IllegalStateException e) { - player.sendMessage(new TranslatableText(e.getMessage()).formatted(Formatting.RED), Util.field_25140); + player.sendMessage(new TranslatableText(e.getMessage()).formatted(Formatting.RED), Util.NIL_UUID); } catch (Exception e) { - player.sendMessage(new TranslatableText("error.rei.internal.error", e.getMessage()).formatted(Formatting.RED), Util.field_25140); + player.sendMessage(new TranslatableText("error.rei.internal.error", e.getMessage()).formatted(Formatting.RED), Util.NIL_UUID); e.printStackTrace(); } } catch (Exception e) { diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java index 7bd843d0c..847946d82 100644 --- a/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java +++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java @@ -97,7 +97,7 @@ public class CreditsScreen extends Screen { ); }).collect(Collectors.toList()); int i = width - 80 - 6; - for (String line : I18n.translate("text.rei.credit.text", FabricLoader.getInstance().getModContainer("roughlyenoughitems").map(mod -> mod.getMetadata().getVersion().getFriendlyString()).orElse("Unknown"), "%translators%").split("\n")) + for (String line : String.format("§lRoughly Enough Items (v%s)\n§7Originally a fork for Almost Enough Items.\n\n§lLanguage Translation\n%s\n\n§lLicense\n§7Roughly Enough Items is licensed under MIT.", FabricLoader.getInstance().getModContainer("roughlyenoughitems").map(mod -> mod.getMetadata().getVersion().getFriendlyString()).orElse("Unknown"), "%translators%").split("\n")) if (line.equalsIgnoreCase("%translators%")) { if (exception[0] != null) { entryListWidget.creditsAddEntry(new TextCreditsItem(new LiteralText("Failed to get translators: " + exception[0].toString()))); diff --git a/src/main/resources/assets/roughlyenoughitems/lang/bg_bg.json b/src/main/resources/assets/roughlyenoughitems/lang/bg_bg.json index 05c4759c3..ccce7b525 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/bg_bg.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/bg_bg.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": "Entry List Action:", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Scrolled", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Paginated", - "text.rei.credit.text": "§lRoughly Enough Items (v%s)\n§7Originally a fork for Almost Enough Items.\n\n§lDevelopers\n Originally by ZenDarva\n Rewritten by Danielshe\n Old Plugin Support by TehNut\n\n§lLanguage Translation\n%s\n\n§lLicense\n§7Roughly Enough Items is licensed with MIT.", "language.roughlyenoughitems.english": "английски", "language.roughlyenoughitems.japanese": "японски", "language.roughlyenoughitems.chinese_simplified": "опростен китайски", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/de_de.json b/src/main/resources/assets/roughlyenoughitems/lang/de_de.json index 9a87d9b82..c2a9b218d 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/de_de.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/de_de.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": "Darstellung der Gegenstandsliste:", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Bildlauf", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Mehrere Seiten", - "text.rei.credit.text": "§lRoughly Enough Items (v%s)\n§7Ursprünglich ein Fork von Almost Enough Items.\n\n§lEntwickler\n Original von ZenDarva\n Neu geschrieben von Danielshe\n Alter Plugin Support von TehNut\n\n§lÜbersetzung\n%s\n\n§lLizenz \n§7Roughly Enough Items ist unter der MIT-Lizenz veröffentlicht.", "language.roughlyenoughitems.english": "Englisch", "language.roughlyenoughitems.japanese": "Japanisch", "language.roughlyenoughitems.chinese_simplified": "Chinesisch (Vereinfacht)", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_ud.json b/src/main/resources/assets/roughlyenoughitems/lang/en_ud.json index 4ba256d92..f715431b7 100755 --- a/src/main/resources/assets/roughlyenoughitems/lang/en_ud.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/en_ud.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": ":uoᴉʇɔ∀ ʇsᴉ˥ ʎɹʇuƎ", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "pǝlloɹɔS", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "pǝʇɐuᴉƃɐԀ", - "text.rei.credit.text": "§l(%sʌ) sɯǝʇI ɥbnouƎ ʎןɥbnoᴚ\n§7˙sɯǝʇI ɥbnouƎ ʇsoɯן∀ ɹoɟ ʞɹoɟ ɐ ʎןןɐuıbıɹO\n\n§lsɹǝdoןǝʌǝᗡ\n ɐʌɹɐᗡuǝZ ʎq ʎןןɐuıbıɹO\n ǝɥsןǝıuɐᗡ ʎq uǝʇʇıɹʍǝᴚ\n ʇnNɥǝ⊥ ʎq ʇɹoddnS uıbnןԀ pןO\n\n§luoıʇɐןsuɐɹ⊥ ǝbɐnbuɐ˥\n%s\n\n§lǝsuǝɔı˥\n§7˙⊥IW ɥʇıʍ pǝsuǝɔıן sı sɯǝʇI ɥbnouƎ ʎןɥbnoᴚ", "language.roughlyenoughitems.english": "English", "language.roughlyenoughitems.japanese": "Japanese", "language.roughlyenoughitems.chinese_simplified": "Chinese Simplified", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json index 80b825b61..7cf8e4a1c 100755 --- a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": "Entry List Action:", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Scrolled", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Paginated", - "text.rei.credit.text": "§lRoughly Enough Items (v%s)\n§7Originally a fork for Almost Enough Items.\n\n§lDevelopers\n Originally by ZenDarva\n Rewritten by Danielshe\n Old Plugin Support by TehNut\n\n§lLanguage Translation\n%s\n\n§lLicense\n§7Roughly Enough Items is licensed with MIT.", "language.roughlyenoughitems.english": "English", "language.roughlyenoughitems.japanese": "Japanese", "language.roughlyenoughitems.chinese_simplified": "Chinese Simplified", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/et_ee.json b/src/main/resources/assets/roughlyenoughitems/lang/et_ee.json index 887146f9e..072ef8d9c 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/et_ee.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/et_ee.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": "Esemenimekirja tegevus:", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Keritav", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Lehekülgedega", - "text.rei.credit.text": "§lRoughly Enough Items (v%s)\n§7Originaalselt Almost Enough Items'i koodi jätk.\n\n§lArendajad\n Originaal ZenDarva poolt\n Ümber kirjutanud Danielshe\n Vana plugina tugi TehNut poolt\n\n§lKeelte tõlked\n%s\n\n§lLitsents\n§7Roughly Enough Items on litsenseeritud MIT-i alusel.", "language.roughlyenoughitems.english": "inglise", "language.roughlyenoughitems.japanese": "jaapani", "language.roughlyenoughitems.chinese_simplified": "lihtsustatud hiina", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json b/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json index d5a9b91a5..c79d5f2a2 100755 --- a/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": "Type de navigation dans la liste :", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Défilement", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Pagination", - "text.rei.credit.text": "§lRoughly Enough Items (v%s)\n§7Initialement un fork du mod Almost Enough Items.\n\n§lDéveloppeurs\n Mod de base par ZenDarva\n Réécrit par Danielshe\n Prise en charge sur d'anciens plugins par TehNut\n\n§lTraductions\n%s\n\n§lLicence\n§7Roughly Enough Items est sous licence MIT.", "language.roughlyenoughitems.english": "Anglais", "language.roughlyenoughitems.japanese": "Japonais", "language.roughlyenoughitems.chinese_simplified": "Chinois simplifié", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/ja_jp.json b/src/main/resources/assets/roughlyenoughitems/lang/ja_jp.json index ba67ee83b..c89de6f1c 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/ja_jp.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/ja_jp.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": "リストの表示形式:", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "スクロール", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "ページ", - "text.rei.credit.text": "§lRoughly Enough Items (v%s)\n§7Originally a fork for Almost Enough Items.\n\n§lDevelopers\n Originally by ZenDarva\n Rewritten by Danielshe\n Old Plugin Support by TehNut\n\n§lLanguage Translation\n%s\n\n§lLicense\n§7Roughly Enough Items is licensed with MIT.", "language.roughlyenoughitems.english": "英語", "language.roughlyenoughitems.japanese": "日本語", "language.roughlyenoughitems.chinese_simplified": "Chinese Simplified", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/lol_us.json b/src/main/resources/assets/roughlyenoughitems/lang/lol_us.json index 57fec194d..9c0067acf 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/lol_us.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/lol_us.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": "Entwy List Action:", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Scwolled", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Paginwated", - "text.rei.credit.text": "§wWoughwy Enough Items (v%s)\n§7Owiginawwy a fowk fow Awmost Enough Items.\n\n§wDevewopews\n Owiginawwy by ZenDawva\n Wewwitten by Daniewshe\n Owd Pwugin Suppowt by TehNut\n\n§wWanguage Twanswation\n%s\n\n§wWicense\n§7Woughwy Enough Items is wicensed wid MIT.", "language.roughlyenoughitems.english": "English", "language.roughlyenoughitems.japanese": "Japanees", "language.roughlyenoughitems.chinese_simplified": "Chinees Simplifid", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/nn_no.json b/src/main/resources/assets/roughlyenoughitems/lang/nn_no.json index 80b825b61..7cf8e4a1c 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/nn_no.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/nn_no.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": "Entry List Action:", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Scrolled", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Paginated", - "text.rei.credit.text": "§lRoughly Enough Items (v%s)\n§7Originally a fork for Almost Enough Items.\n\n§lDevelopers\n Originally by ZenDarva\n Rewritten by Danielshe\n Old Plugin Support by TehNut\n\n§lLanguage Translation\n%s\n\n§lLicense\n§7Roughly Enough Items is licensed with MIT.", "language.roughlyenoughitems.english": "English", "language.roughlyenoughitems.japanese": "Japanese", "language.roughlyenoughitems.chinese_simplified": "Chinese Simplified", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/pl_pl.json b/src/main/resources/assets/roughlyenoughitems/lang/pl_pl.json index 60ff61c3d..8c6702390 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/pl_pl.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/pl_pl.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": "Sposób przeglądania przedmiotów:", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Pasek przewijania", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Ponumerowane strony", - "text.rei.credit.text": "§lRoughly Enough Items (v %s)\n§7Oryginalnie fork modyfikacji Almost Enough Items.\n\n§lDeveloperzy\n Oryginalnie | ZenDarva\n Przepisanie od podstaw | Danielshe\n Wsparcie starego pluginu | TehNut\n\n§lTłumaczenie\n%s\n\n§lLicencja\n§7Roughly Enough Items działa na licencji MIT.", "language.roughlyenoughitems.english": "English", "language.roughlyenoughitems.japanese": "Japanese", "language.roughlyenoughitems.chinese_simplified": "Chinese Simplified", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/pt_br.json b/src/main/resources/assets/roughlyenoughitems/lang/pt_br.json index 980a0883f..a46cffa57 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/pt_br.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/pt_br.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": "Formatação da Lista:", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Formato de Rolagem", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Formato de Páginas", - "text.rei.credit.text": "§lRoughly Enough Items\n§7Originally a fork for Almost Enough Items.\n\n§lDevelopers\n - Originally by ZenDarva\n - Created by Danielshe\n - Plugin Support by TehNut\n\n§lLanguage Translation\n English - Danielshe\n Simplified Chinese - XuyuEre & Danielshe\n Traditional Chinese - hugoalh, gxy17886 & Danielshe\n French - Yanis48\n German - MelanX\n Estonian - Madis0\n Portuguese - thiagokenis\n LOLCAT - Danielshe\n Upside Down - Danielshe\n Brazilian Portuguese - thiagokenis\n Bulgarian - geniiii\n\n§lLicense\n§7Roughly Enough Items is using MIT.", "language.roughlyenoughitems.english": "Inglês", "language.roughlyenoughitems.japanese": "Japonês", "language.roughlyenoughitems.chinese_simplified": "Chinês Simplificado", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/pt_pt.json b/src/main/resources/assets/roughlyenoughitems/lang/pt_pt.json index 6bf00042e..e3b519caf 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/pt_pt.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/pt_pt.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": "Ação da Lista de Referências:", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Por Rolagem", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Por Páginas", - "text.rei.credit.text": "§lRoughly Enough Items\n§7Originally a fork for Almost Enough Items.\n\n§lDevelopers\n - Originally by ZenDarva\n - Created by Danielshe\n - Plugin Support by TehNut\n\n§lLanguage Translation\n English - Danielshe\n Simplified Chinese - XuyuEre & Danielshe\n Traditional Chinese - hugoalh, gxy17886 & Danielshe\n French - Yanis48\n German - MelanX\n Estonian - Madis0\n Portuguese - thiagokenis\n LOLCAT - Danielshe\n Upside Down - Danielshe\n Brazilian Portuguese - thiagokenis\n Bulgarian - geniiii\n\n§lLicense\n§7Roughly Enough Items is using MIT.", "language.roughlyenoughitems.english": "English", "language.roughlyenoughitems.japanese": "Japanese", "language.roughlyenoughitems.chinese_simplified": "Chinese Simplified", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/ru_ru.json b/src/main/resources/assets/roughlyenoughitems/lang/ru_ru.json index 33b5b9151..0af9d8ac2 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/ru_ru.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/ru_ru.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": "Режим списка предметов:", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "Прокрутка", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Кнопки", - "text.rei.credit.text": "§lRoughly Enough Items (v%s)\n§7Первоначально форк Almost Enough Items.\n\n§lРазработчики\n Автор мода ZenDarva\n Мод переписал Danielshe\n Поддержка старого плагина от TehNut\n\n§lЯзыковой перевод\n%s\n\n§lЛицензия\n§7Roughly Enough Items лицензируется с MIT.", "language.roughlyenoughitems.english": "Английский", "language.roughlyenoughitems.japanese": "Японский", "language.roughlyenoughitems.chinese_simplified": "Китайский (упрощенный)", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json b/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json index 89b5f6d92..ff74c607c 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json @@ -199,7 +199,6 @@ "config.roughlyenoughitems.scrollingEntryListWidget": "条目列表操作：", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "滚动", "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "分页", - "text.rei.credit.text": "§lRoughly Enough Items (v%s)\n§7原是 Almost Enough Items 的分支.\n\n§l主要开发人员\n AEI 作者 ZenDarva\n 重写作者 Danielshe\n\n§l语言翻译\n%s\n\n§l许可\n§7Roughly Enough Items 使用 MIT.", "language.roughlyenoughitems.english": "英语", "language.roughlyenoughitems.japanese": "日语", "language.roughlyenoughitems.chinese_simplified": "简体中文", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 299e933d1..19ed050bd 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -49,17 +49,17 @@ "rei:translators": { "English": "shedaniel", "Japanese": ["swordglowsblue", "hinataaki"], - "Chinese Simplified": ["XuyuEre", "shedaniel", "SciUniv_Moring", "Takakura-Anri", "liushuyu"], + "Chinese Simplified": ["XuyuEre", "shedaniel", "SciUniv_Moring", "Takakura-Anri", "liushuyu", "lkxian17084", "MynameisTT"], "Chinese Traditional": ["hugoalh", "gxy17886", "shedaniel", "961111ray"], - "French": ["Yanis48", "Koockies"], - "German": ["MelanX", "guntram7", "tabmeier12"], + "French": ["Yanis48", "Koockies", "dagdar", "samnamstyle123"], + "German": ["MelanX", "guntram7", "tabmeier12", "Siphalor", "M-S-72"], "Estonian": ["Madis0"], "Portuguese": ["thiagokenis", "KewaiiGamer"], - "Portuguese Brazilian": ["thiagokenis", "joaoh1", "yuriob262", "Pinkstyles"], - "LOLCAT": ["shedaniel", "RaxedMC"], + "Portuguese Brazilian": ["thiagokenis", "joaoh1", "yuriob262", "Pinkstyles", "felipemk67"], + "LOLCAT": ["shedaniel", "RaxedMC", "lkxian17084"], "Upside Down English": ["shedaniel", "magnusk28", "scarzdz"], - "Bulgarian": ["geniiii"], - "Russian": ["MrYonter", "kwmika1girl", "LimyChitou", "Great_Manalal", "s3rbug", "TheByKotik", "ebogish", "xqr.", "scarzdz"], + "Bulgarian": ["geniiii", "Dremski"], + "Russian": ["MrYonter", "kwmika1girl", "LimyChitou", "Great_Manalal", "s3rbug", "TheByKotik", "ebogish", "xqr.", "scarzdz", "JCat", "map788", "kyrtion"], "Polish": ["mikolajkazmierczak", "Piteriuz"] } } |