From 66fc847c8f029464f1957c5b81f773cf09fbd6c3 Mon Sep 17 00:00:00 2001 From: Caedis Date: Sat, 6 Jul 2024 13:17:01 -0500 Subject: [PATCH 1/2] Revert TFPlanks to TFPlank + remap --- src/main/java/twilightforest/TwilightForestMod.java | 4 +--- src/main/java/twilightforest/block/TFBlocks.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/twilightforest/TwilightForestMod.java b/src/main/java/twilightforest/TwilightForestMod.java index 3b8fa16655..b69c1159dd 100644 --- a/src/main/java/twilightforest/TwilightForestMod.java +++ b/src/main/java/twilightforest/TwilightForestMod.java @@ -400,14 +400,12 @@ public void startServer(FMLServerStartingEvent event) { @EventHandler public void missingMappings(FMLMissingMappingsEvent event) { for (FMLMissingMappingsEvent.MissingMapping mapping : event.get()) { - if (mapping.name.equals("TwilightForest:tile.TFPlank")) { + if (mapping.name.equals("TwilightForest:tile.TFPlanks")) { if (mapping.type == GameRegistry.Type.BLOCK) { mapping.remap(TFBlocks.planks); } else if (mapping.type == GameRegistry.Type.ITEM) { mapping.remap(Item.getItemFromBlock(TFBlocks.planks)); } - } else { - FMLLog.fine("missing mapping?: %s - %s", mapping.name, mapping.id); } } } diff --git a/src/main/java/twilightforest/block/TFBlocks.java b/src/main/java/twilightforest/block/TFBlocks.java index 128df76f63..a2fde8dbaf 100644 --- a/src/main/java/twilightforest/block/TFBlocks.java +++ b/src/main/java/twilightforest/block/TFBlocks.java @@ -145,7 +145,7 @@ public class TFBlocks { public static void registerBlocks() { log = (new BlockTFLog()).setBlockName("TFLog"); - planks = (new BlockTFWood()).setBlockName("TFPlanks"); + planks = (new BlockTFWood()).setBlockName("TFPlank"); doubleWoodenSlab = new BlockTFWoodSlab(true).setBlockName("TFWoodSlabDouble"); woodenSlab = new BlockTFWoodSlab(false).setBlockName("TFWoodSlab"); woodenStairsTwilight = (new BlockTFWoodStairs(0)).setBlockName("TFWoodStairsTwilight"); From 98e08bb6b221f29016cf7994c7e761e130be039d Mon Sep 17 00:00:00 2001 From: Caedis Date: Sat, 6 Jul 2024 13:35:13 -0500 Subject: [PATCH 2/2] update lang files --- .../assets/twilightforest/lang/en_US.lang | 16 ++++++++-------- .../assets/twilightforest/lang/ru_RU.lang | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/resources/assets/twilightforest/lang/en_US.lang b/src/main/resources/assets/twilightforest/lang/en_US.lang index c6e1facd4f..f3e05e87eb 100644 --- a/src/main/resources/assets/twilightforest/lang/en_US.lang +++ b/src/main/resources/assets/twilightforest/lang/en_US.lang @@ -11,14 +11,14 @@ tile.TFLog.8.name=Twilight Oak Wood tile.TFLog.9.name=Canopy Tree Wood tile.TFLog.10.name=Mangrove Wood tile.TFLog.11.name=Darkwood Wood -tile.TFPlanks.0.name=Twilight Oak Planks -tile.TFPlanks.1.name=Canopy Tree Planks -tile.TFPlanks.2.name=Mangrove Planks -tile.TFPlanks.3.name=Darkwood Planks -tile.TFPlanks.4.name=Timewood Planks -tile.TFPlanks.5.name=Transwood Planks -tile.TFPlanks.6.name=Minewood Planks -tile.TFPlanks.7.name=Sortingwood Planks +tile.TFPlank.0.name=Twilight Oak Planks +tile.TFPlank.1.name=Canopy Tree Planks +tile.TFPlank.2.name=Mangrove Planks +tile.TFPlank.3.name=Darkwood Planks +tile.TFPlank.4.name=Timewood Planks +tile.TFPlank.5.name=Transwood Planks +tile.TFPlank.6.name=Minewood Planks +tile.TFPlank.7.name=Sortingwood Planks tile.TFWoodSlab.0.name=Twilight Oak Slab tile.TFWoodSlab.1.name=Canopy Tree Slab tile.TFWoodSlab.2.name=Mangrove Slab diff --git a/src/main/resources/assets/twilightforest/lang/ru_RU.lang b/src/main/resources/assets/twilightforest/lang/ru_RU.lang index ac90302557..d0fd99ad70 100644 --- a/src/main/resources/assets/twilightforest/lang/ru_RU.lang +++ b/src/main/resources/assets/twilightforest/lang/ru_RU.lang @@ -11,14 +11,14 @@ tile.TFLog.8.name=Сумеречный дуб tile.TFLog.9.name=Сумеречная сосна tile.TFLog.10.name=Мангровое дерево tile.TFLog.11.name=Тёмное дерево -tile.TFPlanks.0.name=Доски из сумеречного дуба -tile.TFPlanks.1.name=Доски из сумеречной сосны -tile.TFPlanks.2.name=Мангровые доски -tile.TFPlanks.3.name=Доски из тёмного дерева -tile.TFPlanks.4.name=Доски из дерева времени -tile.TFPlanks.5.name=Доски из дерева трансформации -tile.TFPlanks.6.name=Доски из дерева шахтёра -tile.TFPlanks.7.name=Доски из дерева сортировки +tile.TFPlank.0.name=Доски из сумеречного дуба +tile.TFPlank.1.name=Доски из сумеречной сосны +tile.TFPlank.2.name=Мангровые доски +tile.TFPlank.3.name=Доски из тёмного дерева +tile.TFPlank.4.name=Доски из дерева времени +tile.TFPlank.5.name=Доски из дерева трансформации +tile.TFPlank.6.name=Доски из дерева шахтёра +tile.TFPlank.7.name=Доски из дерева сортировки tile.TFWoodSlab.0.name=Плита из сумеречного дуба tile.TFWoodSlab.1.name=Плита из сумеречной сосны tile.TFWoodSlab.2.name=Мангровая плита