Skip to content

Commit 2e541f1

Browse files
Lyof429Lyof429
committed
shimmer stone brick stairs and slab
1 parent a8cfc09 commit 2e541f1

16 files changed

+342
-3
lines changed

‎src/main/generated/assets/infernalexp/blockstates/shimmer_stone_brick_slab.json

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"variants": {
3+
"type=bottom": {
4+
"model": "infernalexp:block/shimmer_stone_brick_slab"
5+
},
6+
"type=double": {
7+
"model": "infernalexp:block/shimmer_stone_bricks"
8+
},
9+
"type=top": {
10+
"model": "infernalexp:block/shimmer_stone_brick_slab_top"
11+
}
12+
}
13+
}

‎src/main/generated/assets/infernalexp/blockstates/shimmer_stone_brick_stairs.json

+209
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,209 @@
1+
{
2+
"variants": {
3+
"facing=east,half=bottom,shape=inner_left": {
4+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
5+
"uvlock": true,
6+
"y": 270
7+
},
8+
"facing=east,half=bottom,shape=inner_right": {
9+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner"
10+
},
11+
"facing=east,half=bottom,shape=outer_left": {
12+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
13+
"uvlock": true,
14+
"y": 270
15+
},
16+
"facing=east,half=bottom,shape=outer_right": {
17+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer"
18+
},
19+
"facing=east,half=bottom,shape=straight": {
20+
"model": "infernalexp:block/shimmer_stone_brick_stairs"
21+
},
22+
"facing=east,half=top,shape=inner_left": {
23+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
24+
"uvlock": true,
25+
"x": 180
26+
},
27+
"facing=east,half=top,shape=inner_right": {
28+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
29+
"uvlock": true,
30+
"x": 180,
31+
"y": 90
32+
},
33+
"facing=east,half=top,shape=outer_left": {
34+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
35+
"uvlock": true,
36+
"x": 180
37+
},
38+
"facing=east,half=top,shape=outer_right": {
39+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
40+
"uvlock": true,
41+
"x": 180,
42+
"y": 90
43+
},
44+
"facing=east,half=top,shape=straight": {
45+
"model": "infernalexp:block/shimmer_stone_brick_stairs",
46+
"uvlock": true,
47+
"x": 180
48+
},
49+
"facing=north,half=bottom,shape=inner_left": {
50+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
51+
"uvlock": true,
52+
"y": 180
53+
},
54+
"facing=north,half=bottom,shape=inner_right": {
55+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
56+
"uvlock": true,
57+
"y": 270
58+
},
59+
"facing=north,half=bottom,shape=outer_left": {
60+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
61+
"uvlock": true,
62+
"y": 180
63+
},
64+
"facing=north,half=bottom,shape=outer_right": {
65+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
66+
"uvlock": true,
67+
"y": 270
68+
},
69+
"facing=north,half=bottom,shape=straight": {
70+
"model": "infernalexp:block/shimmer_stone_brick_stairs",
71+
"uvlock": true,
72+
"y": 270
73+
},
74+
"facing=north,half=top,shape=inner_left": {
75+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
76+
"uvlock": true,
77+
"x": 180,
78+
"y": 270
79+
},
80+
"facing=north,half=top,shape=inner_right": {
81+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
82+
"uvlock": true,
83+
"x": 180
84+
},
85+
"facing=north,half=top,shape=outer_left": {
86+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
87+
"uvlock": true,
88+
"x": 180,
89+
"y": 270
90+
},
91+
"facing=north,half=top,shape=outer_right": {
92+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
93+
"uvlock": true,
94+
"x": 180
95+
},
96+
"facing=north,half=top,shape=straight": {
97+
"model": "infernalexp:block/shimmer_stone_brick_stairs",
98+
"uvlock": true,
99+
"x": 180,
100+
"y": 270
101+
},
102+
"facing=south,half=bottom,shape=inner_left": {
103+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner"
104+
},
105+
"facing=south,half=bottom,shape=inner_right": {
106+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
107+
"uvlock": true,
108+
"y": 90
109+
},
110+
"facing=south,half=bottom,shape=outer_left": {
111+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer"
112+
},
113+
"facing=south,half=bottom,shape=outer_right": {
114+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
115+
"uvlock": true,
116+
"y": 90
117+
},
118+
"facing=south,half=bottom,shape=straight": {
119+
"model": "infernalexp:block/shimmer_stone_brick_stairs",
120+
"uvlock": true,
121+
"y": 90
122+
},
123+
"facing=south,half=top,shape=inner_left": {
124+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
125+
"uvlock": true,
126+
"x": 180,
127+
"y": 90
128+
},
129+
"facing=south,half=top,shape=inner_right": {
130+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
131+
"uvlock": true,
132+
"x": 180,
133+
"y": 180
134+
},
135+
"facing=south,half=top,shape=outer_left": {
136+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
137+
"uvlock": true,
138+
"x": 180,
139+
"y": 90
140+
},
141+
"facing=south,half=top,shape=outer_right": {
142+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
143+
"uvlock": true,
144+
"x": 180,
145+
"y": 180
146+
},
147+
"facing=south,half=top,shape=straight": {
148+
"model": "infernalexp:block/shimmer_stone_brick_stairs",
149+
"uvlock": true,
150+
"x": 180,
151+
"y": 90
152+
},
153+
"facing=west,half=bottom,shape=inner_left": {
154+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
155+
"uvlock": true,
156+
"y": 90
157+
},
158+
"facing=west,half=bottom,shape=inner_right": {
159+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
160+
"uvlock": true,
161+
"y": 180
162+
},
163+
"facing=west,half=bottom,shape=outer_left": {
164+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
165+
"uvlock": true,
166+
"y": 90
167+
},
168+
"facing=west,half=bottom,shape=outer_right": {
169+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
170+
"uvlock": true,
171+
"y": 180
172+
},
173+
"facing=west,half=bottom,shape=straight": {
174+
"model": "infernalexp:block/shimmer_stone_brick_stairs",
175+
"uvlock": true,
176+
"y": 180
177+
},
178+
"facing=west,half=top,shape=inner_left": {
179+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
180+
"uvlock": true,
181+
"x": 180,
182+
"y": 180
183+
},
184+
"facing=west,half=top,shape=inner_right": {
185+
"model": "infernalexp:block/shimmer_stone_brick_stairs_inner",
186+
"uvlock": true,
187+
"x": 180,
188+
"y": 270
189+
},
190+
"facing=west,half=top,shape=outer_left": {
191+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
192+
"uvlock": true,
193+
"x": 180,
194+
"y": 180
195+
},
196+
"facing=west,half=top,shape=outer_right": {
197+
"model": "infernalexp:block/shimmer_stone_brick_stairs_outer",
198+
"uvlock": true,
199+
"x": 180,
200+
"y": 270
201+
},
202+
"facing=west,half=top,shape=straight": {
203+
"model": "infernalexp:block/shimmer_stone_brick_stairs",
204+
"uvlock": true,
205+
"x": 180,
206+
"y": 180
207+
}
208+
}
209+
}

