diff --git a/src/main/java/techreborn/blocks/BlockFusionCoil.java b/src/main/java/techreborn/blocks/BlockFusionCoil.java index 27c084098..40fe86cf3 100644 --- a/src/main/java/techreborn/blocks/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/BlockFusionCoil.java @@ -1,23 +1,17 @@ package techreborn.blocks; +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.EnumFacing; -import reborncore.common.blocks.BlockMachineBase; import techreborn.client.TechRebornCreativeTab; -public class BlockFusionCoil extends BlockMachineBase { - - private final String prefix = "techreborn:blocks/machine/greg_machines/"; +public class BlockFusionCoil extends Block { public BlockFusionCoil(Material material) { - super(); + super(Material.IRON); + setHardness(2f); + setSoundType(SoundType.METAL); setUnlocalizedName("techreborn.fusioncoil"); setCreativeTab(TechRebornCreativeTab.instance); } - - @Override - public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) { - return prefix + "fusion_coil"; - } } diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index ebed8fc32..85f15ad49 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -41,8 +41,6 @@ public class RegisterItemJsons { register(ModItems.diamondJackhammer, "tool/diamond_jackhammer"); register(ModItems.advancedJackhammer, "tool/advanced_jackhammer"); register(ModBlocks.rubberSapling, "misc/rubber_sapling"); - register(ModBlocks.ore, "techreborn.ore"); - register(ModBlocks.ore2, "techreborn.ore2"); for (int i = 0; i < ItemIngots.types.length; ++i) { String[] name = ItemIngots.types.clone(); diff --git a/src/main/resources/assets/techreborn/blockstates/fusioncoil.json b/src/main/resources/assets/techreborn/blockstates/fusioncoil.json new file mode 100644 index 000000000..7c06ef7d4 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/fusioncoil.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube", + "textures": { + "particle": "techreborn:blocks/machine/greg_machines/fusion_coil_side", + "down": "techreborn:blocks/machine/greg_machines/fusion_coil_heart", + "up": "techreborn:blocks/machine/greg_machines/fusion_coil_heart", + "north": "techreborn:blocks/machine/greg_machines/fusion_coil_side", + "south": "techreborn:blocks/machine/greg_machines/fusion_coil_side", + "west": "techreborn:blocks/machine/greg_machines/fusion_coil_side", + "east": "techreborn:blocks/machine/greg_machines/fusion_coil_side" + } + } +} \ No newline at end of file