diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/common/Blocks.java | 30 | ||||
| -rw-r--r-- | src/main/java/common/tileentities/GTMTE_SpaceElevator.java | 18 | ||||
| -rw-r--r-- | src/main/resources/assets/kekztech/textures/blocks/CoilHolder.png | bin | 0 -> 228 bytes | |||
| -rw-r--r-- | src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorBase_side.png | bin | 0 -> 203 bytes | |||
| -rw-r--r-- | src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorBase_top.png | bin | 0 -> 242 bytes |
5 files changed, 20 insertions, 28 deletions
diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java index f6939ffd90..4b26ddc133 100644 --- a/src/main/java/common/Blocks.java +++ b/src/main/java/common/Blocks.java @@ -1,26 +1,6 @@ package common; -import common.blocks.Block_ControlRod; -import common.blocks.Block_GDCUnit; -import common.blocks.Block_IchorJar; -import common.blocks.Block_ItemProxyCable; -import common.blocks.Block_ItemProxyEndpoint; -import common.blocks.Block_ItemProxySource; -import common.blocks.Block_ItemServerDrive; -import common.blocks.Block_ItemServerIOPort; -import common.blocks.Block_ItemServerRackCasing; -import common.blocks.Block_LapotronicEnergyUnit; -import common.blocks.Block_ReactorChamber_OFF; -import common.blocks.Block_ReactorChamber_ON; -import common.blocks.Block_TFFTCasing; -import common.blocks.Block_TFFTMultiHatch; -import common.blocks.Block_TFFTStorageFieldBlockT1; -import common.blocks.Block_TFFTStorageFieldBlockT2; -import common.blocks.Block_TFFTStorageFieldBlockT3; -import common.blocks.Block_TFFTStorageFieldBlockT4; -import common.blocks.Block_TFFTStorageFieldBlockT5; -import common.blocks.Block_ThaumiumReinforcedJar; -import common.blocks.Block_YSZUnit; +import common.blocks.*; import kekztech.KekzCore; import net.minecraft.block.Block; @@ -53,6 +33,8 @@ public class Blocks { public static Block jarIchor; public static Block lscLapotronicEnergyUnit; + + public static Block spaceElevatorStructure; public static void preInit() { KekzCore.LOGGER.info("Registering blocks..."); @@ -64,6 +46,7 @@ public class Blocks { //registerBlocks_ItemProxy(); registerBlocks_Jars(); registerBlocks_LSC(); + registerBlocks_SpaceElevator(); KekzCore.LOGGER.info("Finished registering blocks"); } @@ -109,4 +92,9 @@ public class Blocks { private static void registerBlocks_LSC() { lscLapotronicEnergyUnit = Block_LapotronicEnergyUnit.registerBlock(); } + + private static void registerBlocks_SpaceElevator() { + spaceElevatorStructure = Block_SpaceElevator.registerBlock(); + } + } diff --git a/src/main/java/common/tileentities/GTMTE_SpaceElevator.java b/src/main/java/common/tileentities/GTMTE_SpaceElevator.java index 5c2bca1323..d3bc87aea2 100644 --- a/src/main/java/common/tileentities/GTMTE_SpaceElevator.java +++ b/src/main/java/common/tileentities/GTMTE_SpaceElevator.java @@ -1,5 +1,6 @@ package common.tileentities; +import common.Blocks; import gregtech.api.GregTech_API; import gregtech.api.enums.Dyes; import gregtech.api.enums.Textures; @@ -25,9 +26,10 @@ import java.util.ArrayList; public class GTMTE_SpaceElevator extends GT_MetaTileEntity_MultiBlockBase { - private static final int CASING_TEXTURE_ID = 16; // Solid Steel Casing - private static final Block CASING_BLOCK = GregTech_API.sBlockCasings2; - private static final int CASING_META = 0; + private static final Block BASE_BLOCK = Blocks.spaceElevatorStructure; + private static final int BASE_META = 0; + private static final int COIL_HOLDER_META = 1; + private static final int HATCH_OVERLAY_ID = 16; private long lastLaunchEUCost = 0; @@ -140,12 +142,12 @@ public class GTMTE_SpaceElevator extends GT_MetaTileEntity_MultiBlockBase { // Tries to add TE as either of those kinds of hatches. // The number is the texture index number for the texture that needs to be painted over the hatch texture - if ( !super.addMaintenanceToMachineList(currentTE, CASING_TEXTURE_ID) - && !this.addEnergyInputToMachineList(currentTE, CASING_TEXTURE_ID)) { + if ( !super.addMaintenanceToMachineList(currentTE, HATCH_OVERLAY_ID) + && !this.addEnergyInputToMachineList(currentTE, HATCH_OVERLAY_ID)) { // If it's not a hatch, is it the right casing for this machine? Check block and block meta. - if ((thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CASING_BLOCK) - && (thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z()) == CASING_META)) { + if ((thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == BASE_BLOCK) + && (thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z()) == BASE_META)) { // Seems to be valid casing. Decrement counter. minCasingAmount--; } else { @@ -155,6 +157,8 @@ public class GTMTE_SpaceElevator extends GT_MetaTileEntity_MultiBlockBase { } } KekzCore.LOGGER.info("Space Elevator Base accepted"); + // Capacitor banks + // Anchor // Coil holders diff --git a/src/main/resources/assets/kekztech/textures/blocks/CoilHolder.png b/src/main/resources/assets/kekztech/textures/blocks/CoilHolder.png Binary files differnew file mode 100644 index 0000000000..12f87ce0f8 --- /dev/null +++ b/src/main/resources/assets/kekztech/textures/blocks/CoilHolder.png diff --git a/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorBase_side.png b/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorBase_side.png Binary files differnew file mode 100644 index 0000000000..05afd9318a --- /dev/null +++ b/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorBase_side.png diff --git a/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorBase_top.png b/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorBase_top.png Binary files differnew file mode 100644 index 0000000000..876c26f8cb --- /dev/null +++ b/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorBase_top.png |