‎src/main/generated/assets/infernalexp/models/block/shimmer_stone_brick_slab.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"parent": "minecraft:block/slab",
3+
"textures": {
4+
"bottom": "infernalexp:block/shimmer_stone_bricks",
5+
"side": "infernalexp:block/shimmer_stone_bricks",
6+
"top": "infernalexp:block/shimmer_stone_bricks"
7+
}
8+
}

‎src/main/generated/assets/infernalexp/models/block/shimmer_stone_brick_slab_top.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"parent": "minecraft:block/slab_top",
3+
"textures": {
4+
"bottom": "infernalexp:block/shimmer_stone_bricks",
5+
"side": "infernalexp:block/shimmer_stone_bricks",
6+
"top": "infernalexp:block/shimmer_stone_bricks"
7+
}
8+
}

‎src/main/generated/assets/infernalexp/models/block/shimmer_stone_brick_stairs.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"parent": "minecraft:block/stairs",
3+
"textures": {
4+
"bottom": "infernalexp:block/shimmer_stone_bricks",
5+
"side": "infernalexp:block/shimmer_stone_bricks",
6+
"top": "infernalexp:block/shimmer_stone_bricks"
7+
}
8+
}

‎src/main/generated/assets/infernalexp/models/block/shimmer_stone_brick_stairs_inner.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"parent": "minecraft:block/inner_stairs",
3+
"textures": {
4+
"bottom": "infernalexp:block/shimmer_stone_bricks",
5+
"side": "infernalexp:block/shimmer_stone_bricks",
6+
"top": "infernalexp:block/shimmer_stone_bricks"
7+
}
8+
}

‎src/main/generated/assets/infernalexp/models/block/shimmer_stone_brick_stairs_outer.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"parent": "minecraft:block/outer_stairs",
3+
"textures": {
4+
"bottom": "infernalexp:block/shimmer_stone_bricks",
5+
"side": "infernalexp:block/shimmer_stone_bricks",
6+
"top": "infernalexp:block/shimmer_stone_bricks"
7+
}
8+
}

‎src/main/generated/assets/infernalexp/models/item/shimmer_stone_brick_slab.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "infernalexp:block/shimmer_stone_brick_slab"
3+
}

