Added security station (wip)
Added security station texture by LemADEC Improved texture naming consistency
This commit is contained in:
Unknown
unknown
parent
23ed243d1a
commit
569351b5ba
20 changed files with 80 additions and 58 deletions
|
|
@ -4,6 +4,7 @@ import cr0s.warpdrive.api.IBlockBase;
|
|||
import cr0s.warpdrive.block.BlockChunkLoader;
|
||||
import cr0s.warpdrive.block.BlockLaser;
|
||||
import cr0s.warpdrive.block.BlockLaserMedium;
|
||||
import cr0s.warpdrive.block.BlockSecurityStation;
|
||||
import cr0s.warpdrive.block.atomic.BlockAcceleratorControlPoint;
|
||||
import cr0s.warpdrive.block.atomic.BlockAcceleratorController;
|
||||
import cr0s.warpdrive.block.atomic.BlockChiller;
|
||||
|
|
@ -219,6 +220,7 @@ public class WarpDrive {
|
|||
public static Block[] blockForceFields;
|
||||
public static Block[] blockForceFieldProjectors;
|
||||
public static Block[] blockForceFieldRelays;
|
||||
public static Block blockSecurityStation;
|
||||
public static Block blockAcceleratorController;
|
||||
public static Block blockAcceleratorControlPoint;
|
||||
public static Block blockParticlesCollider;
|
||||
|
|
@ -376,9 +378,7 @@ public class WarpDrive {
|
|||
blockForceFieldProjectors[index] = new BlockForceFieldProjector("block_projector" + tier, tier);
|
||||
blockForceFieldRelays[index] = new BlockForceFieldRelay("block_force_field_relay" + tier, tier);
|
||||
}
|
||||
/* @TODO security station
|
||||
blockSecurityStation = new BlockSecurityStation("blockSecurityStation");
|
||||
*/
|
||||
blockSecurityStation = new BlockSecurityStation("block_security_station");
|
||||
itemForceFieldShape = new ItemForceFieldShape("item_force_field_shape");
|
||||
itemForceFieldUpgrade = new ItemForceFieldUpgrade("item_force_field_upgrade");
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package cr0s.warpdrive.block;
|
|||
import cr0s.warpdrive.Commons;
|
||||
import cr0s.warpdrive.TileEntitySecurityStation;
|
||||
import cr0s.warpdrive.WarpDrive;
|
||||
import cr0s.warpdrive.block.movement.TileEntityShipController;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
|
|
@ -22,7 +21,7 @@ public class BlockSecurityStation extends BlockAbstractContainer {
|
|||
|
||||
public BlockSecurityStation(final String registryName) {
|
||||
super(registryName, Material.IRON);
|
||||
setUnlocalizedName("warpdrive.movement.ship_controller");
|
||||
setUnlocalizedName("warpdrive.machines.security_station");
|
||||
|
||||
setDefaultState(getDefaultState());
|
||||
registerTileEntity(TileEntitySecurityStation.class, new ResourceLocation(WarpDrive.MODID, registryName));
|
||||
|
|
@ -31,7 +30,7 @@ public class BlockSecurityStation extends BlockAbstractContainer {
|
|||
@Nonnull
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(@Nonnull final World world, final int metadata) {
|
||||
return new TileEntityShipController();
|
||||
return new TileEntitySecurityStation();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "minecraft:cube_bottom_top",
|
||||
"textures": {
|
||||
"side" : "warpdrive:blocks/security_station-side",
|
||||
"bottom": "warpdrive:blocks/security_station-top_bottom",
|
||||
"top" : "warpdrive:blocks/security_station-top_bottom"
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": [{}]
|
||||
}
|
||||
}
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
"model": "minecraft:cube_bottom_top",
|
||||
"textures": {
|
||||
"side" : "warpdrive:blocks/movement/ship_controller-side_inactive",
|
||||
"bottom": "warpdrive:blocks/movement/ship_controller-bottom",
|
||||
"top" : "warpdrive:blocks/movement/ship_controller-top"
|
||||
"bottom": "warpdrive:blocks/movement/ship_controller-top_bottom",
|
||||
"top" : "warpdrive:blocks/movement/ship_controller-top_bottom"
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -3,123 +3,123 @@
|
|||
"variants": {
|
||||
"normal": [{}],
|
||||
"inventory": { "model": "minecraft:cube", "textures": {
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_core-right_online",
|
||||
"south" : "warpdrive:blocks/movement/ship_core-left_online",
|
||||
"west" : "warpdrive:blocks/movement/ship_controller-top",
|
||||
"west" : "warpdrive:blocks/movement/ship_core-front",
|
||||
"east" : "warpdrive:blocks/movement/ship_controller-side_active2"
|
||||
} },
|
||||
|
||||
"active=false,facing=down" : { "model": "minecraft:cube", "textures": {
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_controller-side_inactive",
|
||||
"south" : "warpdrive:blocks/movement/ship_controller-side_inactive",
|
||||
"west" : "warpdrive:blocks/movement/ship_controller-side_inactive",
|
||||
"east" : "warpdrive:blocks/movement/ship_controller-side_inactive"
|
||||
} },
|
||||
"active=false,facing=up" : { "model": "minecraft:cube", "textures": {
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_controller-side_inactive",
|
||||
"south" : "warpdrive:blocks/movement/ship_controller-side_inactive",
|
||||
"west" : "warpdrive:blocks/movement/ship_controller-side_inactive",
|
||||
"east" : "warpdrive:blocks/movement/ship_controller-side_inactive"
|
||||
} },
|
||||
"active=false,facing=north": { "model": "minecraft:cube", "textures": {
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_controller-top",
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_core-front",
|
||||
"south" : "warpdrive:blocks/movement/ship_controller-side_active1",
|
||||
"west" : "warpdrive:blocks/movement/ship_core-left_offline",
|
||||
"east" : "warpdrive:blocks/movement/ship_core-right_offline"
|
||||
} },
|
||||
"active=false,facing=south": { "model": "minecraft:cube", "textures": {
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_controller-side_active2",
|
||||
"south" : "warpdrive:blocks/movement/ship_controller-top",
|
||||
"south" : "warpdrive:blocks/movement/ship_core-front",
|
||||
"west" : "warpdrive:blocks/movement/ship_core-right_offline",
|
||||
"east" : "warpdrive:blocks/movement/ship_core-left_offline"
|
||||
} },
|
||||
"active=false,facing=west" : { "model": "minecraft:cube", "textures": {
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_core-right_offline",
|
||||
"south" : "warpdrive:blocks/movement/ship_core-left_offline",
|
||||
"west" : "warpdrive:blocks/movement/ship_controller-top",
|
||||
"west" : "warpdrive:blocks/movement/ship_core-front",
|
||||
"east" : "warpdrive:blocks/movement/ship_controller-side_active3"
|
||||
} },
|
||||
"active=false,facing=east" : { "model": "minecraft:cube", "textures": {
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_core-left_offline",
|
||||
"south" : "warpdrive:blocks/movement/ship_core-right_offline",
|
||||
"west" : "warpdrive:blocks/movement/ship_controller-side_active4",
|
||||
"east" : "warpdrive:blocks/movement/ship_controller-top"
|
||||
"east" : "warpdrive:blocks/movement/ship_core-front"
|
||||
} },
|
||||
|
||||
"active=true,facing=down" : { "model": "minecraft:cube", "textures": {
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_controller-side_inactive",
|
||||
"south" : "warpdrive:blocks/movement/ship_controller-side_inactive",
|
||||
"west" : "warpdrive:blocks/movement/ship_controller-side_inactive",
|
||||
"east" : "warpdrive:blocks/movement/ship_controller-side_inactive"
|
||||
} },
|
||||
"active=true,facing=up" : { "model": "minecraft:cube", "textures": {
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_controller-side_inactive",
|
||||
"south" : "warpdrive:blocks/movement/ship_controller-side_inactive",
|
||||
"west" : "warpdrive:blocks/movement/ship_controller-side_inactive",
|
||||
"east" : "warpdrive:blocks/movement/ship_controller-side_inactive"
|
||||
} },
|
||||
"active=true,facing=north": { "model": "minecraft:cube", "textures": {
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_controller-top",
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_core-front",
|
||||
"south" : "warpdrive:blocks/movement/ship_controller-side_active1",
|
||||
"west" : "warpdrive:blocks/movement/ship_core-left_online",
|
||||
"east" : "warpdrive:blocks/movement/ship_core-right_online"
|
||||
} },
|
||||
"active=true,facing=south": { "model": "minecraft:cube", "textures": {
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_controller-side_active2",
|
||||
"south" : "warpdrive:blocks/movement/ship_controller-top",
|
||||
"south" : "warpdrive:blocks/movement/ship_core-front",
|
||||
"west" : "warpdrive:blocks/movement/ship_core-right_online",
|
||||
"east" : "warpdrive:blocks/movement/ship_core-left_online"
|
||||
} },
|
||||
"active=true,facing=west" : { "model": "minecraft:cube", "textures": {
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_core-right_online",
|
||||
"south" : "warpdrive:blocks/movement/ship_core-left_online",
|
||||
"west" : "warpdrive:blocks/movement/ship_controller-top",
|
||||
"west" : "warpdrive:blocks/movement/ship_core-front",
|
||||
"east" : "warpdrive:blocks/movement/ship_controller-side_active3"
|
||||
} },
|
||||
"active=true,facing=east" : { "model": "minecraft:cube", "textures": {
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top-bottom",
|
||||
"particle": "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"down" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"up" : "warpdrive:blocks/movement/ship_core-top_bottom",
|
||||
"north" : "warpdrive:blocks/movement/ship_core-left_online",
|
||||
"south" : "warpdrive:blocks/movement/ship_core-right_online",
|
||||
"west" : "warpdrive:blocks/movement/ship_controller-side_active4",
|
||||
"east" : "warpdrive:blocks/movement/ship_controller-top"
|
||||
"east" : "warpdrive:blocks/movement/ship_core-front"
|
||||
} }
|
||||
}
|
||||
}
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
"model": "minecraft:cube_bottom_top",
|
||||
"textures": {
|
||||
"side" : "warpdrive:blocks/weapon/weapon_controller-side",
|
||||
"bottom": "warpdrive:blocks/movement/ship_controller-bottom",
|
||||
"top" : "warpdrive:blocks/movement/ship_controller-top"
|
||||
"bottom": "warpdrive:blocks/weapon/weapon_controller-top_bottom",
|
||||
"top" : "warpdrive:blocks/weapon/weapon_controller-top_bottom"
|
||||
},
|
||||
"transform": "forge:default-block"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -203,6 +203,7 @@ tile.warpdrive.passive.highly_advanced_machine.name=Stark weiterentwickelter Mas
|
|||
tile.warpdrive.machines.chunk_loader.name=Chunk Loader
|
||||
tile.warpdrive.machines.laser.name=Laser
|
||||
tile.warpdrive.machines.laser_medium.name=Medium Laser (Teilchenbeschleuniger)
|
||||
tile.warpdrive.machines.security_station.name=Security Station
|
||||
|
||||
tile.warpdrive.atomic.accelerator_controller.name=Beschleunigungsregler
|
||||
tile.warpdrive.atomic.accelerator_controller.tooltip=Regelt einen oder mehrere Teilchenbeschleuniger.\nSollte neben einem Elektromagnet platziert werden.
|
||||
|
|
|
|||
|
|
@ -201,6 +201,7 @@ tile.warpdrive.passive.highly_advanced_machine.name=Highly Advanced Machine Bloc
|
|||
tile.warpdrive.machines.chunk_loader.name=Chunk Loader
|
||||
tile.warpdrive.machines.laser.name=Laser
|
||||
tile.warpdrive.machines.laser_medium.name=Laser Medium (Particle Booster)
|
||||
tile.warpdrive.machines.security_station.name=Security Station
|
||||
|
||||
tile.warpdrive.atomic.accelerator_controller.name=Accelerator Controller
|
||||
tile.warpdrive.atomic.accelerator_controller.tooltip=Controls one or more particle accelerators.\nShall be placed next to an electromagnet.
|
||||
|
|
|
|||
|
|
@ -201,6 +201,7 @@ tile.warpdrive.passive.highly_advanced_machine.name=Bloc de machine hyper avanc
|
|||
tile.warpdrive.machines.chunk_loader.name=Chargeur de chunk
|
||||
tile.warpdrive.machines.laser.name=Laser
|
||||
tile.warpdrive.machines.laser_medium.name=Milieu amplificateur
|
||||
tile.warpdrive.machines.security_station.name=Station de sécurité
|
||||
|
||||
tile.warpdrive.atomic.accelerator_controller.name=Controlleur d'accélérateurs
|
||||
tile.warpdrive.atomic.accelerator_controller.tooltip=Contrôle un ou plusieurs accélérateurs de particules.\nDoit être placé à coté d'un électroaimant.
|
||||
|
|
|
|||
|
|
@ -198,6 +198,7 @@ tile.warpdrive.passive.highly_advanced_machine.name=Heel geavanceerd machineblok
|
|||
tile.warpdrive.machines.chunk_loader.name=Chunk-lader
|
||||
tile.warpdrive.machines.laser.name=Laser
|
||||
tile.warpdrive.machines.laser_medium.name=Deeltjesversneller
|
||||
tile.warpdrive.machines.security_station.name=Security Station
|
||||
|
||||
tile.warpdrive.atomic.accelerator_controller.name=Versnellers-regelaar
|
||||
tile.warpdrive.atomic.accelerator_controller.tooltip=Regelt één of meer deeltjesversnellers.\nMoet naast een elektromagneet worden geplaats.
|
||||
|
|
|
|||
|
|
@ -201,6 +201,7 @@ tile.warpdrive.passive.highly_advanced_machine.name=Высокотехнолог
|
|||
tile.warpdrive.machines.chunk_loader.name=Загрузчик чанков
|
||||
tile.warpdrive.machines.laser.name=Лазер
|
||||
tile.warpdrive.machines.laser_medium.name=Лазерный излучатель (Ускоритель частиц)
|
||||
tile.warpdrive.machines.security_station.name=Security Station
|
||||
|
||||
tile.warpdrive.atomic.accelerator_controller.name=Accelerator Controller
|
||||
tile.warpdrive.atomic.accelerator_controller.tooltip=Controls one or more particle accelerators.\nShall be placed next to an electromagnet.
|
||||
|
|
|
|||
|
|
@ -198,6 +198,7 @@ tile.warpdrive.passive.highly_advanced_machine.name=高新机械块
|
|||
tile.warpdrive.machines.chunk_loader.name=区块加载器
|
||||
tile.warpdrive.machines.laser.name=激光
|
||||
tile.warpdrive.machines.laser_medium.name=激光介质(粒子助推器)
|
||||
tile.warpdrive.machines.security_station.name=Security Station
|
||||
|
||||
tile.warpdrive.atomic.accelerator_controller.name=加速器操纵仪
|
||||
tile.warpdrive.atomic.accelerator_controller.tooltip=操纵一或多个粒子加速器.\n需要连接电磁体.
|
||||
|
|
|
|||
|
|
@ -198,6 +198,7 @@ tile.warpdrive.passive.highly_advanced_machine.name=高級機床
|
|||
tile.warpdrive.machines.chunk_loader.name=方塊裝載器
|
||||
tile.warpdrive.machines.laser.name=鐳射
|
||||
tile.warpdrive.machines.laser_medium.name=鐳射單元 (粒子加速器)
|
||||
tile.warpdrive.machines.security_station.name=Security Station
|
||||
|
||||
tile.warpdrive.atomic.accelerator_controller.name=Accelerator Controller
|
||||
tile.warpdrive.atomic.accelerator_controller.tooltip=Controls one or more particle accelerators.\nShall be placed next to an electromagnet.
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.9 KiB |
Loading…
Reference in a new issue