diff options
author | Martin Robertz <dream-master@gmx.net> | 2023-09-10 11:42:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-10 11:42:20 +0200 |
commit | 5e96dc400bc0b659c8e129a23de3221acd656e96 (patch) | |
tree | f220edeb781676a12dcefd69dead4e6f0eaf63a0 | |
parent | abb9901767709e7db59ea1f6ff523220c0174663 (diff) | |
parent | 97cd10e0534de8312b53ce866ba0fc9752767c52 (diff) | |
download | GT5-Unofficial-5e96dc400bc0b659c8e129a23de3221acd656e96.tar.gz GT5-Unofficial-5e96dc400bc0b659c8e129a23de3221acd656e96.tar.bz2 GT5-Unofficial-5e96dc400bc0b659c8e129a23de3221acd656e96.zip |
Merge pull request #76 from GTNewHorizons/cleanup/unused-stuff
Cleanup unused stuff
143 files changed, 5 insertions, 3119 deletions
diff --git a/.github/scripts/test_no_error_reports b/.github/scripts/test_no_error_reports deleted file mode 100755 index 1fcc7396c6..0000000000 --- a/.github/scripts/test_no_error_reports +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -# bashsupport disable=BP5006 # Global environment variables -RUNDIR="run" \ - CRASH="crash-reports" \ - SERVERLOG="server.log" - -# enable nullglob to get 0 results when no match rather than the pattern -shopt -s nullglob - -# store matches in array -crash_reports=("$RUNDIR/$CRASH/crash"*.txt) - -# if array not empty there are crash_reports -if [ "${#crash_reports[@]}" -gt 0 ]; then - # get the latest crash_report from array - latest_crash_report="${crash_reports[-1]}" - { - printf 'Latest crash report detected %s:\n' "${latest_crash_report##*/}" - cat "$latest_crash_report" - } >&2 - exit 1 -fi - -if grep --quiet --fixed-strings 'Fatal errors were detected' "$SERVERLOG"; then - { - printf 'Fatal errors detected:\n' - cat server.log - } >&2 - exit 1 -fi - -if grep --quiet --fixed-strings 'The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED' \ - "$SERVERLOG"; then - { - printf 'Server force stopped:' - cat server.log - } >&2 - exit 1 -fi - -if ! grep --quiet --perl-regexp --only-matching '.+Done \(.+\)\! For help, type "help" or "\?"' "$SERVERLOG"; then - { - printf 'Server did not finish startup:' - cat server.log - } >&2 - exit 1 -fi - -printf 'No crash reports detected' -exit 0 diff --git a/src/main/java/client/ClientProxy.java b/src/main/java/client/ClientProxy.java index 58a30cd14d..9dfaea0d33 100644 --- a/src/main/java/client/ClientProxy.java +++ b/src/main/java/client/ClientProxy.java @@ -1,14 +1,7 @@ package client; import common.CommonProxy; -import common.tileentities.TE_BeamTransmitter; -import common.tileentities.TE_SpaceElevatorCapacitor; -import common.tileentities.TE_SpaceElevatorTether; -import client.renderer.TESR_BeamTransmitter; -import client.renderer.TESR_SECapacitor; -import client.renderer.TESR_SETether; -import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @@ -17,10 +10,6 @@ public class ClientProxy extends CommonProxy { @Override public void preInit(final FMLPreInitializationEvent e) { super.preInit(e); - // Register TESR - ClientRegistry.bindTileEntitySpecialRenderer(TE_SpaceElevatorTether.class, new TESR_SETether()); - ClientRegistry.bindTileEntitySpecialRenderer(TE_SpaceElevatorCapacitor.class, new TESR_SECapacitor()); - ClientRegistry.bindTileEntitySpecialRenderer(TE_BeamTransmitter.class, new TESR_BeamTransmitter()); } @Override diff --git a/src/main/java/client/gui/Gui_ItemProxyEndpoint.java b/src/main/java/client/gui/Gui_ItemProxyEndpoint.java deleted file mode 100644 index d98417f686..0000000000 --- a/src/main/java/client/gui/Gui_ItemProxyEndpoint.java +++ /dev/null @@ -1,55 +0,0 @@ -package client.gui; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -import common.container.Container_ItemProxyEndpoint; - -import kekztech.KekzCore; - -public class Gui_ItemProxyEndpoint extends GuiContainer { - - private final ResourceLocation texture = new ResourceLocation( - KekzCore.MODID, - "textures/gui/ItemTechReceiverNode.png"); - - private final InventoryPlayer inventory; - private final IInventory te; - - public Gui_ItemProxyEndpoint(TileEntity te, EntityPlayer player) { - super(new Container_ItemProxyEndpoint(te, player)); - inventory = player.inventory; - this.te = (IInventory) te; - } - - @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - - Minecraft.getMinecraft().renderEngine.bindTexture(texture); - GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - - final int x = (super.width - super.xSize) / 2; - final int y = (super.height - super.ySize) / 2; - - super.drawTexturedModalRect(x, y, 0, 0, super.xSize, super.ySize); - } - - @Override - protected void drawGuiContainerForegroundLayer(int p1, int p2) { - super.fontRendererObj.drawString( - I18n.format(te.getInventoryName()), - (super.xSize / 2) - (fontRendererObj.getStringWidth(I18n.format(te.getInventoryName())) / 2), - 6, - 4210752, - false); - super.fontRendererObj.drawString(I18n.format(inventory.getInventoryName()), 8, super.ySize - 96 + 2, 4210752); - } -} diff --git a/src/main/java/client/gui/Gui_ItemProxySource.java b/src/main/java/client/gui/Gui_ItemProxySource.java deleted file mode 100644 index 8618ff828f..0000000000 --- a/src/main/java/client/gui/Gui_ItemProxySource.java +++ /dev/null @@ -1,53 +0,0 @@ -package client.gui; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -import common.container.Container_ItemProxySource; - -import kekztech.KekzCore; - -public class Gui_ItemProxySource extends GuiContainer { - - private final ResourceLocation texture = new ResourceLocation(KekzCore.MODID, "textures/gui/ItemTech4by4.png"); - - private final InventoryPlayer inventory; - private final IInventory te; - - public Gui_ItemProxySource(TileEntity te, EntityPlayer player) { - super(new Container_ItemProxySource(te, player)); - inventory = player.inventory; - this.te = (IInventory) te; - } - - @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - - Minecraft.getMinecraft().renderEngine.bindTexture(texture); - GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - - final int x = (super.width - super.xSize) / 2; - final int y = (super.height - super.ySize) / 2; - - super.drawTexturedModalRect(x, y, 0, 0, super.xSize, super.ySize); - } - - @Override - protected void drawGuiContainerForegroundLayer(int p1, int p2) { - super.fontRendererObj.drawString( - I18n.format(te.getInventoryName()), - (super.xSize / 2) - (fontRendererObj.getStringWidth(I18n.format(te.getInventoryName())) / 2), - 6, - 4210752, - false); - super.fontRendererObj.drawString(I18n.format(inventory.getInventoryName()), 8, super.ySize - 96 + 2, 4210752); - } -} diff --git a/src/main/java/client/renderer/ConduitRenderer.java b/src/main/java/client/renderer/ConduitRenderer.java deleted file mode 100644 index a9e3436bcc..0000000000 --- a/src/main/java/client/renderer/ConduitRenderer.java +++ /dev/null @@ -1,95 +0,0 @@ -package client.renderer; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - -import common.tileentities.TE_ItemProxyCable; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - -public class ConduitRenderer implements ISimpleBlockRenderingHandler { - - public static final int RID = RenderingRegistry.getNextAvailableRenderId(); - private static final ConduitRenderer INSTANCE = new ConduitRenderer(); - - private ConduitRenderer() {} - - public static ConduitRenderer getInstance() { - return INSTANCE; - } - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {} - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, - RenderBlocks renderer) { - final TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TE_ItemProxyCable) { - final TE_ItemProxyCable cable = (TE_ItemProxyCable) te; - - final float thickness = TE_ItemProxyCable.getThickness(); - final float space = (1.0f - thickness) / 2.0f; - - float xThickness = thickness; - float xOffset = space; - float yThickness = thickness; - float yOffset = space; - float zThickness = thickness; - float zOffset = space; - - for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - if (cable.isConnected(side)) { - switch (side) { - case DOWN: - yOffset = 0.0F; - yThickness += space; - break; - case UP: - yThickness += space; - break; - case NORTH: - zOffset = 0.0F; - zThickness += space; - break; - case SOUTH: - zThickness += space; - break; - case WEST: - xOffset += 0.0F; - xThickness += space; - break; - case EAST: - xThickness += space; - break; - } - } - } - - block.setBlockBounds( - xOffset, - yOffset, - zOffset, - xOffset + xThickness, - yOffset + yThickness, - zOffset + zThickness); - renderer.setRenderBoundsFromBlock(block); - } - - return false; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return ConduitRenderer.RID; - } -} diff --git a/src/main/java/client/renderer/TESR_BeamTransmitter.java b/src/main/java/client/renderer/TESR_BeamTransmitter.java deleted file mode 100644 index e6e31f80d5..0000000000 --- a/src/main/java/client/renderer/TESR_BeamTransmitter.java +++ /dev/null @@ -1,72 +0,0 @@ -package client.renderer; - -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -import common.tileentities.TE_BeamTransmitter; - -import kekztech.KekzCore; - -public class TESR_BeamTransmitter extends TileEntitySpecialRenderer { - - private static final ResourceLocation beamTexture = new ResourceLocation( - KekzCore.MODID, - "textures/effects/Tether_beam.png"); - - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { - final TE_BeamTransmitter beamTransmitter = (TE_BeamTransmitter) te; - - GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); - // Get Tessellator instance - final Tessellator tessellator = Tessellator.instance; - // Bind beam texture and set texture params - super.bindTexture(beamTexture); - GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0F); - GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 10497.0F); - // Set render flags for inner beam - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - OpenGlHelper.glBlendFunc(770, 1, 1, 0); - // Prepare Tessellator - tessellator.startDrawingQuads(); - tessellator.setColorRGBA(255, 255, 255, 32); - // Variables stuff II - final float exactTime = (float) beamTransmitter.getWorldObj().getTotalWorldTime() + partialTick; - final float streamTextureOffset = -exactTime * 0.2F - (float) MathHelper.floor_float(-exactTime * 0.1F); - - final double halfBeamWidth = 0.1D; - final double height = beamTransmitter.getDistanceFromTarget(); - final double uv_x1 = 0.0D; - final double uv_x2 = 1.0D; - final double uv_y1 = -1.0D - streamTextureOffset; // This makes the beam stream upwards if you subtract a time - // sensitive number - // from it - final double uv_y2 = height * (0.5D / (halfBeamWidth * 2)) + uv_y1; - // Construct mesh with texture - tessellator.addVertexWithUV(x + 0.5 + halfBeamWidth, y + 0.5, z + 0.5, uv_x2, uv_y2); - tessellator.addVertexWithUV(x + 0.5 + halfBeamWidth, y + height, z + 0.5, uv_x2, uv_y1); - tessellator.addVertexWithUV(x + 0.5 - halfBeamWidth, y + height, z + 0.5, uv_x1, uv_y1); - tessellator.addVertexWithUV(x + 0.5 - halfBeamWidth, y + 0.5, z + 0.5, uv_x1, uv_y2); - - tessellator.addVertexWithUV(x + 0.5, y + 0.5, z + 0.5 + halfBeamWidth, uv_x2, uv_y2); - tessellator.addVertexWithUV(x + 0.5, y + height, z + 0.5 + halfBeamWidth, uv_x2, uv_y1); - tessellator.addVertexWithUV(x + 0.5, y + height, z + 0.5 - halfBeamWidth, uv_x1, uv_y1); - tessellator.addVertexWithUV(x + 0.5, y + 0.5, z + 0.5 - halfBeamWidth, uv_x1, uv_y2); - // Draw! - tessellator.draw(); - - // Reset render flags - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDepthMask(true); - } -} diff --git a/src/main/java/client/renderer/TESR_SECapacitor.java b/src/main/java/client/renderer/TESR_SECapacitor.java deleted file mode 100644 index 0da33dee66..0000000000 --- a/src/main/java/client/renderer/TESR_SECapacitor.java +++ /dev/null @@ -1,78 +0,0 @@ -package client.renderer; - -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -import common.tileentities.TE_SpaceElevatorCapacitor; - -import kekztech.KekzCore; - -public class TESR_SECapacitor extends TileEntitySpecialRenderer { - - private static final ResourceLocation capSide = new ResourceLocation( - KekzCore.MODID, - "textures/blocks/SpaceElevatorCapacitor_side_renderbase.png"); - - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { - final Tessellator tessellator = Tessellator.instance; - final TE_SpaceElevatorCapacitor teCap = (TE_SpaceElevatorCapacitor) te; - // Setup vertices - final double fbr_x = x + 1; - final double fbr_z = z + 1; - - final double ftr_y = y + 1; - - final double uv_a_u = 1.0D; - final double uv_a_v = 1.0D; - - final double uv_b_u = 1.0D; - final double uv_b_v = 0.0D; - - final double uv_c_u = 0.0D; - final double uv_c_v = 0.0D; - - final double uv_d_u = 0.0D; - final double uv_d_v = 1.0D; - // Render sides - super.bindTexture(capSide); - - // Prepare Tessellator - tessellator.startDrawingQuads(); - // Render the caps as red if there are maintenance issues - if (teCap.isDamaged()) { - final float wave = (float) Math.abs(Math.sin((te.getWorldObj().getTotalWorldTime() + partialTick) / 20.0D)); - final int redSat = 64 + (int) Math.ceil(191 * wave); - tessellator.setColorRGBA(redSat, 0, 0, 255); - } else { - final int sat = (int) Math.ceil(teCap.getChargeLevel() * 255); - tessellator.setColorRGBA(0, 0, sat, 255); - } - tessellator.setBrightness(255); - // (DOWN and UP faces are not rendered as they will not ever be visible in the Space Elevator structure) - // NORTH - tessellator.addVertexWithUV(x, y, z, uv_a_u, uv_a_v); - tessellator.addVertexWithUV(x, ftr_y, z, uv_b_u, uv_b_v); - tessellator.addVertexWithUV(fbr_x, ftr_y, z, uv_c_u, uv_c_v); - tessellator.addVertexWithUV(fbr_x, y, z, uv_d_u, uv_d_v); - // SOUTH - tessellator.addVertexWithUV(fbr_x, y, fbr_z, uv_a_u, uv_a_v); - tessellator.addVertexWithUV(fbr_x, ftr_y, fbr_z, uv_b_u, uv_b_v); - tessellator.addVertexWithUV(x, ftr_y, fbr_z, uv_c_u, uv_c_v); - tessellator.addVertexWithUV(x, y, fbr_z, uv_d_u, uv_d_v); - // WEST - tessellator.addVertexWithUV(x, y, fbr_z, uv_a_u, uv_a_v); - tessellator.addVertexWithUV(x, ftr_y, fbr_z, uv_b_u, uv_b_v); - tessellator.addVertexWithUV(x, ftr_y, z, uv_c_u, uv_c_v); - tessellator.addVertexWithUV(x, y, z, uv_d_u, uv_d_v); - // EAST - tessellator.addVertexWithUV(fbr_x, y, z, uv_a_u, uv_a_v); - tessellator.addVertexWithUV(fbr_x, ftr_y, z, uv_b_u, uv_b_v); - tessellator.addVertexWithUV(fbr_x, ftr_y, fbr_z, uv_c_u, uv_c_v); - tessellator.addVertexWithUV(fbr_x, y, fbr_z, uv_d_u, uv_d_v); - // Draw! - tessellator.draw(); - } -} diff --git a/src/main/java/client/renderer/TESR_SETether.java b/src/main/java/client/renderer/TESR_SETether.java deleted file mode 100644 index 5d5c0581c1..0000000000 --- a/src/main/java/client/renderer/TESR_SETether.java +++ /dev/null @@ -1,79 +0,0 @@ -package client.renderer; - -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -import kekztech.KekzCore; - -public class TESR_SETether extends TileEntitySpecialRenderer { - - private static final ResourceLocation tetherBeamTexture = new ResourceLocation( - KekzCore.MODID, - "textures/effects/Tether_beam.png"); - - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { - float beamLengthScale = 1.0F; // [0.0F, 1.0F] -> linear scale from 0 to 256 - GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); - - // Get Tessellator instance - final Tessellator tessellator = Tessellator.instance; - // Bind beam texture and set texture params - super.bindTexture(tetherBeamTexture); - GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0F); - GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 10497.0F); - // Set render flags for inner beam - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - OpenGlHelper.glBlendFunc(770, 1, 1, 0); - // Prepare Tessellator - tessellator.startDrawingQuads(); - tessellator.setColorRGBA(255, 255, 255, 32); - // Variables stuff II - final double halfBeamWidth = 0.38D; - final double d_rot1 = 0.5D + Math.cos(2.356194490192345D) * halfBeamWidth; // rotates the beam... - final double d_rot2 = 0.5D + Math.sin(2.356194490192345D) * halfBeamWidth; - final double d_rot3 = 0.5D + Math.cos((Math.PI / 4D)) * halfBeamWidth; - final double d_rot4 = 0.5D + Math.sin((Math.PI / 4D)) * halfBeamWidth; - final double d_rot5 = 0.5D + Math.cos(3.9269908169872414D) * halfBeamWidth; - final double d_rot6 = 0.5D + Math.sin(3.9269908169872414D) * halfBeamWidth; - final double d_rot7 = 0.5D + Math.cos(5.497787143782138D) * halfBeamWidth; - final double d_rot8 = 0.5D + Math.sin(5.497787143782138D) * halfBeamWidth; // ...until here - final double height = 256.0F * beamLengthScale; - final double uv_x1 = 0.0D; - final double uv_x2 = 1.0D; - final double uv_y1 = -1.0D; // This makes the beam stream upwards if you add a time sensitive number to it - final double uv_y2 = (double) (256.0F * beamLengthScale) * (0.5D / halfBeamWidth) + uv_y1; - // Construct mesh with texture - tessellator.addVertexWithUV(x + d_rot1, y + height, z + d_rot2, uv_x2, uv_y2); - tessellator.addVertexWithUV(x + d_rot1, y, z + d_rot2, uv_x2, uv_y1); - tessellator.addVertexWithUV(x + d_rot3, y, z + d_rot4, uv_x1, uv_y1); - tessellator.addVertexWithUV(x + d_rot3, y + height, z + d_rot4, uv_x1, uv_y2); - tessellator.addVertexWithUV(x + d_rot7, y + height, z + d_rot8, uv_x2, uv_y2); - tessellator.addVertexWithUV(x + d_rot7, y, z + d_rot8, uv_x2, uv_y1); - tessellator.addVertexWithUV(x + d_rot5, y, z + d_rot6, uv_x1, uv_y1); - tessellator.addVertexWithUV(x + d_rot5, y + height, z + d_rot6, uv_x1, uv_y2); - tessellator.addVertexWithUV(x + d_rot3, y + height, z + d_rot4, uv_x2, uv_y2); - tessellator.addVertexWithUV(x + d_rot3, y, z + d_rot4, uv_x2, uv_y1); - tessellator.addVertexWithUV(x + d_rot7, y, z + d_rot8, uv_x1, uv_y1); - tessellator.addVertexWithUV(x + d_rot7, y + height, z + d_rot8, uv_x1, uv_y2); - tessellator.addVertexWithUV(x + d_rot5, y + height, z + d_rot6, uv_x2, uv_y2); - tessellator.addVertexWithUV(x + d_rot5, y, z + d_rot6, uv_x2, uv_y1); - tessellator.addVertexWithUV(x + d_rot1, y, z + d_rot2, uv_x1, uv_y1); - tessellator.addVertexWithUV(x + d_rot1, y + height, z + d_rot2, uv_x1, uv_y2); - // Draw! - tessellator.draw(); - - // Reset render flags - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDepthMask(true); - } -} diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java index f43482b909..4003e8e9e4 100644 --- a/src/main/java/common/Blocks.java +++ b/src/main/java/common/Blocks.java @@ -17,15 +17,9 @@ public class Blocks { public static Block yszUnit; public static Block gdcUnit; public static Block tfftStorageField; - public static Block reactorChamberOFF; - public static Block reactorChamberON; - public static Block reactorControlRod; public static Block jarThaumiumReinforced; public static Block jarIchor; public static Block lscLapotronicEnergyUnit; - public static Block spaceElevatorStructure; - public static Block spaceElevatorCapacitor; - public static Block spaceElevatorTether; public static Block largeHexPlate; diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java index 3af1fd1671..540e6ced89 100644 --- a/src/main/java/common/CommonProxy.java +++ b/src/main/java/common/CommonProxy.java @@ -2,24 +2,18 @@ package common; import common.items.ErrorItem; import common.items.MetaItem_CraftingComponent; -import common.items.MetaItem_ReactorComponent; import common.tileentities.GTMTE_TFFTHatch; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -import gregtech.api.GregTech_API; -import kekztech.GuiHandler; import kekztech.Items; -import kekztech.KekzCore; public class CommonProxy { public void preInit(final FMLPreInitializationEvent e) { // Items ErrorItem.getInstance().registerItem(); - MetaItem_ReactorComponent.getInstance().registerItem(); MetaItem_CraftingComponent.getInstance().registerItem(); Items.registerOreDictNames(); // Blocks @@ -28,8 +22,6 @@ public class CommonProxy { TileEntities.preInit(); // TC Research Researches.preInit(); - // GUI Handler - NetworkRegistry.INSTANCE.registerGuiHandler(KekzCore.instance, new GuiHandler()); } public void init(final FMLInitializationEvent e) { @@ -43,6 +35,6 @@ public class CommonProxy { // Research Researches.postInit(); - if (GregTech_API.mAE2) GTMTE_TFFTHatch.registerAEIntegration(); + GTMTE_TFFTHatch.registerAEIntegration(); } } diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java index 9ad4fdb99f..31246ac5d8 100644 --- a/src/main/java/common/TileEntities.java +++ b/src/main/java/common/TileEntities.java @@ -3,7 +3,6 @@ package common; import common.tileentities.GTMTE_LapotronicSuperCapacitor; import common.tileentities.GTMTE_SOFuelCellMK1; import common.tileentities.GTMTE_SOFuelCellMK2; -import common.tileentities.GTMTE_SpaceElevator; import common.tileentities.GTMTE_TFFT; import common.tileentities.GTMTE_TFFTHatch; import common.tileentities.TE_IchorJar; @@ -18,10 +17,8 @@ public class TileEntities { // Multiblock controllers public static GTMTE_SOFuelCellMK1 sofc1; public static GTMTE_SOFuelCellMK2 sofc2; - // public static GTMTE_ModularNuclearReactor mdr; public static GTMTE_TFFT tfft; public static GTMTE_LapotronicSuperCapacitor lsc; - public static GTMTE_SpaceElevator se; // Singleblocks public static GTMTE_TFFTHatch tfftHatch; diff --git a/src/main/java/common/blocks/Block_BeamTransmitter.java b/src/main/java/common/blocks/Block_BeamTransmitter.java deleted file mode 100644 index 48bedd3b7f..0000000000 --- a/src/main/java/common/blocks/Block_BeamTransmitter.java +++ /dev/null @@ -1,53 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import common.tileentities.TE_BeamTransmitter; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; - -public class Block_BeamTransmitter extends Block { - - private static final Block_BeamTransmitter INSTANCE = new Block_BeamTransmitter(); - - private Block_BeamTransmitter() { - super(Material.glass); - } - - public static Block registerBlock() { - final String blockName = "kekztech_beamtransmitter_block"; - INSTANCE.setBlockName(blockName); - INSTANCE.setCreativeTab(CreativeTabs.tabMisc); - INSTANCE.setHardness(5.0f); - INSTANCE.setResistance(5.0f); - INSTANCE.setBlockTextureName(KekzCore.MODID + ":" + "Tether_top"); - GameRegistry.registerBlock(INSTANCE, blockName); - - return INSTANCE; - } - - @Override - public TileEntity createTileEntity(World world, int meta) { - return new TE_BeamTransmitter(); - } - - @Override - public boolean hasTileEntity(int meta) { - return true; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } -} diff --git a/src/main/java/common/blocks/Block_ControlRod.java b/src/main/java/common/blocks/Block_ControlRod.java deleted file mode 100644 index 7c86c9910f..0000000000 --- a/src/main/java/common/blocks/Block_ControlRod.java +++ /dev/null @@ -1,29 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; - -public class Block_ControlRod extends BaseGTUpdateableBlock { - - private static final Block_ControlRod instance = new Block_ControlRod(); - - private Block_ControlRod() { - super(Material.iron); - } - - public static Block registerBlock() { - final String blockName = "kekztech_controlrod_block"; - instance.setBlockName(blockName); - instance.setCreativeTab(CreativeTabs.tabMisc); - instance.setBlockTextureName(KekzCore.MODID + ":" + "ControlRod"); - instance.setHardness(5.0f); - instance.setResistance(6.0f); - GameRegistry.registerBlock(instance, blockName); - - return instance; - } -} diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java deleted file mode 100644 index cf9307dde0..0000000000 --- a/src/main/java/common/blocks/Block_ItemProxyCable.java +++ /dev/null @@ -1,68 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import common.itemBlocks.IB_ItemProxyCable; -import common.tileentities.TE_ItemProxyCable; - -import client.renderer.ConduitRenderer; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import kekztech.KekzCore; - -public class Block_ItemProxyCable extends Block { - - private static final Block_ItemProxyCable instance = new Block_ItemProxyCable(); - - private Block_ItemProxyCable() { - super(Material.glass); - } - - public static Block registerBlock() { - final String blockName = "kekztech_itemproxycable_block"; - instance.setBlockName(blockName); - instance.setCreativeTab(CreativeTabs.tabMisc); - instance.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing"); - instance.setHardness(3.0f); - instance.setResistance(2.0f); - GameRegistry.registerBlock(instance, IB_ItemProxyCable.class, blockName); - - return instance; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public TileEntity createTileEntity(World world, int p_149915_2_) { - return new TE_ItemProxyCable(); - } - - @Override - public boolean hasTileEntity(int metadata) { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public int getRenderBlockPass() { - return 1; - } - - @Override - public int getRenderType() { - return ConduitRenderer.RID; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } -} diff --git a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java deleted file mode 100644 index 5f60eba040..0000000000 --- a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java +++ /dev/null @@ -1,63 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import common.itemBlocks.IB_ItemProxyEndpoint; -import common.tileentities.TE_ItemProxyEndpoint; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.GuiHandler; -import kekztech.KekzCore; - -public class Block_ItemProxyEndpoint extends Block { - - private static final Block_ItemProxyEndpoint instance = new Block_ItemProxyEndpoint(); - - private Block_ItemProxyEndpoint() { - super(Material.glass); - } - - public static Block registerBlock() { - final String blockName = "kekztech_itemproxyendpoint_block"; - instance.setBlockName(blockName); - instance.setCreativeTab(CreativeTabs.tabMisc); - instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxyEndpoint"); - instance.setHardness(3.0f); - instance.setResistance(2.0f); - instance.setHarvestLevel("wrench", 2); - GameRegistry.registerBlock(instance, IB_ItemProxyEndpoint.class, blockName); - - return instance; - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, - float lz) { - if (world.isRemote) { - return true; - } - - final TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TE_ItemProxyEndpoint) { - player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_ENDPOINT, world, x, y, z); - return true; - } else { - return false; - } - } - - @Override - public TileEntity createTileEntity(World world, int p_149915_2_) { - return new TE_ItemProxyEndpoint(); - } - - @Override - public boolean hasTileEntity(int metadata) { - return true; - } -} diff --git a/src/main/java/common/blocks/Block_ItemProxySource.java b/src/main/java/common/blocks/Block_ItemProxySource.java deleted file mode 100644 index 7ab34ade52..0000000000 --- a/src/main/java/common/blocks/Block_ItemProxySource.java +++ /dev/null @@ -1,63 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import common.itemBlocks.IB_ItemProxySource; -import common.tileentities.TE_ItemProxySource; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.GuiHandler; -import kekztech.KekzCore; - -public class Block_ItemProxySource extends Block { - - private static final Block_ItemProxySource instance = new Block_ItemProxySource(); - - private Block_ItemProxySource() { - super(Material.glass); - } - - public static Block registerBlock() { - final String blockName = "kekztech_itemproxysource_block"; - instance.setBlockName(blockName); - instance.setCreativeTab(CreativeTabs.tabMisc); - instance.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxySource"); - instance.setHardness(3.0f); - instance.setResistance(2.0f); - instance.setHarvestLevel("wrench", 2); - GameRegistry.registerBlock(instance, IB_ItemProxySource.class, blockName); - - return instance; - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, - float lz) { - if (world.isRemote) { - return true; - } - - final TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TE_ItemProxySource) { - player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_SOURCE, world, x, y, z); - return true; - } else { - return false; - } - } - - @Override - public TileEntity createTileEntity(World world, int p_149915_2_) { - return new TE_ItemProxySource(); - } - - @Override - public boolean hasTileEntity(int metadata) { - return true; - } -} diff --git a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java deleted file mode 100644 index 3c8b29c3cc..0000000000 --- a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java +++ /dev/null @@ -1,29 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; - -public class Block_ReactorChamber_OFF extends BaseGTUpdateableBlock { - - private static final Block_ReactorChamber_OFF instance = new Block_ReactorChamber_OFF(); - - private Block_ReactorChamber_OFF() { - super(Material.iron); - } - - public static Block registerBlock() { - final String blockName = "kekztech_reactorchamberoff_block"; - instance.setBlockName(blockName); - instance.setCreativeTab(CreativeTabs.tabMisc); - instance.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_OFF"); - instance.setHardness(10.0f); - instance.setResistance(16.0f); - GameRegistry.registerBlock(instance, blockName); - - return instance; - } -} diff --git a/src/main/java/common/blocks/Block_ReactorChamber_ON.java b/src/main/java/common/blocks/Block_ReactorChamber_ON.java deleted file mode 100644 index 7a894561ae..0000000000 --- a/src/main/java/common/blocks/Block_ReactorChamber_ON.java +++ /dev/null @@ -1,34 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; - -public class Block_ReactorChamber_ON extends BaseGTUpdateableBlock { - - private static final Block_ReactorChamber_ON instance = new Block_ReactorChamber_ON(); - - private Block_ReactorChamber_ON() { - super(Material.iron); - } - - public static Block registerBlock() { - final String blockName = "kekztech_reactorchamberon_block"; - instance.setBlockName(blockName); - instance.setCreativeTab(CreativeTabs.tabMisc); - instance.setBlockTextureName(KekzCore.MODID + ":" + "ReactorChamber_ON"); - instance.setHardness(-1.0f); - instance.setResistance(16.0f); - GameRegistry.registerBlock(instance, blockName); - - return instance; - } - - @Override - public int getLightValue() { - return 15; - } -} diff --git a/src/main/java/common/blocks/Block_SpaceElevator.java b/src/main/java/common/blocks/Block_SpaceElevator.java deleted file mode 100644 index 2f491db0a4..0000000000 --- a/src/main/java/common/blocks/Block_SpaceElevator.java +++ /dev/null @@ -1,62 +0,0 @@ -package common.blocks; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import common.itemBlocks.IB_SpaceElevator; - -import cpw.mods.fml.common.registry.GameRegistry; - -public class Block_SpaceElevator extends BaseGTUpdateableBlock { - - private static final Block_SpaceElevator INSTANCE = new Block_SpaceElevator(); - - private IIcon baseTop; - private IIcon baseSide; - private IIcon coilHolder; - - private Block_SpaceElevator() { - super(Material.iron); - } - - public static Block registerBlock() { - final String blockName = "kekztech_spaceelevator_block"; - INSTANCE.setBlockName(blockName); - INSTANCE.setCreativeTab(CreativeTabs.tabMisc); - INSTANCE.setHardness(7.0f); - INSTANCE.setResistance(10.0f); - GameRegistry.registerBlock(INSTANCE, IB_SpaceElevator.class, blockName); - - return INSTANCE; - } - - @Override - public void registerBlockIcons(IIconRegister ir) { - baseTop = ir.registerIcon("kekztech:SpaceElevatorBase_top"); - baseSide = ir.registerIcon("kekztech:SpaceElevatorBase_side"); - coilHolder = ir.registerIcon("kekztech:CoilHolder"); - } - - @Override - @SuppressWarnings({ "unchecked" }) - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - par3List.add(new ItemStack(par1, 1, 0)); - par3List.add(new ItemStack(par1, 1, 1)); - } - - @Override - public IIcon getIcon(int side, int meta) { - if (meta == 0) { - return (side < 2) ? baseTop : baseSide; - } else { - return coilHolder; - } - } -} diff --git a/src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java b/src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java deleted file mode 100644 index b6816ba7e8..0000000000 --- a/src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java +++ /dev/null @@ -1,82 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import common.itemBlocks.IB_SpaceElevatorCapacitor; -import common.tileentities.TE_SpaceElevatorCapacitor; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class Block_SpaceElevatorCapacitor extends BaseGTUpdateableBlock { - - private static final Block_SpaceElevatorCapacitor INSTANCE = new Block_SpaceElevatorCapacitor(); - - private IIcon top; - private IIcon side; - - private Block_SpaceElevatorCapacitor() { - super(Material.iron); - } - - public static Block registerBlock() { - final String blockName = "kekztech_spaceelevatorcapacitor_block"; - INSTANCE.setBlockName(blockName); - INSTANCE.setCreativeTab(CreativeTabs.tabMisc); - INSTANCE.setHardness(5.0f); - INSTANCE.setResistance(3.0f); - GameRegistry.registerBlock(INSTANCE, IB_SpaceElevatorCapacitor.class, blockName); - - return INSTANCE; - } - - @Override - public void registerBlockIcons(IIconRegister ir) { - top = ir.registerIcon("kekztech:SpaceElevatorCapacitor_top_fullbase"); - side = ir.registerIcon("kekztech:SpaceElevatorCapacitor_side_fullbase"); - } - - @Override - public IIcon getIcon(int side, int meta) { - return (side < 2) ? this.top : this.side; - } - - @Override - public TileEntity createTileEntity(World world, int p_149915_2_) { - return new TE_SpaceElevatorCapacitor(); - } - - @Override - public boolean hasTileEntity(int metadata) { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public int getRenderBlockPass() { - return 0; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { - return false; - } - - @Override - public int getLightValue() { - return 2; - } -} diff --git a/src/main/java/common/blocks/Block_SpaceElevatorTether.java b/src/main/java/common/blocks/Block_SpaceElevatorTether.java deleted file mode 100644 index c6ed0f54b0..0000000000 --- a/src/main/java/common/blocks/Block_SpaceElevatorTether.java +++ /dev/null @@ -1,67 +0,0 @@ -package common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - -import common.tileentities.TE_SpaceElevatorTether; - -import cpw.mods.fml.common.registry.GameRegistry; - -public class Block_SpaceElevatorTether extends BaseGTUpdateableBlock { - - private static final Block_SpaceElevatorTether INSTANCE = new Block_SpaceElevatorTether(); - - private IIcon top; - private IIcon side; - - private Block_SpaceElevatorTether() { - super(Material.glass); - } - - public static Block registerBlock() { - final String blockName = "kekztech_spaceelevatortether_block"; - INSTANCE.setBlockName(blockName); - INSTANCE.setCreativeTab(CreativeTabs.tabMisc); - INSTANCE.setHardness(15.0f); - INSTANCE.setResistance(15.0f); - GameRegistry.registerBlock(INSTANCE, blockName); - - return INSTANCE; - } - - @Override - public void registerBlockIcons(IIconRegister ir) { - top = ir.registerIcon("kekztech:Tether_top"); - side = ir.registerIcon("kekztech:Tether_side"); - } - - @Override - public IIcon getIcon(int side, int meta) { - return (side < 2) ? this.top : this.side; - } - - @Override - public TileEntity createTileEntity(World world, int p_149915_2_) { - return new TE_SpaceElevatorTether(); - } - - @Override - public boolean hasTileEntity(int metadata) { - return true; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } -} diff --git a/src/main/java/common/container/Container_ItemProxyEndpoint.java b/src/main/java/common/container/Container_ItemProxyEndpoint.java deleted file mode 100644 index 8f509e789c..0000000000 --- a/src/main/java/common/container/Container_ItemProxyEndpoint.java +++ /dev/null @@ -1,66 +0,0 @@ -package common.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -public class Container_ItemProxyEndpoint extends Container { - - private final IInventory teInventory; - - private int slotID = 0; - - public Container_ItemProxyEndpoint(TileEntity te, EntityPlayer player) { - this.teInventory = (IInventory) te; - - // Source Slot - addSlotToContainer(new Slot(teInventory, slotID++, 80, 35)); - // Config slot - addSlotToContainer(new Slot(teInventory, slotID++, 100, 35)); - - // Inventory - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - // Hotbar - for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142)); - } - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotRaw) { - ItemStack stack = null; - final Slot slot = (Slot) inventorySlots.get(slotRaw); - - if (slot != null && slot.getHasStack()) { - final ItemStack stackInSlot = slot.getStack(); - stack = stackInSlot.copy(); - - if (slotRaw < 3 * 9) { - if (!mergeItemStack(stackInSlot, 3 * 9, inventorySlots.size(), true)) { - return null; - } - } else if (!mergeItemStack(stackInSlot, 0, 3 * 9, false)) { - return null; - } - - if (stackInSlot.stackSize == 0) { - slot.putStack((ItemStack) null); - } else { - slot.onSlotChanged(); - } - } - return stack; - } - - @Override - public boolean canInteractWith(EntityPlayer player) { - return teInventory.isUseableByPlayer(player); - } -} diff --git a/src/main/java/common/container/Container_ItemProxySource.java b/src/main/java/common/container/Container_ItemProxySource.java deleted file mode 100644 index 23af97e5bb..0000000000 --- a/src/main/java/common/container/Container_ItemProxySource.java +++ /dev/null @@ -1,79 +0,0 @@ -package common.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -public class Container_ItemProxySource extends Container { - - private final IInventory teInventory; - - private int slotID = 0; - - public Container_ItemProxySource(TileEntity te, EntityPlayer player) { - this.teInventory = (IInventory) te; - - // Source Slots - addSlotToContainer(new Slot(teInventory, slotID++, 53, 8)); - addSlotToContainer(new Slot(teInventory, slotID++, 71, 8)); - addSlotToContainer(new Slot(teInventory, slotID++, 89, 8)); - addSlotToContainer(new Slot(teInventory, slotID++, 107, 8)); - addSlotToContainer(new Slot(teInventory, slotID++, 53, 26)); - addSlotToContainer(new Slot(teInventory, slotID++, 71, 26)); - addSlotToContainer(new Slot(teInventory, slotID++, 89, 26)); - addSlotToContainer(new Slot(teInventory, slotID++, 107, 26)); - addSlotToContainer(new Slot(teInventory, slotID++, 53, 44)); - addSlotToContainer(new Slot(teInventory, slotID++, 71, 44)); - addSlotToContainer(new Slot(teInventory, slotID++, 89, 44)); - addSlotToContainer(new Slot(teInventory, slotID++, 107, 44)); - addSlotToContainer(new Slot(teInventory, slotID++, 53, 62)); - addSlotToContainer(new Slot(teInventory, slotID++, 71, 62)); - addSlotToContainer(new Slot(teInventory, slotID++, 89, 62)); - addSlotToContainer(new Slot(teInventory, slotID++, 107, 62)); - - // Inventory - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - // Hotbar - for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142)); - } - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotRaw) { - ItemStack stack = null; - final Slot slot = (Slot) inventorySlots.get(slotRaw); - - if (slot != null && slot.getHasStack()) { - final ItemStack stackInSlot = slot.getStack(); - stack = stackInSlot.copy(); - - if (slotRaw < 3 * 9) { - if (!mergeItemStack(stackInSlot, 3 * 9, inventorySlots.size(), true)) { - return null; - } - } else if (!mergeItemStack(stackInSlot, 0, 3 * 9, false)) { - return null; - } - - if (stackInSlot.stackSize == 0) { - slot.putStack((ItemStack) null); - } else { - slot.onSlotChanged(); - } - } - return stack; - } - - @Override - public boolean canInteractWith(EntityPlayer player) { - return teInventory.isUseableByPlayer(player); - } -} diff --git a/src/main/java/common/container/Container_ModularNuclearReactor.java b/src/main/java/common/container/Container_ModularNuclearReactor.java deleted file mode 100644 index d3a06a2f61..0000000000 --- a/src/main/java/common/container/Container_ModularNuclearReactor.java +++ /dev/null @@ -1,77 +0,0 @@ -package common.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import reactor.ButtonSlot; - -public class Container_ModularNuclearReactor extends Container { - - private int nextSlotID = 0; - private final Slot[] REACTOR_SLOTS = new Slot[54]; - private final Slot SLOT_CONFIGURATION; - private final Slot BUTTON_EU_MODE; - private final Slot BUTTON_FLUID_MODE; - private final Slot BUTTON_CONDITION; - private final Slot BUTTON_CONFIGURE; - private final Slot BUTTON_RESET; - - public Container_ModularNuclearReactor(IGregTechTileEntity te, EntityPlayer player) { - - // Add the reactor chamber - for (int x = 0; x < 9; x++) { - for (int y = 0; y < 6; y++) { - REACTOR_SLOTS[nextSlotID] = super.addSlotToContainer( - new Slot(te, getNextSlotID(), (16 + 67 * x), (16 + 67 * y))); - } - } - // Add the configuration slot - SLOT_CONFIGURATION = super.addSlotToContainer(new Slot(te, getNextSlotID(), 0, 0)); - - // Add buttons (they're also slots) - BUTTON_EU_MODE = super.addSlotToContainer(new ButtonSlot(te, getNextSlotID(), 0, 0)); - BUTTON_FLUID_MODE = super.addSlotToContainer(new ButtonSlot(te, getNextSlotID(), 0, 0)); - BUTTON_CONDITION = super.addSlotToContainer(new ButtonSlot(te, getNextSlotID(), 0, 0)); - BUTTON_CONFIGURE = super.addSlotToContainer(new ButtonSlot(te, getNextSlotID(), 0, 0)); - BUTTON_RESET = super.addSlotToContainer(new ButtonSlot(te, getNextSlotID(), 0, 0)); - } - - private int getNextSlotID() { - nextSlotID++; - return nextSlotID - 1; - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotRaw) { - ItemStack stack = null; - final Slot slot = (Slot) inventorySlots.get(slotRaw); - - if (slot != null && slot.getHasStack()) { - final ItemStack stackInSlot = slot.getStack(); - stack = stackInSlot.copy(); - - if (slotRaw < 3 * 9) { - if (!mergeItemStack(stackInSlot, 3 * 9, inventorySlots.size(), true)) { - return null; - } - } else if (!mergeItemStack(stackInSlot, 0, 3 * 9, false)) { - return null; - } - - if (stackInSlot.stackSize == 0) { - slot.putStack(null); - } else { - slot.onSlotChanged(); - } - } - return stack; - } - - @Override - public boolean canInteractWith(EntityPlayer p_75145_1_) { - return true; - } -} diff --git a/src/main/java/common/itemBlocks/IB_ItemProxyCable.java b/src/main/java/common/itemBlocks/IB_ItemProxyCable.java deleted file mode 100644 index 6022194225..0000000000 --- a/src/main/java/common/itemBlocks/IB_ItemProxyCable.java +++ /dev/null @@ -1,22 +0,0 @@ -package common.itemBlocks; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -public class IB_ItemProxyCable extends ItemBlock { - - public IB_ItemProxyCable(Block block) { - super(block); - } - - @SuppressWarnings({ "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) { - lines.add(StatCollector.translateToLocal("tile.kekztech_itemproxycable_block.0.desc")); - } -} diff --git a/src/main/java/common/itemBlocks/IB_ItemProxyEndpoint.java b/src/main/java/common/itemBlocks/IB_ItemProxyEndpoint.java deleted file mode 100644 index 2cde2c14d3..0000000000 --- a/src/main/java/common/itemBlocks/IB_ItemProxyEndpoint.java +++ /dev/null @@ -1,23 +0,0 @@ -package common.itemBlocks; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -public class IB_ItemProxyEndpoint extends ItemBlock { - - public IB_ItemProxyEndpoint(Block block) { - super(block); - } - - @SuppressWarnings({ "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) { - lines.add(StatCollector.translateToLocal("tile.kekztech_itemproxyendpoint_block.0.desc")); - lines.add(StatCollector.translateToLocal("tile.kekztech_itemproxyendpoint_block.1.desc")); - } -} diff --git a/src/main/java/common/itemBlocks/IB_ItemProxySource.java b/src/main/java/common/itemBlocks/IB_ItemProxySource.java deleted file mode 100644 index 42371ab6e6..0000000000 --- a/src/main/java/common/itemBlocks/IB_ItemProxySource.java +++ /dev/null @@ -1,24 +0,0 @@ -package common.itemBlocks; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -public class IB_ItemProxySource extends ItemBlock { - - public IB_ItemProxySource(Block block) { - super(block); - } - - @SuppressWarnings({ "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) { - lines.add(StatCollector.translateToLocal("tile:kekztech_itemproxysource_block.0.desc")); - lines.add(StatCollector.translateToLocal("tile:kekztech_itemproxysource_block.1.desc")); - lines.add(StatCollector.translateToLocal("tile:kekztech_itemproxysource_block.2.desc")); - } -} diff --git a/src/main/java/common/itemBlocks/IB_SpaceElevator.java b/src/main/java/common/itemBlocks/IB_SpaceElevator.java deleted file mode 100644 index 8b7668207b..0000000000 --- a/src/main/java/common/itemBlocks/IB_SpaceElevator.java +++ /dev/null @@ -1,37 +0,0 @@ -package common.itemBlocks; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -public class IB_SpaceElevator extends ItemBlock { - - public IB_SpaceElevator(Block block) { - super(block); - } - - @Override - public int getMetadata(int meta) { - return meta; - } - - @Override - public boolean getHasSubtypes() { - return true; - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName() + "." + stack.getItemDamage(); - } - - @SuppressWarnings("unchecked") - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) { - lines.add(StatCollector.translateToLocal("tile.kekztech_spaceelevator_block.desc")); - } -} diff --git a/src/main/java/common/itemBlocks/IB_SpaceElevatorCapacitor.java b/src/main/java/common/itemBlocks/IB_SpaceElevatorCapacitor.java deleted file mode 100644 index fc367ae6a5..0000000000 --- a/src/main/java/common/itemBlocks/IB_SpaceElevatorCapacitor.java +++ /dev/null @@ -1,22 +0,0 @@ -package common.itemBlocks; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -public class IB_SpaceElevatorCapacitor extends ItemBlock { - - public IB_SpaceElevatorCapacitor(Block block) { - super(block); - } - - @SuppressWarnings("unchecked") - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) { - lines.add(StatCollector.translateToLocal("tile.kekztech_spaceelevatorcapacitor_block.desc")); - } -} diff --git a/src/main/java/common/items/MetaItem_CraftingComponent.java b/src/main/java/common/items/MetaItem_CraftingComponent.java index 3b5d9238b1..205e7392c5 100644 --- a/src/main/java/common/items/MetaItem_CraftingComponent.java +++ b/src/main/java/common/items/MetaItem_CraftingComponent.java @@ -35,17 +35,6 @@ public class MetaItem_CraftingComponent extends Item { @Override public void registerIcons(IIconRegister reg) { int counter = 9; - // Raw heat pipes - /* - * icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "CopperHeatPipe"); icons[counter++] = - * reg.registerIcon(KekzCore.MODID + ":" + "SilverHeatPipe"); icons[counter++] = reg.registerIcon(KekzCore.MODID - * + ":" + "BoronArsenideHeatPipe"); icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + - * "DiamondHeatPipe"); // Dust icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "BoronArsenideDust"); - * icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "IsotopicallyPureDiamondDust"); icons[counter++] = - * reg.registerIcon(KekzCore.MODID + ":" + "AmineCarbamateDust"); // Crystal icons[counter++] = - * reg.registerIcon(KekzCore.MODID + ":" + "BoronArsenideCrystal"); icons[counter++] = - * reg.registerIcon(KekzCore.MODID + ":" + "IsotopicallyPureDiamondCrystal"); - */ // Ceramics icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "YSZCeramicDust"); icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "GDCCeramicDust"); diff --git a/src/main/java/common/items/MetaItem_ReactorComponent.java b/src/main/java/common/items/MetaItem_ReactorComponent.java deleted file mode 100644 index 45e3a17798..0000000000 --- a/src/main/java/common/items/MetaItem_ReactorComponent.java +++ /dev/null @@ -1,119 +0,0 @@ -package common.items; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; - -import org.lwjgl.input.Keyboard; - -import kekztech.KekzCore; -import reactor.items.CoolantCell; -import reactor.items.FuelRod; -import reactor.items.HeatExchanger; -import reactor.items.HeatVent; -import reactor.items.NeutronReflector; - -public class MetaItem_ReactorComponent extends Item { - - private static final MetaItem_ReactorComponent INSTANCE = new MetaItem_ReactorComponent(); - private final IIcon[] icons = new IIcon[50]; - - private MetaItem_ReactorComponent() {} - - public static MetaItem_ReactorComponent getInstance() { - return INSTANCE; - } - - public void registerItem() { - super.setHasSubtypes(true); - final String unlocalizedName = "kekztech_reactor_item"; - super.setUnlocalizedName(unlocalizedName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setMaxStackSize(1); - // GameRegistry.registerItem(getInstance(), unlocalizedName); - } - - @Override - public void registerIcons(IIconRegister reg) { - int counter = 0; - for (String s : HeatVent.RESOURCE_NAMES) { - icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s); - } - for (String s : HeatExchanger.RESOURCE_NAME) { - icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s); - } - for (String s : FuelRod.RESOURCE_NAME) { - icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s); - } - for (String s : FuelRod.RESOURCE_NAME_DEPLETED) { - icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s); - } - for (String s : NeutronReflector.RESOURCE_NAME) { - icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s); - } - for (String s : CoolantCell.RESOURCE_NAME) { - icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s); - } - } - - @Override - public IIcon getIconFromDamage(int meta) { - return icons[meta]; - } - - @SuppressWarnings({ "unchecked" }) - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < icons.length; i++) { - list.add(new ItemStack(item, 1, i)); - } - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName() + "." + stack.getItemDamage(); - } - - @SuppressWarnings({ "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) { - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - list.add("Property = 1"); - } else { - list.add("Part for the Modular Nuclear Reactor"); - list.add( - "Hold " + EnumChatFormatting.BOLD - + "[LSHIFT]" - + EnumChatFormatting.RESET - + EnumChatFormatting.GRAY - + " to display properties"); - } - } - - @Override - public double getDurabilityForDisplay(ItemStack stack) { - NBTTagCompound nbt = (stack.getTagCompound() == null) ? new NBTTagCompound() : stack.getTagCompound(); - if (nbt.getInteger("HEALTH") != 0 && nbt.getInteger("MAXHEALTH") != 0) { - return 1 - (double) (nbt.getInteger("HEALTH") / nbt.getInteger("MAXHEALTH")); - } else { - return 0.0d; - } - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - final int meta = stack.getItemDamage(); - return meta < 31 || meta > 45; - } - - public ItemStack getStackFromDamage(int meta) { - return new ItemStack(getInstance(), 1, meta); - } -} diff --git a/src/main/java/common/reactorItem/AbstractReactorItem.java b/src/main/java/common/reactorItem/AbstractReactorItem.java deleted file mode 100644 index 876d8b4811..0000000000 --- a/src/main/java/common/reactorItem/AbstractReactorItem.java +++ /dev/null @@ -1,29 +0,0 @@ -package common.reactorItem; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public abstract class AbstractReactorItem extends Item { - - private final int[] behaviourID; - - protected AbstractReactorItem(int... behaviourID) { - this.behaviourID = behaviourID; - } - - @Override - public abstract double getDurabilityForDisplay(ItemStack stack); - - @Override - public abstract boolean showDurabilityBar(ItemStack stack); - - @Override - public final String getUnlocalizedName(ItemStack stack) { - return super.hasSubtypes ? (super.getUnlocalizedName() + "." + stack.getItemDamage()) - : super.getUnlocalizedName(); - } - - public final int getBehaviourID(int meta) { - return behaviourID[meta]; - } -} diff --git a/src/main/java/common/reactorItem/ReactorItem.java b/src/main/java/common/reactorItem/ReactorItem.java deleted file mode 100644 index 8e69e40e95..0000000000 --- a/src/main/java/common/reactorItem/ReactorItem.java +++ /dev/null @@ -1,47 +0,0 @@ -package common.reactorItem; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.common.registry.GameRegistry; - -public class ReactorItem extends AbstractReactorItem { - - private static final ReactorItem INSTANCE = new ReactorItem(); - - private final IIcon[] icons = new IIcon[50]; - - private ReactorItem() { - super(); - } - - public static ReactorItem registerItem() { - INSTANCE.setHasSubtypes(true); - INSTANCE.setCreativeTab(CreativeTabs.tabMisc); - INSTANCE.setMaxStackSize(1); - final String unloc = "kekztech_reactor_item"; - INSTANCE.setUnlocalizedName(unloc); - GameRegistry.registerItem(INSTANCE, unloc); - return INSTANCE; - } - - @Override - public void registerIcons(IIconRegister reg) {} - - @Override - public IIcon getIconFromDamage(int meta) { - return icons[meta]; - } - - @Override - public double getDurabilityForDisplay(ItemStack stack) { - return 0; - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return false; - } -} diff --git a/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java b/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java deleted file mode 100644 index 1875a097e5..0000000000 --- a/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java +++ /dev/null @@ -1,224 +0,0 @@ -package common.tileentities; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - -import org.joml.Vector3i; - -import common.Blocks; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; -import gregtech.api.objects.GT_RenderedTexture; - -public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBase { - - private final Block CASING = GregTech_API.sBlockCasings3; - private final int CASING_META = 12; - private final int CASING_TEXTURE_ID = 44; - - private final Block CHAMBER_OFF = Blocks.reactorChamberOFF; - private final Block CHAMBER_ON = Blocks.reactorChamberON; - private final Block CONTROL_ROD = Blocks.reactorControlRod; - - private boolean euMode = true; - - public GTMTE_ModularNuclearReactor(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - } - - public GTMTE_ModularNuclearReactor(String aName) { - super(aName); - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity var1) { - return new GTMTE_ModularNuclearReactor(super.mName); - } - - @Override - public String[] getDescription() { - return new String[] { "Disabled" }; - /* - * final MultiBlockTooltipBuilder b = new MultiBlockTooltipBuilder(); - * b.addInfo("Can be built, BUT DOES NOT WORK") .addInfo("Converts fissile material and outputs power or heat") - * .addSeparator() .addInfo("EU-MODE:") - * .addInfo(" Directly outputs electricity depending on inserted fuel rods") .addSeparator() - * .addInfo("COOLANT-MODE:") .addInfo(" Requires coolant to be pumped into the reactor.") - * .addInfo(" Coolant is heated and should be drained and converted to electricity by other means.") - * .addSeparator() .addInfo("NOTES:") .addInfo(" Does NOT use Industrialcraft 2 reactor components!") - * .addInfo(" Consult controller GUI on how to arrange the outer casings.") .addSeparator() - * .beginStructureBlock(7, 6, 7) .addController("Front bottom Center") - * .addCasingInfo("Radiation Proof Machine Casing", 100) .addOtherStructurePart("Control Rods", - * "Four pillars, four blocks high each. Diagonal to the inner edges of the shell") - * .addOtherStructurePart("Nuclear Reactor Chamber", - * "17 of them to fill out the rest of the floor inside the shell") - * .addDynamoHatch("ONLY in EU-mode, at least one") .addOtherStructurePart("Input Bus, Output Bus", - * "Optional but required for automation") .addOtherStructurePart("Input Hatch, Output Hatch", - * "ONLY in Coolant-Mode, at least one each") .signAndFinalize("Kekzdealer"); - * if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { return b.getInformation(); } else { return - * b.getStructureInformation(); } - */ - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, - final ForgeDirection facing, final int colorIndex, final boolean aActive, final boolean aRedstone) { - return side == facing - ? new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_TEXTURE_ID), - new GT_RenderedTexture( - aActive ? Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE - : Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER) } - : new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_TEXTURE_ID) }; - } - - @Override - public boolean isCorrectMachinePart(ItemStack stack) { - return true; - } - - @Override - public boolean checkRecipe(ItemStack stack) { - return false; - } - - @Override - public void onPostTick(IGregTechTileEntity thisController, long aTick) { - super.onPostTick(thisController, aTick); - - if (super.getBaseMetaTileEntity().isActive()) { - // Switch to ON blocks - } else { - // Switch to OFF blocks - } - } - - @Override - public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) { - // Figure out the vector for the direction the back face of the controller is facing - final int dirX = thisController.getBackFacing().offsetX; - final int dirZ = thisController.getBackFacing().offsetZ; - int minCasingAmount = 100; - boolean checklist = true; // if this is still true at the end, machine is good to go :) - - // Determine the ground level center of the structure - final Vector3i center = new Vector3i( - thisController.getXCoord(), - thisController.getYCoord(), - thisController.getZCoord()).add(dirX * 3, 0, dirZ * 3); - // Scan for outer tube - // - Scan sides - for (int x = -3; x <= 3; x++) { - for (int z = -3; z <= 3; z++) { - // Only scan the three wide even sides, skip rest - if ((Math.abs(x) <= 1 && Math.abs(z) == 3) || (Math.abs(z) <= 1 && Math.abs(x) == 3)) { - for (int h = 0; h < 6; h++) { - final Vector3i pos = new Vector3i(center.x() + x, center.y() + h, center.z() + z); - if (h == 0 && pos.x() == thisController.getXCoord() - && pos.y() == thisController.getYCoord() - && pos.z() == thisController.getZCoord()) { - // Ignore controller - continue; - } else if (thisController.getBlock(pos.x(), pos.y(), pos.z()) == CASING - && thisController.getMetaID(pos.x(), pos.y(), pos.z()) == CASING_META) { - minCasingAmount--; - } else { - checklist = false; - } - } - } - } - } - // - Scan corners of tube - for (int x = -2; x <= 2; x++) { - for (int z = -2; z <= 2; z++) { - // Only scan the four corners, skip rest - if (Math.abs(x) + Math.abs(z) == 4) { - for (int h = 0; h < 6; h++) { - final Vector3i pos = new Vector3i(center.x() + x, center.y() + h, center.z() + z); - if (h == 0 && pos.x() == thisController.getXCoord() - && pos.y() == thisController.getYCoord() - && pos.z() == thisController.getZCoord()) { - // Ignore controller - continue; - } else if (thisController.getBlock(pos.x(), pos.y(), pos.z()) == CASING - && thisController.getMetaID(pos.x(), pos.y(), pos.z()) == CASING_META) { - minCasingAmount--; - } else { - checklist = false; - } - } - } - } - } - // Scan ground layer - for (int x = -2; x <= 2; x++) { - for (int z = -2; z <= 2; z++) { - if (!(thisController.getBlock(center.x() + x, center.y(), center.z() + z) == CASING - && thisController.getMetaID(center.x() + x, center.y(), center.z() + z) == CASING_META)) { - checklist = false; - } else { - minCasingAmount--; - } - } - } - // Scan reactor chambers - for (int x = -2; x <= 2; x++) { - for (int z = -2; z <= 2; z++) { - // Skip if diagonal, don't skip center - if (Math.abs(x) == Math.abs(z) && !(x == 0 && z == 0)) { - continue; - } - if (!(thisController.getBlock(center.x() + x, center.y() + 1, center.z() + z) == CHAMBER_OFF - || thisController.getBlock(center.x() + x, center.y() + 1, center.z() + z) == CHAMBER_ON)) { - checklist = false; - } - } - } - // Scan control rods - for (int h = 1; h < 5; h++) { - for (int x = -1; x <= 1; x++) { - for (int z = -1; z <= 1; z++) { - // Only check diagonal - if (x == 0 || z == 0) { - continue; - } - if (!(thisController.getBlock(center.x() + x, center.y() + h, center.z() + z) == CONTROL_ROD)) { - checklist = false; - } - } - } - } - - if (minCasingAmount > 0) { - checklist = false; - } - - return checklist; - } - - @Override - public int getMaxEfficiency(ItemStack stack) { - return 10000; - } - - @Override - public int getPollutionPerTick(ItemStack stack) { - return 0; - } - - @Override - public int getDamageToComponent(ItemStack stack) { - return 0; - } - - @Override - public boolean explodesOnComponentBreak(ItemStack stack) { - return false; - } -} diff --git a/src/main/java/common/tileentities/GTMTE_SpaceElevator.java b/src/main/java/common/tileentities/GTMTE_SpaceElevator.java deleted file mode 100644 index 421a2e2760..0000000000 --- a/src/main/java/common/tileentities/GTMTE_SpaceElevator.java +++ /dev/null @@ -1,260 +0,0 @@ -package common.tileentities; - -import java.util.ArrayList; -import java.util.HashSet; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.util.ForgeDirection; - -import common.Blocks; - -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; -import gregtech.api.objects.GT_RenderedTexture; -import util.Vector3i; -import util.Vector3ic; - -public class GTMTE_SpaceElevator extends GT_MetaTileEntity_MultiBlockBase { - - private static final Block BASE_BLOCK = Blocks.spaceElevatorStructure; - private static final Block CAP_BLOCK = Blocks.spaceElevatorCapacitor; - private static final Block TETHER_BLOCK = Blocks.spaceElevatorTether; - private static final int BASE_META = 0; - private static final int COIL_HOLDER_META = 1; - private static final String glassNameBorosilicate = "BW_GlasBlocks"; - private static final int HATCH_OVERLAY_ID = 16; - - // Scan positions for capacitor banks - // Start with top left bank, clockwise - // Start with top middle pillar within bank, clockwise, middle last - private static final int[] bankOffsetsX = { -7, 5, 5, -7 }; - private static final int[] bankOffsetsY = { -7, -7, 5, 5 }; - private static final int[] scanOffsetsX = { 1, 2, 1, 0, 1 }; - private static final int[] scanOffsetsY = { 0, 1, 2, 1, 1 }; - - private final HashSet<TE_SpaceElevatorCapacitor> capacitors = new HashSet<>(); - private long lastLaunchEUCost = 0; - - public GTMTE_SpaceElevator(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - } - - public GTMTE_SpaceElevator(String aName) { - super(aName); - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity var1) { - return new GTMTE_SpaceElevator((super.mName)); - } - - @Override - public String[] getDescription() { - return new String[] { "Disabled" }; - /* - * final MultiBlockTooltipBuilder b = new MultiBlockTooltipBuilder(); - * b.addInfo("Access for your Space Station!") - * .addInfo("Check out the wiki on my github if you are having trouble with the structure") - * .addInfo("Regenerative Breaking will recover up to X% of the energy spent on launch") - * .addInfo("Energy recovered depends on coil tier: +10% per coil tier, up to 90%") .addSeparator() - * .beginStructureBlock(15, 11, 15) .addController("Bottom Center") - * .addEnergyHatch("Instead of any casing in the bottom floor") - * .addMaintenanceHatch("Instead of any casing in the bottom floor") - * .addCasingInfo("Solid Steel Machine Casing", 320) .addOtherStructurePart("Any EBF coil", - * "40x, have to be all the same") .addOtherStructurePart("Space Elevator Tether", "4x") - * .addOtherStructurePart("Space Elevator Cabin Block", "42x") - * .addOtherStructurePart("Space Elevator Cabin Guide", "8x") .signAndFinalize("Kekzdealer"); - * if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { return b.getInformation(); } else { return - * b.getStructureInformation(); } - */ - } - - @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int colorIndex, boolean aActive, boolean aRedstone) { - ITexture[] sTexture = new ITexture[] { new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, - Dyes.getModulation(-1, Dyes._NULL.mRGBa)) }; - if (side == facing && aActive) { - sTexture = new ITexture[] { new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW, - Dyes.getModulation(-1, Dyes._NULL.mRGBa)) }; - } - return sTexture; - } - - @Override - public boolean isCorrectMachinePart(ItemStack stack) { - return true; - } - - @Override - public boolean checkRecipe(ItemStack stack) { - this.mProgresstime = 1; - this.mMaxProgresstime = 1; - this.mEUt = 0; - this.mEfficiencyIncrease = 10000; - return true; - } - - public Vector3ic rotateOffsetVector(Vector3ic forgeDirection, int x, int y, int z) { - final Vector3i offset = new Vector3i(0, 0, 0); - // either direction on y-axis - if (forgeDirection.y() == -1) { - offset.x = x; - offset.y = z; - offset.z = y; - } - - return offset; - } - - @Override - public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) { - // Make sure the controller is either facing up or down - if (thisController.getFrontFacing().offsetY != 0) { - return false; - } - - // Figure out the vector for the direction the back face of the controller is facing - final Vector3ic forgeDirection = new Vector3i( - thisController.getBackFacing().offsetX, - thisController.getBackFacing().offsetY, - thisController.getBackFacing().offsetZ); - boolean formationChecklist = true; - int minCasingAmount = 320; - int firstCoilMeta = -1; - capacitors.clear(); - - // Base floor - for (int X = -7; X <= 7; X++) { - for (int Y = -7; Y <= 7; Y++) { - if (X == 0 && Y == 0) { - continue; // Skip controller - } - - final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, 0); - final IGregTechTileEntity currentTE = thisController - .getIGregTechTileEntityOffset(offset.x(), offset.y(), offset.z()); - - // 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, 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()) == BASE_BLOCK) - && (thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z()) == BASE_META)) { - // Seems to be valid casing. Decrement counter. - minCasingAmount--; - } else { - formationChecklist = false; - } - } - } - } - System.out.println(""); - // Capacitor banks - for (int bank = 0; bank < 4; bank++) { - for (int Z = 1; Z <= 5; Z++) { - for (int scan = 0; scan < 5; scan++) { - final Vector3ic offset = rotateOffsetVector( - forgeDirection, - bankOffsetsX[bank] + scanOffsetsX[scan], - bankOffsetsY[bank] + scanOffsetsY[scan], - Z); - if (Z == 1 || Z == 5) { - // Check for casings - if (thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == BASE_BLOCK - && thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z()) == BASE_META) { - minCasingAmount--; - } else { - formationChecklist = false; - } - } else { - if (scan == 4) { - // Check for capacitors - final TileEntity te = thisController - .getTileEntityOffset(offset.x(), offset.y(), offset.z()); - if (thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == CAP_BLOCK - && te instanceof TE_SpaceElevatorCapacitor) { - capacitors.add((TE_SpaceElevatorCapacitor) te); - } else { - formationChecklist = false; - } - } else { - // Check for Glass - if (!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName() - .equals(glassNameBorosilicate)) { - formationChecklist = false; - } - } - } - } - } - } - // Anchor - - // Coil holders - - // Coils - - if (minCasingAmount > 0) { - formationChecklist = false; - } - - for (TE_SpaceElevatorCapacitor cap : capacitors) { - cap.setIsDamaged(false); - } - - return formationChecklist; - } - - @Override - public String[] getInfoData() { - final ArrayList<String> ll = new ArrayList<>(); - ll.add(EnumChatFormatting.YELLOW + "Operational Data:" + EnumChatFormatting.RESET); - - ll.add( - "Maintenance Status: " + ((super.getRepairStatus() == super.getIdealStatus()) - ? EnumChatFormatting.GREEN + "Working perfectly" + EnumChatFormatting.RESET - : EnumChatFormatting.RED + "Has Problems" + EnumChatFormatting.RESET)); - ll.add("---------------------------------------------"); - - final String[] a = new String[ll.size()]; - return ll.toArray(a); - } - - @Override - public boolean isGivingInformation() { - return true; - } - - @Override - public int getMaxEfficiency(ItemStack stack) { - return 10000; - } - - @Override - public int getPollutionPerTick(ItemStack stack) { - return 0; - } - - @Override - public int getDamageToComponent(ItemStack stack) { - return 0; - } - - @Override - public boolean explodesOnComponentBreak(ItemStack stack) { - return false; - } -} diff --git a/src/main/java/common/tileentities/TE_BeamTransmitter.java b/src/main/java/common/tileentities/TE_BeamTransmitter.java deleted file mode 100644 index e8999e393f..0000000000 --- a/src/main/java/common/tileentities/TE_BeamTransmitter.java +++ /dev/null @@ -1,49 +0,0 @@ -package common.tileentities; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; - -import org.joml.Vector3i; -import org.joml.Vector3ic; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class TE_BeamTransmitter extends TileEntity { - - private final Vector3ic position; - - private final Vector3ic target = new Vector3i(10, 20, 10); - private double distanceCache; - private boolean distanceCacheValid = false; - - public TE_BeamTransmitter() { - position = new Vector3i(super.xCoord, super.yCoord, super.zCoord); - } - - public Vector3ic getTargetPosition() { - return target; - } - - public double getDistanceFromTarget() { - if (!distanceCacheValid) { - distanceCache = position.distance(target); - distanceCacheValid = true; - } - return distanceCache; - } - - @SideOnly(Side.CLIENT) - @Override - public double getMaxRenderDistanceSquared() { - // 4k is standard, 65k is what the vanilla beacon uses - return 65536.0D; - } - - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getRenderBoundingBox() { - // Make it so the beam is still rendered even when the source block is out of sight - return INFINITE_EXTENT_AABB; - } -} diff --git a/src/main/java/common/tileentities/TE_ItemProxyCable.java b/src/main/java/common/tileentities/TE_ItemProxyCable.java deleted file mode 100644 index 1dc539c89e..0000000000 --- a/src/main/java/common/tileentities/TE_ItemProxyCable.java +++ /dev/null @@ -1,155 +0,0 @@ -package common.tileentities; - -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -public class TE_ItemProxyCable extends TileEntity { - - private static final float THICKNESS = 0.5F; - private byte connections = 0; - private byte connectionAllowed = 63; - private String idCache = null; - - public TE_ItemProxyCable() {} - - @Override - public void updateEntity() { - // Check all 6 sides and connect the conduit if it is allowed to - for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - final TileEntity te = super.getWorldObj().getTileEntity( - super.xCoord + side.offsetX, - super.yCoord + side.offsetY, - super.zCoord + side.offsetZ); - if (te instanceof TE_ItemProxyCable) { - final TE_ItemProxyCable cable = (TE_ItemProxyCable) te; - setConnection(side, cable.isConnectionAllowed(side.getOpposite())); - } else { - setConnection(side, false); - } - } - } - - public static float getThickness() { - return THICKNESS; - } - - /** - * Builds a simple unique identifier for this TileEntity by appending the x, y, and z coordinates in a string. - * - * @return unique identifier for this TileEntity - */ - public String getIdentifier() { - if (idCache == null) { - idCache = "" + super.xCoord + super.yCoord + super.zCoord; - return idCache; - } else { - return idCache; - } - } - - /** - * 0 0 0 0 0 0 0 0 = 0 -> no connection </br> - * 0 0 0 0 0 0 0 1 = 1 -> down </br> - * 0 0 0 0 0 0 1 0 = 2 -> up </br> - * 0 0 0 0 0 1 0 0 = 4 -> north </br> - * 0 0 0 0 1 0 0 0 = 8 -> south </br> - * 0 0 0 1 0 0 0 0 = 16 -> west </br> - * 0 0 1 0 0 0 0 0 = 32 -> east </br> - * - * @param side The side for which to set the connection status. - * @param connected Whether this side should be connected or not - * @return True if the connection was allowed - */ - public boolean setConnection(ForgeDirection side, boolean connected) { - if (isConnectionAllowed(side)) { - switch (side) { - case DOWN: - connections = (byte) ((connected) ? connections | 1 : connections ^ 1); - break; - case UP: - connections = (byte) ((connected) ? connections | 2 : connections ^ 2); - break; - case NORTH: - connections = (byte) ((connected) ? connections | 4 : connections ^ 4); - break; - case SOUTH: - connections = (byte) ((connected) ? connections | 8 : connections ^ 8); - break; - case WEST: - connections = (byte) ((connected) ? connections | 16 : connections ^ 16); - break; - case EAST: - connections = (byte) ((connected) ? connections | 32 : connections ^ 32); - break; - default: - return false; - } - return true; - } else { - return false; - } - } - - public boolean isConnected(ForgeDirection side) { - switch (side) { - case DOWN: - return (connections & 1) == 1; - case UP: - return (connections & 2) == 2; - case NORTH: - return (connections & 4) == 4; - case SOUTH: - return (connections & 8) == 8; - case WEST: - return (connections & 16) == 16; - case EAST: - return (connections & 32) == 32; - default: - return false; - } - } - - public void setConnectionAllowed(ForgeDirection side, boolean allowed) { - switch (side) { - case DOWN: - connectionAllowed = (byte) ((allowed) ? connectionAllowed | 1 : connectionAllowed ^ 1); - break; - case UP: - connectionAllowed = (byte) ((allowed) ? connectionAllowed | 2 : connectionAllowed ^ 2); - break; - case NORTH: - connectionAllowed = (byte) ((allowed) ? connectionAllowed | 4 : connectionAllowed ^ 4); - break; - case SOUTH: - connectionAllowed = (byte) ((allowed) ? connectionAllowed | 8 : connectionAllowed ^ 8); - break; - case WEST: - connectionAllowed = (byte) ((allowed) ? connectionAllowed | 16 : connectionAllowed ^ 16); - break; - case EAST: - connectionAllowed = (byte) ((allowed) ? connectionAllowed | 32 : connectionAllowed ^ 32); - break; - default: - break; - } - } - - public boolean isConnectionAllowed(ForgeDirection side) { - switch (side) { - case DOWN: - return (connectionAllowed & 1) == 1; - case UP: - return (connectionAllowed & 2) == 2; - case NORTH: - return (connectionAllowed & 4) == 4; - case SOUTH: - return (connectionAllowed & 8) == 8; - case WEST: - return (connectionAllowed & 16) == 16; - case EAST: - return (connectionAllowed & 32) == 32; - default: - return false; - } - } -} diff --git a/src/main/java/common/tileentities/TE_ItemProxyEndpoint.java b/src/main/java/common/tileentities/TE_ItemProxyEndpoint.java deleted file mode 100644 index 7d58a21c61..0000000000 --- a/src/main/java/common/tileentities/TE_ItemProxyEndpoint.java +++ /dev/null @@ -1,175 +0,0 @@ -package common.tileentities; - -import java.util.HashSet; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -public class TE_ItemProxyEndpoint extends TileEntity implements ISidedInventory { - - private byte channel = -1; - private IInventory proxyInventory = null; - private int tickCounter = 0; - - public TE_ItemProxyEndpoint() { - channel = 0; - } - - public void setChannel(byte channel) { - this.channel = channel; - } - - public int getChannel() { - return channel; - } - - @Override - public void updateEntity() { - if (tickCounter == 20) { - if (channel != -1) { - proxyInventory = searchSource(); - } - tickCounter = 0; - } - tickCounter++; - } - - private TE_ItemProxySource searchSource() { - - final HashSet<TE_ItemProxySource> sources = new HashSet<>(); - final HashSet<String> visited = new HashSet<>(); - - for (ForgeDirection next : ForgeDirection.VALID_DIRECTIONS) { - final TileEntity te = super.getWorldObj().getTileEntity( - super.xCoord + next.offsetX, - super.yCoord + next.offsetY, - super.zCoord + next.offsetZ); - if (te instanceof TE_ItemProxyCable) { - final TE_ItemProxyCable cable = (TE_ItemProxyCable) te; - if (cable.isConnected(next.getOpposite())) { - searchSourceRecursive(sources, visited, next.getOpposite(), cable); - } - } - } - - if (sources.isEmpty()) { - return null; - } else { - return sources.iterator().next(); - } - } - - private void searchSourceRecursive(HashSet<TE_ItemProxySource> sources, HashSet<String> visited, - ForgeDirection from, TE_ItemProxyCable nextTarget) { - - if (!visited.contains(nextTarget.getIdentifier())) { - visited.add(nextTarget.getIdentifier()); - - for (ForgeDirection next : ForgeDirection.VALID_DIRECTIONS) { - if (next != from) { - final TileEntity te = super.getWorldObj().getTileEntity( - nextTarget.xCoord + next.offsetX, - nextTarget.yCoord + next.offsetY, - nextTarget.zCoord + next.offsetZ); - if (te instanceof TE_ItemProxyCable) { - final TE_ItemProxyCable cable = (TE_ItemProxyCable) te; - if (cable.isConnected(next.getOpposite())) { - searchSourceRecursive(sources, visited, next.getOpposite(), cable); - } - } else if (te instanceof TE_ItemProxySource) { - sources.add((TE_ItemProxySource) te); - } - } - } - } - } - - @Override - public int getSizeInventory() { - return 1; - } - - @Override - public ItemStack getStackInSlot(int slot) { - if (proxyInventory != null && slot == 0) { - return proxyInventory.getStackInSlot(channel); - } else { - return null; - } - } - - @Override - public ItemStack decrStackSize(int slot, int amount) { - if (proxyInventory != null && slot == 0) { - return proxyInventory.decrStackSize(channel, amount); - } else { - return null; - } - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return (proxyInventory != null) ? proxyInventory.getStackInSlotOnClosing(channel) : null; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack itemStack) { - if (proxyInventory != null && slot == 0) { - proxyInventory.setInventorySlotContents(channel, itemStack); - } - } - - @Override - public String getInventoryName() { - return (proxyInventory != null) ? "Connected: " + proxyInventory.getInventoryName() : "Untethered Proxy"; - } - - @Override - public boolean hasCustomInventoryName() { - return true; - } - - @Override - public int getInventoryStackLimit() { - return (proxyInventory != null) ? proxyInventory.getInventoryStackLimit() : 0; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return true; - } - - @Override - public void openInventory() {} - - @Override - public void closeInventory() {} - - @Override - public boolean isItemValidForSlot(int slot, ItemStack itemStack) { - if (proxyInventory != null && slot == 0) { - return proxyInventory.isItemValidForSlot(channel, itemStack); - } else { - return false; - } - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return new int[] { 0 }; - } - - @Override - public boolean canInsertItem(int slot, ItemStack itemStack, int side) { - return isItemValidForSlot(slot, itemStack); - } - - @Override - public boolean canExtractItem(int slot, ItemStack itemStack, int side) { - return slot == 0; - } -} diff --git a/src/main/java/common/tileentities/TE_ItemProxySource.java b/src/main/java/common/tileentities/TE_ItemProxySource.java deleted file mode 100644 index 31403f5352..0000000000 --- a/src/main/java/common/tileentities/TE_ItemProxySource.java +++ /dev/null @@ -1,105 +0,0 @@ -package common.tileentities; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -public class TE_ItemProxySource extends TileEntity implements IInventory { - - private final ItemStack[] slots = new ItemStack[16]; - private String idCache = null; - - /** - * Builds a simple unique identifier for this TileEntity by appending the x, y, and z coordinates in a string. - * - * @return unique identifier for this TileEntity - */ - public String getIdentifier() { - if (idCache == null) { - idCache = "" + super.xCoord + super.yCoord + super.zCoord; - return idCache; - } else { - return idCache; - } - } - - @Override - public int getSizeInventory() { - return slots.length; - } - - @Override - public ItemStack getStackInSlot(int slot) { - return slots[slot]; - } - - @Override - public ItemStack decrStackSize(int slot, int amount) { - if (slots[slot] != null) { - - ItemStack copy; - - if (slots[slot].stackSize == amount) { - copy = slots[slot]; - slots[slot] = null; - super.markDirty(); - return copy; - } else { - copy = slots[slot].splitStack(amount); - if (slots[slot].stackSize == 0) { - slots[slot] = null; - } - return copy; - } - - } else { - return null; - } - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return null; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack itemStack) { - slots[slot] = itemStack; - if (itemStack != null && itemStack.stackSize > getInventoryStackLimit()) { - itemStack.stackSize = getInventoryStackLimit(); - } - super.markDirty(); - } - - @Override - public String getInventoryName() { - return "Item Proxy Source"; - } - - @Override - public boolean hasCustomInventoryName() { - return true; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { - return true; - } - - @Override - public void openInventory() {} - - @Override - public void closeInventory() {} - - @Override - public boolean isItemValidForSlot(int slot, ItemStack itemStack) { - return true; - } -} diff --git a/src/main/java/common/tileentities/TE_SpaceElevatorCapacitor.java b/src/main/java/common/tileentities/TE_SpaceElevatorCapacitor.java deleted file mode 100644 index ea5211bfba..0000000000 --- a/src/main/java/common/tileentities/TE_SpaceElevatorCapacitor.java +++ /dev/null @@ -1,53 +0,0 @@ -package common.tileentities; - -import net.minecraft.tileentity.TileEntity; - -public class TE_SpaceElevatorCapacitor extends TileEntity { - - private float chargeLevel = 0.0F; - private boolean isDamaged = true; - - /** - * Called by {@link GTMTE_SpaceElevator} while charging - * - * @param charge Current elevator charge - * @param maxCharge Charge level it is trying to reach - */ - public void updateChargeLevel(int charge, int maxCharge) { - chargeLevel = ((float) charge) / ((float) maxCharge); - } - - /** - * Called by {@link client.renderer.TESR_SECapacitor} to calculate the block's colour saturation - * - * @return Charge level from 0.0F to 1.0F - */ - public float getChargeLevel() { - return chargeLevel; - } - - /** - * Called by {@link GTMTE_SpaceElevator} in case of power loss - */ - public void resetChargeLevel() { - chargeLevel = 0.0F; - } - - /** - * Called by {@link GTMTE_SpaceElevator} in case of maintenance issues - * - * @param isDamaged has maintenance issue - */ - public void setIsDamaged(boolean isDamaged) { - this.isDamaged = isDamaged; - } - - /** - * Called by {@link client.renderer.TESR_SECapacitor} to check whether the block should be rendered red - * - * @return should be rendered red - */ - public boolean isDamaged() { - return isDamaged; - } -} diff --git a/src/main/java/common/tileentities/TE_SpaceElevatorTether.java b/src/main/java/common/tileentities/TE_SpaceElevatorTether.java deleted file mode 100644 index 7e76a9c14d..0000000000 --- a/src/main/java/common/tileentities/TE_SpaceElevatorTether.java +++ /dev/null @@ -1,24 +0,0 @@ -package common.tileentities; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class TE_SpaceElevatorTether extends TileEntity { - - @SideOnly(Side.CLIENT) - @Override - public double getMaxRenderDistanceSquared() { - // 4k is standard, 65k is what the vanilla beacon uses - return 65536.0D; - } - - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getRenderBoundingBox() { - // Make it so the beam is still rendered even when the source block is out of sight - return INFINITE_EXTENT_AABB; - } -} diff --git a/src/main/java/kekztech/GuiHandler.java b/src/main/java/kekztech/GuiHandler.java deleted file mode 100644 index 9708b89d24..0000000000 --- a/src/main/java/kekztech/GuiHandler.java +++ /dev/null @@ -1,46 +0,0 @@ -package kekztech; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import common.container.Container_ItemProxyEndpoint; -import common.container.Container_ItemProxySource; - -import client.gui.Gui_ItemProxyEndpoint; -import client.gui.Gui_ItemProxySource; -import cpw.mods.fml.common.network.IGuiHandler; - -public class GuiHandler implements IGuiHandler { - - public static final int ITEM_PROXY_SOURCE = 0; - public static final int ITEM_PROXY_ENDPOINT = 1; - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - final TileEntity te = world.getTileEntity(x, y, z); - if (te != null) { - switch (ID) { - case ITEM_PROXY_SOURCE: - return new Container_ItemProxySource(te, player); - case ITEM_PROXY_ENDPOINT: - return new Container_ItemProxyEndpoint(te, player); - } - } - return null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - final TileEntity te = world.getTileEntity(x, y, z); - if (te != null) { - switch (ID) { - case ITEM_PROXY_SOURCE: - return new Gui_ItemProxySource(te, player); - case ITEM_PROXY_ENDPOINT: - return new Gui_ItemProxyEndpoint(te, player); - } - } - return null; - } -} diff --git a/src/main/java/kekztech/Items.java b/src/main/java/kekztech/Items.java index e1243820b4..747f8c903f 100644 --- a/src/main/java/kekztech/Items.java +++ b/src/main/java/kekztech/Items.java @@ -6,31 +6,11 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import common.items.MetaItem_CraftingComponent; -import common.items.MetaItem_ReactorComponent; import util.Util; public enum Items { - /* - * // Heat Vents T1HeatVent(0,0), T2HeatVent(1,0), T3HeatVent(2,0), T4HeatVent(3,0), T1ComponentHeatVent(4,0), - * T2ComponentHeatVent(5,0), T3ComponentHeatVent(6,0), T4ComponentHeatVent(7,0), T1OverclockedHeatVent(8,0), - * T2OverclockedHeatVent(9,0), T3OverclockedHeatVent(10,0), T4OverclockedHeatVent(11,0), // Heat Exchanger - * T1HeatExchanger(12,0), T2HeatExchanger(13,0), T3HeatExchanger(14,0), T4HeatExchanger(15,0), // Fuel Rods - * UraniumFuelRod(16,0), UraniumDualFuelRod(17,0), UraniumQuadFuelRod(18,0), ThoriumFuelRod(19,0), - * ThoriumDualFuelRod(20,0), ThoriumQuadFuelRod(21,0), MOXFuelRod(22,0), MOXDualFuelRod(23,0), MOXQuadFuelRod(24,0), - * NaquadahFuelRod(25,0), NaquadahDualFuelRod(26,0), NaquadahQuadFuelRod(27,0), Th_MOXFuelRod(28,0), - * Th_MOXDualFuelRod(29,0), Th_MOXQuadFuelRod(30,0), // Depleted Fuel Rods DepletedUraniumFuelRod(31,0), - * DepletedUraniumDualFuelRod(32,0), DepletedUraniumQuadFuelRod(33,0), DepletedThoriumFuelRod(34,0), - * DepletedThoriumDualFuelRod(35,0), DepletedThoriumQuadFuelRod(36,0), DepletedMOXFuelRod(37,0), - * DepletedMOXDualFuelRod(38,0), DepletedMOXQuadFuelRod(39,0), DepletedNaquadahFuelRod(40,0), - * DepletedNaquadahDualFuelRod(41,0), DepletedNaquadahQuadFuelRod(42,0), Th_DepletedMOXFuelRod(43,0), - * Th_DepletedMOXDualFuelRod(44,0), Th_DepletedMOXQuadFuelRod(45,0), // Neutron Reflectors T1NeutronReflector(46,0), - * T2NeutronReflector(47,0), // Coolant Cells HeliumCoolantCell360k(48,0), NaKCoolantCell360k(49,0), // Heat Pipes - * CopperHeatPipe(0,1), SilverHeatPipe(1,1), BoronArsenideHeatPipe(2,1), DiamondHeatPipe(3,1), - * BoronArsenideDust(4,1), IsotopicallyPureDiamondDust(5,1), AmineCarbamiteDust(6,1), BoronArsenideCrystal(7,1), - * IsotopicallyPureDiamondCrystal(8,1), - */ // Ceramics YSZCeramicDust(9, 1), GDCCeramicDust(10, 1), @@ -40,9 +20,7 @@ public enum Items { YSZCeramicPlate(14, 1), GDCCeramicPlate(15, 1), // Error Item - Error(0, 1), - // Configurator - Configurator(0, 1); + Error(0, 1); static { YttriaDust.setOreDictName("dustYttriumOxide"); @@ -72,14 +50,12 @@ public enum Items { } public ItemStack getNonOreDictedItemStack(int amount) { - return identifier == 0 ? new ItemStack(MetaItem_ReactorComponent.getInstance(), amount, this.getMetaID()) - : new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID()); + return new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID()); } public ItemStack getOreDictedItemStack(int amount) { return this.getOreDictName() != null ? Util.getStackofAmountFromOreDict(this.getOreDictName(), amount) - : identifier == 0 ? new ItemStack(MetaItem_ReactorComponent.getInstance(), amount, this.getMetaID()) - : new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID()); + : new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID()); } public String getOreDictName() { diff --git a/src/main/java/reactor/ButtonSlot.java b/src/main/java/reactor/ButtonSlot.java deleted file mode 100644 index 2c059e363a..0000000000 --- a/src/main/java/reactor/ButtonSlot.java +++ /dev/null @@ -1,11 +0,0 @@ -package reactor; - -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; - -public class ButtonSlot extends Slot { - - public ButtonSlot(IInventory playerIventory, int slotID, int posX, int posY) { - super(playerIventory, slotID, posX, posY); - } -} diff --git a/src/main/java/reactor/Reactor.java b/src/main/java/reactor/Reactor.java deleted file mode 100644 index 024daf102b..0000000000 --- a/src/main/java/reactor/Reactor.java +++ /dev/null @@ -1,8 +0,0 @@ -package reactor; - -public class Reactor { - - private long energyPerSecond; - private long heat; - private long maxHeat; -} diff --git a/src/main/java/reactor/itemBehaviour/IReactorItemBehaviour.java b/src/main/java/reactor/itemBehaviour/IReactorItemBehaviour.java deleted file mode 100644 index 1990938270..0000000000 --- a/src/main/java/reactor/itemBehaviour/IReactorItemBehaviour.java +++ /dev/null @@ -1,20 +0,0 @@ -package reactor.itemBehaviour; - -import java.util.HashMap; - -public abstract class IReactorItemBehaviour { - - protected final HashMap<String, String> properties; - - protected IReactorItemBehaviour(String propertiesKey) { - // load - - properties = new HashMap<>(); - } - - public abstract void apply(); - - public abstract boolean hasDurabilityBar(); - - public abstract double getDurabilityForDisplay(); -} diff --git a/src/main/java/reactor/items/CoolantCell.java b/src/main/java/reactor/items/CoolantCell.java deleted file mode 100644 index 2f59d6cfaa..0000000000 --- a/src/main/java/reactor/items/CoolantCell.java +++ /dev/null @@ -1,10 +0,0 @@ -package reactor.items; - -public class CoolantCell { - - public static String TYPE = "CoolantCell"; - - public static String[] RESOURCE_NAME = { "HeliumCoolantCell360k", "NaKCoolantCell360k" }; - - public static int[] HEAT_CAPACITY = { 360000, 360000 }; -} diff --git a/src/main/java/reactor/items/FuelRod.java b/src/main/java/reactor/items/FuelRod.java deleted file mode 100644 index f9e41e6ced..0000000000 --- a/src/main/java/reactor/items/FuelRod.java +++ /dev/null @@ -1,44 +0,0 @@ -package reactor.items; - -public class FuelRod { - - public static final int METAOFFSET = 17; - public static final int METAOFFSET_DEPLETED = 29; - - public static final String TYPE = "FuelRod"; - public static final String TYPE_DEPLETED = "DepletedFuelRod"; - public static final String LIFETIME = "LIFETIME"; - public static final String PULSES = "PULSES"; - public static final String HEAT_PER_SECOND = "HEAT_PER_SECOND"; - public static final String HEAT_PER_PULSE = "HEAT_PER_PULSE"; - public static final String HEAT_BOOST_RATE = "HEAT_BOOST_RATE"; - public static final String EU_PER_TICK = "EU_PER_TICK"; - public static final String EU_PER_PULSE = "EU_PER_PULSE"; - - public static final String[] RESOURCE_NAME = { "UraniumFuelRod", "UraniumDualFuelRod", "UraniumQuadFuelRod", - "ThoriumFuelRod", "ThoriumDualFuelRod", "ThoriumQuadFuelRod", "MOXFuelRod", "MOXDualFuelRod", - "MOXQuadFuelRod", "NaquadahFuelRod", "NaquadahDualFuelRod", "NaquadahQuadFuelRod", "Th_MOXFuelRod", - "Th_MOXDualFuelRod", "Th_MOXQuadFuelRod" }; - - public static final String[] RESOURCE_NAME_DEPLETED = { "DepletedUraniumFuelRod", "DepletedUraniumDualFuelRod", - "DepletedUraniumQuadFuelRod", "DepletedThoriumFuelRod", "DepletedThoriumDualFuelRod", - "DepletedThoriumQuadFuelRod", "DepletedMOXFuelRod", "DepletedMOXDualFuelRod", "DepletedMOXQuadFuelRod", - "DepletedNaquadahFuelRod", "DepletedNaquadahDualFuelRod", "DepletedNaquadahQuadFuelRod", - "Th_DepletedMOXFuelRod", "Th_DepletedMOXDualFuelRod", "Th_DepletedMOXQuadFuelRod" }; - - public static final int[] VALUES_LIFETIME = { 20000, 20000, 20000, 100000, 100000, 100000, 10000, 10000, 10000, - 100000, 100000, 100000, 50000, 50000, 50000 }; - - public static final int[] VALUES_PULSES = { 1, 2, 4, 1, 2, 4, 1, 2, 4, 1, 2, 4, 1, 2, 4 }; - - public static final int[] VALUES_HEAT_PER_SECOND = { 4, 24, 96, 1, 6, 24, 4, 24, 96, 80, 480, 1920, 1, 6, 24 }; - - public static final int[] VALUES_HEAT_PER_PULSE = { 4, 4, 4, 1, 1, 1, 4, 4, 4, 80, 80, 80, 1, 1, 1 }; - - public static final double[] VALUES_HEAT_BOOST_RATE = { 1, 1, 1, 1, 1, 1, 5, 5, 5, 1, 1, 1, 2, 2, 2 }; - - public static final int[] VALUES_EU_PER_TICK = { 50, 200, 600, 10, 40, 120, 50, 200, 600, 100, 400, 1200, 10, 40, - 120 }; - - public static final int[] VALUES_EU_PER_PULSE = { 50, 50, 50, 10, 10, 10, 50, 50, 50, 100, 100, 100, 10, 10, 10 }; -} diff --git a/src/main/java/reactor/items/HeatExchanger.java b/src/main/java/reactor/items/HeatExchanger.java deleted file mode 100644 index 5be68d1541..0000000000 --- a/src/main/java/reactor/items/HeatExchanger.java +++ /dev/null @@ -1,15 +0,0 @@ -package reactor.items; - -public class HeatExchanger { - - public static String TYPE = "HeatExchanger"; - - public static String[] RESOURCE_NAME = { "T1HeatExchanger", "T2HeatExchanger", "T3HeatExchanger", - "T4HeatExchanger" }; - - public static int[] HEAT_CAPACITY = { 2000, 8000, 32000, 128000 }; - - public static int[] COMPONENT_EXCHANGE_RATE = { 12, 24, 96, 384 }; - - public static int[] HULL_EXCHANGE_RATE = { 4, 8, 32, 128 }; -} diff --git a/src/main/java/reactor/items/HeatVent.java b/src/main/java/reactor/items/HeatVent.java deleted file mode 100644 index 3ff65d97bd..0000000000 --- a/src/main/java/reactor/items/HeatVent.java +++ /dev/null @@ -1,24 +0,0 @@ -package reactor.items; - -public class HeatVent { - - public static final String TYPE = "HeatVent"; - public static final String HEAT = "HEAT"; - public static final String RESOURCE_NAME = "RESOURCE_NAME"; - public static final String HEAT_CAPACITY = "HEAT_CAPACITY"; - public static final String COMPONENT_VENT_RATE = "COMPONENT_VENT_RATE"; - public static final String HULL_DRAW_RATE = "HULL_DRAW_RATE"; - public static final String SELF_COOL_RATE = "SELF_COOL_RATE"; - - public static String[] RESOURCE_NAMES = { "T1HeatVent", "T2HeatVent", "T3HeatVent", "T4HeatVent", - "T1ComponentHeatVent", "T2ComponentHeatVent", "T3ComponentHeatVent", "T4ComponentHeatVent", - "T1OverclockedHeatVent", "T2OverclockedHeatVent", "T3OverclockedHeatVent", "T4OverclockedHeatVent" }; - - public static int[] HEAT_CAPACITIES = { 1000, 4000, 8000, 32000, 1000, 4000, 8000, 32000, 1000, 4000, 8000, 32000 }; - - public static int[] COMPONENT_VENT_RATES = { 0, 0, 0, 0, 6, 12, 48, 96, 0, 0, 0, 0 }; - - public static int[] HULL_DRAW_RATES = { 0, 0, 0, 0, 0, 0, 0, 0, 18, 36, 144, 288 }; - - public static int[] SELF_COOL_RATES = { 6, 12, 48, 96, 0, 0, 0, 0, 10, 20, 80, 160 }; -} diff --git a/src/main/java/reactor/items/NeutronReflector.java b/src/main/java/reactor/items/NeutronReflector.java deleted file mode 100644 index 44f04e32c9..0000000000 --- a/src/main/java/reactor/items/NeutronReflector.java +++ /dev/null @@ -1,10 +0,0 @@ -package reactor.items; - -public class NeutronReflector { - - public static String TYPE = "NeutronReflector"; - - public static String[] RESOURCE_NAME = { "T1NeutronReflector", "T2NeutronReflector" }; - - public static int[] DURABILITY = { 512000, 2147483647 }; -} diff --git a/src/main/java/util/Vector3i.java b/src/main/java/util/Vector3i.java deleted file mode 100644 index 6b35d14787..0000000000 --- a/src/main/java/util/Vector3i.java +++ /dev/null @@ -1,30 +0,0 @@ -package util; - -public class Vector3i implements Vector3ic { - - public int x, y, z; - - public Vector3i() { - x = 1; - y = 1; - z = 1; - } - - public Vector3i(int x, int y, int z) { - this.x = x; - this.y = y; - this.z = z; - } - - public int x() { - return x; - } - - public int y() { - return y; - } - - public int z() { - return z; - } -} diff --git a/src/main/java/util/Vector3ic.java b/src/main/java/util/Vector3ic.java deleted file mode 100644 index 296c4f0268..0000000000 --- a/src/main/java/util/Vector3ic.java +++ /dev/null @@ -1,10 +0,0 @@ -package util; - -public interface Vector3ic { - - int x(); - - int y(); - - int z(); -} diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang index e147c1546c..a77f21bcbe 100644 --- a/src/main/resources/assets/kekztech/lang/en_US.lang +++ b/src/main/resources/assets/kekztech/lang/en_US.lang @@ -18,84 +18,6 @@ mbdesc.signAndFinalize.Hold=Hold mbdesc.signAndFinalize.todisplay=to display structure guidelines mbdesc.signAndFinalize.createdby=Created by -# -------- Reactor: Structure Blocks -tile.kekztech_controlrod_block.name=Nuclear Reactor Control Rod -tile.kekztech_reactorchamberoff_block.name=Nuclear Reactor Chamber (OFF) -tile.kekztech_reactorchamberon_block.name=Nuclear Reactor Chamber (ON) - -# -------- Reactor: Heat Vents -item.kekztech_reactor_item.0.name=Weak Heat Vent -item.kekztech_reactor_item.1.name=Basic Heat Vent -item.kekztech_reactor_item.2.name=Advanced Heat Vent -item.kekztech_reactor_item.3.name=High-Tech Heat Vent -item.kekztech_reactor_item.4.name=Weak Component Heat Vent -item.kekztech_reactor_item.5.name=Basic Component Heat Vent -item.kekztech_reactor_item.6.name=Advanced Component Heat Vent -item.kekztech_reactor_item.7.name=High-Tech Component Heat Vent -item.kekztech_reactor_item.8.name=Weak Overclocked Heat Vent -item.kekztech_reactor_item.9.name=Basic Overclocked Heat Vent -item.kekztech_reactor_item.10.name=Advanced Overclocked Heat Vent -item.kekztech_reactor_item.11.name=High-Tech Overclocked Heat Vent - -# -------- Reactor: Heat Exchangers -item.kekztech_reactor_item.12.name=Weak Heat Exchanger -item.kekztech_reactor_item.13.name=Basic Heat Exchanger -item.kekztech_reactor_item.14.name=Advanced Heat Exchanger -item.kekztech_reactor_item.15.name=High-Tech Heat Exchanger - -# -------- Reactor: Fuel Rods -item.kekztech_reactor_item.16.name=Fuel Rod (Enriched Uranium) -item.kekztech_reactor_item.17.name=Dual Fuel Rod (Enriched Uranium) -item.kekztech_reactor_item.18.name=Quad Fuel Rod (Enriched Uranium) -item.kekztech_reactor_item.19.name=Fuel Rod (Thorium) -item.kekztech_reactor_item.20.name=Dual Fuel Rod (Thorium) -item.kekztech_reactor_item.21.name=Quad Fuel Rod (Thorium) -item.kekztech_reactor_item.22.name=Fuel Rod (Plutonium MOX) -item.kekztech_reactor_item.23.name=Dual Fuel Rod (Plutonium MOX) -item.kekztech_reactor_item.24.name=Quad Fuel Rod (Plutonium MOX) -item.kekztech_reactor_item.25.name=Fuel Rod (Enriched Naquadah) -item.kekztech_reactor_item.26.name=Dual Fuel Rod (Enriched Naquadah) -item.kekztech_reactor_item.27.name=Quad Fuel Rod (Enriched Naquadah) -item.kekztech_reactor_item.28.name=Fuel Rod (Thorium MOX) -item.kekztech_reactor_item.29.name=Dual Fuel Rod (Thorium MOX) -item.kekztech_reactor_item.30.name=Quad Fuel Rod (Thorium MOX) - -# -------- Reactor: Fuel Rods (Depleted) -item.kekztech_reactor_item.31.name=Depleted Fuel Rod (Enriched Uranium) -item.kekztech_reactor_item.32.name=Depleted Dual Fuel Rod (Enriched Uranium) -item.kekztech_reactor_item.33.name=Depleted Quad Fuel Rod (Enriched Uranium) -item.kekztech_reactor_item.34.name=Depleted Fuel Rod (Thorium) -item.kekztech_reactor_item.35.name=Depleted Dual Fuel Rod (Thorium) -item.kekztech_reactor_item.36.name=Depleted Quad Fuel Rod (Thorium) -item.kekztech_reactor_item.37.name=Depleted Fuel Rod (Plutonium MOX) -item.kekztech_reactor_item.38.name=Depleted Dual Fuel Rod (Plutonium MOX) -item.kekztech_reactor_item.39.name=Depleted Quad Fuel Rod (Plutonium MOX) -item.kekztech_reactor_item.40.name=Depleted Fuel Rod (Enriched Naquadah) -item.kekztech_reactor_item.41.name=Depleted Dual Fuel Rod (Enriched Naquadah) -item.kekztech_reactor_item.42.name=Depleted Quad Fuel Rod (Enriched Naquadah) -item.kekztech_reactor_item.43.name=Depleted Fuel Rod (Thorium MOX) -item.kekztech_reactor_item.44.name=Depleted Fuel Rod (Thorium MOX) -item.kekztech_reactor_item.45.name=Depleted Fuel Rod (Thorium MOX) - -# -------- Reactor: Neutron Reflectors -item.kekztech_reactor_item.46.name=Neutron Reflector -item.kekztech_reactor_item.47.name=Neutron Supermirror (Unbreakable) - -# -------- Reactor: Coolant Cells -item.kekztech_reactor_item.48.name=Helium Coolant Cell -item.kekztech_reactor_item.49.name=NaK Coolant Cell - -# -------- Reactor: Crafting Components -item.kekztech_crafting_item.0.name=Copper Heat Pipe -item.kekztech_crafting_item.1.name=Silver Heat Pipe -item.kekztech_crafting_item.2.name=Boron Arsenide Heat Pipe -item.kekztech_crafting_item.3.name=Diamond Heat Pipe -item.kekztech_crafting_item.4.name=Boron Arsenide Dust -item.kekztech_crafting_item.5.name=Isotopically Pure Diamond Dust -item.kekztech_crafting_item.6.name=Amine Carbamate Dust -item.kekztech_crafting_item.7.name=Boron Arsenide Crystal -item.kekztech_crafting_item.8.name=Isotopically Pure Diamond Crystal - # -------- Fuel Cell: Structure Blocks tile.kekztech_gdcceramicelectrolyteunit_block.name=GDC Ceramic Electrolyte Unit tile.kekztech_yszceramicelectrolyteunit_block.name=YSZ Ceramic Electrolyte Unit @@ -127,17 +49,6 @@ tile.kekztech_tfftstoragefield_block.hint.2=Hint 2 Dot: T.F.F.T Casing, Maintena tile.kekztech_tfftstoragefield_block.hint.3=Hint 3 Dot: EV+ Tier Glass, T.F.F.T Multi I/O Hatch, Input/Output Hatch tile.kekztech_tfftstoragefield_block.hint.4=Hint 4 Dot: EV+ Tier Glass -# -------- Item Proxy: Structure Blocks -tile.kekztech_itemproxycable_block.name=Item Proxy Network Cable -tile.kekztech_itemproxycable_block.0.desc=Connects Item Proxy Nodes -tile.kekztech_itemproxysource_block.name=Item Proxy Network Source -tile.kekztech_itemproxysource_block.0.desc=Point to an inventory to act as source for the item proxy network -tile.kekztech_itemproxysource_block.1.desc=Insert an Integrated Circuit to set the network channel -tile.kekztech_itemproxysource_block.2.desc=Only one source can use one channel on the same network -tile.kekztech_itemproxyendpoint_block.name=Item Proxy Network Endpoint -tile.kekztech_itemproxyendpoint_block.0.desc=Point the marked side to where you want to provide an inventory proxy to -tile.kekztech_itemproxyendpoint_block.1.desc=Insert an Integrated Circuit to set the network channel - # -------- Lapotronic Super Capacitor: Structure Blocks tile.kekztech_lapotronicenergyunit_block.0.name=Lapotronic Super Capacitor Casing tile.kekztech_lapotronicenergyunit_block.1.name=Lapotronic Capacitor (IV) @@ -174,20 +85,9 @@ tc.research_name.ICHORJAR=Ichor Jars tc.research_text.ICHORJAR=Much better jars kekztech.research_page.ICHORJAR.0=This is it!<BR><BR>By infusing a jar with just a single piece of Ichor you have created something to rival digitized Essentia storage without sacrificing any of the beauty of Warded Jars.<BR><BR>Ichor Jars can hold an astounding 4096 Essentia and fit nicely into your recently aquired set of Ichor based achievements.<BR><BR>You definitely don't want to disturb these jars. Luckily Ichor is resilient enough to make accidentially destroying one unlikely. -# -------- Space Elevator: Block -tile.kekztech_spaceelevator_block.0.name=Space Elevator Base -tile.kekztech_spaceelevator_block.1.name=Space Elevator Coil Holder -tile.kekztech_spaceelevator_block.desc=Part of the Space Elevator Base Station -tile.kekztech_spaceelevatorcapacitor_block.name=Space Elevator Capacitor -tile.kekztech_spaceelevatorcapacitor_block.desc=The see-through is good for your FPS! -tile.kekztech_spaceelevatortether_block.name=Space Elevator Tether - # -------- Cosmetic Blocks tile.kekztech_largehextile_block.name=Large Hex Tile -# -------- Beam Transmitter -tile.kekztech_beamtransmitter_block=Beam Transmitter - # -------- Achievements achievement.tile.kekztech_lapotronicenergyunit_block.2.desc=Pickup this item to see the recipe in NEI achievement.tile.kekztech_lapotronicenergyunit_block.2=Lapotronic Capacitor (LuV) diff --git a/src/main/resources/assets/kekztech/lang/zh_CN.lang b/src/main/resources/assets/kekztech/lang/zh_CN.lang index d7ec936c48..360e4d540f 100644 --- a/src/main/resources/assets/kekztech/lang/zh_CN.lang +++ b/src/main/resources/assets/kekztech/lang/zh_CN.lang @@ -16,85 +16,7 @@ mbdesc.addOutputBus.OutputBus=输出总线 mbdesc.addOutputHatch.OutputHatch=输出仓 mbdesc.signAndFinalize.Hold=按住 mbdesc.signAndFinalize.todisplay=以显示结构指导 -mbdesc.signAndFinalize.createdby=添加者: - -# -------- Reactor: Structure Blocks -tile.kekztech_controlrod_block.name=核反应堆控制棒 -tile.kekztech_reactorchamberoff_block.name=核反应堆室(OFF) -tile.kekztech_reactorchamberon_block.name=核反应堆室(ON) - -# -------- Reactor: Heat Vents -item.kekztech_reactor_item.0.name=简易散热风扇 -item.kekztech_reactor_item.1.name=基础散热风扇 -item.kekztech_reactor_item.2.name=进阶散热风扇 -item.kekztech_reactor_item.3.name=高科技散热风扇 -item.kekztech_reactor_item.4.name=简易散热风扇组件 -item.kekztech_reactor_item.5.name=基础散热风扇组件 -item.kekztech_reactor_item.6.name=进阶散热风扇组件 -item.kekztech_reactor_item.7.name=高科技散热风扇组件 -item.kekztech_reactor_item.8.name=简易超频散热风扇 -item.kekztech_reactor_item.9.name=基础超频散热风扇 -item.kekztech_reactor_item.10.name=进阶超频散热风扇 -item.kekztech_reactor_item.11.name=高科技超频散热风扇 - -# -------- Reactor: Heat Exchangers -item.kekztech_reactor_item.12.name=简易热交换器 -item.kekztech_reactor_item.13.name=基础热交换器 -item.kekztech_reactor_item.14.name=进阶热交换器 -item.kekztech_reactor_item.15.name=高科技热交换器 - -# -------- Reactor: Fuel Rods -item.kekztech_reactor_item.16.name=燃料棒(浓缩铀) -item.kekztech_reactor_item.17.name=二联燃料棒(浓缩铀) -item.kekztech_reactor_item.18.name=四联燃料棒(浓缩铀) -item.kekztech_reactor_item.19.name=燃料棒(钍) -item.kekztech_reactor_item.20.name=二联燃料棒(钍) -item.kekztech_reactor_item.21.name=四联燃料棒(钍) -item.kekztech_reactor_item.22.name=燃料棒(钚MOX) -item.kekztech_reactor_item.23.name=二联燃料棒(钚MOX) -item.kekztech_reactor_item.24.name=四联燃料棒(钚MOX) -item.kekztech_reactor_item.25.name=燃料棒(富集硅岩) -item.kekztech_reactor_item.26.name=二联燃料棒(富集硅岩) -item.kekztech_reactor_item.27.name=四联燃料棒(富集硅岩) -item.kekztech_reactor_item.28.name=燃料棒(钍MOX) -item.kekztech_reactor_item.29.name=二联燃料棒(钍MOX) -item.kekztech_reactor_item.30.name=四联燃料棒(钍MOX) - -# -------- Reactor: Fuel Rods (Depleted) -item.kekztech_reactor_item.31.name=枯竭燃料棒(浓缩铀) -item.kekztech_reactor_item.32.name=枯竭二联燃料棒(浓缩铀) -item.kekztech_reactor_item.33.name=枯竭四联燃料棒(浓缩铀) -item.kekztech_reactor_item.34.name=枯竭燃料棒(钍) -item.kekztech_reactor_item.35.name=枯竭二联燃料棒(钍) -item.kekztech_reactor_item.36.name=枯竭四联燃料棒(钍) -item.kekztech_reactor_item.37.name=枯竭燃料棒(钚MOX) -item.kekztech_reactor_item.38.name=枯竭二联燃料棒(钚MOX) -item.kekztech_reactor_item.39.name=枯竭四联燃料棒(钚MOX) -item.kekztech_reactor_item.40.name=枯竭燃料棒(富集硅岩) -item.kekztech_reactor_item.41.name=枯竭二联燃料棒(富集硅岩) -item.kekztech_reactor_item.42.name=枯竭四联燃料棒(富集硅岩) -item.kekztech_reactor_item.43.name=枯竭燃料棒(钍MOX) -item.kekztech_reactor_item.44.name=枯竭燃料棒(钍MOX) -item.kekztech_reactor_item.45.name=枯竭燃料棒(钍MOX) - -# -------- Reactor: Neutron Reflectors -item.kekztech_reactor_item.46.name=中子反射板 -item.kekztech_reactor_item.47.name=超级中子反射板(坚不可摧) - -# -------- Reactor: Coolant Cells -item.kekztech_reactor_item.48.name=氦冷却单元 -item.kekztech_reactor_item.49.name=钠钾冷却单元 - -# -------- Reactor: Crafting Components -item.kekztech_crafting_item.0.name=铜导热管 -item.kekztech_crafting_item.1.name=银导热管 -item.kekztech_crafting_item.2.name=砷化硼导热管 -item.kekztech_crafting_item.3.name=钻石导热管 -item.kekztech_crafting_item.4.name=砷化硼粉 -item.kekztech_crafting_item.5.name=钻石同位素粉 -item.kekztech_crafting_item.6.name=氨基甲酸酯粉 -item.kekztech_crafting_item.7.name=砷化硼晶体 -item.kekztech_crafting_item.8.name=钻石同位素晶体 +mbdesc.signAndFinalize.createdby=添加者: # -------- Fuel Cell: Structure Blocks tile.kekztech_gdcceramicelectrolyteunit_block.name=钆铈陶瓷电解质单元 @@ -123,17 +45,6 @@ tile.kekztech_tfftstoragefield_block.9.name=T.F.F.T存储库方块(T9) tile.kekztech_tfftstoragefield_block.10.name=T.F.F.T存储库方块(T10) tile.kekztech_tfftstoragefield_block.desc=这不是流体储罐 -# -------- Item Proxy: Structure Blocks -tile.kekztech_itemproxycable_block.name=物流网络线缆 -tile.kekztech_itemproxycable_block.0.desc=连接物流网络节点 -tile.kekztech_itemproxysource_block.name=物流网络源 -tile.kekztech_itemproxysource_block.0.desc=指向容器/存储, 充当物流网络的源头 -tile.kekztech_itemproxysource_block.1.desc=插入编程电路以设置网络频道 -tile.kekztech_itemproxysource_block.2.desc=同一网络中只有一个源可以使用一个频道 -tile.kekztech_itemproxyendpoint_block.name=物流网络终端 -tile.kekztech_itemproxyendpoint_block.0.desc=将标记的一面指向你需要物流网络提供物品的地方 -tile.kekztech_itemproxyendpoint_block.1.desc=插入编程电路以设置网络频道 - # -------- Lapotronic Super Capacitor: Structure Blocks tile.kekztech_lapotronicenergyunit_block.0.name=兰波顿超级电容机械方块 tile.kekztech_lapotronicenergyunit_block.1.name=兰波顿电容(IV) @@ -167,20 +78,9 @@ tc.research_name.ICHORJAR=灵液源质罐子 tc.research_text.ICHORJAR=非常好的罐子 kekztech.research_page.ICHORJAR.0=就是这个!<BR><BR>将一点灵液注魔进源质罐子,你获得了可以与数字化源质存储相匹敌,同时还不用牺牲美感的新罐子.<BR><BR>灵液源质罐子可以装下惊人的4096点源质,非常适合你刚解锁的这些基于灵液的注魔.<BR><BR>你绝对不会想打扰这些罐子的.不过幸运的是,灵液源质罐子拥有足够的柔韧性,不太容易被误操作摧毁. -# -------- Space Elevator: Block -tile.kekztech_spaceelevator_block.0.name=太空电梯基座 -tile.kekztech_spaceelevator_block.1.name=太空电梯线圈 -tile.kekztech_spaceelevator_block.desc=太空电梯基站的一部分 -tile.kekztech_spaceelevatorcapacitor_block.name=太空电梯电容 -tile.kekztech_spaceelevatorcapacitor_block.desc=透视对你的FPS有好处! -tile.kekztech_spaceelevatortether_block.name=太空电梯线缆 - # -------- Cosmetic Blocks tile.kekztech_largehextile_block.name=大六角瓷砖 -# -------- Beam Transmitter -tile.kekztech_beamtransmitter_block=光束发射器 - # -------- Achievements achievement.tile.kekztech_lapotronicenergyunit_block.2.desc=捡起这个物品以在NEI内查看配方 achievement.tile.kekztech_lapotronicenergyunit_block.2=兰波顿电容(LuV) diff --git a/src/main/resources/assets/kekztech/textures/blocks/CoilHolder.png b/src/main/resources/assets/kekztech/textures/blocks/CoilHolder.png Binary files differdeleted file mode 100644 index 12f87ce0f8..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/CoilHolder.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ControlRod.png b/src/main/resources/assets/kekztech/textures/blocks/ControlRod.png Binary files differdeleted file mode 100644 index 177e5c7231..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ControlRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ItemProxyEndpoint.png b/src/main/resources/assets/kekztech/textures/blocks/ItemProxyEndpoint.png Binary files differdeleted file mode 100644 index 0bfab8cbaf..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ItemProxyEndpoint.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ItemProxySource.png b/src/main/resources/assets/kekztech/textures/blocks/ItemProxySource.png Binary files differdeleted file mode 100644 index 742e562834..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ItemProxySource.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ItemServer2.png b/src/main/resources/assets/kekztech/textures/blocks/ItemServer2.png Binary files differdeleted file mode 100644 index cd806e7e7f..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ItemServer2.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ItemServer2_BOTTOM.png b/src/main/resources/assets/kekztech/textures/blocks/ItemServer2_BOTTOM.png Binary files differdeleted file mode 100644 index 9adc2b745c..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ItemServer2_BOTTOM.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ItemServer2_TOP.png b/src/main/resources/assets/kekztech/textures/blocks/ItemServer2_TOP.png Binary files differdeleted file mode 100644 index fa6b2f578c..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ItemServer2_TOP.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ItemServerDrive.png b/src/main/resources/assets/kekztech/textures/blocks/ItemServerDrive.png Binary files differdeleted file mode 100644 index 2560ec1c14..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ItemServerDrive.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ItemServerDrive_BOTTOM.png b/src/main/resources/assets/kekztech/textures/blocks/ItemServerDrive_BOTTOM.png Binary files differdeleted file mode 100644 index c62f716f68..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ItemServerDrive_BOTTOM.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ItemServerDrive_TOP.png b/src/main/resources/assets/kekztech/textures/blocks/ItemServerDrive_TOP.png Binary files differdeleted file mode 100644 index 9f3b2f2c0c..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ItemServerDrive_TOP.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ItemServerIOPort.png b/src/main/resources/assets/kekztech/textures/blocks/ItemServerIOPort.png Binary files differdeleted file mode 100644 index 5e387411f2..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ItemServerIOPort.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ItemServerRackCasing.png b/src/main/resources/assets/kekztech/textures/blocks/ItemServerRackCasing.png Binary files differdeleted file mode 100644 index 5f3a9b6d58..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ItemServerRackCasing.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ReactorChamber_OFF.png b/src/main/resources/assets/kekztech/textures/blocks/ReactorChamber_OFF.png Binary files differdeleted file mode 100644 index 40a33e52a9..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ReactorChamber_OFF.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/ReactorChamber_ON.png b/src/main/resources/assets/kekztech/textures/blocks/ReactorChamber_ON.png Binary files differdeleted file mode 100644 index 6480a8ab9b..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/ReactorChamber_ON.png +++ /dev/null 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 differdeleted file mode 100644 index 876c26f8cb..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorBase_side.png +++ /dev/null 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 differdeleted file mode 100644 index 05afd9318a..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorBase_top.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_side_0.png b/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_side_0.png Binary files differdeleted file mode 100644 index 4715a813ed..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_side_0.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_side_fullbase.png b/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_side_fullbase.png Binary files differdeleted file mode 100644 index 84f5909b9e..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_side_fullbase.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_side_renderbase.png b/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_side_renderbase.png Binary files differdeleted file mode 100644 index 32aee141d9..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_side_renderbase.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_top_fullbase.png b/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_top_fullbase.png Binary files differdeleted file mode 100644 index f1c045b5af..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/SpaceElevatorCapacitor_top_fullbase.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/Tether_side.png b/src/main/resources/assets/kekztech/textures/blocks/Tether_side.png Binary files differdeleted file mode 100644 index b98c084e74..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/Tether_side.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/blocks/Tether_top.png b/src/main/resources/assets/kekztech/textures/blocks/Tether_top.png Binary files differdeleted file mode 100644 index fe1e8e2dd9..0000000000 --- a/src/main/resources/assets/kekztech/textures/blocks/Tether_top.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/effects/Tether_beam.png b/src/main/resources/assets/kekztech/textures/effects/Tether_beam.png Binary files differdeleted file mode 100644 index ca8274820b..0000000000 --- a/src/main/resources/assets/kekztech/textures/effects/Tether_beam.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/gui/ItemTech1by1.png b/src/main/resources/assets/kekztech/textures/gui/ItemTech1by1.png Binary files differdeleted file mode 100644 index 816e27a66b..0000000000 --- a/src/main/resources/assets/kekztech/textures/gui/ItemTech1by1.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/gui/ItemTech4by4.png b/src/main/resources/assets/kekztech/textures/gui/ItemTech4by4.png Binary files differdeleted file mode 100644 index 60c9f99fff..0000000000 --- a/src/main/resources/assets/kekztech/textures/gui/ItemTech4by4.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/gui/ItemTechReceiverNode.png b/src/main/resources/assets/kekztech/textures/gui/ItemTechReceiverNode.png Binary files differdeleted file mode 100644 index 704fb39c96..0000000000 --- a/src/main/resources/assets/kekztech/textures/gui/ItemTechReceiverNode.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/AmineCarbamateDust.png b/src/main/resources/assets/kekztech/textures/items/AmineCarbamateDust.png Binary files differdeleted file mode 100644 index d52f6c823c..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/AmineCarbamateDust.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/BoronArsenideCrystal.png b/src/main/resources/assets/kekztech/textures/items/BoronArsenideCrystal.png Binary files differdeleted file mode 100644 index b5f4bfcfa6..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/BoronArsenideCrystal.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/BoronArsenideDust.png b/src/main/resources/assets/kekztech/textures/items/BoronArsenideDust.png Binary files differdeleted file mode 100644 index d6475829ed..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/BoronArsenideDust.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/BoronArsenideHeatPipe.png b/src/main/resources/assets/kekztech/textures/items/BoronArsenideHeatPipe.png Binary files differdeleted file mode 100644 index 3dba0931da..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/BoronArsenideHeatPipe.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/CopperHeatPipe.png b/src/main/resources/assets/kekztech/textures/items/CopperHeatPipe.png Binary files differdeleted file mode 100644 index 4f6fe9583b..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/CopperHeatPipe.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DemonCore.png b/src/main/resources/assets/kekztech/textures/items/DemonCore.png Binary files differdeleted file mode 100644 index 026b8fdeed..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DemonCore.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedMOXDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedMOXDualFuelRod.png Binary files differdeleted file mode 100644 index b74dd955d4..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedMOXDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedMOXFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedMOXFuelRod.png Binary files differdeleted file mode 100644 index fea49e3594..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedMOXFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedMOXQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedMOXQuadFuelRod.png Binary files differdeleted file mode 100644 index 1f4c95d5ac..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedMOXQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahDualFuelRod.png Binary files differdeleted file mode 100644 index b5f1019022..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahFuelRod.png Binary files differdeleted file mode 100644 index 808c45ff8a..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahQuadFuelRod.png Binary files differdeleted file mode 100644 index 0854d0426c..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedNaquadahQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedThoriumDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedThoriumDualFuelRod.png Binary files differdeleted file mode 100644 index 680e8be89c..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedThoriumDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedThoriumFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedThoriumFuelRod.png Binary files differdeleted file mode 100644 index 0fd9e646c4..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedThoriumFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedThoriumQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedThoriumQuadFuelRod.png Binary files differdeleted file mode 100644 index 3521deea10..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedThoriumQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedUraniumDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedUraniumDualFuelRod.png Binary files differdeleted file mode 100644 index 8f55e7b9e3..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedUraniumDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedUraniumFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedUraniumFuelRod.png Binary files differdeleted file mode 100644 index 6e4dec95c4..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedUraniumFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DepletedUraniumQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/DepletedUraniumQuadFuelRod.png Binary files differdeleted file mode 100644 index 83492ea5aa..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DepletedUraniumQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/DiamondHeatPipe.png b/src/main/resources/assets/kekztech/textures/items/DiamondHeatPipe.png Binary files differdeleted file mode 100644 index 0c67b69b21..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/DiamondHeatPipe.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/HeliumCoolantCell360k.png b/src/main/resources/assets/kekztech/textures/items/HeliumCoolantCell360k.png Binary files differdeleted file mode 100644 index 421eac6879..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/HeliumCoolantCell360k.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/IsotopicallyPureDiamondCrystal.png b/src/main/resources/assets/kekztech/textures/items/IsotopicallyPureDiamondCrystal.png Binary files differdeleted file mode 100644 index 0e7d47f02e..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/IsotopicallyPureDiamondCrystal.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/IsotopicallyPureDiamondDust.png b/src/main/resources/assets/kekztech/textures/items/IsotopicallyPureDiamondDust.png Binary files differdeleted file mode 100644 index eb552c5ab3..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/IsotopicallyPureDiamondDust.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/MOXDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/MOXDualFuelRod.png Binary files differdeleted file mode 100644 index bacbf5a087..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/MOXDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/MOXFuelRod.png b/src/main/resources/assets/kekztech/textures/items/MOXFuelRod.png Binary files differdeleted file mode 100644 index 3af0cf956f..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/MOXFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/MOXQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/MOXQuadFuelRod.png Binary files differdeleted file mode 100644 index fa1c0b1ba6..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/MOXQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/NaKCoolantCell360k.png b/src/main/resources/assets/kekztech/textures/items/NaKCoolantCell360k.png Binary files differdeleted file mode 100644 index c006ea245a..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/NaKCoolantCell360k.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/NaquadahDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/NaquadahDualFuelRod.png Binary files differdeleted file mode 100644 index 082ef703fa..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/NaquadahDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/NaquadahFuelRod.png b/src/main/resources/assets/kekztech/textures/items/NaquadahFuelRod.png Binary files differdeleted file mode 100644 index b4099a19b7..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/NaquadahFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/NaquadahQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/NaquadahQuadFuelRod.png Binary files differdeleted file mode 100644 index c860a3a2bd..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/NaquadahQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/PlutoniumGalliumDust.png b/src/main/resources/assets/kekztech/textures/items/PlutoniumGalliumDust.png Binary files differdeleted file mode 100644 index fc978ad329..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/PlutoniumGalliumDust.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/RawDemonCore.png b/src/main/resources/assets/kekztech/textures/items/RawDemonCore.png Binary files differdeleted file mode 100644 index 94105601d1..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/RawDemonCore.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/SilverHeatPipe.png b/src/main/resources/assets/kekztech/textures/items/SilverHeatPipe.png Binary files differdeleted file mode 100644 index 278de757c7..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/SilverHeatPipe.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T1ComponentHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T1ComponentHeatVent.png Binary files differdeleted file mode 100644 index 50cfaf3500..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T1ComponentHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T1HeatExchanger.png b/src/main/resources/assets/kekztech/textures/items/T1HeatExchanger.png Binary files differdeleted file mode 100644 index 3de49b2a8e..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T1HeatExchanger.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T1HeatVent.png b/src/main/resources/assets/kekztech/textures/items/T1HeatVent.png Binary files differdeleted file mode 100644 index 5d898e72f8..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T1HeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T1NeutronReflector.png b/src/main/resources/assets/kekztech/textures/items/T1NeutronReflector.png Binary files differdeleted file mode 100644 index 5c16d10365..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T1NeutronReflector.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T1OverclockedHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T1OverclockedHeatVent.png Binary files differdeleted file mode 100644 index 3e463d03d6..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T1OverclockedHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T2ComponentHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T2ComponentHeatVent.png Binary files differdeleted file mode 100644 index 01d7514ca2..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T2ComponentHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T2HeatExchanger.png b/src/main/resources/assets/kekztech/textures/items/T2HeatExchanger.png Binary files differdeleted file mode 100644 index a67693cd15..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T2HeatExchanger.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T2HeatVent.png b/src/main/resources/assets/kekztech/textures/items/T2HeatVent.png Binary files differdeleted file mode 100644 index 8e30ff11e5..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T2HeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T2NeutronReflector.png b/src/main/resources/assets/kekztech/textures/items/T2NeutronReflector.png Binary files differdeleted file mode 100644 index b85428abed..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T2NeutronReflector.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T2OverclockedHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T2OverclockedHeatVent.png Binary files differdeleted file mode 100644 index 6e3d8447c5..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T2OverclockedHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T3ComponentHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T3ComponentHeatVent.png Binary files differdeleted file mode 100644 index 46e717f2c7..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T3ComponentHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T3HeatExchanger.png b/src/main/resources/assets/kekztech/textures/items/T3HeatExchanger.png Binary files differdeleted file mode 100644 index bdc6dc25af..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T3HeatExchanger.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T3HeatVent.png b/src/main/resources/assets/kekztech/textures/items/T3HeatVent.png Binary files differdeleted file mode 100644 index d53f010af6..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T3HeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T3OverclockedHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T3OverclockedHeatVent.png Binary files differdeleted file mode 100644 index 1e12e2480d..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T3OverclockedHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T4ComponentHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T4ComponentHeatVent.png Binary files differdeleted file mode 100644 index 37b3de63c7..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T4ComponentHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T4HeatExchanger.png b/src/main/resources/assets/kekztech/textures/items/T4HeatExchanger.png Binary files differdeleted file mode 100644 index fb890073eb..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T4HeatExchanger.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T4HeatVent.png b/src/main/resources/assets/kekztech/textures/items/T4HeatVent.png Binary files differdeleted file mode 100644 index b9de168eea..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T4HeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/T4OverclockedHeatVent.png b/src/main/resources/assets/kekztech/textures/items/T4OverclockedHeatVent.png Binary files differdeleted file mode 100644 index 44d14ce35c..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/T4OverclockedHeatVent.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXDualFuelRod.png Binary files differdeleted file mode 100644 index f7b9319a6c..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXFuelRod.png b/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXFuelRod.png Binary files differdeleted file mode 100644 index 64c40e0e7d..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXQuadFuelRod.png Binary files differdeleted file mode 100644 index ec3086224b..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/Th_DepletedMOXQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/Th_MOXDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/Th_MOXDualFuelRod.png Binary files differdeleted file mode 100644 index f23128cfc1..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/Th_MOXDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/Th_MOXFuelRod.png b/src/main/resources/assets/kekztech/textures/items/Th_MOXFuelRod.png Binary files differdeleted file mode 100644 index 78731f7089..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/Th_MOXFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/Th_MOXQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/Th_MOXQuadFuelRod.png Binary files differdeleted file mode 100644 index 23e8626fc6..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/Th_MOXQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/ThoriumDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/ThoriumDualFuelRod.png Binary files differdeleted file mode 100644 index f876b8c761..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/ThoriumDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/ThoriumFuelRod.png b/src/main/resources/assets/kekztech/textures/items/ThoriumFuelRod.png Binary files differdeleted file mode 100644 index c8dbf6d4a5..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/ThoriumFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/ThoriumQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/ThoriumQuadFuelRod.png Binary files differdeleted file mode 100644 index bbe4757d0d..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/ThoriumQuadFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/UraniumDualFuelRod.png b/src/main/resources/assets/kekztech/textures/items/UraniumDualFuelRod.png Binary files differdeleted file mode 100644 index 531a018694..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/UraniumDualFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/UraniumFuelRod.png b/src/main/resources/assets/kekztech/textures/items/UraniumFuelRod.png Binary files differdeleted file mode 100644 index 96e1fb32bf..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/UraniumFuelRod.png +++ /dev/null diff --git a/src/main/resources/assets/kekztech/textures/items/UraniumQuadFuelRod.png b/src/main/resources/assets/kekztech/textures/items/UraniumQuadFuelRod.png Binary files differdeleted file mode 100644 index 2b111de025..0000000000 --- a/src/main/resources/assets/kekztech/textures/items/UraniumQuadFuelRod.png +++ /dev/null |