Skip to content

Commit

Permalink
Lit Redstone Lamps
Browse files Browse the repository at this point in the history
  • Loading branch information
cassiancc committed May 29, 2024
1 parent d280720 commit 0bcedf6
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 1 deletion.
2 changes: 1 addition & 1 deletion common/src/main/java/cc/cassian/pyrite/Pyrite.java
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ public static void init() {
//Resource Blocks
generateResourceBlocks();
//Lamps
createPyriteBlock("lit_redstone_lamp","block", 0.3f, MapColor.ORANGE, 15);
createPyriteBlock("lit_redstone_lamp", "block", Blocks.REDSTONE_LAMP, 15);
createPyriteBlock("glowstone_lamp","block", 0.3f, MapColor.YELLOW, 15);
//Classic Features
createPyriteBlock("glowing_obsidian","obsidian", 50f, MapColor.RED, 15);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minecraft:block/redstone_lamp_on"
}
}
}
1 change: 1 addition & 0 deletions common/src/main/resources/assets/pyrite/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@
"block.pyrite.star_stained_door": "Star Stained Door",
"block.pyrite.honey_stained_door": "Honey Stained Door",
"block.pyrite.nostalgia_stained_door": "Nostalgia Stained Door",
"block.pyrite.lit_redstone_lamp": "Lit Redstone Lamp",
"block.pyrite.white_lamp": "White Lamp",
"block.pyrite.orange_lamp": "Orange Lamp",
"block.pyrite.magenta_lamp": "Magenta Lamp",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "minecraft:block/redstone_lamp_on"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "pyrite:lit_redstone_lamp"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"C",
"D"
],
"key": {
"C": {
"item": "minecraft:redstone_lamp"
},
"D": {
"item": "minecraft:redstone_torch"
}
},
"result": {
"item": "pyrite:lit_redstone_lamp",
"id": "pyrite:lit_redstone_lamp",
"count": 1
}
}

0 comments on commit 0bcedf6

Please sign in to comment.