Skip to content

Commit 2eff875

Browse files
cakeGitcakeGit
committed
Log by bulb z fighting fix
1 parent 342052b commit 2eff875

5 files changed

Lines changed: 29 additions & 35 deletions

File tree

‎src/main/resources/assets/bits_n_bobs/models/block/lightbulb/lightbulb.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
"east": {"uv": [6, 0, 10, 4.5], "texture": "#1"},
6767
"south": {"uv": [6, 0, 10, 4.5], "texture": "#1"},
6868
"west": {"uv": [6, 0, 10, 4.5], "texture": "#1"},
69-
"up": {"uv": [6, 0, 10, 4], "texture": "#1"},
70-
"down": {"uv": [6, 0, 10, 4], "texture": "#1"}
69+
"up": {"uv": [10, 0, 14, 4], "texture": "#1"},
70+
"down": {"uv": [10, 4, 14, 8], "texture": "#1"}
7171
}
7272
},
7373
{
@@ -79,8 +79,8 @@
7979
"east": {"uv": [6, 4.5, 10, 0], "texture": "#1"},
8080
"south": {"uv": [6, 4.5, 10, 0], "texture": "#1"},
8181
"west": {"uv": [6, 4.5, 10, 0], "texture": "#1"},
82-
"up": {"uv": [10, 0, 6, 4], "texture": "#1"},
83-
"down": {"uv": [10, 0, 6, 4], "texture": "#1"}
82+
"up": {"uv": [14, 4, 10, 8], "texture": "#1"},
83+
"down": {"uv": [14, 0, 10, 4], "texture": "#1"}
8484
}
8585
}
8686
],

