diff --git a/src/main/java/supersymmetry/common/CommonProxy.java b/src/main/java/supersymmetry/common/CommonProxy.java index 397bc437f..1f37b9bc4 100644 --- a/src/main/java/supersymmetry/common/CommonProxy.java +++ b/src/main/java/supersymmetry/common/CommonProxy.java @@ -160,6 +160,7 @@ public static void registerBlocks(@NotNull RegistryEvent.Register event) registry.register(SuSyBlocks.METALLURGY_ROLL); registry.register(SuSyBlocks.CONVEYOR_BELT); registry.register(SuSyBlocks.ROCKET_ASSEMBLER_CASING); + registry.register(SuSyBlocks.REINFORCED_CONCRETE); registry.register(SuSyBlocks.REGOLITH); registry.register(SuSyBlocks.FAKEWOOL); @@ -200,6 +201,7 @@ public static void registerItems(@NotNull RegistryEvent.Register event) { registry.register(createItemBlock(SuSyBlocks.METALLURGY_ROLL, VariantItemBlock::new)); registry.register(createItemBlock(SuSyBlocks.CONVEYOR_BELT, VariantItemBlock::new)); registry.register(createItemBlock(SuSyBlocks.ROCKET_ASSEMBLER_CASING, VariantItemBlock::new)); + registry.register(createItemBlock(SuSyBlocks.REINFORCED_CONCRETE, VariantItemBlock::new)); registry.register(createItemBlock(SuSyBlocks.REGOLITH, VariantItemBlockFalling::new)); registry.register(createItemBlock(SuSyBlocks.FAKEWOOL, VariantItemBlock::new)); diff --git a/src/main/java/supersymmetry/common/blocks/BlockReinforcedConcrete.java b/src/main/java/supersymmetry/common/blocks/BlockReinforcedConcrete.java new file mode 100644 index 000000000..d10b36cb5 --- /dev/null +++ b/src/main/java/supersymmetry/common/blocks/BlockReinforcedConcrete.java @@ -0,0 +1,67 @@ +package supersymmetry.common.blocks; + +import gregtech.api.GregTechAPI; +import gregtech.api.block.IStateHarvestLevel; +import gregtech.api.block.VariantBlock; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLiving; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import org.jetbrains.annotations.NotNull; + +import javax.annotation.Nonnull; + +public class BlockReinforcedConcrete extends VariantBlock { + + public BlockReinforcedConcrete(){ + super(Material.ROCK); + setTranslationKey("concrete_reinforced"); + setHardness(6.0f); + setResistance(15.0f); + setSoundType(SoundType.STONE); + setHarvestLevel("pickaxe", 2); + setDefaultState(getState(Type.FRAMED)); + setCreativeTab(GregTechAPI.TAB_GREGTECH_DECORATIONS); + } + + @Override + public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAccess world, @NotNull BlockPos pos, + @NotNull EntityLiving.SpawnPlacementType type) { + return false; + } + + @NotNull + @Override + public BlockRenderLayer getRenderLayer() { + return BlockRenderLayer.SOLID; + } + + public enum Type implements IStringSerializable, IStateHarvestLevel { + FRAMED("framed", 2); + + private final String name; + private final int harvestLevel; + + Type(String name, int harvestLevel) { + this.name = name; + this.harvestLevel = harvestLevel; + } + + @Nonnull + public String getName() { + return this.name; + } + + public int getHarvestLevel(IBlockState state) { + return this.harvestLevel; + } + + public String getHarvestTool(IBlockState state) { + return "pickaxe"; + } + } +} diff --git a/src/main/java/supersymmetry/common/blocks/SuSyBlocks.java b/src/main/java/supersymmetry/common/blocks/SuSyBlocks.java index 47d3bfe20..2c08b9d85 100644 --- a/src/main/java/supersymmetry/common/blocks/SuSyBlocks.java +++ b/src/main/java/supersymmetry/common/blocks/SuSyBlocks.java @@ -52,6 +52,7 @@ public class SuSyBlocks { public static BlockMetallurgyRoll METALLURGY_ROLL; public static BlockConveyor CONVEYOR_BELT; public static BlockRocketAssemblerCasing ROCKET_ASSEMBLER_CASING; + public static BlockReinforcedConcrete REINFORCED_CONCRETE; public static BlockRegolith REGOLITH; public static BlocksFakeWool FAKEWOOL; @@ -142,6 +143,9 @@ public static void init() { ROCKET_ASSEMBLER_CASING = new BlockRocketAssemblerCasing(); ROCKET_ASSEMBLER_CASING.setRegistryName("rocket_assembler_casing"); + REINFORCED_CONCRETE = new BlockReinforcedConcrete(); + REINFORCED_CONCRETE.setRegistryName("concrete_reinforced"); + REGOLITH = new BlockRegolith(); REGOLITH.setRegistryName("regolith"); @@ -180,6 +184,7 @@ public static void registerItemModels() { registerItemModel(METALLURGY_ROLL); registerItemModel(CONVEYOR_BELT); registerItemModel(ROCKET_ASSEMBLER_CASING); + registerItemModel(REINFORCED_CONCRETE); registerItemModel(REGOLITH); registerItemModel(FAKEWOOL); } diff --git a/src/main/resources/assets/gregtech/textures/blocks/concrete_reinforced/framed.png b/src/main/resources/assets/gregtech/textures/blocks/concrete_reinforced/framed.png new file mode 100644 index 000000000..7aa39215b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/concrete_reinforced/framed.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/concrete_reinforced/framed.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/concrete_reinforced/framed.png.mcmeta new file mode 100644 index 000000000..6c5664bb5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/concrete_reinforced/framed.png.mcmeta @@ -0,0 +1,10 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "CTM", + "layer": "SOLID", + "textures": [ + "gregtech:blocks/concrete_reinforced/framed_ctm" + ] + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/concrete_reinforced/framed_ctm.png b/src/main/resources/assets/gregtech/textures/blocks/concrete_reinforced/framed_ctm.png new file mode 100644 index 000000000..2a2ad81a0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/concrete_reinforced/framed_ctm.png differ diff --git a/src/main/resources/assets/susy/blockstates/concrete_reinforced.json b/src/main/resources/assets/susy/blockstates/concrete_reinforced.json new file mode 100644 index 000000000..42da2d150 --- /dev/null +++ b/src/main/resources/assets/susy/blockstates/concrete_reinforced.json @@ -0,0 +1,11 @@ +{ + "forge_marker" : 1, + "variants" : { + "variant=framed" : { + "model" : "minecraft:cube_all", + "textures" : { + "all" : "gregtech:blocks/concrete_reinforced/framed" + } + } + } +} diff --git a/src/main/resources/assets/susy/lang/en_us.lang b/src/main/resources/assets/susy/lang/en_us.lang index bf43290b9..4640f08d7 100644 --- a/src/main/resources/assets/susy/lang/en_us.lang +++ b/src/main/resources/assets/susy/lang/en_us.lang @@ -161,6 +161,8 @@ tile.susy_stone_bricks.anorthosite.name=Anorthosite Bricks tile.susy_stone_bricks.industrial_concrete.name=Industrial Concrete Bricks tile.susy_stone_bricks.minitary_concrete.name=Military Concrete Bricks +tile.concrete_reinforced.framed.name=Frame-Reinforced Concrete + # Materials susy.material.manganese_iron_arsenic_phosphide=Manganese Iron Arsenic Phosphide susy.material.praseodymium_nickel=Praseodymium-Nickel