Skip to content

Commit 703e705

Browse files
JiingyJiingy
committed
Added new blocks, world gen.
Added: - Smooth Stone stairs/wall - World gen for slate Removed: - CORRITE FUCKIGN AGAIN HOLY SHIT AFADSGUB FMNKIM WNDYJGATNM VBDHTNGAEVMFHD - Duplicates
1 parent 94b9ac8 commit 703e705

19 files changed

+434
-22
lines changed

‎src/main/java/com/jingy/jineric/Jineric.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
public class Jineric implements ModInitializer {
1616
public static final String MOD_ID = "jineric";
1717
public static ConfiguredFeature<?, ?> BORITE_VEIN = Feature.ORE.configure(new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, JinericBlocks.BORITE.getDefaultState(), 33)).rangeOf(80).spreadHorizontally().repeat(10);
18+
public static ConfiguredFeature<?, ?> SLATE_VEIN = Feature.ORE.configure(new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, JinericBlocks.SLATE.getDefaultState(), 33)).rangeOf(80).spreadHorizontally().repeat(10);
1819

1920
@Override
2021
public void onInitialize() {
@@ -26,5 +27,8 @@ public void onInitialize() {
2627
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, borite_vein.getValue(), BORITE_VEIN);
2728
BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, borite_vein);
2829

30+
RegistryKey<ConfiguredFeature<?, ?>> slate_vein = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, new Identifier(Jineric.MOD_ID, "slate_vein"));
31+
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, slate_vein.getValue(), SLATE_VEIN);
32+
BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, slate_vein);
2933
}
3034
}

