Initial Godforged Block work

src/main/java/com/teammetallurgy/atum/blocks/GodGodforgedBlock.java

@@ -0,0 +1,17 @@
+package com.teammetallurgy.atum.blocks;
+
+import com.teammetallurgy.atum.entity.undead.PharaohEntity;
+
+import javax.annotation.Nonnull;
+
+public class GodGodforgedBlock extends GodforgedBlock {
+    private final PharaohEntity.God god;
+
+    public GodGodforgedBlock(@Nonnull PharaohEntity.God god) {
+        this.god = god;
+    }
+
+    public PharaohEntity.God getGod() {
+        return god;
+    }
+}

src/main/java/com/teammetallurgy/atum/blocks/GodforgedBlock.java

@@ -0,0 +1,14 @@
+package com.teammetallurgy.atum.blocks;
+
+import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.material.MaterialColor;
+import net.minecraftforge.common.ToolType;
+
+public class GodforgedBlock extends Block {
+
+    public GodforgedBlock() {
+        super(AbstractBlock.Properties.create(Material.ROCK, MaterialColor.GOLD).setRequiresTool().harvestTool(ToolType.PICKAXE).harvestLevel(3).hardnessAndResistance(50.0F, 1200.0F));
+    }
+}

src/main/java/com/teammetallurgy/atum/init/AtumBlocks.java

@@ -1,10 +1,7 @@
 package com.teammetallurgy.atum.init;
 
 import com.teammetallurgy.atum.Atum;
-import com.teammetallurgy.atum.blocks.AtumOresBlock;
-import com.teammetallurgy.atum.blocks.PortalBlock;
-import com.teammetallurgy.atum.blocks.SandLayersBlock;
-import com.teammetallurgy.atum.blocks.StrangeSandBlock;
+import com.teammetallurgy.atum.blocks.*;
 import com.teammetallurgy.atum.blocks.base.AtumLanternBlock;
 import com.teammetallurgy.atum.blocks.base.AtumPaneBlock;
 import com.teammetallurgy.atum.blocks.base.AtumTorchBlock;
@@ -89,6 +86,22 @@ public class AtumBlocks {
     public static final Block RELIC_ORE = registerBlock(new AtumOresBlock(create(Material.ROCK).hardnessAndResistance(3.0F, 3.0F).harvestTool(ToolType.PICKAXE).harvestLevel(1)), "relic_ore");
     public static final Block NEBU_ORE = registerBlock(new AtumOresBlock(create(Material.ROCK).hardnessAndResistance(3.0F, 3.0F).harvestTool(ToolType.PICKAXE).harvestLevel(2)), "nebu_ore");
     public static final Block NEBU_BLOCK = registerBlock(new Block(AbstractBlock.Properties.create(Material.IRON, MaterialColor.GOLD).setRequiresTool().hardnessAndResistance(3.0F, 6.0F).sound(SoundType.METAL)), "nebu_block");
+    public static final Block GODFORGED_BLOCK = registerBlock(new GodforgedBlock(), "godforged_block");
+    public static final Block ANPUT_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.ANPUT), "anput_godforged_block");
+    public static final Block ANUBIS_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.ANUBIS), "anubis_godforged_block");
+    public static final Block ATEM_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.ATEM), "atem_godforged_block");
+    public static final Block GEB_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.GEB), "geb_godforged_block");
+    public static final Block HORUS_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.HORUS), "horus_godforged_block");
+    public static final Block ISIS_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.ISIS), "isis_godforged_block");
+    public static final Block MONTU_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.MONTU), "montu_godforged_block");
+    public static final Block NEPTHYS_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.NEPTHYS), "nepthys_godforged_block");
+    public static final Block NUIT_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.NUIT), "nuit_godforged_block");
+    public static final Block OSIRIS_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.OSIRIS), "osiris_godforged_block");
+    public static final Block PTAH_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.PTAH), "ptah_godforged_block");
+    public static final Block RA_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.RA), "ra_godforged_block");
+    public static final Block SETH_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.SETH), "seth_godforged_block");
+    public static final Block SHU_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.SHU), "shu_godforged_block");
+    public static final Block TEFNUT_GODFORGED_BLOCK = registerBlock(new GodGodforgedBlock(PharaohEntity.God.TEFNUT), "tefnut_godforged_block");
     public static final Block DIRTY_BONE = registerBlock(new RotatedPillarBlock(create(Material.ROCK, MaterialColor.SAND).hardnessAndResistance(2.0F)), "dirty_bone_block");
     public static final Block DIRTY_BONE_SLAB = registerBlock(new SlabBlock(create(Material.ROCK, MaterialColor.SAND).hardnessAndResistance(2.0F)), "dirty_bone_slab");
     public static final Block BONE_LADDER = registerBlock(new AtumLadderBlock(), "bone_ladder");

src/main/java/com/teammetallurgy/atum/init/AtumItems.java

