Merge branch 'dairy-product-testing' into main

Jiingy · Jan 30, 2021 · c537e48 · c537e48
2 parents c3655a8 + 091ccad
commit c537e48
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 0 deletions.
diff --git a/src/main/java/com/jingy/jineric/Blocks.java b/src/main/java/com/jingy/jineric/Blocks.java
@@ -119,6 +119,9 @@ public class Blocks {
     //SOUL JACK O' LANTERN
     public static final Block SOUL_JACK_O_LANTERN = register("soul_jack_o_lantern", new Block(FabricBlockSettings.copy(JACK_O_LANTERN)));
 
+    //testing making a block
+    public static final Block TEST_BLOCK = register("test_block", new Block(FabricBlockSettings.copy(ICE)));
+
     //CHARCOAL BLOCK
     public static final Block CHARCOAL_BLOCK = register("charcoal_block", new Block(FabricBlockSettings.copy(COAL_BLOCK)));
 

diff --git a/src/main/java/com/jingy/jineric/Items.java b/src/main/java/com/jingy/jineric/Items.java
@@ -81,6 +81,9 @@ public class Items {
     public static final Item WAVY_SOUL_SANDSTONE_STAIRS = register("wavy_soul_sandstone_stairs", new BlockItem(Blocks.WAVY_SOUL_SANDSTONE_STAIRS, ItemSettings.BuildingBlocks().group(ItemGroups.JINERIC_BLOCKS)));
     public static final Item WAVY_SOUL_SANDSTONE_WALL = register("wavy_soul_sandstone_wall", new BlockItem(Blocks.WAVY_SOUL_SANDSTONE_WALL, ItemSettings.Decoration().group(ItemGroups.JINERIC_BLOCKS)));
 
+    //test block
+    public static final Item TEST_BLOCK = register("test_block", new BlockItem(Blocks.TEST_BLOCK, ItemSettings.BuildingBlocks().group(ItemGroups.JINERIC_BLOCKS)));
+
 
 //STONES
     //BORITE

diff --git a/src/main/resources/assets/jineric/blockstates/test_block.json b/src/main/resources/assets/jineric/blockstates/test_block.json
@@ -0,0 +1,7 @@
+{
+    "variants": {
+        "": {
+            "model": "jineric:block/test_block"
+        }
+    }
+}
diff --git a/src/main/resources/assets/jineric/lang/en_us.json b/src/main/resources/assets/jineric/lang/en_us.json
@@ -46,6 +46,8 @@
   "block.jineric.smooth_soul_sandstone_slab": "Smooth Soul Sandstone Slab",
   "block.jineric.smooth_soul_sandstone_stairs": "Smooth Soul Sandstone Stair",
   "block.jineric.smooth_soul_sandstone_wall": "Smooth Soul Sandstone Wall",
+
+  "block.jineric.test_block": "Test Block",
 
   "block.jineric.soul_jack_o_lantern": "Soul Jack o'Lantern",
 

diff --git a/src/main/resources/assets/jineric/models/block/test_block.json b/src/main/resources/assets/jineric/models/block/test_block.json
@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:block/cube_all",
+    "textures": {
+        "all": "jineric:block/cooldevtexture"
+    }
+}
diff --git a/src/main/resources/assets/jineric/models/item/test_block.json b/src/main/resources/assets/jineric/models/item/test_block.json
@@ -0,0 +1,3 @@
+{
+    "parent": "jineric:block/test_block"
+}
diff --git a/src/main/resources/assets/jineric/textures/block/cooldevtexture.png b/src/main/resources/assets/jineric/textures/block/cooldevtexture.png