Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert TFPlanks to TFPlank + remap #82

Merged
merged 2 commits into from
Jul 6, 2024
Merged

Revert TFPlanks to TFPlank + remap #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66fc847
Revert TFPlanks to TFPlank + remap
Caedis Jul 6, 2024
98e08bb
update lang files
Caedis Jul 6, 2024
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
4 changes: 1 addition & 3 deletions src/main/java/twilightforest/TwilightForestMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/twilightforest/block/TFBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
16 changes: 8 additions & 8 deletions src/main/resources/assets/twilightforest/lang/en_US.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/main/resources/assets/twilightforest/lang/ru_RU.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=Мангровая плита
Expand Down