From c90962feafb1edc4e5ab5e3dab46cfe3830f366a Mon Sep 17 00:00:00 2001 From: JFronny <33260128+JFronny@users.noreply.github.com> Date: Mon, 13 Jul 2020 17:16:06 +0200 Subject: [PATCH] Less terrible, still hacky --- .../translater/CachingTransformer.java | 3 +- .../gitlab/jfronny/translater/IMClient.java | 5 - .../io/gitlab/jfronny/translater/ModInit.java | 4 - .../jfronny/translater/TransformingMap.java | 6 +- .../jfronny/translater/YnTransformer.java | 12 +- .../translater/interfaces/IMClient.java | 5 + .../{ => interfaces}/StringTransformer.java | 2 +- .../translater/mixin/MixinLanguage.java | 8 +- .../mixin/MixinMinecraftClient.java | 13 ++- .../translater/mixin/MixinSplashScreen.java | 18 +-- src/main/resources/namecache.ini | 105 +++++++++--------- src/main/resources/translater.mixins.json | 4 +- 12 files changed, 87 insertions(+), 98 deletions(-) delete mode 100644 src/main/java/io/gitlab/jfronny/translater/IMClient.java create mode 100644 src/main/java/io/gitlab/jfronny/translater/interfaces/IMClient.java rename src/main/java/io/gitlab/jfronny/translater/{ => interfaces}/StringTransformer.java (60%) diff --git a/src/main/java/io/gitlab/jfronny/translater/CachingTransformer.java b/src/main/java/io/gitlab/jfronny/translater/CachingTransformer.java index d1ae1fe..18fc1ae 100644 --- a/src/main/java/io/gitlab/jfronny/translater/CachingTransformer.java +++ b/src/main/java/io/gitlab/jfronny/translater/CachingTransformer.java @@ -1,5 +1,6 @@ package io.gitlab.jfronny.translater; +import io.gitlab.jfronny.translater.interfaces.StringTransformer; import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; import me.sargunvohra.mcmods.autoconfig1u.ConfigManager; import net.fabricmc.loader.api.FabricLoader; @@ -14,7 +15,7 @@ public abstract class CachingTransformer implements StringTransformer { @Override public String transform(String str) { if (str == null) - return str; + return null; if (cache == null) { cache = new Properties(); if (ModInit.cfg.forceRegenerate) { diff --git a/src/main/java/io/gitlab/jfronny/translater/IMClient.java b/src/main/java/io/gitlab/jfronny/translater/IMClient.java deleted file mode 100644 index f6d64f2..0000000 --- a/src/main/java/io/gitlab/jfronny/translater/IMClient.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.gitlab.jfronny.translater; - -public interface IMClient { - void runRender(boolean tick); -} diff --git a/src/main/java/io/gitlab/jfronny/translater/ModInit.java b/src/main/java/io/gitlab/jfronny/translater/ModInit.java index a176660..b009894 100644 --- a/src/main/java/io/gitlab/jfronny/translater/ModInit.java +++ b/src/main/java/io/gitlab/jfronny/translater/ModInit.java @@ -26,10 +26,6 @@ public class ModInit implements ModInitializer { logger.log(Level.WARN, "[" + MOD_NAME + "] " + msg); } - public static void LogDebug(String msg) { - logger.log(Level.DEBUG, "[" + MOD_NAME + "] " + msg); - } - @Override public void onInitialize() { Log("Loaded translater"); diff --git a/src/main/java/io/gitlab/jfronny/translater/TransformingMap.java b/src/main/java/io/gitlab/jfronny/translater/TransformingMap.java index aee2661..5a5a937 100644 --- a/src/main/java/io/gitlab/jfronny/translater/TransformingMap.java +++ b/src/main/java/io/gitlab/jfronny/translater/TransformingMap.java @@ -1,5 +1,7 @@ package io.gitlab.jfronny.translater; +import io.gitlab.jfronny.translater.interfaces.IMClient; +import io.gitlab.jfronny.translater.interfaces.StringTransformer; import net.minecraft.client.MinecraftClient; import java.util.Collection; @@ -27,10 +29,10 @@ public class TransformingMap implements Map { if (ModInit.cfg.renderProgress == Cfg.progressMode.Console || ModInit.cfg.renderProgress == Cfg.progressMode.Full) { initI++; ModInit.Log("Transforming " + initI + "/" + initMax); + if (ModInit.cfg.renderProgress == Cfg.progressMode.Full && initI % 10 == 0) + ((IMClient)MinecraftClient.getInstance()).render(); } transformer.transform(value); - if (ModInit.cfg.renderProgress == Cfg.progressMode.Full && initI % 10 == 0) - ((IMClient)MinecraftClient.getInstance()).runRender(false); } initializing = false; } diff --git a/src/main/java/io/gitlab/jfronny/translater/YnTransformer.java b/src/main/java/io/gitlab/jfronny/translater/YnTransformer.java index 29ed2f6..1c04f58 100644 --- a/src/main/java/io/gitlab/jfronny/translater/YnTransformer.java +++ b/src/main/java/io/gitlab/jfronny/translater/YnTransformer.java @@ -68,13 +68,13 @@ public class YnTransformer extends CachingTransformer { private String Break(String str) { try { - if (!valid(str)) + if (invalid(str)) return str; Language startLang = StringUtils.isAlpha(ModInit.cfg.targetLanguage) && ModInit.cfg.targetLanguage.length() == 2 ? Language.of(ModInit.cfg.targetLanguage) : api.detectionApi().detect(str).orElse(Language.EN); - if (!valid(startLang.code())) { + if (invalid(startLang.code())) { ModInit.Warn("Could not detect language for: " + str); ModInit.Warn("Defaulting to EN"); startLang = Language.EN; @@ -97,15 +97,15 @@ public class YnTransformer extends CachingTransformer { } } - private boolean valid(String str) { + private boolean invalid(String str) { if (str.length() < 2) - return false; + return true; for (char c : str.toCharArray()) { String tmp = "" + c; if (StringUtils.isAlphanumeric(tmp)) - return true; + return false; } - return false; + return true; } private Language selectRandom() { diff --git a/src/main/java/io/gitlab/jfronny/translater/interfaces/IMClient.java b/src/main/java/io/gitlab/jfronny/translater/interfaces/IMClient.java new file mode 100644 index 0000000..233ba18 --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/translater/interfaces/IMClient.java @@ -0,0 +1,5 @@ +package io.gitlab.jfronny.translater.interfaces; + +public interface IMClient { + void render(); +} diff --git a/src/main/java/io/gitlab/jfronny/translater/StringTransformer.java b/src/main/java/io/gitlab/jfronny/translater/interfaces/StringTransformer.java similarity index 60% rename from src/main/java/io/gitlab/jfronny/translater/StringTransformer.java rename to src/main/java/io/gitlab/jfronny/translater/interfaces/StringTransformer.java index 619a8ec..8d4dd68 100644 --- a/src/main/java/io/gitlab/jfronny/translater/StringTransformer.java +++ b/src/main/java/io/gitlab/jfronny/translater/interfaces/StringTransformer.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.translater; +package io.gitlab.jfronny.translater.interfaces; public interface StringTransformer { String transform(String str); diff --git a/src/main/java/io/gitlab/jfronny/translater/mixin/MixinLanguage.java b/src/main/java/io/gitlab/jfronny/translater/mixin/MixinLanguage.java index 0ad6e2d..2c9d738 100644 --- a/src/main/java/io/gitlab/jfronny/translater/mixin/MixinLanguage.java +++ b/src/main/java/io/gitlab/jfronny/translater/mixin/MixinLanguage.java @@ -27,8 +27,6 @@ public class MixinLanguage { "Ljava/util/Map;"), true); - private static final YnTransformer transformer = new YnTransformer(); - @Inject(at = @At("HEAD"), method = "setInstance") private static void languageSetInstance(Language language, CallbackInfo ci) { if (FIELD == null) { @@ -37,8 +35,10 @@ public class MixinLanguage { } if (language instanceof TranslationStorage) { try { - ModInit.map = new TransformingMap((Map) FIELD.get(language), transformer); - ModInit.map.init(); + if (ModInit.map == null) { + ModInit.map = new TransformingMap((Map) FIELD.get(language), new YnTransformer()); + ModInit.map.init(); + } FIELD.set(language, ModInit.map); } catch (IllegalAccessException | ClassCastException e) { e.printStackTrace(); diff --git a/src/main/java/io/gitlab/jfronny/translater/mixin/MixinMinecraftClient.java b/src/main/java/io/gitlab/jfronny/translater/mixin/MixinMinecraftClient.java index aafb454..17a524f 100644 --- a/src/main/java/io/gitlab/jfronny/translater/mixin/MixinMinecraftClient.java +++ b/src/main/java/io/gitlab/jfronny/translater/mixin/MixinMinecraftClient.java @@ -1,17 +1,18 @@ package io.gitlab.jfronny.translater.mixin; -import io.gitlab.jfronny.translater.IMClient; +import io.gitlab.jfronny.translater.interfaces.IMClient; import net.minecraft.client.MinecraftClient; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @Mixin(MinecraftClient.class) public class MixinMinecraftClient implements IMClient { - @Override - public void runRender(boolean tick) { - render(tick); + @Shadow + private void render(boolean tick) { } - @Shadow - private void render(boolean tick) {} + @Override + public void render() { + render(false); + } } diff --git a/src/main/java/io/gitlab/jfronny/translater/mixin/MixinSplashScreen.java b/src/main/java/io/gitlab/jfronny/translater/mixin/MixinSplashScreen.java index 7305662..de6ae11 100644 --- a/src/main/java/io/gitlab/jfronny/translater/mixin/MixinSplashScreen.java +++ b/src/main/java/io/gitlab/jfronny/translater/mixin/MixinSplashScreen.java @@ -26,13 +26,10 @@ public abstract class MixinSplashScreen extends Overlay { @Shadow @Final private MinecraftClient client; - @Shadow public abstract void render(MatrixStack matrices, int mouseX, int mouseY, float delta); - @Inject(at = @At("RETURN"), method = "renderProgressBar") private void RenderTrnslProgress(MatrixStack matrixStack, int i, int j, int k, int l, float f, CallbackInfo ci) { if (ModInit.cfg.renderProgress == Cfg.progressMode.Full && ModInit.map != null && ModInit.map.initializing) { - int n = Math.round(f * 255.0F); - renderer.draw(matrixStack, "Transforming " + ModInit.map.initI + "/" + ModInit.map.initMax, 10, 10, colorString("0,0,0") & 16777215 | n); + renderer.draw(matrixStack, "Transforming " + ModInit.map.initI + "/" + ModInit.map.initMax, 10, 10, 0); } } @@ -69,17 +66,4 @@ public abstract class MixinSplashScreen extends Overlay { fontStorage_1.setFonts(Collections.singletonList(FontType.BITMAP.createLoader(new JsonParser().parse(FONT_JSON).getAsJsonObject()).load(client.getResourceManager()))); renderer = new TextRenderer(id -> fontStorage_1); } - - private static int colorString(String color) { - String[] rgb = color.split(","); - if (rgb.length != 3) { - throw new IllegalArgumentException(color + " is not a valid color string. Too many values - format is '255,255,255'"); - } else { - int[] rgb2 = new int[3]; - for (int i = 0; i < rgb.length; i++) { - rgb2[i] = Integer.valueOf(rgb[i]); - } - return new Color(rgb2[0], rgb2[1], rgb2[2]).getRGB(); - } - } } diff --git a/src/main/resources/namecache.ini b/src/main/resources/namecache.ini index 9ac05d6..7979ece 100644 --- a/src/main/resources/namecache.ini +++ b/src/main/resources/namecache.ini @@ -1,5 +1,5 @@ #---Lang--- -#Sat Jul 11 12:44:22 CEST 2020 +#Mon Jul 13 16:56:43 CEST 2020 Break\ your\ way\ into\ a\ Nether\ Fortress=Smash your way into a Fortress is a Nether Evoker\ murmurs=Evoker Rutuliukai Light\ Gray\ Bed=Light Grey Sofa Bed @@ -417,6 +417,7 @@ Save\ hotbar\ with\ %1$s+%2$s=To save the panel %1$s+%2$s New\ world=One Of The New World %s\ has\ %s\ experience\ points=%s it is not a %s Erfaring poeng Structure\ Seed=Toxum Ev +Progress\ Renderer\ \ =The Progress Of The Work %s\ says\ %s=%s victory %s Normal\ user=A normal user %s\ in\ storage\ %s\ after\ scale\ factor\ of\ %s\ is\ %s=%s in stock %s when the scaling factor %s it %s @@ -1057,6 +1058,7 @@ Eroded\ Badlands=He Said, Exhaustion Server\ Address=Naslov Stre\u017Enika Exchange Server Replaced\ a\ slot\ at\ %s,\ %s,\ %s\ with\ %s=Jack, instead of the %s, %s, %s and %s Item\ Frame\ fills=The item fills the frame +Restart\ game\ to\ load\ mods=Once again, the game is to download the mod Line\ Spacing=In between Light\ Blue\ Stained\ Glass\ Pane=Panelen Lyser Bl\u00E5tt Stained Glas Removed\ %s\ items\ from\ %s\ players=To remove %s statii %s players @@ -1206,6 +1208,7 @@ Thunder\ roars=The Thunder Roars Blue\ Ice=The Blue-Ice Target\ Language=Language Green\ Base\ Sinister\ Canton=The Green Base Is In Guangzhou, The Claim +Do\ you\ want\ to\ copy\ the\ following\ mods\ into\ the\ mods\ directory?=If you want to copy and paste the following content, the content of the book? Website=The home page of the website Light\ Gray\ Per\ Pale\ Inverted=Light-Gray To Light-A Reverse Order Of Warning\!\ These\ settings\ are\ using\ experimental\ features=Attention\!\!\! For this purpose, technical characteristics overview @@ -1911,6 +1914,7 @@ Brick\ Slab=Brick Oven Blue\ Cross=Blue Cross Slime\ hurts=The abomination of evil Automatic\ saving\ is\ now\ enabled=Auto save is currently owned by +Successfully\ copied\ mods=He successfully copied on the spot Old\ graphics\ card\ detected;\ this\ may\ prevent\ you\ from=My old graphics card detected; this may prevent you from Brown\ Base\ Indented=Brown's Most Important Features Skeleton\ Horse\ Spawn\ Egg=Skeleton Of A Horse \u0421\u043F\u0430\u0443\u043D Eggs @@ -2778,6 +2782,7 @@ That\ position\ is\ out\ of\ this\ world\!=This place is out of this world\!\!\! Pink\ Field\ Masoned=Pink Box, Bricked Up Underground Ender\ Pearl=This Is A Ender Pearl Render\ Distance=Render Distance +Deprecated=Has passed Black\ Gradient=The Curve In Black Flight\ Duration\:=For The Duration Of The Trip\: Mossy\ Cobblestone=Herbal Rocks @@ -4612,37 +4617,37 @@ Horse\ gallops=Horse, gallop Magenta\ Terracotta=Purple Terracotta Villages=Village Villager=The villagers -Hotbar\ Slot\ 9=The Games Panel 9 Prismarine\ Brick\ Stairs=Prismarine Brick Pill\u0259k\u0259n +Hotbar\ Slot\ 9=The Games Panel 9 Hotbar\ Slot\ 8=En Hotbar Slot 8 Hotbar\ Slot\ 7=Games, Group 7 -Hotbar\ Slot\ 6=Game 6. -Connection\ Lost=Lost Contact Potted\ Orange\ Tulip=Potted Tulip Orange +Connection\ Lost=Lost Contact +Hotbar\ Slot\ 6=Game 6. Hotbar\ Slot\ 5=Lizdas Hotbar 5 -Hotbar\ Slot\ 4=Toolbar For Quick Access To The Socket 4-X Tripwire\ attaches=It +Hotbar\ Slot\ 4=Toolbar For Quick Access To The Socket 4-X Hotbar\ Slot\ 3=Children Playing in Panel 3 Hotbar\ Slot\ 2=The Quick Access Toolbar Slot 2 Hotbar\ Slot\ 1=Hotbar Slot 1 Blue\ Per\ Bend\ Sinister\ Inverted=Bend Sinister Substitute, Blue -Left\ Control=Levi Check Out -%s,\ %s,\ %s\ has\ the\ following\ block\ data\:\ %s=%s, %s, %s you have nasleduj\u00FAce block put\: %s Library=Library +%s,\ %s,\ %s\ has\ the\ following\ block\ data\:\ %s=%s, %s, %s you have nasleduj\u00FAce block put\: %s +Left\ Control=Levi Check Out 5x5\ (Normal)=5x5 (Normalno) Pink\ Bed=Rosa Bed Block\ broken=The unit does not work Min.\ Height=Thousands of people. Height Lime\ Per\ Bend=The Cement Of The Corner Drowned\ Spawn\ Egg=Spawn Eggs -Cow\ hurts=Cow-it hurts so bad -Allow\ Cheats\:=Da Bi Aktiviran Cheat %1$s\ walked\ into\ a\ cactus\ whilst\ trying\ to\ escape\ %2$s=%1$s he walked up to the cactus to commit, if you try to escape %2$s +Allow\ Cheats\:=Da Bi Aktiviran Cheat +Cow\ hurts=Cow-it hurts so bad %1$s\ starved\ to\ death=%1$s how would die of hunger Black\ Per\ Fess\ Inverted=Black And Kanim VI VI Da Teach Snowball=Gradu snow -Splash\ Potion\ of\ Luck=Good Luck, The Splash Potions Potted\ Allium=Pot Ashita +Splash\ Potion\ of\ Luck=Good Luck, The Splash Potions Good\ Luck=Good luck Target\ doesn't\ have\ the\ requested\ effect=The goal is not to the expected effects of the Invalid\ position\ for\ summon=Invalid Standards Call @@ -4654,13 +4659,13 @@ Spawn\ Tries=As Future Generations Of Trying Lever\ clicks=Press down on the handle Coal\ Ore=Coal, Iron Ore Can't\ insert\ %s\ into\ list\ of\ %s=You can't %s a lista %s -Exported=Export Polar\ Bear=Polar bear +Exported=Export Pink\ Per\ Pale=Pink Light -You\ have\ passed\ your\ fifth\ day.\ Use\ %s\ to\ save\ a\ screenshot\ of\ your\ creation.=You have passed your fifth day. Use %s to save an image of your own creation. -There\ are\ no\ bans=There is no restriction -Pink\ Chief=The Key To The Pink Cooked\ Rabbit=Stew The Rabbit +Pink\ Chief=The Key To The Pink +There\ are\ no\ bans=There is no restriction +You\ have\ passed\ your\ fifth\ day.\ Use\ %s\ to\ save\ a\ screenshot\ of\ your\ creation.=You have passed your fifth day. Use %s to save an image of your own creation. Light\ Blue\ Stained\ Glass=Blue Linssit Press\ a\ key\ to\ select\ a\ command,\ and\ again\ to\ use\ it.=Press the button if you want to choose a team and use it again. Chorus\ Fruit=Shell E Frutave @@ -4670,8 +4675,8 @@ Blue\ Per\ Fess\ Inverted=The Blue Bar Is Upside Down Squid\ Spawn\ Egg=Squid Spawn Egg Potion\ of\ Luck=Drink Succes Illusioner\ prepares\ blindness=Illusioner the preparation of the glare -Are\ you\ sure\ you\ want\ to\ quit?=Are you sure to want to stop you? White\ Base\ Indented=White Base Indented +Are\ you\ sure\ you\ want\ to\ quit?=Are you sure to want to stop you? Elder\ Guardian\ dies=Senior Guard door Witch=Witch Yellow\ Base\ Gradient=Yellow Base, Tilt @@ -4679,14 +4684,14 @@ Light\ Gray\ Base\ Sinister\ Canton=Light Grey, Based On The Data Of The Canton White\ Chief\ Dexter\ Canton=Black-And-Feel Faster Too\ Expensive\!=It is Very Expensive\! Fish\ Caught=Fish -Unknown\ predicate\:\ %s=Known to be inter-related\: %s -Expires\ in\ %s\ days=This is the stuff %s days ago Panda=White +Expires\ in\ %s\ days=This is the stuff %s days ago +Unknown\ predicate\:\ %s=Known to be inter-related\: %s Cocoa=Cocoa Realms\ Notifications=Kogus Teated -Yellow\ Roundel=Yellow, Round -Language\ translations\ may\ not\ be\ 100%%\ accurate=The translation may not be 100%% exactly Keep\ Jigsaws\:\ =Puzzle\: +Language\ translations\ may\ not\ be\ 100%%\ accurate=The translation may not be 100%% exactly +Yellow\ Roundel=Yellow, Round Create\ realm=To create an empire Removed\ %s\ members\ from\ team\ %s=Remove %s the members of the team %s Current=Today @@ -4697,8 +4702,8 @@ Acquire\ Hardware=Hardware Overname Bucket=The kashik Crimson\ Trapdoor=Raspberry Luc Ender\ Dragon=The Ender Dragon -Awkward\ Splash\ Potion=Pevn\u00FD Splash Potion Warped\ Sign=Unreadable Characters +Awkward\ Splash\ Potion=Pevn\u00FD Splash Potion Black\ Bed=Kravet Crna %1$s\ was\ squashed\ by\ %2$s=%1$s it has been discontinued %2$s World\ border\ cannot\ be\ bigger\ than\ 60,000,000\ blocks\ wide=Svijet granice are not the men to be higher than that of the ukupno 60 000 000 blokova the \u0161iroku @@ -4710,14 +4715,14 @@ LAN\ World=LAN Svete Horse=The Bee\ buzzes\ happily=Happy buzzing of bees Silk\ Touch=Press Silk -Respawn\ Anchor\ sets\ spawn=The anchor is generated by sets of the spawn Nether\ Gold\ Ore=Invalid Ore +Respawn\ Anchor\ sets\ spawn=The anchor is generated by sets of the spawn Carrot\ on\ a\ Stick=Carrot and pictures Lingering\ Potion\ of\ Weakness=Constantly Broth For Slabost Executed\ %s\ commands\ from\ function\ '%s'=Death %s the function of the control '%s' -Music\ &\ Sound\ Options=The Music And Sound Options -Acacia\ Door=Some Of The Doors %1$s\ fell\ off\ some\ weeping\ vines=%1$s fell weeping on the vine +Acacia\ Door=Some Of The Doors +Music\ &\ Sound\ Options=The Music And Sound Options Birch\ Stairs=Birch Stairs Purple\ Thing=Purple Something Jungle\ Planks=The Jungle In The Community @@ -4727,8 +4732,8 @@ Splash\ Potion\ of\ Regeneration=The screen saver preview on google C418\ -\ blocks=C418 - blocks Nether\ Brick\ Slab=The Void, Brick, Table Brewing=Cook -Horse\ breathes=Their breath Unknown\ command\ or\ insufficient\ permissions=I don't know, for the will or for the lack of a right of access to +Horse\ breathes=Their breath Enable\ only\ works\ on\ trigger-objectives=As to activate it, only works in the drawing is the goal Black\ Pale\ Sinister=Black Pale Sinister Changes\ Not\ Saved=The Changes Will Not Be Saved @@ -4742,8 +4747,8 @@ Cod\ hurts=The heat Minecart\ with\ Chest=Minecart rinnassa Panda\ whimpers=The panda cries Dragon\ dies=Zmaj Umrah -Golden\ Carrot=The Golden Carrot Nothing\ changed.\ The\ player\ is\ not\ an\ operator=Nothing will change. The player operator +Golden\ Carrot=The Golden Carrot All\ players=Each player Yellow\ Base\ Sinister\ Canton=Yellow Base Sinister Canton Berries\ pop=Plodove pop @@ -4751,14 +4756,14 @@ Berries\ pop=Plodove pop Brown\ Base\ Sinister\ Canton=Brown Canton Sinister Base Authentication\ servers\ are\ down.\ Please\ try\ again\ later,\ sorry\!=On the servers, and then to the bottom. Please try again later, I'm so sorry\! Parrot\ grunts=Sam le parrot -Evoker\ prepares\ charming=Evoker prepares wonderful %1$s\ was\ slain\ by\ %2$s=%1$s he was killed %2$s +Evoker\ prepares\ charming=Evoker prepares wonderful Bat\ hurts=The Bat hurts Entities\ on\ team=Operators in the team Save\ mode\ -\ write\ to\ file=Saving Mode d' - the file to write No\ schedules\ with\ id\ %s=No graphics id %s -Minigames=Mini-games Games\ Quit=During The Game +Minigames=Mini-games Awkward\ Potion=Strange Potion Gray\ Bend\ Sinister=Boz G\u00F6z Sinister Honey\ Block=Honey, A Block Of @@ -4766,14 +4771,14 @@ Customized\ worlds\ are\ no\ longer\ supported=The world is no longer supported Realms\ Terms\ of\ Service=Rules for the use of Brew\ a\ potion=To prepare a drink Advancements=Progress -Invalid\ name\ or\ UUID=Non-valid name or UUID All\ entities=All units in +Invalid\ name\ or\ UUID=Non-valid name or UUID Get\ a\ trial\!=To obtain the court\! Kelp=Polishing Polished\ Blackstone\ Brick\ Slab=Polish Merchant-Brick Block Player\ teleports=Now the player -Minigame\:=The game\: Husk\ converts\ to\ Zombie=Shell turn you into a zombie +Minigame\:=The game\: Light\ Gray\ Shield=The Light Gray Shield Yellow\ Banner=Yellow Verbose\ Logging=Detailed Records @@ -4791,10 +4796,10 @@ Ocean=The sea Level\ shouldn't\ be\ negative=The level must be non-negative Pink\ Shield=The Shield Of The Rose Attack\ Knockback=Drop Aanvallen -Safe\ Mode=In The Safe Mode Set\ Console\ Command\ for\ Block=To configure the shell to the interior -Invalid\ session\ (Try\ restarting\ your\ game\ and\ the\ launcher)=It is not allowed for the session (try restarting the game and launcher) +Safe\ Mode=In The Safe Mode Do\ you\ want\ to\ add\ following\ packs\ to\ Minecraft?=Tem certainty that deseja add as the following pacotes Minecraft? +Invalid\ session\ (Try\ restarting\ your\ game\ and\ the\ launcher)=It is not allowed for the session (try restarting the game and launcher) Husk=The skin of the Resetting\ world...=Delete the world... Hello,\ world\!=Hola, m\u00F3n\! @@ -4802,17 +4807,17 @@ Vindicator\ Spawn\ Egg=Vindicator Eggs, Caviar Dark\ Oak\ Door=Dark Oak Doors Stopped\ sound\ '%s'\ on\ source\ '%s'=In order to stop the vote%ssource%s' Fox\ bites=Fox bite -Deal\ fire\ damage=Damage from the fire. Arrow\ of\ Luck=OK, good luck +Deal\ fire\ damage=Damage from the fire. Endermite=In endermit -Temples=The church Web\ Links=Links +Temples=The church Splash\ Potion\ of\ Water\ Breathing=Splash Potion Of Water Breathing Cobblestone\ Wall=Cobblestone \u0405\u0438\u0434 -Lime\ Field\ Masoned=Var Oblastta On Masoned Farmland=The country -Added\ tag\ '%s'\ to\ %s=Add a bookmark%s"a %s +Lime\ Field\ Masoned=Var Oblastta On Masoned Magenta\ Pale\ Dexter=The Purple, Delicate-As Soon As Possible +Added\ tag\ '%s'\ to\ %s=Add a bookmark%s"a %s Zombie\ Wall\ Head=The Zombie's Head Into The Wall Small\ Fireball=A Small Ball Of Fire Show\ invisible\ blocks\:=To show the hidden blocks\: @@ -4821,25 +4826,25 @@ Biome\ Size=Here, The Size Scanning\ for\ games\ on\ your\ local\ network=Are you in search of game, LAN Totem\ activates=Totem of nature Bowl=Glass -Keep\ inventory\ after\ death=You keep your inventory after death Value\ of\ modifier\ %s\ on\ attribute\ %s\ for\ entity\ %s\ is\ %s=The modifier value is %s attribute %s device %s ji %s +Keep\ inventory\ after\ death=You keep your inventory after death End\ Crystal=At The End Of The Crystal Oak\ Wall\ Sign=Oak Wall Merkki Raw\ Cod=Raaka-Cod -Feed\ us\ data\!=Fed the information\! World\ backups=World copy +Feed\ us\ data\!=Fed the information\! Yellow\ Tang=Yellow Could\ not\ find\ a\ biome\ of\ type\ "%s"\ within\ reasonable\ distance=I can't find the type of \u0431\u0438\u043E\u043C\u0430 "%swithin a reasonable distance Green\ Pale\ Dexter=Green Pale Dexter -Deep\ Ocean=Deep Ocean -You\ cannot\ trigger\ this\ objective\ yet=No, no, no, you can run this mission The\ Killer\ Bunny=The Killer Bunny -Blue\ Concrete\ Powder=Children Of The Concrete Into Dust +You\ cannot\ trigger\ this\ objective\ yet=No, no, no, you can run this mission +Deep\ Ocean=Deep Ocean Block\ placed=The block is attached to -Bucket\ of\ Salmon=Tbsp, Laks +Blue\ Concrete\ Powder=Children Of The Concrete Into Dust Dungeon\ Count=In The Dungeon Of The Count -Ride\ a\ Strider\ with\ a\ Warped\ Fungus\ on\ a\ Stick=Travel Strider, who Perverted the mushrooms to the notice of the +Bucket\ of\ Salmon=Tbsp, Laks Height=Height +Ride\ a\ Strider\ with\ a\ Warped\ Fungus\ on\ a\ Stick=Travel Strider, who Perverted the mushrooms to the notice of the Damage\ Absorbed=The Damage Is Absorbed Vex\ dies=Vex d\u00F8 Coordinate\ Scale=Coordinate In The Volume @@ -4851,8 +4856,8 @@ Great\ View\ From\ Up\ Here=This Is A Very Beautiful Landscape Back\ to\ Game=To get back in the game Crimson\ Button=Dark Red Button ... `=` -Red\ Nether\ Brick\ Stairs=Red Nether Brick, Wooden Stairs ]=] +Red\ Nether\ Brick\ Stairs=Red Nether Brick, Wooden Stairs \\=\\ [=[ X=X @@ -4860,29 +4865,29 @@ V=V Trader's\ next\ level=Next level trader Fast\ graphics\ reduces\ the\ amount\ of\ visible\ rain\ and\ snow.\nTransparency\ effects\ are\ disabled\ for\ various\ blocks\ such\ as\ tree-leaves.=Fast graphics, it reduces the size of the sum shows up in rain and snow.\nTransparency-effect disable various blocks, for example, the leaves of the trees. Have\ every\ effect\ applied\ at\ the\ same\ time=There, the whole effect, applied, at the same time -Piglin\ Spawn\ Egg=Piglin, Add The Eggs I=I +Piglin\ Spawn\ Egg=Piglin, Add The Eggs Sweeping\ Edge=The Beautiful Border Purple\ Cross=The Purple Kors Oak\ Leaves=The leaves of the oak tree \==\= ;=; Fox\ eats=The fox has to eat it -Birch\ Planks=Bedoll Consells Reset\ to\ Default=Kuidas reset default, +Birch\ Planks=Bedoll Consells Heart\ of\ the\ Sea=In the middle of the sea What\ is\ Realms?=The fact that he was at the top. -Shrinking\ the\ world\ border\ to\ %s\ blocks\ wide\ over\ %s\ seconds=The fall of the world border %s the blocks %s seconds Cyan\ Field\ Masoned=Blue Boxes Have Been Replaced With Brick Underground -Anemone=The SAS +Shrinking\ the\ world\ border\ to\ %s\ blocks\ wide\ over\ %s\ seconds=The fall of the world border %s the blocks %s seconds /=/ -.=. +Anemone=The SAS You\ must\ enter\ a\ name\!=You must enter a name\! +.=. -=- ,=, -Rollable=Instagram -World\ options=The world's choice Elder\ Guardian\ moans=Father, Guardian, moans +World\ options=The world's choice +Rollable=Instagram '=' Scroll\ Sensitivity=The Sensitivity Of The Weight Picked\ Up=I took the diff --git a/src/main/resources/translater.mixins.json b/src/main/resources/translater.mixins.json index a61ff1c..638b5d4 100644 --- a/src/main/resources/translater.mixins.json +++ b/src/main/resources/translater.mixins.json @@ -5,8 +5,8 @@ "compatibilityLevel": "JAVA_8", "client": [ "MixinLanguage", - "MixinSplashScreen", - "MixinMinecraftClient" + "MixinMinecraftClient", + "MixinSplashScreen" ], "injectors": { "defaultRequire": 1