made stone type do some stats for sand like stone types automatically…

…, fixed gc id in Ref
GregTech-Intergalactical · Sep 12, 2023 · 8bccebe · 8bccebe
1 parent 17ec2fe
commit 8bccebe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/common/src/main/java/muramasa/antimatter/Ref.java b/common/src/main/java/muramasa/antimatter/Ref.java
@@ -154,7 +154,7 @@ public class Ref {
     public static final String MOD_IC2 = "ic2";
     public static final String MOD_IC2C = "ic2-classic-spmod";
     public static final String MOD_AE = "ae2";
-    public static final String MOD_GC = "GalacticraftCore";
+    public static final String MOD_GC = "galacticraft";
     public static final String MOD_GC_PLANETS = "GalacticraftPlanets";
     public static final String MOD_TE = "thermalexpansion";
     public static final String MOD_TF = "thermalfoundation";

diff --git a/common/src/main/java/muramasa/antimatter/data/AntimatterStoneTypes.java b/common/src/main/java/muramasa/antimatter/data/AntimatterStoneTypes.java
@@ -18,10 +18,10 @@ public class AntimatterStoneTypes {
     public static StoneType ANDESITE = AntimatterAPI.register(StoneType.class, new VanillaStoneType(Ref.ID, "andesite", AntimatterMaterials.Andesite, "block/stone/", new Texture("minecraft", "block/andesite"), SoundType.STONE, false).setState(Blocks.ANDESITE));
     public static StoneType DEEPSLATE = AntimatterAPI.register(StoneType.class, new StoneType(Ref.ID, "deepslate", AntimatterMaterials.Deepslate, new Texture("minecraft", "block/deepslate"), SoundType.STONE, false).setState(Blocks.DEEPSLATE));
     public static StoneType TUFF = AntimatterAPI.register(StoneType.class, new StoneType(Ref.ID, "tuff", AntimatterMaterials.Tuff, new Texture("minecraft", "block/tuff"), SoundType.STONE, false).setState(Blocks.TUFF));
-    public static StoneType GRAVEL = AntimatterAPI.register(StoneType.class, new StoneType(Ref.ID, "gravel", AntimatterMaterials.Gravel, new Texture("minecraft", "block/gravel"), SoundType.GRAVEL, false).setState(Blocks.GRAVEL).setGravity(true).setBlockMaterial(net.minecraft.world.level.material.Material.SAND).setHardnessAndResistance(0.6F).setRequiresTool(false).setType(BlockTags.MINEABLE_WITH_SHOVEL)).setSandLike(true);
+    public static StoneType GRAVEL = AntimatterAPI.register(StoneType.class, new StoneType(Ref.ID, "gravel", AntimatterMaterials.Gravel, new Texture("minecraft", "block/gravel"), SoundType.GRAVEL, false).setState(Blocks.GRAVEL)).setHardnessAndResistance(0.6F).setSandLike(true);
     public static StoneType DIRT = AntimatterAPI.register(StoneType.class, new StoneType(Ref.ID, "dirt", AntimatterMaterials.Dirt, new Texture("minecraft", "block/dirt"), SoundType.GRAVEL, false).setState(Blocks.DIRT).setBlockMaterial(net.minecraft.world.level.material.Material.DIRT).setHardnessAndResistance(0.5F).setRequiresTool(false).setType(BlockTags.MINEABLE_WITH_SHOVEL).setGenerateOre(false));
-    public static StoneType SAND = AntimatterAPI.register(StoneType.class, new StoneType(Ref.ID, "sand", AntimatterMaterials.Sand, new Texture("minecraft", "block/sand"), SoundType.SAND, false).setState(Blocks.SAND).setGravity(true).setBlockMaterial(net.minecraft.world.level.material.Material.SAND).setHardnessAndResistance(0.5F).setRequiresTool(false).setType(BlockTags.MINEABLE_WITH_SHOVEL)).setSandLike(true);
-    public static StoneType SAND_RED = AntimatterAPI.register(StoneType.class, new StoneType(Ref.ID, "sand_red", AntimatterMaterials.RedSand, new Texture("minecraft", "block/red_sand"), SoundType.SAND, false).setState(Blocks.RED_SAND).setGravity(true).setBlockMaterial(net.minecraft.world.level.material.Material.SAND).setHardnessAndResistance(0.5F).setRequiresTool(false).setType(BlockTags.MINEABLE_WITH_SHOVEL)).setSandLike(true);
+    public static StoneType SAND = AntimatterAPI.register(StoneType.class, new StoneType(Ref.ID, "sand", AntimatterMaterials.Sand, new Texture("minecraft", "block/sand"), SoundType.SAND, false).setState(Blocks.SAND)).setSandLike(true);
+    public static StoneType SAND_RED = AntimatterAPI.register(StoneType.class, new StoneType(Ref.ID, "sand_red", AntimatterMaterials.RedSand, new Texture("minecraft", "block/red_sand"), SoundType.SAND, false).setState(Blocks.RED_SAND)).setSandLike(true);
     public static StoneType SANDSTONE = AntimatterAPI.register(StoneType.class, new StoneType(Ref.ID, "sandstone", AntimatterMaterials.Sandstone, new Texture("minecraft", "block/sandstone"), SoundType.STONE, false).setState(Blocks.SANDSTONE)
             .setTextures(new Texture("minecraft", "block/sandstone_bottom"), new Texture("minecraft", "block/sandstone_top"), new Texture("minecraft", "block/sandstone"), new Texture("minecraft", "block/sandstone"), new Texture("minecraft", "block/sandstone"), new Texture("minecraft", "block/sandstone")));
     public static StoneType BASALT = AntimatterAPI.register(StoneType.class, new VanillaStoneType(Ref.ID, "basalt", AntimatterMaterials.Basalt, "block/stone/", new Texture("minecraft", "block/basalt_side"), SoundType.BASALT, false).setState(Blocks.BASALT).setHardnessAndResistance(1.25F, 4.2F)

diff --git a/common/src/main/java/muramasa/antimatter/ore/StoneType.java b/common/src/main/java/muramasa/antimatter/ore/StoneType.java
@@ -86,6 +86,7 @@ public StoneType setFallingDustColor(int fallingDustColor) {
     }
 
     public StoneType setSandLike(boolean sandLike) {
+        if (sandLike) this.setHardnessAndResistance(0.5F).setRequiresTool(false).setType(BlockTags.MINEABLE_WITH_SHOVEL).setGravity(true).setBlockMaterial(net.minecraft.world.level.material.Material.SAND);
         this.sandLike = sandLike;
         return this;
     }