‎src/main/resources/assets/bits_n_bobs/models/block/lightbulb/lightbulb_on.json‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"credit": "Made with Blockbench",
44
"texture_size": [32, 32],
55
"textures": {
6-
"1": "bits_n_bobs:block/lightbulb_on",
76
"2": "bits_n_bobs:block/lightbulb_on",
87
"particle": "bits_n_bobs:block/lightbulb_on"
98
},
@@ -13,12 +12,12 @@
1312
"from": [5, 5, 5],
1413
"to": [11, 13, 11],
1514
"faces": {
16-
"north": {"uv": [0, 0, 3, 4], "texture": "#1"},
17-
"east": {"uv": [0, 0, 3, 4], "texture": "#1"},
18-
"south": {"uv": [0, 0, 3, 4], "texture": "#1"},
19-
"west": {"uv": [0, 0, 3, 4], "texture": "#1"},
20-
"up": {"uv": [6, 3, 3, 0], "texture": "#1"},
21-
"down": {"uv": [6, 0, 3, 3], "texture": "#1"}
15+
"north": {"uv": [0, 0, 3, 4], "texture": "#2"},
16+
"east": {"uv": [0, 0, 3, 4], "texture": "#2"},
17+
"south": {"uv": [0, 0, 3, 4], "texture": "#2"},
18+
"west": {"uv": [0, 0, 3, 4], "texture": "#2"},
19+
"up": {"uv": [6, 3, 3, 0], "texture": "#2"},
20+
"down": {"uv": [6, 0, 3, 3], "texture": "#2"}
2221
}
2322
},
2423
{
@@ -62,29 +61,28 @@
6261
"from": [4, 5, 4],
6362
"to": [12, 14, 12],
6463
"faces": {
65-
"north": {"uv": [6, 0, 10, 4.5], "texture": "#1"},
66-
"east": {"uv": [6, 0, 10, 4.5], "texture": "#1"},
67-
"south": {"uv": [6, 0, 10, 4.5], "texture": "#1"},
68-
"west": {"uv": [6, 0, 10, 4.5], "texture": "#1"},
69-
"up": {"uv": [6, 0, 10, 4], "texture": "#1"},
70-
"down": {"uv": [6, 0, 10, 4], "texture": "#1"}
64+
"north": {"uv": [6, 0, 10, 4.5], "texture": "#2"},
65+
"east": {"uv": [6, 0, 10, 4.5], "texture": "#2"},
66+
"south": {"uv": [6, 0, 10, 4.5], "texture": "#2"},
67+
"west": {"uv": [6, 0, 10, 4.5], "texture": "#2"},
68+
"up": {"uv": [10, 0, 14, 4], "texture": "#2"},
69+
"down": {"uv": [10, 4, 14, 8], "texture": "#2"}
7170
}
7271
},
7372
{
7473
"name": "cage inverted",
7574
"from": [12, 14, 12],
7675
"to": [4, 5, 4],
7776
"faces": {
78-
"north": {"uv": [6, 4.5, 10, 0], "texture": "#1"},
79-
"east": {"uv": [6, 4.5, 10, 0], "texture": "#1"},
80-
"south": {"uv": [6, 4.5, 10, 0], "texture": "#1"},
81-
"west": {"uv": [6, 4.5, 10, 0], "texture": "#1"},
82-
"up": {"uv": [10, 0, 6, 4], "texture": "#1"},
83-
"down": {"uv": [10, 0, 6, 4], "texture": "#1"}
77+
"north": {"uv": [6, 4.5, 10, 0], "texture": "#2"},
78+
"east": {"uv": [6, 4.5, 10, 0], "texture": "#2"},
79+
"south": {"uv": [6, 4.5, 10, 0], "texture": "#2"},
80+
"west": {"uv": [6, 4.5, 10, 0], "texture": "#2"},
81+
"up": {"uv": [10, 0, 6, 4], "texture": "#2"},
82+
"down": {"uv": [10, 0, 6, 4], "texture": "#2"}
8483
}
8584
}
8685
],
87-
"display": {},
8886
"groups": [
8987
{
9088
"name": "log by bulb",

‎src/main/resources/assets/bits_n_bobs/models/block/lightbulb/lightbulb_uncaged_on.json‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"credit": "Made with Blockbench",
44
"texture_size": [32, 32],
55
"textures": {
6-
"1": "bits_n_bobs:block/lightbulb_on",
76
"2": "bits_n_bobs:block/lightbulb_on",
87
"particle": "bits_n_bobs:block/lightbulb_on"
98
},
@@ -13,12 +12,12 @@
1312
"from": [5, 5, 5],
1413
"to": [11, 13, 11],
1514
"faces": {
16-
"north": {"uv": [0, 0, 3, 4], "texture": "#1"},
17-
"east": {"uv": [0, 0, 3, 4], "texture": "#1"},
18-
"south": {"uv": [0, 0, 3, 4], "texture": "#1"},
19-
"west": {"uv": [0, 0, 3, 4], "texture": "#1"},
20-
"up": {"uv": [6, 3, 3, 0], "texture": "#1"},
21-
"down": {"uv": [6, 0, 3, 3], "texture": "#1"}
15+
"north": {"uv": [0, 0, 3, 4], "texture": "#2"},
16+
"east": {"uv": [0, 0, 3, 4], "texture": "#2"},
17+
"south": {"uv": [0, 0, 3, 4], "texture": "#2"},
18+
"west": {"uv": [0, 0, 3, 4], "texture": "#2"},
19+
"up": {"uv": [6, 3, 3, 0], "texture": "#2"},
20+
"down": {"uv": [6, 0, 3, 3], "texture": "#2"}
2221
}
2322
},
2423
{
@@ -58,15 +57,12 @@
5857
}
5958
}
6059
],
61-
"display": {},
6260
"groups": [
6361
{
6462
"name": "log by bulb",
6563
"origin": [0, 0, 0],
6664
"color": 0,
6765
"children": [0, 1, 2, 3]
68-
},
69-
4,
70-
5
66+
}
7167
]
7268
}

‎src/main/resources/assets/bits_n_bobs/textures/block/lightbulb.png‎

62 Bytes
Loading

‎src/main/resources/assets/bits_n_bobs/textures/block/lightbulb_on.png‎

86 Bytes
Loading

0 commit comments

Comments
 (0)