aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main/java/client/ClientProxy.java3
-rw-r--r--src/main/java/client/renderer/TESR_BeamTransmitter.java72
-rw-r--r--src/main/java/common/blocks/Block_BeamTransmitter.java53
-rw-r--r--src/main/java/common/tileentities/TE_BeamTransmitter.java49
-rw-r--r--src/main/resources/assets/kekztech/lang/en_US.lang3
-rw-r--r--src/main/resources/assets/kekztech/lang/zh_CN.lang5
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/Tether_top.pngbin233 -> 0 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/effects/Tether_beam.pngbin195 -> 0 bytes
8 files changed, 1 insertions, 184 deletions
diff --git a/src/main/java/client/ClientProxy.java b/src/main/java/client/ClientProxy.java
index 58a30cd14d..50b78a4d0a 100644
--- a/src/main/java/client/ClientProxy.java
+++ b/src/main/java/client/ClientProxy.java
@@ -1,11 +1,9 @@
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;
@@ -20,7 +18,6 @@ public class ClientProxy extends CommonProxy {
// 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/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/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/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/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang
index e147c1546c..2b6912fb43 100644
--- a/src/main/resources/assets/kekztech/lang/en_US.lang
+++ b/src/main/resources/assets/kekztech/lang/en_US.lang
@@ -185,9 +185,6 @@ 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..49dd9258f8 100644
--- a/src/main/resources/assets/kekztech/lang/zh_CN.lang
+++ b/src/main/resources/assets/kekztech/lang/zh_CN.lang
@@ -16,7 +16,7 @@ mbdesc.addOutputBus.OutputBus=输出总线
mbdesc.addOutputHatch.OutputHatch=输出仓
mbdesc.signAndFinalize.Hold=按住
mbdesc.signAndFinalize.todisplay=以显示结构指导
-mbdesc.signAndFinalize.createdby=添加者:
+mbdesc.signAndFinalize.createdby=添加者:
# -------- Reactor: Structure Blocks
tile.kekztech_controlrod_block.name=核反应堆控制棒
@@ -178,9 +178,6 @@ 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/Tether_top.png b/src/main/resources/assets/kekztech/textures/blocks/Tether_top.png
deleted file mode 100644
index fe1e8e2dd9..0000000000
--- a/src/main/resources/assets/kekztech/textures/blocks/Tether_top.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/effects/Tether_beam.png b/src/main/resources/assets/kekztech/textures/effects/Tether_beam.png
deleted file mode 100644
index ca8274820b..0000000000
--- a/src/main/resources/assets/kekztech/textures/effects/Tether_beam.png
+++ /dev/null
Binary files differ
generated by cgit (git 2.46.0) at 2025-03-07 07:57:16 +0000