Skip to content

Commit

Permalink
fix fire sides
Browse files Browse the repository at this point in the history
  • Loading branch information
Badtz committed Oct 14, 2023
1 parent 0bd9e79 commit e2d5bc1
Show file tree
Hide file tree
Showing 26 changed files with 324 additions and 409 deletions.
227 changes: 217 additions & 10 deletions src/main/resources/assets/bone/blockstates/bone_fire.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,43 @@
},
{
"when": {
"type": "aegir"
"type": "jord"
},
"apply": [
{
"model": "bone:block/aegir_fire_floor0"
"model": "bone:block/jord_fire_side0"
},
{
"model": "bone:block/aegir_fire_floor1"
"model": "bone:block/jord_fire_side1"
},
{
"model": "bone:block/jord_fire_side_alt0"
},
{
"model": "bone:block/jord_fire_side_alt1"
}
]
},
{
"when": {
"type": "stjarna"
"type": "jord"
},
"apply": [
{
"model": "bone:block/stjarna_fire_floor0"
"model": "bone:block/jord_fire_side0",
"y": 90
},
{
"model": "bone:block/stjarna_fire_floor1"
"model": "bone:block/jord_fire_side1",
"y": 90
},
{
"model": "bone:block/jord_fire_side_alt0",
"y": 90
},
{
"model": "bone:block/jord_fire_side_alt1",
"y": 90
}
]
},
Expand All @@ -45,16 +61,56 @@
},
"apply": [
{
"model": "bone:block/jord_fire_side0"
"model": "bone:block/jord_fire_side0",
"y": 180
},
{
"model": "bone:block/jord_fire_side1"
"model": "bone:block/jord_fire_side1",
"y": 180
},
{
"model": "bone:block/jord_fire_side_alt0"
"model": "bone:block/jord_fire_side_alt0",
"y": 180
},
{
"model": "bone:block/jord_fire_side_alt1"
"model": "bone:block/jord_fire_side_alt1",
"y": 180
}
]
},
{
"when": {
"type": "jord"
},
"apply": [
{
"model": "bone:block/jord_fire_side0",
"y": 270
},
{
"model": "bone:block/jord_fire_side1",
"y": 270
},
{
"model": "bone:block/jord_fire_side_alt0",
"y": 270
},
{
"model": "bone:block/jord_fire_side_alt1",
"y": 270
}
]
},
{
"when": {
"type": "aegir"
},
"apply": [
{
"model": "bone:block/aegir_fire_floor0"
},
{
"model": "bone:block/aegir_fire_floor1"
}
]
},
Expand All @@ -77,6 +133,88 @@
}
]
},
{
"when": {
"type": "aegir"
},
"apply": [
{
"model": "bone:block/aegir_fire_side0",
"y": 90
},
{
"model": "bone:block/aegir_fire_side1",
"y": 90
},
{
"model": "bone:block/aegir_fire_side_alt0",
"y": 90
},
{
"model": "bone:block/aegir_fire_side_alt1",
"y": 90
}
]
},
{
"when": {
"type": "aegir"
},
"apply": [
{
"model": "bone:block/aegir_fire_side0",
"y": 180
},
{
"model": "bone:block/aegir_fire_side1",
"y": 180
},
{
"model": "bone:block/aegir_fire_side_alt0",
"y": 180
},
{
"model": "bone:block/aegir_fire_side_alt1",
"y": 180
}
]
},
{
"when": {
"type": "aegir"
},
"apply": [
{
"model": "bone:block/aegir_fire_side0",
"y": 270
},
{
"model": "bone:block/aegir_fire_side1",
"y": 270
},
{
"model": "bone:block/aegir_fire_side_alt0",
"y": 270
},
{
"model": "bone:block/aegir_fire_side_alt1",
"y": 270
}
]
},
{
"when": {
"type": "stjarna"
},
"apply": [
{
"model": "bone:block/stjarna_fire_floor0"
},
{
"model": "bone:block/stjarna_fire_floor1"
}
]
},
{
"when": {
"type": "stjarna"
Expand All @@ -95,6 +233,75 @@
"model": "bone:block/stjarna_fire_side_alt1"
}
]
},
{
"when": {
"type": "stjarna"
},
"apply": [
{
"model": "bone:block/stjarna_fire_side0",
"y": 90
},
{
"model": "bone:block/stjarna_fire_side1",
"y": 90
},
{
"model": "bone:block/stjarna_fire_side_alt0",
"y": 90
},
{
"model": "bone:block/stjarna_fire_side_alt1",
"y": 90
}
]
},
{
"when": {
"type": "stjarna"
},
"apply": [
{
"model": "bone:block/stjarna_fire_side0",
"y": 180
},
{
"model": "bone:block/stjarna_fire_side1",
"y": 180
},
{
"model": "bone:block/stjarna_fire_side_alt0",
"y": 180
},
{
"model": "bone:block/stjarna_fire_side_alt1",
"y": 180
}
]
},
{
"when": {
"type": "stjarna"
},
"apply": [
{
"model": "bone:block/stjarna_fire_side0",
"y": 270
},
{
"model": "bone:block/stjarna_fire_side1",
"y": 270
},
{
"model": "bone:block/stjarna_fire_side_alt0",
"y": 270
},
{
"model": "bone:block/stjarna_fire_side_alt1",
"y": 270
}
]
}
]
}
4 changes: 4 additions & 0 deletions src/main/resources/assets/bone/lang/en_us.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"block.bone.bone_forge": "Bone Forge",
"block.bone.bone_fire": "Bone Fire",
"block.bone.bone_fire.type=jord": "Jord Fire",
"block.bone.bone_fire.type=aegir": "Aegir Fire",
"block.bone.bone_fire.type=stjarna": "Stjarna Fire",
"item.bone.amethyst_dust": "Amethyst Dust",
"item.bone.lapis_dust": "Lapis Dust",
"item.bone.diamond_dust": "Diamond Dust",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/aegir_fire_floor0.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_floor",
"parent": "minecraft:block/template_fire_floor",
"textures": {
"fire": "bone:block/aegir_fire_0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/aegir_fire_floor1.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_floor",
"parent": "minecraft:block/template_fire_floor",
"textures": {
"fire": "bone:block/aegir_fire_1"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/aegir_fire_side0.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_side",
"parent": "minecraft:block/template_fire_side",
"textures": {
"fire": "bone:block/aegir_fire_0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/aegir_fire_side1.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_side",
"parent": "minecraft:block/template_fire_side",
"textures": {
"fire": "bone:block/aegir_fire_1"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/aegir_fire_side_alt0.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_side_alt",
"parent": "minecraft:block/template_fire_side_alt",
"textures": {
"fire": "bone:block/aegir_fire_0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/aegir_fire_side_alt1.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_side_alt",
"parent": "minecraft:block/template_fire_side_alt",
"textures": {
"fire": "bone:block/aegir_fire_1"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/jord_fire_floor0.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_floor",
"parent": "minecraft:block/template_fire_floor",
"textures": {
"fire": "bone:block/jord_fire_0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/jord_fire_floor1.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_floor",
"parent": "minecraft:block/template_fire_floor",
"textures": {
"fire": "bone:block/jord_fire_1"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/jord_fire_side0.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_side",
"parent": "minecraft:block/template_fire_side",
"textures": {
"fire": "bone:block/jord_fire_0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/jord_fire_side1.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_side",
"parent": "minecraft:block/template_fire_side",
"textures": {
"fire": "bone:block/jord_fire_1"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/jord_fire_side_alt0.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_side_alt",
"parent": "minecraft:block/template_fire_side_alt",
"textures": {
"fire": "bone:block/jord_fire_0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/jord_fire_side_alt1.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_side_alt",
"parent": "minecraft:block/template_fire_side_alt",
"textures": {
"fire": "bone:block/jord_fire_1"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/stjarna_fire_floor0.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_floor",
"parent": "minecraft:block/template_fire_floor",
"textures": {
"fire": "bone:block/stjarna_fire_0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/stjarna_fire_floor1.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_floor",
"parent": "minecraft:block/template_fire_floor",
"textures": {
"fire": "bone:block/stjarna_fire_1"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/stjarna_fire_side0.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_side",
"parent": "minecraft:block/template_fire_side",
"textures": {
"fire": "bone:block/stjarna_fire_0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/bone/models/block/stjarna_fire_side1.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "bone:block/template_fire_side",
"parent": "minecraft:block/template_fire_side",
"textures": {
"fire": "bone:block/stjarna_fire_1"
}
Expand Down
Loading

0 comments on commit e2d5bc1

Please sign in to comment.