@@ -87,7 +87,7 @@ public class AtumItems {
     public static final Item LIMESTONE_AXE = registerItem(new AxeItem(AtumMats.LIMESTONE, 7.0F, -3.2F, new Item.Properties().group(Atum.GROUP)), "limestone_axe");
     public static final Item LIMESTONE_SWORD = registerItem(new SwordItem(AtumMats.LIMESTONE, 3, -2.4F, new Item.Properties().group(Atum.GROUP)), "limestone_sword");
     public static final Item LIMESTONE_HOE = registerItem(new HoeItem(AtumMats.LIMESTONE, -1, -1.8F, new Item.Properties().group(Atum.GROUP)), "limestone_hoe");
-    public static final Item NEBU_HAMMER = registerItem(new SimpleItem(), "nebu_hammer");
+    public static final Item NEBU_HAMMER = registerItem(new NebuHammerItem(), "nebu_hammer");
     public static final Item DAGGER_IRON = registerItem(new DaggerItem(ItemTier.IRON), "iron_dagger");
     public static final Item POISON_DAGGER = registerItem(new PoisonDaggerItem(), "dagger_poison");
     public static final Item SCIMITAR_IRON = registerItem(new SwordItem(ItemTier.IRON, 3, -2.4F, new Item.Properties().group(Atum.GROUP)), "iron_scimitar");

src/main/java/com/teammetallurgy/atum/items/NebuHammerItem.java

@@ -0,0 +1,20 @@
+package com.teammetallurgy.atum.items;
+
+import com.teammetallurgy.atum.blocks.GodforgedBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.item.ItemStack;
+
+import javax.annotation.Nonnull;
+
+public class NebuHammerItem extends SimpleItem {
+
+    @Override
+    public boolean canHarvestBlock(@Nonnull ItemStack stack, BlockState state) {
+        return state.getBlock() instanceof GodforgedBlock;
+    }
+
+    @Override
+    public float getDestroySpeed(@Nonnull ItemStack stack, @Nonnull BlockState state) {
+        return state.getBlock() instanceof GodforgedBlock ? 50.0F : super.getDestroySpeed(stack, state);
+    }
+}

src/main/resources/assets/atum/blockstates/anput_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/anput_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/anubis_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/anubis_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/atem_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/atem_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/geb_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/geb_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/horus_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/horus_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/isis_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/isis_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/montu_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/montu_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/nepthys_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/nepthys_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/nuit_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/nuit_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/osiris_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/osiris_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/ptah_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/ptah_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/ra_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/ra_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/seth_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/seth_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/shu_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/shu_godforged_block" }
+  }
+}

src/main/resources/assets/atum/blockstates/tefnut_godforged_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "atum:block/tefnut_godforged_block" }
+  }
+}

src/main/resources/assets/atum/lang/en_us.json

@@ -256,6 +256,22 @@
   "block.atum.relic_ore": "Relic Ore",
   "block.atum.nebu_ore": "Nebu Ore",
   "block.atum.nebu_block": "Nebu Block",
+  "block.atum.godforged_block": "Godforged Block",
+  "block.atum.anput_godforged_block": "Anput Godforged Block",
+  "block.atum.anubis_godforged_block": "Anubis Godforged Block",
+  "block.atum.atem_godforged_block": "Atem Godforged Block",
+  "block.atum.geb_godforged_block": "Geb Godforged Block",
+  "block.atum.horus_godforged_block": "Horus Godforged Block",
+  "block.atum.isis_godforged_block": "Isis Godforged Block",
+  "block.atum.montu_godforged_block": "Montu Godforged Block",
+  "block.atum.nepthys_godforged_block": "Nepthys Godforged Block",
+  "block.atum.nuit_godforged_block": "Nuit Godforged Block",
+  "block.atum.osiris_godforged_block": "Osiris Godforged Block",
+  "block.atum.ptah_godforged_block": "Ptah Godforged Block",
+  "block.atum.ra_godforged_block": "Ra Godforged Block",
+  "block.atum.seth_godforged_block": "Seth Godforged Block",
+  "block.atum.shu_godforged_block": "Shu Godforged Block",
+  "block.atum.tefnut_godforged_block": "Tefnut Godforged Block",
   "block.atum.khnumite_raw": "Raw Khnumite",
   "block.atum.dirty_bone_block": "Dirty Bone Block",
   "block.atum.dirty_bone_slab": "Dirty Bone Slab",

src/main/resources/assets/atum/models/block/anput_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/anput_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/anubis_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/anubis_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/atem_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/atem_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/geb_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/geb_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/horus_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/horus_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/isis_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/isis_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/montu_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/montu_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/nepthys_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/nepthys_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/nuit_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/nuit_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/osiris_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/osiris_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/ptah_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/ptah_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/ra_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/ra_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/seth_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/seth_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/shu_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/shu_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/block/tefnut_godforged_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "atum:block/tefnut_godforged_block"
+  }
+}

src/main/resources/assets/atum/models/item/anput_godforged_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "atum:block/anput_godforged_block"
+}

src/main/resources/assets/atum/models/item/anubis_godforged_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "atum:block/anubis_godforged_block"
+}

src/main/resources/assets/atum/models/item/atem_godforged_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "atum:block/atem_godforged_block"
+}

src/main/resources/assets/atum/models/item/geb_godforged_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "atum:block/geb_godforged_block"
+}

src/main/resources/assets/atum/models/item/godforged_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "atum:block/godforged_block"
+}

src/main/resources/assets/atum/models/item/horus_godforged_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "atum:block/horus_godforged_block"
+}

src/main/resources/assets/atum/models/item/isis_godforged_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "atum:block/isis_godforged_block"
+}