Skip to content

Commit

Permalink
Fixes for language file
Browse files Browse the repository at this point in the history
- Move Oak Crafting Table override to Pyrite lang file
- Integration with Item Descriptions
- Disable Signs for hotfix release
  • Loading branch information
cassiancc committed Aug 27, 2024
1 parent 754f74d commit 30c4cba
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public static void createWoodSet(String blockID, MapColor color, int blockLux, S
//Crafting Tables
createPyriteBlock( blockID+"_crafting_table", "crafting", Blocks.CRAFTING_TABLE, color, blockLux, platform);
createPyriteBlock( blockID+"_ladder", "ladder", Blocks.LADDER, color, blockLux, platform);
createPyriteBlock(blockID+"_sign", "sign", Blocks.OAK_SIGN, color, blockLux, GENERATED_SET, GENERATED_TYPE, platform);
// createPyriteBlock(blockID+"_sign", "sign", Blocks.OAK_SIGN, color, blockLux, GENERATED_SET, GENERATED_TYPE, platform);



Expand Down
1 change: 0 additions & 1 deletion common/src/main/resources/assets/minecraft/lang/en_us.json

This file was deleted.

31 changes: 31 additions & 0 deletions common/src/main/resources/assets/pyrite/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,35 @@
{
"lore.pyrite.rose": "This red flower makes you think of the past.",
"lore.pyrite.orange_rose": "This blue flower makes you think of the past.",
"lore.pyrite.white_rose": "This blue flower makes you think of the past.",
"lore.pyrite.pink_rose": "This blue flower makes you think of the past.",
"lore.pyrite.blue_rose": "This blue flower makes you think of the past.",
"lore.pyrite.charred_nether_bricks": "A decorative block adding a shadowy accent to your Nether Bricks.",
"lore.pyrite.blue_nether_bricks": "A decorative block adding a pop of blue to your Nether Bricks.",
"lore.pyrite.glowing_obsidian": "This block might have once had a purpose, but now just serves as a light source.",
"lore.pyrite.nostalgia_glowing_obsidian": "This block might have once had a purpose, but now just serves as a light source.",
"lore.pyrite.locked_chest": "This block might have once had a purpose, but now just serves as a light source.",
"lore.pyrite.nostalgia_cobblestone": "Just looking at this block's dramatic cracks brings back memories.",
"lore.pyrite.nostalgia_mossy_cobblestone": "Just looking at this block's dramatic cracks brings back memories.",
"lore.pyrite.nostalgia_netherrack": "Just looking at this block's strange texture brings back memories.",
"lore.pyrite.nostalgia_gravel": "Just looking at this block's messy texture brings back memories.",
"lore.pyrite.nostalgia_iron_block": "Just looking at this block's shiny texture brings back memories.",
"lore.pyrite.nostalgia_gold_block": "Just looking at this block's shiny texture brings back memories.",
"lore.pyrite.nostalgia_diamond_block": "Just looking at this block's shiny texture brings back memories.",
"lore.pyrite.nostalgia_emerald_block": "Just looking at this block's chiseled texture brings back memories.",
"lore.pyrite.nostalgia_redstone_block": "Just looking at this block's darker texture brings back memories.",
"lore.pyrite.nostalgia_netherite_block": "Just looking at this block's shiny texture makes you wonder what might have been.",
"lore.pyrite.nostalgia_copper_block": "Just looking at this block's shiny texture makes you wonder what might have been.",
"lore.pyrite.nostalgia_exposed_copper_block": "Just looking at this block's shiny texture makes you wonder what might have been.",
"lore.pyrite.nostalgia_weathered_copper_block": "Just looking at this block's shiny texture makes you wonder what might have been.",
"lore.pyrite.nostalgia_oxidized_copper_block": "Just looking at this block's shiny texture makes you wonder what might have been.",
"lore.pyrite.nostalgia_amethyst_block": "Just looking at this block's shiny texture makes you wonder what might have been.",
"lore.pyrite.nostalgia_lapis_block": "Just looking at this block's smooth texture brings back memories.",
"lore.pyrite.nostalgia_bricks": "Just looking at this block's bright texture brings back memories.",
"lore.pyrite.lit_redstone_lamp": "This block resembles a Redstone Lamp, but is permanently powered thanks to the Redstone Torch inside.",
"lore.pyrite.cobblestone_bricks": "This brick block is great for both early and late game builds.",
"lore.pyrite.smooth_stone_bricks": "A variant of Smooth Stone that has been carved into bricks. ",
"block.minecraft.crafting_table": "Oak Crafting Table",
"block.pyrite.acacia_crafting_table": "Acacia Crafting Table",
"block.pyrite.amethyst_bars": "Amethyst Bars",
"block.pyrite.amethyst_bricks": "Amethyst Bricks",
Expand Down
30 changes: 30 additions & 0 deletions common/src/main/resources/data/c/tags/items/lamps.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"replace": false,
"values": [
"pyrite:white_lamp",
"pyrite:orange_lamp",
"pyrite:magenta_lamp",
"pyrite:light_blue_lamp",
"pyrite:yellow_lamp",
"pyrite:lime_lamp",
"pyrite:pink_lamp",
"pyrite:gray_lamp",
"pyrite:light_gray_lamp",
"pyrite:cyan_lamp",
"pyrite:purple_lamp",
"pyrite:blue_lamp",
"pyrite:brown_lamp",
"pyrite:green_lamp",
"pyrite:red_lamp",
"pyrite:black_lamp",
"pyrite:glow_lamp",
"pyrite:dragon_lamp",
"pyrite:star_lamp",
"pyrite:honey_lamp",
"pyrite:nostalgia_lamp",
"pyrite:rose_lamp",
"pyrite:poisonous_lamp"

]
}

0 comments on commit 30c4cba

Please sign in to comment.