R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.18 into 1.19.2

Browse Source
This commit is contained in:
embeddedt 2023-07-03 14:58:44 -04:00
commit 0f90f53f53
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/main/resources/assets/modernfix/lang/zh_tw.json Normal file
View File

@ -0,0 +1,13 @@
{
"key.modernfix": "ModernFix",
"key.modernfix.config": "開啟設定介面",
"modernfix.jei_load": "正在載入 JEI，這可能需要一點時間",
"modernfix.no_lazydfu": "沒有安裝 LazyDFU。如果 Minecraft 需要從舊版本更新遊戲資料，可能會出現明顯的延遲。",
"modernfix.config": "ModernFix 注入設定",
"modernfix.config.done_restart": "完成（需要重新啟動遊戲）",
"modernfix.option.on": "開啟",
"modernfix.option.off": "關閉",
"modernfix.config.not_default": "（已修改）",
"asynclocator.map.locating": "地圖（定位中...）",
"asynclocator.map.none": "地圖（未找到附近的特徵）"
}

2
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/LootTableManagerMixin.java
View File

@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(LootTables.class) @Mixin(LootTables.class)
public class LootTableManagerMixin { public class LootTableManagerMixin {
@Redirect(method = "*(Lnet/minecraft/server/packs/resources/ResourceManager;Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/resources/ResourceLocation;Lcom/google/gson/JsonElement;)V", @Redirect(method = "*(Lnet/minecraft/server/packs/resources/ResourceManager;Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/resources/ResourceLocation;Lcom/google/gson/JsonElement;)V",
at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false)) at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false), require = 0)
private void logWithoutStacktrace(Logger instance, String s, Object location, Object exc) { private void logWithoutStacktrace(Logger instance, String s, Object location, Object exc) {
instance.error(s + ": {}", location, exc.toString()); instance.error(s + ": {}", location, exc.toString());
} }

2
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java
View File

@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(RecipeManager.class) @Mixin(RecipeManager.class)
public class RecipeManagerMixin { public class RecipeManagerMixin {
@Redirect(method = "apply(Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false)) @Redirect(method = "apply(Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false), require = 0)
private void silenceException(Logger instance, String s, Object location, Object exc) { private void silenceException(Logger instance, String s, Object location, Object exc) {
instance.error(s + ": {}", location, exc.toString()); instance.error(s + ": {}", location, exc.toString());
} }