‎src/main/generated/assets/infernalexp/models/item/shimmer_stone_brick_stairs.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "infernalexp:block/shimmer_stone_brick_stairs"
3+
}

‎src/main/generated/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_slab.json

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"type": "minecraft:block",
3+
"pools": [
4+
{
5+
"bonus_rolls": 0.0,
6+
"entries": [
7+
{
8+
"type": "minecraft:item",
9+
"functions": [
10+
{
11+
"add": false,
12+
"conditions": [
13+
{
14+
"block": "infernalexp:shimmer_stone_brick_slab",
15+
"condition": "minecraft:block_state_property",
16+
"properties": {
17+
"type": "double"
18+
}
19+
}
20+
],
21+
"count": 2.0,
22+
"function": "minecraft:set_count"
23+
},
24+
{
25+
"function": "minecraft:explosion_decay"
26+
}
27+
],
28+
"name": "infernalexp:shimmer_stone_brick_slab"
29+
}
30+
],
31+
"rolls": 1.0
32+
}
33+
]
34+
}

‎src/main/generated/data/infernalexp/loot_tables/blocks/shimmer_stone_brick_stairs.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"type": "minecraft:block",
3+
"pools": [
4+
{
5+
"bonus_rolls": 0.0,
6+
"conditions": [
7+
{
8+
"condition": "minecraft:survives_explosion"
9+
}
10+
],
11+
"entries": [
12+
{
13+
"type": "minecraft:item",
14+
"name": "infernalexp:shimmer_stone_brick_stairs"
15+
}
16+
],
17+
"rolls": 1.0
18+
}
19+
]
20+
}

‎src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
"values": [
44
"infernalexp:shimmer_stone",
55
"infernalexp:shimmer_stone_bricks",
6+
"infernalexp:shimmer_stone_brick_stairs",
7+
"infernalexp:shimmer_stone_brick_slab",
68
"infernalexp:polished_glowstone",
79
"infernalexp:dimstone",
810
"infernalexp:polished_dimstone",
911
"infernalexp:dullstone",
1012
"infernalexp:polished_dullstone",
11-
"infernalexp:dullstone_pressure_plate",
12-
"infernalexp:dullstone_button"
13+
"infernalexp:dullstone_button",
14+
"infernalexp:dullstone_pressure_plate"
1315
]
1416
}

‎src/main/java/org/infernalstudios/infernalexp/block/ModBlocks.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
public class ModBlocks {
1313
public static void register() {
1414
InfernalExpansion.log("Registering Blocks for " + InfernalExpansion.MOD_ID);
15+
16+
17+
ModRegistry.registerStairsAndSlab(SHIMMER_STONE_BRICKS, SHIMMER_STONE_BRICK_STAIRS, SHIMMER_STONE_BRICK_SLAB);
1518
}
1619

1720
private static final FabricBlockSettings shimmerStone =
@@ -41,7 +44,15 @@ public static void register() {
4144

4245
public static final Block SHIMMER_STONE_BRICKS = ModRegistry.ofBlock("shimmer_stone_bricks",
4346
new Block(shimmerStone))
44-
.model().drop().tool("wood_pickaxe").build();
47+
.drop().tool("wood_pickaxe").build();
48+
49+
public static final Block SHIMMER_STONE_BRICK_STAIRS = ModRegistry.ofBlock("shimmer_stone_brick_stairs",
50+
new StairsBlock(SHIMMER_STONE_BRICKS.getDefaultState(), shimmerStone))
51+
.model(ModRegistry.Models.STAIRS).drop().tool("wood_pickaxe").build();
52+
53+
public static final Block SHIMMER_STONE_BRICK_SLAB = ModRegistry.ofBlock("shimmer_stone_brick_slab",
54+
new SlabBlock(shimmerStone))
55+
.model(ModRegistry.Models.SLAB).drop().tool("wood_pickaxe").build();
4556

4657

4758
public static final Block POLISHED_GLOWSTONE = ModRegistry.ofBlock("polished_glowstone",

‎src/main/java/org/infernalstudios/infernalexp/item/ModItemGroups.java

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ public class ModItemGroups {
2323

2424
entries.add(ModBlocks.SHIMMER_STONE);
2525
entries.add(ModBlocks.SHIMMER_STONE_BRICKS);
26+
entries.add(ModBlocks.SHIMMER_STONE_BRICK_STAIRS);
27+
entries.add(ModBlocks.SHIMMER_STONE_BRICK_SLAB);
2628

2729
entries.add(ModBlocks.POLISHED_GLOWSTONE);
2830
entries.add(ModBlocks.DIMSTONE);

0 commit comments

Comments
 (0)