Skip to content

Commit

Permalink
Added new blocks, world gen.
Browse files Browse the repository at this point in the history 
Added:
- Smooth Stone stairs/wall
- World gen for slate

Removed:
- CORRITE FUCKIGN AGAIN HOLY SHIT AFADSGUB FMNKIM WNDYJGATNM VBDHTNGAEVMFHD
- Duplicates
  • Loading branch information
@Jiingy
Jiingy committed Feb 3, 2021
1 parent 94b9ac8 commit 703e705
Show file tree
Hide file tree
Showing 19 changed files with 434 additions and 22 deletions.
4 changes: 4 additions & 0 deletions src/main/java/com/jingy/jineric/Jineric.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
public class Jineric implements ModInitializer {
public static final String MOD_ID = "jineric";
public static ConfiguredFeature<?, ?> BORITE_VEIN = Feature.ORE.configure(new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, JinericBlocks.BORITE.getDefaultState(), 33)).rangeOf(80).spreadHorizontally().repeat(10);
public static ConfiguredFeature<?, ?> SLATE_VEIN = Feature.ORE.configure(new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, JinericBlocks.SLATE.getDefaultState(), 33)).rangeOf(80).spreadHorizontally().repeat(10);

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

RegistryKey<ConfiguredFeature<?, ?>> slate_vein = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, new Identifier(Jineric.MOD_ID, "slate_vein"));
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, slate_vein.getValue(), SLATE_VEIN);
BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, slate_vein);
}
}
13 changes: 10 additions & 3 deletions src/main/java/com/jingy/jineric/JinericBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ public class JinericBlocks {
public static final Block WAVY_SOUL_SANDSTONE_WALL = register("wavy_soul_sandstone_wall", new WallBlock(FabricBlockSettings.copy(SOUL_SANDSTONE)));

//STONE TYPES:
//SMOOTH STONE
public static final Block SMOOTH_STONE_STAIRS = register("smooth_stone_stairs", new BaseJinericStairBlock(SMOOTH_STONE.getDefaultState(),FabricBlockSettings.copy(SMOOTH_STONE)));
public static final Block SMOOTH_STONE_WALL = register("smooth_stone_wall", new WallBlock(FabricBlockSettings.copy(SMOOTH_STONE)));

//BORITE
public static final Block BORITE = register("borite", new Block(FabricBlockSettings.copy(STONE)));
public static final Block BORITE_STAIRS = register("borite_stairs", new BaseJinericStairBlock(STONE.getDefaultState(),FabricBlockSettings.copy(STONE)));
Expand All @@ -101,21 +105,24 @@ public class JinericBlocks {
public static final Block SLATE_SLAB = register("slate_slab", new SlabBlock(FabricBlockSettings.copy(STONE)));
public static final Block SLATE_WALL = register("slate_wall", new WallBlock(FabricBlockSettings.copy(STONE)));

//STORAGE BLOCKS
//STORAGE BLOCKS
public static final Block SALT_BLOCK = register("salt_block", new SandBlock(14409422,FabricBlockSettings.copy(SAND)));
public static final Block ROTTEN_FLESH_BLOCK = register("rotten_flesh_block", new Block(FabricBlockSettings.copy(HONEYCOMB_BLOCK)));
public static final Block FLINT_BLOCK = register("flint_block", new Block(FabricBlockSettings.copy(STONE)));
public static final Block CHARCOAL_BLOCK = register("charcoal_block", new Block(FabricBlockSettings.copy(COAL_BLOCK)));

//WOOD
//WOOD
//BOREAL
public static final Block BOREAL_PLANKS = register("boreal_planks", new Block(FabricBlockSettings.copy(OAK_PLANKS)));
public static final Block BOREAL_SLAB = register("boreal_slab", new SlabBlock(FabricBlockSettings.copy(OAK_PLANKS)));
public static final Block BOREAL_STAIRS = register("boreal_stairs", new BaseJinericStairBlock(OAK_PLANKS.getDefaultState(),FabricBlockSettings.copy(OAK_PLANKS)));

//DECORATION BLOCKS
//DECORATION BLOCKS
public static final Block SOUL_JACK_O_LANTERN = register("soul_jack_o_lantern", new BaseJinericCarvedPumpkinBlock(FabricBlockSettings.copy(JACK_O_LANTERN)));
public static final Block FULL_GRASS_BLOCK = register("full_grass_block", new GrassBlock(FabricBlockSettings.copy(GRASS_BLOCK)));



//SHULKER CHEST
public static final Block SHULKER_CHEST = register("shulker_chest", new Block(FabricBlockSettings.copy(SHULKER_BOX)));

Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/jingy/jineric/JinericItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ public class JinericItems {


//STONES
//SMOOTH STONE
public static final Item SMOOTH_STONE_STAIRS = register("smooth_stone_stairs", new BlockItem(JinericBlocks.SMOOTH_STONE_STAIRS, JinericItemSettings.BuildingBlocks().group(JinericItemGroups.JINERIC_BLOCKS)));
public static final Item SMOOTH_STONE_WALL = register("smooth_stone_wall", new BlockItem(JinericBlocks.SMOOTH_STONE_WALL, JinericItemSettings.Decoration().group(JinericItemGroups.JINERIC_BLOCKS)));

//BORITE
public static final Item BORITE = register("borite", new BlockItem(JinericBlocks.BORITE, JinericItemSettings.BuildingBlocks().group(JinericItemGroups.JINERIC_BLOCKS)));
public static final Item BORITE_SLAB = register("borite_slab", new BlockItem(JinericBlocks.BORITE_SLAB, JinericItemSettings.BuildingBlocks().group(JinericItemGroups.JINERIC_BLOCKS)));
Expand Down Expand Up @@ -122,8 +126,12 @@ public class JinericItems {
public static final Item BOREAL_STAIRS = register("boreal_stairs", new BlockItem(JinericBlocks.BOREAL_STAIRS, JinericItemSettings.Decoration().group(JinericItemGroups.JINERIC_BLOCKS)));
public static final Item BOREAL_SLAB = register("boreal_slab", new BlockItem(JinericBlocks.BOREAL_SLAB, JinericItemSettings.Decoration().group(JinericItemGroups.JINERIC_BLOCKS)));


//DECORATION
//SOUL JACK O'LANTERN
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)));

//FULL GRASS BLOCK
public static final Item FULL_GRASS_BLOCK = register("full_grass_block", new BlockItem(JinericBlocks.FULL_GRASS_BLOCK, JinericItemSettings.BuildingBlocks().group(JinericItemGroups.JINERIC_BLOCKS)));


Expand Down
209 changes: 209 additions & 0 deletions src/main/resources/assets/jineric/blockstates/smooth_stone_stairs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
{
"variants": {
"facing=east,half=bottom,shape=inner_left": {
"model": "jineric:block/smooth_stone_stairs_inner",
"y": 270,
"uvlock": true
},
"facing=east,half=bottom,shape=inner_right": {
"model": "jineric:block/smooth_stone_stairs_inner"
},
"facing=east,half=bottom,shape=outer_left": {
"model": "jineric:block/smooth_stone_stairs_outer",
"y": 270,
"uvlock": true
},
"facing=east,half=bottom,shape=outer_right": {
"model": "jineric:block/smooth_stone_stairs_outer"
},
"facing=east,half=bottom,shape=straight": {
"model": "jineric:block/smooth_stone_stairs"
},
"facing=east,half=top,shape=inner_left": {
"model": "jineric:block/smooth_stone_stairs_inner",
"x": 180,
"uvlock": true
},
"facing=east,half=top,shape=inner_right": {
"model": "jineric:block/smooth_stone_stairs_inner",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=east,half=top,shape=outer_left": {
"model": "jineric:block/smooth_stone_stairs_outer",
"x": 180,
"uvlock": true
},
"facing=east,half=top,shape=outer_right": {
"model": "jineric:block/smooth_stone_stairs_outer",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=east,half=top,shape=straight": {
"model": "jineric:block/smooth_stone_stairs",
"x": 180,
"uvlock": true
},
"facing=north,half=bottom,shape=inner_left": {
"model": "jineric:block/smooth_stone_stairs_inner",
"y": 180,
"uvlock": true
},
"facing=north,half=bottom,shape=inner_right": {
"model": "jineric:block/smooth_stone_stairs_inner",
"y": 270,
"uvlock": true
},
"facing=north,half=bottom,shape=outer_left": {
"model": "jineric:block/smooth_stone_stairs_outer",
"y": 180,
"uvlock": true
},
"facing=north,half=bottom,shape=outer_right": {
"model": "jineric:block/smooth_stone_stairs_outer",
"y": 270,
"uvlock": true
},
"facing=north,half=bottom,shape=straight": {
"model": "jineric:block/smooth_stone_stairs",
"y": 270,
"uvlock": true
},
"facing=north,half=top,shape=inner_left": {
"model": "jineric:block/smooth_stone_stairs_inner",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=north,half=top,shape=inner_right": {
"model": "jineric:block/smooth_stone_stairs_inner",
"x": 180,
"uvlock": true
},
"facing=north,half=top,shape=outer_left": {
"model": "jineric:block/smooth_stone_stairs_outer",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=north,half=top,shape=outer_right": {
"model": "jineric:block/smooth_stone_stairs_outer",
"x": 180,
"uvlock": true
},
"facing=north,half=top,shape=straight": {
"model": "jineric:block/smooth_stone_stairs",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=south,half=bottom,shape=inner_left": {
"model": "jineric:block/smooth_stone_stairs_inner"
},
"facing=south,half=bottom,shape=inner_right": {
"model": "jineric:block/smooth_stone_stairs_inner",
"y": 90,
"uvlock": true
},
"facing=south,half=bottom,shape=outer_left": {
"model": "jineric:block/smooth_stone_stairs_outer"
},
"facing=south,half=bottom,shape=outer_right": {
"model": "jineric:block/smooth_stone_stairs_outer",
"y": 90,
"uvlock": true
},
"facing=south,half=bottom,shape=straight": {
"model": "jineric:block/smooth_stone_stairs",
"y": 90,
"uvlock": true
},
"facing=south,half=top,shape=inner_left": {
"model": "jineric:block/smooth_stone_stairs_inner",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=south,half=top,shape=inner_right": {
"model": "jineric:block/smooth_stone_stairs_inner",
"x": 180,
"y": 180,
"uvlock": true
},
"facing=south,half=top,shape=outer_left": {
"model": "jineric:block/smooth_stone_stairs_outer",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=south,half=top,shape=outer_right": {
"model": "jineric:block/smooth_stone_stairs_outer",
"x": 180,
"y": 180,
"uvlock": true
},
"facing=south,half=top,shape=straight": {
"model": "jineric:block/smooth_stone_stairs",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=west,half=bottom,shape=inner_left": {
"model": "jineric:block/smooth_stone_stairs_inner",
"y": 90,
"uvlock": true
},
"facing=west,half=bottom,shape=inner_right": {
"model": "jineric:block/smooth_stone_stairs_inner",
"y": 180,
"uvlock": true
},
"facing=west,half=bottom,shape=outer_left": {
"model": "jineric:block/smooth_stone_stairs_outer",
"y": 90,
"uvlock": true
},
"facing=west,half=bottom,shape=outer_right": {
"model": "jineric:block/smooth_stone_stairs_outer",
"y": 180,
"uvlock": true
},
"facing=west,half=bottom,shape=straight": {
"model": "jineric:block/smooth_stone_stairs",
"y": 180,
"uvlock": true
},
"facing=west,half=top,shape=inner_left": {
"model": "jineric:block/smooth_stone_stairs_inner",
"x": 180,
"y": 180,
"uvlock": true
},
"facing=west,half=top,shape=inner_right": {
"model": "jineric:block/smooth_stone_stairs_inner",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=west,half=top,shape=outer_left": {
"model": "jineric:block/smooth_stone_stairs_outer",
"x": 180,
"y": 180,
"uvlock": true
},
"facing=west,half=top,shape=outer_right": {
"model": "jineric:block/smooth_stone_stairs_outer",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=west,half=top,shape=straight": {
"model": "jineric:block/smooth_stone_stairs",
"x": 180,
"y": 180,
"uvlock": true
}
}
}
90 changes: 90 additions & 0 deletions src/main/resources/assets/jineric/blockstates/smooth_stone_wall.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"multipart": [
{
"when": {
"up": true
},
"apply": {
"model": "jineric:block/smooth_stone_wall_post"
}
},
{
"when": {
"north": "low"
},
"apply": {
"model": "jineric:block/smooth_stone_wall_side",
"uvlock": true
}
},
{
"when": {
"east": "low"
},
"apply": {
"model": "jineric:block/smooth_stone_wall_side",
"y": 90,
"uvlock": true
}
},
{
"when": {
"south": "low"
},
"apply": {
"model": "jineric:block/smooth_stone_wall_side",
"y": 180,
"uvlock": true
}
},
{
"when": {
"west": "low"
},
"apply": {
"model": "jineric:block/smooth_stone_wall_side",
"y": 270,
"uvlock": true
}
},
{
"when": {
"north": "tall"
},
"apply": {
"model": "jineric:block/smooth_stone_wall_side_tall",
"uvlock": true
}
},
{
"when": {
"east": "tall"
},
"apply": {
"model": "jineric:block/smooth_stone_wall_side_tall",
"y": 90,
"uvlock": true
}
},
{
"when": {
"south": "tall"
},
"apply": {
"model": "jineric:block/smooth_stone_wall_side_tall",
"y": 180,
"uvlock": true
}
},
{
"when": {
"west": "tall"
},
"apply": {
"model": "jineric:block/smooth_stone_wall_side_tall",
"y": 270,
"uvlock": true
}
}
]
}
Loading

0 comments on commit 703e705

Please sign in to comment.