mirror of
https://github.com/GTNewHorizons/StructureLib.git
synced 2026-11-21 20:42:09 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7389f349db | ||
|
|
5b6b51f80c | ||
|
|
1481b68133 | ||
|
|
ebf2d6f0e1 | ||
|
|
7e7064e006 | ||
|
|
ebcf62fd97 | ||
|
|
74dde96905 | ||
|
|
d73d2bffc2 | ||
|
|
94055bbd6a |
No files matched your search
@@ -1,51 +1,102 @@
|
|||||||
package com.gtnewhorizon.structurelib;
|
package com.gtnewhorizon.structurelib;
|
||||||
|
|
||||||
import com.google.common.collect.BiMap;
|
import static com.gtnewhorizon.structurelib.StructureLib.RANDOM;
|
||||||
import com.google.common.collect.HashBiMap;
|
|
||||||
import com.gtnewhorizon.structurelib.entity.fx.EntityFXBlockHint;
|
import com.gtnewhorizon.structurelib.entity.fx.WeightlessParticleFX;
|
||||||
import com.gtnewhorizon.structurelib.net.SetChannelDataMessage;
|
import com.gtnewhorizon.structurelib.net.SetChannelDataMessage;
|
||||||
|
import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||||
import java.util.ArrayList;
|
import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
|
||||||
import java.util.Iterator;
|
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
|
||||||
import java.util.LinkedList;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.GuiNewChat;
|
import net.minecraft.client.gui.GuiNewChat;
|
||||||
|
import net.minecraft.client.particle.EntityFX;
|
||||||
|
import net.minecraft.client.renderer.Tessellator;
|
||||||
|
import net.minecraft.client.renderer.culling.Frustrum;
|
||||||
|
import net.minecraft.client.renderer.entity.RenderManager;
|
||||||
|
import net.minecraft.client.renderer.texture.TextureMap;
|
||||||
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.EntityPlayerMP;
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.profiler.Profiler;
|
||||||
import net.minecraft.util.ChatComponentText;
|
import net.minecraft.util.ChatComponentText;
|
||||||
import net.minecraft.util.IIcon;
|
import net.minecraft.util.IIcon;
|
||||||
|
import net.minecraft.util.Vec3;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
import net.minecraftforge.client.event.RenderWorldLastEvent;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
import net.minecraftforge.event.world.WorldEvent;
|
import net.minecraftforge.event.world.WorldEvent;
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
public class ClientProxy extends CommonProxy {
|
public class ClientProxy extends CommonProxy {
|
||||||
|
|
||||||
private static final short[] NO_TINT = {255, 255, 255, 0};
|
private static final short[] RGBA_NO_TINT = {255, 255, 255, 255};
|
||||||
|
private static final short[] RGBA_RED_TINT = {255, 128, 128, 0};
|
||||||
|
private static final Map<HintParticleInfo, HintGroup> allHints = new HashMap<>();
|
||||||
|
/**
|
||||||
|
* All batches of hints.
|
||||||
|
*/
|
||||||
|
private static final List<HintGroup> allGroups = new ArrayList<>();
|
||||||
|
|
||||||
|
public static int HOLOGRAM_LIFETIME = 200;
|
||||||
|
/**
|
||||||
|
* Current batch of hints. Belongs to the same logical multiblock.
|
||||||
|
*/
|
||||||
|
private static HintGroup currentHints;
|
||||||
|
/**
|
||||||
|
* Collection of all hints. Sorted from farthest (index 0) to nearest (index size - 1)
|
||||||
|
* <p>
|
||||||
|
* 10k should be more than enough, if not a bit wasteful
|
||||||
|
*/
|
||||||
|
private static final List<HintParticleInfo> allHintsForRender = new ArrayList<>(10000);
|
||||||
|
/**
|
||||||
|
* If the diff to current player position is too great sort the allHints.
|
||||||
|
* Initial value is very far off below y=0 but not huge enough to make a NaN.
|
||||||
|
* <p>
|
||||||
|
* We are using this supposedly immutable object as a mutable object here.
|
||||||
|
* So be aware.
|
||||||
|
*/
|
||||||
|
private static final Vec3 lastPlayerPos = Vec3.createVectorHelper(0, -1e30, 0);
|
||||||
|
/**
|
||||||
|
* if true rebuild the allHints list from all hintOwners (and sort it)
|
||||||
|
*/
|
||||||
|
private static boolean allHintsDirty = false;
|
||||||
|
/**
|
||||||
|
* counter keeping track of how many renderThrough hint particle we have. enable optimization if no renderThrough
|
||||||
|
*/
|
||||||
|
private static int renderThrough;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void hintParticleTinted(World w, int x, int y, int z, IIcon[] icons, short[] RGBa) {
|
public void hintParticleTinted(World w, int x, int y, int z, IIcon[] icons, short[] RGBa) {
|
||||||
EntityFXBlockHint hint = new EntityFXBlockHint(w, x, y, z, icons).withColorTint(RGBa);
|
|
||||||
Minecraft.getMinecraft().effectRenderer.addEffect(hint);
|
|
||||||
ensureHinting();
|
ensureHinting();
|
||||||
|
HintParticleInfo info = new HintParticleInfo(w, x, y, z, icons, RGBa);
|
||||||
|
|
||||||
|
// check and remove colliding holograms
|
||||||
if (ConfigurationHandler.INSTANCE.isRemoveCollidingHologram()) {
|
if (ConfigurationHandler.INSTANCE.isRemoveCollidingHologram()) {
|
||||||
HintParticleInfo info = new HintParticleInfo(x, y, z, currentHints);
|
HintGroup dupe = allHints.get(info);
|
||||||
EntityFXBlockHint dupe = allHints.inverse().get(info);
|
if (dupe != null && dupe != currentHints) {
|
||||||
if (dupe != null) {
|
allGroups.remove(dupe);
|
||||||
List<EntityFXBlockHint> owner = allHints.get(dupe).owner;
|
removeGroup(dupe);
|
||||||
// in case someone forget to call endHinting
|
|
||||||
if (owner != currentHints) {
|
|
||||||
hintOwners.remove(owner);
|
|
||||||
owner.forEach(EntityFXBlockHint::setDead);
|
|
||||||
owner.clear();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
allHints.forcePut(hint, info);
|
|
||||||
}
|
}
|
||||||
currentHints.add(hint);
|
allHints.put(info, currentHints);
|
||||||
|
currentHints.getHints().add(info);
|
||||||
|
allHintsDirty = true;
|
||||||
|
|
||||||
|
EntityFX particle = new WeightlessParticleFX(
|
||||||
|
w,
|
||||||
|
x + RANDOM.nextFloat() * 0.5F,
|
||||||
|
y + RANDOM.nextFloat() * 0.5F,
|
||||||
|
z + RANDOM.nextFloat() * 0.5F,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0);
|
||||||
|
particle.setRBGColorF(0, 0.6F * RANDOM.nextFloat(), 0.8f);
|
||||||
|
Minecraft.getMinecraft().effectRenderer.addEffect(particle);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -55,25 +106,58 @@ public class ClientProxy extends CommonProxy {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void hintParticle(World w, int x, int y, int z, IIcon[] icons) {
|
public void hintParticle(World w, int x, int y, int z, IIcon[] icons) {
|
||||||
hintParticleTinted(w, x, y, z, icons, NO_TINT);
|
hintParticleTinted(w, x, y, z, icons, RGBA_NO_TINT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void hintParticle(World w, int x, int y, int z, Block block, int meta) {
|
public void hintParticle(World w, int x, int y, int z, Block block, int meta) {
|
||||||
hintParticleTinted(w, x, y, z, createIIconFromBlock(block, meta), NO_TINT);
|
hintParticleTinted(w, x, y, z, createIIconFromBlock(block, meta), RGBA_NO_TINT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean updateHintParticleTint(EntityPlayer player, World w, int x, int y, int z, short[] rgBa) {
|
public boolean updateHintParticleTint(EntityPlayer player, World w, int x, int y, int z, short[] rgBa) {
|
||||||
if (player instanceof EntityPlayerMP) return super.updateHintParticleTint(player, w, x, y, z, rgBa);
|
if (player instanceof EntityPlayerMP) return super.updateHintParticleTint(player, w, x, y, z, rgBa);
|
||||||
if (player != getCurrentPlayer()) return false; // how?
|
if (player != getCurrentPlayer()) return false; // how?
|
||||||
HintParticleInfo info = new HintParticleInfo(x, y, z, null);
|
HintParticleInfo hint = getHintParticleInfo(w, x, y, z);
|
||||||
EntityFXBlockHint existing = allHints.inverse().get(info);
|
if (hint == null) {
|
||||||
if (existing != null) {
|
return false;
|
||||||
existing.withColorTint(rgBa);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
return false;
|
hint.setTint(rgBa);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static HintParticleInfo getHintParticleInfo(World w, int x, int y, int z) {
|
||||||
|
HintParticleInfo info = new HintParticleInfo(w, x, y, z, null, null);
|
||||||
|
HintGroup existing = allHints.get(info);
|
||||||
|
if (existing != null) {
|
||||||
|
for (HintParticleInfo hint : existing.getHints()) {
|
||||||
|
if (hint.equals(info)) {
|
||||||
|
return hint;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean markHintParticleError(EntityPlayer player, World w, int x, int y, int z) {
|
||||||
|
if (player instanceof EntityPlayerMP) return super.markHintParticleError(player, w, x, y, z);
|
||||||
|
if (player != getCurrentPlayer()) return false; // how?
|
||||||
|
HintParticleInfo hint = getHintParticleInfo(w, x, y, z);
|
||||||
|
if (hint == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
hint.setTint(RGBA_RED_TINT);
|
||||||
|
hint.setRenderThrough();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void removeGroup(HintGroup group) {
|
||||||
|
for (HintParticleInfo hintParticleInfo : group.getHints()) {
|
||||||
|
allHints.remove(hintParticleInfo);
|
||||||
|
if (hintParticleInfo.renderThrough) renderThrough--;
|
||||||
|
}
|
||||||
|
allHintsDirty = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static IIcon[] createIIconFromBlock(Block block, int meta) {
|
private static IIcon[] createIIconFromBlock(Block block, int meta) {
|
||||||
@@ -102,49 +186,29 @@ public class ClientProxy extends CommonProxy {
|
|||||||
return player == Minecraft.getMinecraft().thePlayer;
|
return player == Minecraft.getMinecraft().thePlayer;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final BiMap<EntityFXBlockHint, HintParticleInfo> allHints = HashBiMap.create();
|
|
||||||
private static final List<List<EntityFXBlockHint>> hintOwners = new ArrayList<>();
|
|
||||||
private static List<EntityFXBlockHint> currentHints;
|
|
||||||
|
|
||||||
public static void onHintDead(EntityFXBlockHint fx) {
|
|
||||||
if (ConfigurationHandler.INSTANCE.isRemoveCollidingHologram()) allHints.remove(fx);
|
|
||||||
for (Iterator<List<EntityFXBlockHint>> iterator = hintOwners.iterator(); iterator.hasNext(); ) {
|
|
||||||
List<EntityFXBlockHint> list = iterator.next();
|
|
||||||
if (list.remove(fx)) {
|
|
||||||
if (list.isEmpty()) iterator.remove();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void startHinting(World w) {
|
public void startHinting(World w) {
|
||||||
if (!w.isRemote) return;
|
if (!w.isRemote) return;
|
||||||
if (currentHints != null) hintOwners.add(currentHints);
|
if (currentHints != null) endHinting(w);
|
||||||
currentHints = new LinkedList<>();
|
currentHints = new HintGroup();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ensureHinting() {
|
private void ensureHinting() {
|
||||||
if (currentHints == null) currentHints = new LinkedList<>();
|
if (currentHints == null) currentHints = new HintGroup();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void endHinting(World w) {
|
public void endHinting(World w) {
|
||||||
if (!w.isRemote) return;
|
if (!w.isRemote || currentHints == null) return;
|
||||||
while (!hintOwners.isEmpty() && hintOwners.size() >= ConfigurationHandler.INSTANCE.getMaxCoexistingHologram()) {
|
while (!allGroups.isEmpty() && allGroups.size() >= ConfigurationHandler.INSTANCE.getMaxCoexistingHologram()) {
|
||||||
List<EntityFXBlockHint> list = hintOwners.remove(0);
|
allGroups.remove(0);
|
||||||
list.forEach(EntityFXBlockHint::setDead);
|
|
||||||
list.clear();
|
|
||||||
}
|
}
|
||||||
if (!currentHints.isEmpty()) hintOwners.add(currentHints);
|
if (!currentHints.getHints().isEmpty()) allGroups.add(currentHints);
|
||||||
|
// we use the player existence time here as some worlds don't really advance the time ticker
|
||||||
|
currentHints.setCreationTime(getCurrentPlayer().ticksExisted);
|
||||||
currentHints = null;
|
currentHints = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void preInit(FMLPreInitializationEvent e) {
|
|
||||||
MinecraftForge.EVENT_BUS.register(new ForgeEventHandler());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long getOverworldTime() {
|
public long getOverworldTime() {
|
||||||
// there is no overworld, better just hope current world time is ok...
|
// there is no overworld, better just hope current world time is ok...
|
||||||
@@ -156,27 +220,76 @@ public class ClientProxy extends CommonProxy {
|
|||||||
StructureLib.net.sendToServer(new SetChannelDataMessage(trigger));
|
StructureLib.net.sendToServer(new SetChannelDataMessage(trigger));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class HintParticleInfo {
|
@Override
|
||||||
private final int x, y, z;
|
public void preInit(FMLPreInitializationEvent e) {
|
||||||
private final List<EntityFXBlockHint> owner;
|
FMLCommonHandler.instance().bus().register(new FMLEventHandler());
|
||||||
|
MinecraftForge.EVENT_BUS.register(new ForgeEventHandler());
|
||||||
|
}
|
||||||
|
|
||||||
public HintParticleInfo(int x, int y, int z, List<EntityFXBlockHint> owner) {
|
static void markTextureUsed(IIcon icon) {
|
||||||
|
if (StructureLib.COMPAT instanceof IStructureCompat)
|
||||||
|
((IStructureCompat) StructureLib.COMPAT).markTextureUsed(icon);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class HintGroup {
|
||||||
|
private final List<HintParticleInfo> hints = new LinkedList<>();
|
||||||
|
private int creationTime = -1;
|
||||||
|
|
||||||
|
public List<HintParticleInfo> getHints() {
|
||||||
|
return hints;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCreationTime(int creationTime) {
|
||||||
|
this.creationTime = creationTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getCreationTime() {
|
||||||
|
return creationTime;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class HintParticleInfo {
|
||||||
|
private final World w;
|
||||||
|
private final int x, y, z;
|
||||||
|
private final double X, Y, Z;
|
||||||
|
private final IIcon[] icons;
|
||||||
|
private short[] tint;
|
||||||
|
private boolean renderThrough;
|
||||||
|
|
||||||
|
private final long creationTime = System.currentTimeMillis(); // use tick time instead maybe
|
||||||
|
|
||||||
|
public HintParticleInfo(World w, int x, int y, int z, IIcon[] icons, short[] tint) {
|
||||||
|
this.w = w;
|
||||||
this.x = x;
|
this.x = x;
|
||||||
this.y = y;
|
this.y = y;
|
||||||
this.z = z;
|
this.z = z;
|
||||||
this.owner = owner;
|
X = x + 0.25;
|
||||||
|
Y = y + 0.25;
|
||||||
|
Z = z + 0.25;
|
||||||
|
this.icons = icons;
|
||||||
|
this.tint = tint;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
if (this == o) return true;
|
if (this == o) return true;
|
||||||
if (o == null || getClass() != o.getClass()) return false;
|
if (!(o instanceof HintParticleInfo)) return false;
|
||||||
|
|
||||||
HintParticleInfo that = (HintParticleInfo) o;
|
HintParticleInfo that = (HintParticleInfo) o;
|
||||||
|
|
||||||
if (x != that.x) return false;
|
return x == that.x && y == that.y && z == that.z;
|
||||||
if (y != that.y) return false;
|
}
|
||||||
return z == that.z;
|
|
||||||
|
public void setTint(short[] tint) {
|
||||||
|
this.tint = tint;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRenderThrough() {
|
||||||
|
if (!this.renderThrough) {
|
||||||
|
ClientProxy.renderThrough += 1;
|
||||||
|
allHintsDirty = true;
|
||||||
|
}
|
||||||
|
this.renderThrough = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -186,15 +299,193 @@ public class ClientProxy extends CommonProxy {
|
|||||||
result = 31 * result + z;
|
result = 31 * result + z;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isInFrustrum(Frustrum frustrum) {
|
||||||
|
return frustrum.isBoxInFrustum(x, y, z, X, Y, Z);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void draw(Tessellator tes) {
|
||||||
|
double size = 0.5;
|
||||||
|
|
||||||
|
int brightness = w.blockExists(x, 0, z) ? w.getLightBrightnessForSkyBlocks(x, y, z, 0) : 0;
|
||||||
|
tes.setBrightness(brightness);
|
||||||
|
|
||||||
|
tes.setColorRGBA((int) (tint[0] * .9F), (int) (tint[1] * .95F), (int) (tint[2] * 1F), 192);
|
||||||
|
|
||||||
|
for (int i = 0; i < 6; i++) {
|
||||||
|
if (icons[i] == null) continue;
|
||||||
|
|
||||||
|
markTextureUsed(icons[i]);
|
||||||
|
|
||||||
|
double u = icons[i].getMinU();
|
||||||
|
double U = icons[i].getMaxU();
|
||||||
|
double v = icons[i].getMinV();
|
||||||
|
double V = icons[i].getMaxV();
|
||||||
|
switch (i) { // {DOWN, UP, NORTH, SOUTH, WEST, EAST}
|
||||||
|
case 0:
|
||||||
|
tes.addVertexWithUV(X, Y, Z + size, u, V);
|
||||||
|
tes.addVertexWithUV(X, Y, Z, u, v);
|
||||||
|
tes.addVertexWithUV(X + size, Y, Z, U, v);
|
||||||
|
tes.addVertexWithUV(X + size, Y, Z + size, U, V);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
tes.addVertexWithUV(X, Y + size, Z, u, v);
|
||||||
|
tes.addVertexWithUV(X, Y + size, Z + size, u, V);
|
||||||
|
tes.addVertexWithUV(X + size, Y + size, Z + size, U, V);
|
||||||
|
tes.addVertexWithUV(X + size, Y + size, Z, U, v);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
tes.addVertexWithUV(X, Y, Z, U, V);
|
||||||
|
tes.addVertexWithUV(X, Y + size, Z, U, v);
|
||||||
|
tes.addVertexWithUV(X + size, Y + size, Z, u, v);
|
||||||
|
tes.addVertexWithUV(X + size, Y, Z, u, V);
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
tes.addVertexWithUV(X + size, Y, Z + size, U, V);
|
||||||
|
tes.addVertexWithUV(X + size, Y + size, Z + size, U, v);
|
||||||
|
tes.addVertexWithUV(X, Y + size, Z + size, u, v);
|
||||||
|
tes.addVertexWithUV(X, Y, Z + size, u, V);
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
|
tes.addVertexWithUV(X, Y, Z + size, U, V);
|
||||||
|
tes.addVertexWithUV(X, Y + size, Z + size, U, v);
|
||||||
|
tes.addVertexWithUV(X, Y + size, Z, u, v);
|
||||||
|
tes.addVertexWithUV(X, Y, Z, u, V);
|
||||||
|
break;
|
||||||
|
case 5:
|
||||||
|
tes.addVertexWithUV(X + size, Y, Z, U, V);
|
||||||
|
tes.addVertexWithUV(X + size, Y + size, Z, U, v);
|
||||||
|
tes.addVertexWithUV(X + size, Y + size, Z + size, u, v);
|
||||||
|
tes.addVertexWithUV(X + size, Y, Z + size, u, V);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getCreationTime() {
|
||||||
|
return creationTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public double getSquareDistanceTo(Vec3 point) {
|
||||||
|
return point.squareDistanceTo(X, Y, Z);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class FMLEventHandler {
|
||||||
|
private void resetPlayerLocation() {
|
||||||
|
lastPlayerPos.xCoord = Minecraft.getMinecraft().thePlayer.posX;
|
||||||
|
lastPlayerPos.yCoord = Minecraft.getMinecraft().thePlayer.posY;
|
||||||
|
lastPlayerPos.zCoord = Minecraft.getMinecraft().thePlayer.posZ;
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public void onClientTick(ClientTickEvent e) {
|
||||||
|
if (e.phase == Phase.END && Minecraft.getMinecraft().thePlayer != null) {
|
||||||
|
Vec3 playerPos = Minecraft.getMinecraft().thePlayer.getPosition(1);
|
||||||
|
boolean sortRequired = false;
|
||||||
|
// The allGroups is implicitly sorted by creationTime
|
||||||
|
// here we exploit this ordering to reduce iteration size
|
||||||
|
int deadline = Minecraft.getMinecraft().thePlayer.ticksExisted - HOLOGRAM_LIFETIME;
|
||||||
|
int i;
|
||||||
|
for (i = 0; i < allGroups.size(); i++) {
|
||||||
|
if (allGroups.get(i).getCreationTime() > deadline) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (i != 0) {
|
||||||
|
sortRequired = true;
|
||||||
|
// clear this block and go no further
|
||||||
|
List<HintGroup> toRemove = allGroups.subList(0, i);
|
||||||
|
toRemove.forEach(ClientProxy::removeGroup);
|
||||||
|
toRemove.clear();
|
||||||
|
}
|
||||||
|
if (allHintsDirty) {
|
||||||
|
allHintsForRender.clear();
|
||||||
|
// we need greatly efficient sequential access and mildly efficient sorting
|
||||||
|
// rebuild is sort of rare, and it's expected to lag anyway
|
||||||
|
// so no min-heap here
|
||||||
|
for (HintGroup c : allGroups) allHintsForRender.addAll(c.getHints());
|
||||||
|
sortRequired = true;
|
||||||
|
}
|
||||||
|
if (renderThrough > 0 && (sortRequired || playerPos.squareDistanceTo(lastPlayerPos) > 1e-2)) {
|
||||||
|
// only sort if there is anything that need depth test disabled
|
||||||
|
// only redo sort if player moved some distance
|
||||||
|
// default is 0.1 block
|
||||||
|
// if there was a full rebuild, go sort it as well
|
||||||
|
allHintsForRender.sort(Comparator.comparingDouble(info -> info.getSquareDistanceTo(playerPos)));
|
||||||
|
resetPlayerLocation();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class ForgeEventHandler {
|
public static class ForgeEventHandler {
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onWorldLoad(WorldEvent.Load e) {
|
public void onWorldLoad(WorldEvent.Load e) {
|
||||||
if (e.world.isRemote) {
|
if (e.world.isRemote) {
|
||||||
allHints.clear();
|
allHintsForRender.clear();
|
||||||
hintOwners.clear();
|
allGroups.clear();
|
||||||
|
lastPlayerPos.yCoord = -1e30;
|
||||||
|
renderThrough = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public void onRenderWorldLast(RenderWorldLastEvent e) {
|
||||||
|
if (allHintsForRender.isEmpty()) return;
|
||||||
|
|
||||||
|
// seriously, I'm not a OpenGL expert, so I'm probably doing a lot of very stupid stuff here.
|
||||||
|
// Please consider contributing patches if you find something to optimize.
|
||||||
|
|
||||||
|
Profiler p = Minecraft.getMinecraft().mcProfiler;
|
||||||
|
|
||||||
|
p.startSection("HintParticle");
|
||||||
|
p.startSection("Prepare");
|
||||||
|
Frustrum frustrum = new Frustrum();
|
||||||
|
Entity entitylivingbase = Minecraft.getMinecraft().renderViewEntity;
|
||||||
|
double d0 = entitylivingbase.lastTickPosX
|
||||||
|
+ (entitylivingbase.posX - entitylivingbase.lastTickPosX) * e.partialTicks;
|
||||||
|
double d1 = entitylivingbase.lastTickPosY
|
||||||
|
+ (entitylivingbase.posY - entitylivingbase.lastTickPosY) * e.partialTicks;
|
||||||
|
double d2 = entitylivingbase.lastTickPosZ
|
||||||
|
+ (entitylivingbase.posZ - entitylivingbase.lastTickPosZ) * e.partialTicks;
|
||||||
|
frustrum.setPosition(d0, d1, d2);
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT); // TODO figure out original states
|
||||||
|
// we need the back facing rendered because the thing is transparent
|
||||||
|
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||||
|
GL11.glEnable(GL11.GL_BLEND); // enable blend so it is transparent
|
||||||
|
GL11.glBlendFunc(GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_SRC_ALPHA);
|
||||||
|
// depth test begin as enabled
|
||||||
|
boolean renderThrough = false;
|
||||||
|
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||||
|
GL11.glTranslated(-RenderManager.renderPosX, -RenderManager.renderPosY, -RenderManager.renderPosZ);
|
||||||
|
Tessellator tes = Tessellator.instance;
|
||||||
|
tes.startDrawingQuads();
|
||||||
|
for (int i = 0, allHintsForRenderSize = allHintsForRender.size(); i < allHintsForRenderSize; i++) {
|
||||||
|
HintParticleInfo hint = allHintsForRender.get(i);
|
||||||
|
if (!hint.isInFrustrum(frustrum)) continue;
|
||||||
|
if (renderThrough != hint.renderThrough) {
|
||||||
|
if (i > 0) {
|
||||||
|
p.endStartSection("Draw");
|
||||||
|
tes.draw();
|
||||||
|
tes.startDrawingQuads();
|
||||||
|
p.endStartSection("Prepare");
|
||||||
|
}
|
||||||
|
if (hint.renderThrough) GL11.glDisable(GL11.GL_DEPTH_TEST);
|
||||||
|
else GL11.glEnable(GL11.GL_DEPTH_TEST);
|
||||||
|
renderThrough = hint.renderThrough;
|
||||||
|
}
|
||||||
|
hint.draw(tes);
|
||||||
|
}
|
||||||
|
p.endStartSection("Draw");
|
||||||
|
tes.draw();
|
||||||
|
p.endSection();
|
||||||
|
|
||||||
|
GL11.glPopAttrib();
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
p.endSection();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.gtnewhorizon.structurelib;
|
package com.gtnewhorizon.structurelib;
|
||||||
|
|
||||||
|
import com.gtnewhorizon.structurelib.net.ErrorHintParticleMessage;
|
||||||
import com.gtnewhorizon.structurelib.net.UpdateHintParticleMessage;
|
import com.gtnewhorizon.structurelib.net.UpdateHintParticleMessage;
|
||||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
@@ -51,4 +52,13 @@ public class CommonProxy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void uploadChannels(ItemStack trigger) {}
|
public void uploadChannels(ItemStack trigger) {}
|
||||||
|
|
||||||
|
public boolean markHintParticleError(EntityPlayer player, World w, int x, int y, int z) {
|
||||||
|
if (player instanceof EntityPlayerMP) { // just in case
|
||||||
|
StructureLib.net.sendTo(new ErrorHintParticleMessage(x, (short) y, z), (EntityPlayerMP) player);
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
package com.gtnewhorizon.structurelib;
|
||||||
|
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
import org.lwjgl.opengl.ARBVertexBufferObject;
|
||||||
|
import org.lwjgl.opengl.ContextCapabilities;
|
||||||
|
import org.lwjgl.opengl.GL15;
|
||||||
|
import org.lwjgl.opengl.GLContext;
|
||||||
|
|
||||||
|
class GLHelper {
|
||||||
|
public static final boolean vboSupported;
|
||||||
|
private static final boolean arbVbo;
|
||||||
|
|
||||||
|
static {
|
||||||
|
ContextCapabilities contextcapabilities = GLContext.getCapabilities();
|
||||||
|
|
||||||
|
arbVbo = !contextcapabilities.OpenGL15 && contextcapabilities.GL_ARB_vertex_buffer_object;
|
||||||
|
vboSupported = contextcapabilities.OpenGL15 || arbVbo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int glGenBuffers() {
|
||||||
|
return arbVbo ? ARBVertexBufferObject.glGenBuffersARB() : GL15.glGenBuffers();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void glBindBuffer(int target, int buffer) {
|
||||||
|
if (arbVbo) {
|
||||||
|
ARBVertexBufferObject.glBindBufferARB(target, buffer);
|
||||||
|
} else {
|
||||||
|
GL15.glBindBuffer(target, buffer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void glBufferData(int target, ByteBuffer data, int usage) {
|
||||||
|
if (arbVbo) {
|
||||||
|
ARBVertexBufferObject.glBufferDataARB(target, data, usage);
|
||||||
|
} else {
|
||||||
|
GL15.glBufferData(target, data, usage);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void glDeleteBuffers(int buffer) {
|
||||||
|
if (arbVbo) {
|
||||||
|
ARBVertexBufferObject.glDeleteBuffersARB(buffer);
|
||||||
|
} else {
|
||||||
|
GL15.glDeleteBuffers(buffer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean useVbo() {
|
||||||
|
return vboSupported;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package com.gtnewhorizon.structurelib;
|
||||||
|
|
||||||
|
import net.minecraft.util.IIcon;
|
||||||
|
|
||||||
|
public interface IStructureCompat {
|
||||||
|
void markTextureUsed(IIcon o);
|
||||||
|
}
|
||||||
@@ -6,9 +6,11 @@ import com.gtnewhorizon.structurelib.item.ItemBlockHint;
|
|||||||
import com.gtnewhorizon.structurelib.item.ItemConstructableTrigger;
|
import com.gtnewhorizon.structurelib.item.ItemConstructableTrigger;
|
||||||
import com.gtnewhorizon.structurelib.item.ItemFrontRotationTool;
|
import com.gtnewhorizon.structurelib.item.ItemFrontRotationTool;
|
||||||
import com.gtnewhorizon.structurelib.net.AlignmentMessage;
|
import com.gtnewhorizon.structurelib.net.AlignmentMessage;
|
||||||
|
import com.gtnewhorizon.structurelib.net.ErrorHintParticleMessage;
|
||||||
import com.gtnewhorizon.structurelib.net.SetChannelDataMessage;
|
import com.gtnewhorizon.structurelib.net.SetChannelDataMessage;
|
||||||
import com.gtnewhorizon.structurelib.net.UpdateHintParticleMessage;
|
import com.gtnewhorizon.structurelib.net.UpdateHintParticleMessage;
|
||||||
import com.gtnewhorizon.structurelib.util.XSTR;
|
import com.gtnewhorizon.structurelib.util.XSTR;
|
||||||
|
import cpw.mods.fml.common.Loader;
|
||||||
import cpw.mods.fml.common.Mod;
|
import cpw.mods.fml.common.Mod;
|
||||||
import cpw.mods.fml.common.SidedProxy;
|
import cpw.mods.fml.common.SidedProxy;
|
||||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||||
@@ -37,6 +39,7 @@ import org.apache.logging.log4j.Logger;
|
|||||||
acceptableRemoteVersions = "*",
|
acceptableRemoteVersions = "*",
|
||||||
guiFactory = "com.gtnewhorizon.structurelib.GuiFactory")
|
guiFactory = "com.gtnewhorizon.structurelib.GuiFactory")
|
||||||
public class StructureLib {
|
public class StructureLib {
|
||||||
|
private static final String STRUCTURECOMPAT_MODID = "structurecompat";
|
||||||
public static boolean DEBUG_MODE;
|
public static boolean DEBUG_MODE;
|
||||||
public static boolean PANIC_MODE = Boolean.getBoolean("structurelib.panic");
|
public static boolean PANIC_MODE = Boolean.getBoolean("structurelib.panic");
|
||||||
public static Logger LOGGER = LogManager.getLogger("StructureLib");
|
public static Logger LOGGER = LogManager.getLogger("StructureLib");
|
||||||
@@ -54,6 +57,7 @@ public class StructureLib {
|
|||||||
net.registerMessage(AlignmentMessage.ClientHandler.class, AlignmentMessage.AlignmentData.class, 1, Side.CLIENT);
|
net.registerMessage(AlignmentMessage.ClientHandler.class, AlignmentMessage.AlignmentData.class, 1, Side.CLIENT);
|
||||||
net.registerMessage(UpdateHintParticleMessage.Handler.class, UpdateHintParticleMessage.class, 2, Side.CLIENT);
|
net.registerMessage(UpdateHintParticleMessage.Handler.class, UpdateHintParticleMessage.class, 2, Side.CLIENT);
|
||||||
net.registerMessage(SetChannelDataMessage.Handler.class, SetChannelDataMessage.class, 3, Side.SERVER);
|
net.registerMessage(SetChannelDataMessage.Handler.class, SetChannelDataMessage.class, 3, Side.SERVER);
|
||||||
|
net.registerMessage(ErrorHintParticleMessage.Handler.class, ErrorHintParticleMessage.class, 4, Side.CLIENT);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
DEBUG_MODE = Boolean.parseBoolean(System.getProperty("structurelib.debug"));
|
DEBUG_MODE = Boolean.parseBoolean(System.getProperty("structurelib.debug"));
|
||||||
@@ -69,6 +73,8 @@ public class StructureLib {
|
|||||||
@Mod.Instance
|
@Mod.Instance
|
||||||
static StructureLib INSTANCE;
|
static StructureLib INSTANCE;
|
||||||
|
|
||||||
|
static Object COMPAT;
|
||||||
|
|
||||||
static Block blockHint;
|
static Block blockHint;
|
||||||
static Item itemBlockHint;
|
static Item itemBlockHint;
|
||||||
static Item itemFrontRotationTool;
|
static Item itemFrontRotationTool;
|
||||||
@@ -93,6 +99,13 @@ public class StructureLib {
|
|||||||
itemConstructableTrigger.getUnlocalizedName());
|
itemConstructableTrigger.getUnlocalizedName());
|
||||||
proxy.preInit(e);
|
proxy.preInit(e);
|
||||||
NetworkRegistry.INSTANCE.registerGuiHandler(instance(), new GuiHandler());
|
NetworkRegistry.INSTANCE.registerGuiHandler(instance(), new GuiHandler());
|
||||||
|
|
||||||
|
if (Loader.isModLoaded(STRUCTURECOMPAT_MODID)) {
|
||||||
|
COMPAT = Loader.instance()
|
||||||
|
.getIndexedModList()
|
||||||
|
.get(STRUCTURECOMPAT_MODID)
|
||||||
|
.getMod();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
|
|||||||
@@ -71,6 +71,14 @@ public class StructureLibAPI {
|
|||||||
proxy.hintParticle(w, x, y, z, block, meta);
|
proxy.hintParticle(w, x, y, z, block, meta);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update the tint of given hint particle. Do nothing if particle not found.
|
||||||
|
* @return false if nothing updated. true if updated.
|
||||||
|
*/
|
||||||
|
public static boolean markHintParticleError(EntityPlayer player, World w, int x, int y, int z) {
|
||||||
|
return proxy.markHintParticleError(player, w, x, y, z);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update the tint of given hint particle. Do nothing if particle not found.
|
* Update the tint of given hint particle. Do nothing if particle not found.
|
||||||
* @return false if nothing updated. true if updated.
|
* @return false if nothing updated. true if updated.
|
||||||
|
|||||||
@@ -1,146 +0,0 @@
|
|||||||
package com.gtnewhorizon.structurelib.entity.fx;
|
|
||||||
|
|
||||||
import com.gtnewhorizon.structurelib.ClientProxy;
|
|
||||||
import com.gtnewhorizon.structurelib.StructureLib;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import net.minecraft.block.Block;
|
|
||||||
import net.minecraft.client.particle.EntityFX;
|
|
||||||
import net.minecraft.client.renderer.Tessellator;
|
|
||||||
import net.minecraft.init.Blocks;
|
|
||||||
import net.minecraft.util.IIcon;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public class EntityFXBlockHint extends EntityFX {
|
|
||||||
private IIcon[] icons;
|
|
||||||
private short[] mRGBa = {255, 255, 255, 0};
|
|
||||||
|
|
||||||
public EntityFXBlockHint(World world) {
|
|
||||||
this(world, 0, 0, 0, Blocks.stone, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param world
|
|
||||||
* @param x
|
|
||||||
* @param y
|
|
||||||
* @param z
|
|
||||||
* @param icons DOWN, UP, NORTH, SOUTH, WEST, EAST
|
|
||||||
*/
|
|
||||||
public EntityFXBlockHint(World world, int x, int y, int z, IIcon[] icons) {
|
|
||||||
super(world, x + .25, y + .5, z + .25);
|
|
||||||
particleGravity = 0;
|
|
||||||
prevPosX = posX;
|
|
||||||
prevPosY = posY;
|
|
||||||
prevPosZ = posZ;
|
|
||||||
noClip = true;
|
|
||||||
particleMaxAge = 2000 + StructureLib.RANDOM.nextInt(200);
|
|
||||||
this.icons = icons;
|
|
||||||
}
|
|
||||||
|
|
||||||
public EntityFXBlockHint(World world, int x, int y, int z, Block block, int meta) {
|
|
||||||
super(world, x + .25, y + .5, z + .25);
|
|
||||||
particleGravity = 0;
|
|
||||||
prevPosX = posX;
|
|
||||||
prevPosY = posY;
|
|
||||||
prevPosZ = posZ;
|
|
||||||
noClip = true;
|
|
||||||
particleMaxAge = 2000 + StructureLib.RANDOM.nextInt(200);
|
|
||||||
icons = new IIcon[6];
|
|
||||||
for (int i = 0; i < 6; i++) {
|
|
||||||
icons[i] = block.getIcon(i, meta);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public EntityFXBlockHint withColorTint(short[] coloure) {
|
|
||||||
this.mRGBa = coloure;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void renderParticle(
|
|
||||||
Tessellator tes,
|
|
||||||
float subTickTime,
|
|
||||||
float p_70539_3_,
|
|
||||||
float p_70539_4_,
|
|
||||||
float p_70539_5_,
|
|
||||||
float p_70539_6_,
|
|
||||||
float p_70539_7_) {
|
|
||||||
float size = .5f;
|
|
||||||
float X = (float) (prevPosX + (posX - prevPosX) * (double) subTickTime - EntityFX.interpPosX);
|
|
||||||
float Y = (float) (prevPosY + (posY - prevPosY) * (double) subTickTime - EntityFX.interpPosY) - size / 2;
|
|
||||||
float Z = (float) (prevPosZ + (posZ - prevPosZ) * (double) subTickTime - EntityFX.interpPosZ);
|
|
||||||
GL11.glDisable(GL11.GL_CULL_FACE);
|
|
||||||
GL11.glDepthMask(false);
|
|
||||||
tes.setColorRGBA((int) (mRGBa[0] * .9F), (int) (mRGBa[1] * .95F), (int) (mRGBa[2] * 1F), 192);
|
|
||||||
|
|
||||||
// var8, var9 - X U
|
|
||||||
// var 10, var 11 - Y V
|
|
||||||
for (int i = 0; i < 6; i++) {
|
|
||||||
if (icons[i] == null) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
double u = icons[i].getMinU();
|
|
||||||
double U = icons[i].getMaxU();
|
|
||||||
double v = icons[i].getMinV();
|
|
||||||
double V = icons[i].getMaxV();
|
|
||||||
switch (i) { // {DOWN, UP, NORTH, SOUTH, WEST, EAST}
|
|
||||||
case 0:
|
|
||||||
tes.addVertexWithUV(X, Y, Z + size, u, V);
|
|
||||||
tes.addVertexWithUV(X, Y, Z, u, v);
|
|
||||||
tes.addVertexWithUV(X + size, Y, Z, U, v);
|
|
||||||
tes.addVertexWithUV(X + size, Y, Z + size, U, V);
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
tes.addVertexWithUV(X, Y + size, Z, u, v);
|
|
||||||
tes.addVertexWithUV(X, Y + size, Z + size, u, V);
|
|
||||||
tes.addVertexWithUV(X + size, Y + size, Z + size, U, V);
|
|
||||||
tes.addVertexWithUV(X + size, Y + size, Z, U, v);
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
tes.addVertexWithUV(X, Y, Z, U, V);
|
|
||||||
tes.addVertexWithUV(X, Y + size, Z, U, v);
|
|
||||||
tes.addVertexWithUV(X + size, Y + size, Z, u, v);
|
|
||||||
tes.addVertexWithUV(X + size, Y, Z, u, V);
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
tes.addVertexWithUV(X + size, Y, Z + size, U, V);
|
|
||||||
tes.addVertexWithUV(X + size, Y + size, Z + size, U, v);
|
|
||||||
tes.addVertexWithUV(X, Y + size, Z + size, u, v);
|
|
||||||
tes.addVertexWithUV(X, Y, Z + size, u, V);
|
|
||||||
break;
|
|
||||||
case 4:
|
|
||||||
tes.addVertexWithUV(X, Y, Z + size, U, V);
|
|
||||||
tes.addVertexWithUV(X, Y + size, Z + size, U, v);
|
|
||||||
tes.addVertexWithUV(X, Y + size, Z, u, v);
|
|
||||||
tes.addVertexWithUV(X, Y, Z, u, V);
|
|
||||||
break;
|
|
||||||
case 5:
|
|
||||||
tes.addVertexWithUV(X + size, Y, Z, U, V);
|
|
||||||
tes.addVertexWithUV(X + size, Y + size, Z, U, v);
|
|
||||||
tes.addVertexWithUV(X + size, Y + size, Z + size, u, v);
|
|
||||||
tes.addVertexWithUV(X + size, Y, Z + size, u, V);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
GL11.glEnable(GL11.GL_CULL_FACE);
|
|
||||||
GL11.glDepthMask(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getFXLayer() {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean shouldRenderInPass(int pass) {
|
|
||||||
return pass == 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setDead() {
|
|
||||||
super.setDead();
|
|
||||||
ClientProxy.onHintDead(this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package com.gtnewhorizon.structurelib.net;
|
||||||
|
|
||||||
|
import static com.gtnewhorizon.structurelib.StructureLib.LOGGER;
|
||||||
|
|
||||||
|
import com.gtnewhorizon.structurelib.StructureLib;
|
||||||
|
import com.gtnewhorizon.structurelib.StructureLibAPI;
|
||||||
|
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||||
|
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||||
|
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||||
|
import io.netty.buffer.ByteBuf;
|
||||||
|
|
||||||
|
public class ErrorHintParticleMessage implements IMessage {
|
||||||
|
private int x;
|
||||||
|
private short y;
|
||||||
|
private int z;
|
||||||
|
|
||||||
|
public ErrorHintParticleMessage() {}
|
||||||
|
|
||||||
|
public ErrorHintParticleMessage(int x, short y, int z) {
|
||||||
|
this.x = x;
|
||||||
|
this.y = y;
|
||||||
|
this.z = z;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void fromBytes(ByteBuf buf) {
|
||||||
|
x = buf.readInt();
|
||||||
|
y = buf.readShort();
|
||||||
|
z = buf.readInt();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void toBytes(ByteBuf buf) {
|
||||||
|
buf.writeInt(x);
|
||||||
|
buf.writeShort(y);
|
||||||
|
buf.writeInt(z);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Handler implements IMessageHandler<ErrorHintParticleMessage, IMessage> {
|
||||||
|
@Override
|
||||||
|
public IMessage onMessage(ErrorHintParticleMessage msg, MessageContext ctx) {
|
||||||
|
boolean updateResult = StructureLibAPI.markHintParticleError(
|
||||||
|
StructureLib.getCurrentPlayer(), StructureLib.getCurrentPlayer().worldObj, msg.x, msg.y, msg.z);
|
||||||
|
if (StructureLib.DEBUG_MODE)
|
||||||
|
LOGGER.debug(
|
||||||
|
"Server instructed to mark hint particle at ({}, {}, {}) error, result {}!",
|
||||||
|
msg.x,
|
||||||
|
msg.y,
|
||||||
|
msg.z,
|
||||||
|
updateResult);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -97,6 +97,7 @@ public interface IStructureElement<T> {
|
|||||||
/**
|
/**
|
||||||
* This element either exists already, or does not yet have an implementation for survivalPlaceBlock, or
|
* This element either exists already, or does not yet have an implementation for survivalPlaceBlock, or
|
||||||
* some other unforeseen situations.
|
* some other unforeseen situations.
|
||||||
|
* TODO this definition doesn't seem right. Should we separate SKIP from EXISTS, or SKIP from ERROR?
|
||||||
*/
|
*/
|
||||||
SKIP,
|
SKIP,
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -37,7 +37,7 @@ class SurvivalBuildStructureWalker<T> implements IStructureWalker<T> {
|
|||||||
if (check) element.check(object, world, x, y, z);
|
if (check) element.check(object, world, x, y, z);
|
||||||
return ++built < elementBudget;
|
return ++built < elementBudget;
|
||||||
case REJECT:
|
case REJECT:
|
||||||
StructureLibAPI.updateHintParticleTint(actor, world, x, y, z, new short[] {255, 128, 128, 0});
|
StructureLibAPI.markHintParticleError(actor, world, x, y, z);
|
||||||
return false;
|
return false;
|
||||||
case ACCEPT_STOP:
|
case ACCEPT_STOP:
|
||||||
if (check) element.check(object, world, x, y, z);
|
if (check) element.check(object, world, x, y, z);
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ structurelib.autoplace.complete=§aThis multiblock has completed!
|
|||||||
structurelib.autoplace.error.not_enabled=§cThis multiblock does not support autoplace in survival!
|
structurelib.autoplace.error.not_enabled=§cThis multiblock does not support autoplace in survival!
|
||||||
structurelib.autoplace.error.no_simple_block=§cSuggested to place §r%s§c but none was found
|
structurelib.autoplace.error.no_simple_block=§cSuggested to place §r%s§c but none was found
|
||||||
structurelib.autoplace.error.no_item_stack=§cSuggested to place block by using §r%s§c but none was found
|
structurelib.autoplace.error.no_item_stack=§cSuggested to place block by using §r%s§c but none was found
|
||||||
structurelib.autoplace.warning.no_explicit_channel=§6This structure depends on nonexistent sub channel §r%s§c. Using master channel instead.
|
structurelib.autoplace.warning.no_explicit_channel=§6This structure depends on nonexistent sub channel §r%s§6. Using master channel instead.
|
||||||
|
|
||||||
structurelib.blockhint.desc.0=Helps while building
|
structurelib.blockhint.desc.0=Helps while building
|
||||||
structurelib.blockhint.0.name=Hint 1 dot
|
structurelib.blockhint.0.name=Hint 1 dot
|
||||||
|
|||||||
Reference in new issue
Block a user