Skip to content

Commit 415dbda

Browse files
committed
LETS GOOOOOO 8HRS DONEEE
1 parent 20ecf48 commit 415dbda

29 files changed

+485
-1
lines changed

src/main/java/com/okcoder1/matrixblocks/ModBlocks.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,28 @@ public static Block register(Block block, String name, boolean shouldRegisterIte
9595
true
9696
);
9797

98+
public static final Block MATRIX_WALL = register(
99+
new WallBlock(AbstractBlock.Settings.create().sounds(BlockSoundGroup.NETHER_BRICKS)),
100+
"matrix_wall",
101+
true
102+
);
103+
public static final Block FADING_MATRIX_WALL = register(
104+
new WallBlock(AbstractBlock.Settings.create().sounds(BlockSoundGroup.CORAL)),
105+
"fading_matrix_wall",
106+
true
107+
);
108+
109+
public static final Block MATRIX_DOOR = register(
110+
new DoorBlock(BlockSetType.IRON, AbstractBlock.Settings.create()),
111+
"matrix_door",
112+
true
113+
);
114+
public static final Block FADING_MATRIX_DOOR = register(
115+
new DoorBlock(BlockSetType.IRON, AbstractBlock.Settings.create()),
116+
"fading_matrix_door",
117+
true
118+
);
119+
98120
public static void initialize() {
99121
Registry.register(Registries.ITEM_GROUP, CUSTOM_ITEM_GROUP_KEY, CUSTOM_ITEM_GROUP);
100122
ItemGroupEvents.modifyEntriesEvent(CUSTOM_ITEM_GROUP_KEY).register(itemGroup -> {
@@ -109,6 +131,10 @@ public static void initialize() {
109131
itemGroup.add(ModBlocks.FADING_MATRIX_PRESSURE_PLATE);
110132
itemGroup.add(ModBlocks.MATRIX_FENCE);
111133
itemGroup.add(ModBlocks.MATRIX_FENCE_GATE);
134+
itemGroup.add(ModBlocks.MATRIX_WALL);
135+
itemGroup.add(ModBlocks.FADING_MATRIX_WALL);
136+
itemGroup.add(ModBlocks.MATRIX_DOOR);
137+
itemGroup.add(ModBlocks.FADING_MATRIX_DOOR);
112138
});
113139
}
114140
}
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
{
2+
"multipart": [
3+
{
4+
"apply": {
5+
"model": "matrix-blocks:block/fading_matrix_wall_post"
6+
},
7+
"when": {
8+
"up": "true"
9+
}
10+
},
11+
{
12+
"apply": {
13+
"model": "matrix-blocks:block/fading_matrix_wall_side",
14+
"uvlock": true
15+
},
16+
"when": {
17+
"north": "low"
18+
}
19+
},
20+
{
21+
"apply": {
22+
"model": "matrix-blocks:block/fading_matrix_wall_side",
23+
"uvlock": true,
24+
"y": 90
25+
},
26+
"when": {
27+
"east": "low"
28+
}
29+
},
30+
{
31+
"apply": {
32+
"model": "matrix-blocks:block/fading_matrix_wall_side",
33+
"uvlock": true,
34+
"y": 180
35+
},
36+
"when": {
37+
"south": "low"
38+
}
39+
},
40+
{
41+
"apply": {
42+
"model": "matrix-blocks:block/fading_matrix_wall_side",
43+
"uvlock": true,
44+
"y": 270
45+
},
46+
"when": {
47+
"west": "low"
48+
}
49+
},
50+
{
51+
"apply": {
52+
"model": "matrix-blocks:block/fading_matrix_wall_side_tall",
53+
"uvlock": true
54+
},
55+
"when": {
56+
"north": "tall"
57+
}
58+
},
59+
{
60+
"apply": {
61+
"model": "matrix-blocks:block/fading_matrix_wall_side_tall",
62+
"uvlock": true,
63+
"y": 90
64+
},
65+
"when": {
66+
"east": "tall"
67+
}
68+
},
69+
{
70+
"apply": {
71+
"model": "matrix-blocks:block/fading_matrix_wall_side_tall",
72+
"uvlock": true,
73+
"y": 180
74+
},
75+
"when": {
76+
"south": "tall"
77+
}
78+
},
79+
{
80+
"apply": {
81+
"model": "matrix-blocks:block/fading_matrix_wall_side_tall",
82+
"uvlock": true,
83+
"y": 270
84+
},
85+
"when": {
86+
"west": "tall"
87+
}
88+
}
89+
]
90+
}
Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
{
2+
"variants": {
3+
"facing=east,half=lower,hinge=left,open=false": {
4+
"model": "matrix-blocks:block/matrix_door_bottom_left"
5+
},
6+
"facing=east,half=lower,hinge=left,open=true": {
7+
"model": "matrix-blocks:block/matrix_door_bottom_left_open",
8+
"y": 90
9+
},
10+
"facing=east,half=lower,hinge=right,open=false": {
11+
"model": "matrix-blocks:block/matrix_door_bottom_right"
12+
},
13+
"facing=east,half=lower,hinge=right,open=true": {
14+
"model": "matrix-blocks:block/matrix_door_bottom_right_open",
15+
"y": 270
16+
},
17+
"facing=east,half=upper,hinge=left,open=false": {
18+
"model": "matrix-blocks:block/matrix_door_top_left"
19+
},
20+
"facing=east,half=upper,hinge=left,open=true": {
21+
"model": "matrix-blocks:block/matrix_door_top_left_open",
22+
"y": 90
23+
},
24+
"facing=east,half=upper,hinge=right,open=false": {
25+
"model": "matrix-blocks:block/matrix_door_top_right"
26+
},
27+
"facing=east,half=upper,hinge=right,open=true": {
28+
"model": "matrix-blocks:block/matrix_door_top_right_open",
29+
"y": 270
30+
},
31+
"facing=north,half=lower,hinge=left,open=false": {
32+
"model": "matrix-blocks:block/matrix_door_bottom_left",
33+
"y": 270
34+
},
35+
"facing=north,half=lower,hinge=left,open=true": {
36+
"model": "matrix-blocks:block/matrix_door_bottom_left_open"
37+
},
38+
"facing=north,half=lower,hinge=right,open=false": {
39+
"model": "matrix-blocks:block/matrix_door_bottom_right",
40+
"y": 270
41+
},
42+
"facing=north,half=lower,hinge=right,open=true": {
43+
"model": "matrix-blocks:block/matrix_door_bottom_right_open",
44+
"y": 180
45+
},
46+
"facing=north,half=upper,hinge=left,open=false": {
47+
"model": "matrix-blocks:block/matrix_door_top_left",
48+
"y": 270
49+
},
50+
"facing=north,half=upper,hinge=left,open=true": {
51+
"model": "matrix-blocks:block/matrix_door_top_left_open"
52+
},
53+
"facing=north,half=upper,hinge=right,open=false": {
54+
"model": "matrix-blocks:block/matrix_door_top_right",
55+
"y": 270
56+
},
57+
"facing=north,half=upper,hinge=right,open=true": {
58+
"model": "matrix-blocks:block/matrix_door_top_right_open",
59+
"y": 180
60+
},
61+
"facing=south,half=lower,hinge=left,open=false": {
62+
"model": "matrix-blocks:block/matrix_door_bottom_left",
63+
"y": 90
64+
},
65+
"facing=south,half=lower,hinge=left,open=true": {
66+
"model": "matrix-blocks:block/matrix_door_bottom_left_open",
67+
"y": 180
68+
},
69+
"facing=south,half=lower,hinge=right,open=false": {
70+
"model": "matrix-blocks:block/matrix_door_bottom_right",
71+
"y": 90
72+
},
73+
"facing=south,half=lower,hinge=right,open=true": {
74+
"model": "matrix-blocks:block/matrix_door_bottom_right_open"
75+
},
76+
"facing=south,half=upper,hinge=left,open=false": {
77+
"model": "matrix-blocks:block/matrix_door_top_left",
78+
"y": 90
79+
},
80+
"facing=south,half=upper,hinge=left,open=true": {
81+
"model": "matrix-blocks:block/matrix_door_top_left_open",
82+
"y": 180
83+
},
84+
"facing=south,half=upper,hinge=right,open=false": {
85+
"model": "matrix-blocks:block/matrix_door_top_right",
86+
"y": 90
87+
},
88+
"facing=south,half=upper,hinge=right,open=true": {
89+
"model": "matrix-blocks:block/matrix_door_top_right_open"
90+
},
91+
"facing=west,half=lower,hinge=left,open=false": {
92+
"model": "matrix-blocks:block/matrix_door_bottom_left",
93+
"y": 180
94+
},
95+
"facing=west,half=lower,hinge=left,open=true": {
96+
"model": "matrix-blocks:block/matrix_door_bottom_left_open",
97+
"y": 270
98+
},
99+
"facing=west,half=lower,hinge=right,open=false": {
100+
"model": "matrix-blocks:block/matrix_door_bottom_right",
101+
"y": 180
102+
},
103+
"facing=west,half=lower,hinge=right,open=true": {
104+
"model": "matrix-blocks:block/matrix_door_bottom_right_open",
105+
"y": 90
106+
},
107+
"facing=west,half=upper,hinge=left,open=false": {
108+
"model": "matrix-blocks:block/matrix_door_top_left",
109+
"y": 180
110+
},
111+
"facing=west,half=upper,hinge=left,open=true": {
112+
"model": "matrix-blocks:block/matrix_door_top_left_open",
113+
"y": 270
114+
},
115+
"facing=west,half=upper,hinge=right,open=false": {
116+
"model": "matrix-blocks:block/matrix_door_top_right",
117+
"y": 180
118+
},
119+
"facing=west,half=upper,hinge=right,open=true": {
120+
"model": "matrix-blocks:block/matrix_door_top_right_open",
121+
"y": 90
122+
}
123+
}
124+
}
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
{
2+
"multipart": [
3+
{
4+
"apply": {
5+
"model": "matrix-blocks:block/matrix_wall_post"
6+
},
7+
"when": {
8+
"up": "true"
9+
}
10+
},
11+
{
12+
"apply": {
13+
"model": "matrix-blocks:block/matrix_wall_side",
14+
"uvlock": true
15+
},
16+
"when": {
17+
"north": "low"
18+
}
19+
},
20+
{
21+
"apply": {
22+
"model": "matrix-blocks:block/matrix_wall_side",
23+
"uvlock": true,
24+
"y": 90
25+
},
26+
"when": {
27+
"east": "low"
28+
}
29+
},
30+
{
31+
"apply": {
32+
"model": "matrix-blocks:block/matrix_wall_side",
33+
"uvlock": true,
34+
"y": 180
35+
},
36+
"when": {
37+
"south": "low"
38+
}
39+
},
40+
{
41+
"apply": {
42+
"model": "matrix-blocks:block/matrix_wall_side",
43+
"uvlock": true,
44+
"y": 270
45+
},
46+
"when": {
47+
"west": "low"
48+
}
49+
},
50+
{
51+
"apply": {
52+
"model": "matrix-blocks:block/matrix_wall_side_tall",
53+
"uvlock": true
54+
},
55+
"when": {
56+
"north": "tall"
57+
}
58+
},
59+
{
60+
"apply": {
61+
"model": "matrix-blocks:block/matrix_wall_side_tall",
62+
"uvlock": true,
63+
"y": 90
64+
},
65+
"when": {
66+
"east": "tall"
67+
}
68+
},
69+
{
70+
"apply": {
71+
"model": "matrix-blocks:block/matrix_wall_side_tall",
72+
"uvlock": true,
73+
"y": 180
74+
},
75+
"when": {
76+
"south": "tall"
77+
}
78+
},
79+
{
80+
"apply": {
81+
"model": "matrix-blocks:block/matrix_wall_side_tall",
82+
"uvlock": true,
83+
"y": 270
84+
},
85+
"when": {
86+
"west": "tall"
87+
}
88+
}
89+
]
90+
}

