diff --git a/src/main/java/techreborn/blocks/BlockAlarm.java b/src/main/java/techreborn/blocks/BlockAlarm.java index 4b0e24892..c03b36d8a 100644 --- a/src/main/java/techreborn/blocks/BlockAlarm.java +++ b/src/main/java/techreborn/blocks/BlockAlarm.java @@ -2,19 +2,30 @@ package techreborn.blocks; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import prospector.shootingstar.ShootingStar; +import prospector.shootingstar.model.ModelCompound; import techreborn.client.TechRebornCreativeTab; +import techreborn.lib.ModInfo; import techreborn.tiles.TileAlarm; import javax.annotation.Nullable; +//TODO: On/off variants, Placeable on walls/roofs(faces), Visible when holding in hand, and recipe. + public class BlockAlarm extends BlockContainer { + public BlockAlarm() { super(Material.ROCK); setUnlocalizedName("techreborn.alarm"); setCreativeTab(TechRebornCreativeTab.instance); - + ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/lighting")); } @Nullable @@ -22,4 +33,30 @@ public class BlockAlarm extends BlockContainer { public TileEntity createNewTileEntity(World worldIn, int meta) { return new TileAlarm(); } + + @Override + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.MODEL; + } + + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } + + @Override + public boolean isFullBlock(IBlockState state) { + return false; + } + + @Override + public boolean isFullCube(IBlockState state) { + return false; + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) { + return new AxisAlignedBB(0.19, 0.0, 0.19, 0.81, 0.18, 0.81); + } + } diff --git a/src/main/resources/assets/techreborn/blockstates/machines/lighting/alarm.json b/src/main/resources/assets/techreborn/blockstates/machines/lighting/alarm.json new file mode 100644 index 000000000..c91c40007 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/machines/lighting/alarm.json @@ -0,0 +1,22 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "techreborn:alarm" + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "model": "techreborn:alarm", + "textures": {} + }, + "normal": { + "transform": "forge:default-block", + "model": "techreborn:alarm", + "textures": { + "alarm": "techreborn:blocks/machines/lighting/alarm_off" + } + } + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index e5187da17..beab9c576 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -93,6 +93,8 @@ tile.techreborn:refined_iron_fence.name=Iron Fence tile.techreborn:lamp_incandescent.name=Incandescent Lamp tile.techreborn:lamp_led.name=LED Lamp +tile.techreborn:alarm.name=Alarm + #Ores tile.techreborn:ore.galena.name=Galena Ore tile.techreborn:ore.iridium.name=Iridium Ore diff --git a/src/main/resources/assets/techreborn/lang/fr_fr.lang b/src/main/resources/assets/techreborn/lang/fr_fr.lang index 0e08e6412..d60000f94 100644 --- a/src/main/resources/assets/techreborn/lang/fr_fr.lang +++ b/src/main/resources/assets/techreborn/lang/fr_fr.lang @@ -898,3 +898,6 @@ achievement.TechReborn:ore_Pickup=Nouveau minerai ! achievement.TechReborn:ore_Pickup.desc=Minez un minerai techreborn achievement.TechReborn:centrifuge_Craft=Il est temps de tourner achievement.TechReborn:thermalgen_Craft=Il est temps de chauffer + +#Blocks +tile.techreborn:alarm.name=Alarme \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/lang/ru_ru.lang b/src/main/resources/assets/techreborn/lang/ru_ru.lang index 39d14d95b..e8716c558 100644 --- a/src/main/resources/assets/techreborn/lang/ru_ru.lang +++ b/src/main/resources/assets/techreborn/lang/ru_ru.lang @@ -87,6 +87,7 @@ tile.techreborn:rubber_leaves.name=Листва гевеи tile.techreborn:rubber_sapling.name=Саженец гевеи tile.techreborn:refined_iron_fence.name=Железный забор +tile.techreborn:alarm.name=аварийная сигнализация #Ores tile.techreborn:ore.galena.name=Галенитовая руда diff --git a/src/main/resources/assets/techreborn/lang/zh_cn.lang b/src/main/resources/assets/techreborn/lang/zh_cn.lang index 595e2a986..1d3a9de23 100644 --- a/src/main/resources/assets/techreborn/lang/zh_cn.lang +++ b/src/main/resources/assets/techreborn/lang/zh_cn.lang @@ -92,6 +92,7 @@ tile.techreborn:rubber_sapling.name=橡胶树苗 tile.techreborn:refined_iron_fence.name=铁栅栏 tile.techreborn:lamp_incandescent.name=白炽灯 tile.techreborn:lamp_led.name=LED灯 +tile.techreborn:alarm.name=报警 #Ores tile.techreborn:ore.galena.name=方铅矿石 diff --git a/src/main/resources/assets/techreborn/models/block/alarm.json b/src/main/resources/assets/techreborn/models/block/alarm.json new file mode 100644 index 000000000..7eea178d6 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/alarm.json @@ -0,0 +1,54 @@ +{ + "textures": { + "0": "techreborn:blocks/machines/lighting/alarm_off", + "particle": "techreborn:blocks/machines/lighting/alarm_off" + }, + "elements": [ + { + "name": "cube", + "from": [3, 0, 3], + "to": [13, 3, 13], + "faces": { + "north": { + "uv": [ + 0.37890625, + 0.5171875, + 15.240625, + 3.3093749999999997 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 0.37890625, + 0.5171875, + 15.240625, + 3.3093749999999997 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 0.37890625, + 0.5171875, + 15.240625, + 3.3093749999999997 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 0.37890625, + 0.5171875, + 15.240625, + 3.3093749999999997 + ], + "texture": "#0" + }, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [5, 2, 6, 3], "texture": "#0"} + }, + "type": "cube" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/alarm.png b/src/main/resources/assets/techreborn/textures/blocks/alarm.png deleted file mode 100644 index 890b42954..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/alarm.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_off.png b/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_off.png new file mode 100644 index 000000000..df4977e74 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_off.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_on.png b/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_on.png new file mode 100644 index 000000000..9d7a70c40 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_on.png differ