‎src/main/java/com/jingy/jineric/JinericBlocks.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ public class JinericBlocks {
7777
public static final Block WAVY_SOUL_SANDSTONE_WALL = register("wavy_soul_sandstone_wall", new WallBlock(FabricBlockSettings.copy(SOUL_SANDSTONE)));
7878

7979
//STONE TYPES:
80+
//SMOOTH STONE
81+
public static final Block SMOOTH_STONE_STAIRS = register("smooth_stone_stairs", new BaseJinericStairBlock(SMOOTH_STONE.getDefaultState(),FabricBlockSettings.copy(SMOOTH_STONE)));
82+
public static final Block SMOOTH_STONE_WALL = register("smooth_stone_wall", new WallBlock(FabricBlockSettings.copy(SMOOTH_STONE)));
83+
8084
//BORITE
8185
public static final Block BORITE = register("borite", new Block(FabricBlockSettings.copy(STONE)));
8286
public static final Block BORITE_STAIRS = register("borite_stairs", new BaseJinericStairBlock(STONE.getDefaultState(),FabricBlockSettings.copy(STONE)));
@@ -101,21 +105,24 @@ public class JinericBlocks {
101105
public static final Block SLATE_SLAB = register("slate_slab", new SlabBlock(FabricBlockSettings.copy(STONE)));
102106
public static final Block SLATE_WALL = register("slate_wall", new WallBlock(FabricBlockSettings.copy(STONE)));
103107

104-
//STORAGE BLOCKS
108+
//STORAGE BLOCKS
105109
public static final Block SALT_BLOCK = register("salt_block", new SandBlock(14409422,FabricBlockSettings.copy(SAND)));
106110
public static final Block ROTTEN_FLESH_BLOCK = register("rotten_flesh_block", new Block(FabricBlockSettings.copy(HONEYCOMB_BLOCK)));
107111
public static final Block FLINT_BLOCK = register("flint_block", new Block(FabricBlockSettings.copy(STONE)));
108112
public static final Block CHARCOAL_BLOCK = register("charcoal_block", new Block(FabricBlockSettings.copy(COAL_BLOCK)));
109113

110-
//WOOD
114+
//WOOD
115+
//BOREAL
111116
public static final Block BOREAL_PLANKS = register("boreal_planks", new Block(FabricBlockSettings.copy(OAK_PLANKS)));
112117
public static final Block BOREAL_SLAB = register("boreal_slab", new SlabBlock(FabricBlockSettings.copy(OAK_PLANKS)));
113118
public static final Block BOREAL_STAIRS = register("boreal_stairs", new BaseJinericStairBlock(OAK_PLANKS.getDefaultState(),FabricBlockSettings.copy(OAK_PLANKS)));
114119

115-
//DECORATION BLOCKS
120+
//DECORATION BLOCKS
116121
public static final Block SOUL_JACK_O_LANTERN = register("soul_jack_o_lantern", new BaseJinericCarvedPumpkinBlock(FabricBlockSettings.copy(JACK_O_LANTERN)));
117122
public static final Block FULL_GRASS_BLOCK = register("full_grass_block", new GrassBlock(FabricBlockSettings.copy(GRASS_BLOCK)));
118123

124+
125+
119126
//SHULKER CHEST
120127
public static final Block SHULKER_CHEST = register("shulker_chest", new Block(FabricBlockSettings.copy(SHULKER_BOX)));
121128

‎src/main/java/com/jingy/jineric/JinericItems.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ public class JinericItems {
8686

8787

8888
//STONES
89+
//SMOOTH STONE
90+
public static final Item SMOOTH_STONE_STAIRS = register("smooth_stone_stairs", new BlockItem(JinericBlocks.SMOOTH_STONE_STAIRS, JinericItemSettings.BuildingBlocks().group(JinericItemGroups.JINERIC_BLOCKS)));
91+
public static final Item SMOOTH_STONE_WALL = register("smooth_stone_wall", new BlockItem(JinericBlocks.SMOOTH_STONE_WALL, JinericItemSettings.Decoration().group(JinericItemGroups.JINERIC_BLOCKS)));
92+
8993
//BORITE
9094
public static final Item BORITE = register("borite", new BlockItem(JinericBlocks.BORITE, JinericItemSettings.BuildingBlocks().group(JinericItemGroups.JINERIC_BLOCKS)));
9195
public static final Item BORITE_SLAB = register("borite_slab", new BlockItem(JinericBlocks.BORITE_SLAB, JinericItemSettings.BuildingBlocks().group(JinericItemGroups.JINERIC_BLOCKS)));
@@ -122,8 +126,12 @@ public class JinericItems {
122126
public static final Item BOREAL_STAIRS = register("boreal_stairs", new BlockItem(JinericBlocks.BOREAL_STAIRS, JinericItemSettings.Decoration().group(JinericItemGroups.JINERIC_BLOCKS)));
123127
public static final Item BOREAL_SLAB = register("boreal_slab", new BlockItem(JinericBlocks.BOREAL_SLAB, JinericItemSettings.Decoration().group(JinericItemGroups.JINERIC_BLOCKS)));
124128

129+
125130
//DECORATION
131+
//SOUL JACK O'LANTERN
126132
public static final Item SOUL_JACK_O_LANTERN = register("soul_jack_o_lantern", new BlockItem(JinericBlocks.SOUL_JACK_O_LANTERN, JinericItemSettings.BuildingBlocks().group(JinericItemGroups.JINERIC_BLOCKS)));
133+
134+
//FULL GRASS BLOCK
127135
public static final Item FULL_GRASS_BLOCK = register("full_grass_block", new BlockItem(JinericBlocks.FULL_GRASS_BLOCK, JinericItemSettings.BuildingBlocks().group(JinericItemGroups.JINERIC_BLOCKS)));
128136

129137

‎src/main/resources/assets/jineric/blockstates/smooth_stone_stairs.json‎

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

‎src/main/resources/assets/jineric/blockstates/smooth_stone_wall.json‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
{
2+
"multipart": [
3+
{
4+
"when": {
5+
"up": true
6+
},
7+
"apply": {
8+
"model": "jineric:block/smooth_stone_wall_post"
9+
}
10+
},
11+
{
12+
"when": {
13+
"north": "low"
14+
},
15+
"apply": {
16+
"model": "jineric:block/smooth_stone_wall_side",
17+
"uvlock": true
18+
}
19+
},
20+
{
21+
"when": {
22+
"east": "low"
23+
},
24+
"apply": {
25+
"model": "jineric:block/smooth_stone_wall_side",
26+
"y": 90,
27+
"uvlock": true
28+
}
29+
},
30+
{
31+
"when": {
32+
"south": "low"
33+
},
34+
"apply": {
35+
"model": "jineric:block/smooth_stone_wall_side",
36+
"y": 180,
37+
"uvlock": true
38+
}
39+
},
40+
{
41+
"when": {
42+
"west": "low"
43+
},
44+
"apply": {
45+
"model": "jineric:block/smooth_stone_wall_side",
46+
"y": 270,
47+
"uvlock": true
48+
}
49+
},
50+
{
51+
"when": {
52+
"north": "tall"
53+
},
54+
"apply": {
55+
"model": "jineric:block/smooth_stone_wall_side_tall",
56+
"uvlock": true
57+
}
58+
},
59+
{
60+
"when": {
61+
"east": "tall"
62+
},
63+
"apply": {
64+
"model": "jineric:block/smooth_stone_wall_side_tall",
65+
"y": 90,
66+
"uvlock": true
67+
}
68+
},
69+
{
70+
"when": {
71+
"south": "tall"
72+
},
73+
"apply": {
74+
"model": "jineric:block/smooth_stone_wall_side_tall",
75+
"y": 180,
76+
"uvlock": true
77+
}
78+
},
79+
{
80+
"when": {
81+
"west": "tall"
82+
},
83+
"apply": {
84+
"model": "jineric:block/smooth_stone_wall_side_tall",
85+
"y": 270,
86+
"uvlock": true
87+
}
88+
}
89+
]
90+
}

0 commit comments

Comments
 (0)