Merge pull request #33 from GrowthcraftCE/Growthcraft-1.19-29

Fixed #29 Salt Block renders in world correctly and has more realisti…
GrowthcraftCE · Apr 21, 2023 · 93d80aa · 93d80aa
2 parents b9a519d + a16f524
commit 93d80aa
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/main/java/growthcraft/core/init/GrowthcraftBlocks.java b/src/main/java/growthcraft/core/init/GrowthcraftBlocks.java
@@ -10,7 +10,6 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.material.Material;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
@@ -63,7 +62,7 @@ public class GrowthcraftBlocks {
 
     public static final RegistryObject<Block> SALT_BLOCK = registerBlock(
             Reference.UnlocalizedName.SALT_BLOCK,
-            () -> new GrowthcraftBlock(Material.STONE, SoundType.STONE)
+            () -> new GrowthcraftBlock(Blocks.GRAVEL, SoundType.GRAVEL)
     );
 
     public static final RegistryObject<Block> SALT_ORE = registerBlock(

diff --git a/src/main/java/growthcraft/lib/block/GrowthcraftBlock.java b/src/main/java/growthcraft/lib/block/GrowthcraftBlock.java
@@ -14,10 +14,18 @@ public GrowthcraftBlock(Material material) {
         this(getInitProperties(material, SoundType.WOOD));
     }
 
+    public GrowthcraftBlock(Block block) {
+        this(getInitProperties(block, SoundType.WOOD));
+    }
+
     public GrowthcraftBlock(Material material, SoundType soundType) {
         this(getInitProperties(material, soundType));
     }
 
+    public GrowthcraftBlock(Block block, SoundType soundType) {
+        this(getInitProperties(block, soundType));
+    }
+
     public GrowthcraftBlock(Properties properties) {
         super(properties);
     }
@@ -27,4 +35,10 @@ private static Properties getInitProperties(Material material, SoundType soundTy
         properties.sound(SoundType.WOOD);
         return properties;
     }
+
+    private static Properties getInitProperties(Block block, SoundType soundType) {
+        Properties properties = Properties.copy(block);
+        properties.sound(SoundType.WOOD);
+        return properties;
+    }
 }
diff --git a/src/main/resources/assets/growthcraft/blockstates/salt_block.json b/src/main/resources/assets/growthcraft/blockstates/salt_block.json
@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "growthcraft:block/salt_block" }
+  }
+}