src/main/resources/assets/matrix-blocks/lang/en_us.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@
1010
"block.matrix-blocks.matrix_pressure_plate": "Matrix Pressure Plate",
1111
"block.matrix-blocks.fading_matrix_pressure_plate": "Fading Matrix Pressure Plate",
1212
"block.matrix-blocks.matrix_fence": "Matrix Fence",
13-
"block.matrix-blocks.matrix_fence_gate": "Matrix Fence Gate"
13+
"block.matrix-blocks.matrix_fence_gate": "Matrix Fence Gate",
14+
"block.matrix-blocks.matrix_wall": "Matrix Wall",
15+
"block.matrix-blocks.fading_matrix_wall": "Fading Matrix Wall"
1416
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:block/wall_inventory",
3+
"textures": {
4+
"wall": "matrix-blocks:block/fading_matrix_block"
5+
}
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:block/template_wall_post",
3+
"textures": {
4+
"wall": "matrix-blocks:block/fading_matrix_block"
5+
}
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:block/template_wall_side",
3+
"textures": {
4+
"wall": "matrix-blocks:block/fading_matrix_block"
5+
}
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:block/template_wall_side_tall",
3+
"textures": {
4+
"wall": "matrix-blocks:block/fading_matrix_block"
5+
}
6+
}

0 commit comments

Comments
 (0)