Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/supersymmetry/common/CommonProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ public static void registerBlocks(@NotNull RegistryEvent.Register<Block> 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);

Expand Down Expand Up @@ -200,6 +201,7 @@ public static void registerItems(@NotNull RegistryEvent.Register<Item> 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));

Expand Down
Original file line number Diff line number Diff line change
@@ -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<BlockReinforcedConcrete.Type> {

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";
}
}
}
5 changes: 5 additions & 0 deletions src/main/java/supersymmetry/common/blocks/SuSyBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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");

Expand Down Expand Up @@ -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);
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"ctm": {
"ctm_version": 1,
"type": "CTM",
"layer": "SOLID",
"textures": [
"gregtech:blocks/concrete_reinforced/framed_ctm"
]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"forge_marker" : 1,
"variants" : {
"variant=framed" : {
"model" : "minecraft:cube_all",
"textures" : {
"all" : "gregtech:blocks/concrete_reinforced/framed"
}
}
}
}
2 changes: 2 additions & 0 deletions src/main/resources/assets/susy/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading