From 597d5225f3d09cd400ce3df955fd3079012c151f Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 12 Sep 2014 00:50:59 +0800 Subject: [PATCH] Started work on renderer for attractor. --- .../textures/blocks/blockAttractorSide.png | Bin 0 -> 1074 bytes .../textures/blocks/blockAttractorSideOn.png | Bin 0 -> 1113 bytes .../java/crazypants/enderio/ClientProxy.java | 8 + .../crazypants/enderio/config/Config.java | 21 ++ .../machine/attractor/AttractorRenderer.java | 188 ++++++++++++++++++ .../machine/attractor/BlockAttractor.java | 76 ++++++- .../machine/attractor/TileAttractor.java | 64 +++--- .../machine/soul/SoulBinderRenderer.java | 7 +- .../java/crazypants/render/CubeRenderer.java | 8 +- 9 files changed, 340 insertions(+), 32 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/blockAttractorSide.png create mode 100644 resources/assets/enderio/textures/blocks/blockAttractorSideOn.png create mode 100644 src/main/java/crazypants/enderio/machine/attractor/AttractorRenderer.java diff --git a/resources/assets/enderio/textures/blocks/blockAttractorSide.png b/resources/assets/enderio/textures/blocks/blockAttractorSide.png new file mode 100644 index 0000000000000000000000000000000000000000..2dd7c8bb68e7700ee9df7d55b15cc6c87726144a GIT binary patch literal 1074 zcmV-21kL-2P)N2bPDNB8 zb~7$DE-^4L^m3s900XW`L_t(YONEvRQrkcfMSU2v24l3?lJRZ~N$!84yzW1n#!#vH z1=1}4b@wdRtbLt#Z})w3ziJ_JyP%z3i54)#jrok? zQUO}=x}LkwOaFCQ@fY!$Fis+&44aBXmnn5x;89Y{XK+Y|CcLoz{bAxkm;fjk5hF*- z4_U7d(|9q68*>9tGMb3j-PcI&IfDpDjO^>y3`2~UXaPXnL-#mi(E%_HM{~bsKyoJt zbh}wgYsRBAksu7v*8pW;^-&+`&UHSlp!|KHmcVewu0klQ|I_JkFZzl5Y|x-X9EL z?*GfcN|e^X?jqkvoNrvxaVMvA`fGqMPX*8#q$DUn*rvMdc+r(&*NERF_8Ko4?%oQ( zIsw3)zXs6$aaj`AH5nLylgwn!4$HuMc_StU0B+rH0c60A3`s=Mh&zMBRS|v<`bPj1 z3K=F|zyAeTmCoc5RD)@4nfM3xX!} z3`oCdB>;C8xn0hG0%TKkFl)p}9JuKOm;=yhNEwvjGn${);BEl-a)2JJC0bKMMl#C* z{)@(B1H=+l?u1Y51c7@9Uv>gatTVelnKoeuPg3 zFxjpnuMZt`$2oD&OanLF6kYB=0<^-k5_l1NbT7AxyVI3o_bJ($0`NR3QMxKT_7YHK zAm8xiqEKWiUrABYGOnr;t#XMp*)c|nve)D*ub@$~{mmvsgg^98*b;r*Me#0Tf?`o< z;^`s9C`Wk(`M08kJ1fez#1`}Lbq$S-z#y_g6s?llk%nP0Rrm_lcMa~;hC^lmI523U s!$|29NYv>o(y&s@ErlDNxVNwKfBqwwvkJN2bPDNB8 zb~7$DE-^4L^m3s900Y%YL_t(YOMRA!cG@ryMfEXcZ3vjnCM+R@q)oTeeLwyG&*&XJ zX)K$z=ez@0*4#HUmW0FPdN3WI&Z^V-?IT@V* z4}38MrCD4o>&u(^Sx*e2W^vifFKX2FZsp_g7TI6}Jn+T!s=3y4$#_-Fn2x z?RvCX4VkcBMm1N=?}@>5cRA#e%v4I?i`+%uZ>#<7#5BN|HL$E+Uzc=wi zHp!sy$TlKceaP;{X__w&@&;}Ow2UG0jr0W)y{#Y{xJS#4Xr>|NON?MZ-u3i6@X#?} z9z>%bS_7w(1Ug=n8F z+X>icP_#&sJPXlF1L){m2w%DehK{AH2ao$%$3PDmoDym2(STy<47r!-%RqEXE7D&a zYQzr)iA@FsCxdMTSIX$L*JMzpUm7TV(PhA`jsfe5Wedm}(nZG=Ip%pfUFm=Ro59nA zsc%3qJA#eJUK7r_E_Qs`9O$3^TY8>? zsSZ0XbfnlZ5>FDl%!dqTZ;vhm=zN-i)=!ibaad4+8L*QHX7BJAxGqmb_rQQtw?}`U zD_}*YBC;5SPM_0Jk^T>6=NQl^WH$Nubp!QX^bduBb?J^elA`7Ou$vN<4m*O?B^8lu z>b^mlJ9-xlw9&vxw!}F+ScjWx-3&>Z)LR4pM=K4W^N=T_fhR8dn{3cRZG9UWu~;B* z(#c?efp&veP^Qmp{#u>>Hqu{51A~g2(QF{*6BP~OKN`VikXzKFlRl4&B$T+*lR+1K zm-dkTqk$snXb>wPv`nozN4Z=4rkajVz#WUbLg(CV^CLK|0l{`0#r|-E+d0P2cKoT) zrH+~|`accygc&9ABKJ%$mrA5_%X5z*Et&@KyVD{+Dq`-XL9YUF)0>M@5ma1BSu)bh zdo7x`EmCl_F{doMbgo!Qjb!VaMTkhho?U 0.5) { + pinch = 0.4; + } + vec.x -= 0.5; + vec.x *= pinch; + vec.x += 0.5; + vec.z -= 0.5; + vec.z *= pinch; + vec.z += 0.5; + + double scale = 0.5; + vec.y -= 0.5; + vec.y *= scale; + vec.y += (0.5 * scale); + } + + @Override + public void applyToNormal(Vector3f vec) { + } + + } + + private static class VertXForm2 implements VertexTransform { + + boolean isX = true; + + public VertXForm2() { + } + + @Override + public void apply(Vertex vertex) { + apply(vertex.xyz); + } + + @Override + public void apply(Vector3d vec) { + double pinch = 0.9; + if(vec.y > 0.2) { + pinch = 0.5; + } + if(isX) { + vec.x -= 0.5; + vec.x *= pinch; + vec.x += 0.5; + } else { + vec.z -= 0.5; + vec.z *= pinch; + vec.z += 0.5; + } + } + + @Override + public void applyToNormal(Vector3f vec) { + } + + } + +} diff --git a/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java b/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java index d5e97c38..ce4be876 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java +++ b/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java @@ -1,5 +1,11 @@ package crazypants.enderio.machine.attractor; +import java.util.Random; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -9,6 +15,8 @@ import crazypants.enderio.machine.AbstractMachineBlock; public class BlockAttractor extends AbstractMachineBlock { + public static int renderId; + public static BlockAttractor create() { BlockAttractor res = new BlockAttractor(); res.init(); @@ -44,7 +52,73 @@ public class BlockAttractor extends AbstractMachineBlock { @Override protected String getMachineFrontIconKey(boolean active) { - return "enderio:blankMachinePanel"; + if(active) { + return "enderio:blockAttractorSideOn"; + } + return "enderio:blockAttractorSide"; + } + + @Override + protected String getSideIconKey(boolean active) { + if(active) { + return "enderio:blockAttractorSideOn"; + } + return "enderio:blockAttractorSide"; } + @Override + protected String getBackIconKey(boolean active) { + if(active) { + return "enderio:blockAttractorSideOn"; + } + return "enderio:blockAttractorSide"; + } + + @Override + protected String getTopIconKey(boolean active) { + return "enderio:blockSoulMachineTop"; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public int getLightOpacity() { + return 0; + } + + @Override + public int getRenderType() { + return renderId; + } + + @SideOnly(Side.CLIENT) + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + if(isActive(world, x, y, z) && world.getTotalWorldTime() % 5 == 0) { + float startX = x + 1.0F; + float startY = y + 0.85F; + float startZ = z + 1.0F; + for (int i = 0; i < 1; i++) { + float xOffset = -0.2F - rand.nextFloat() * 0.6F; + float yOffset = -0.1F + rand.nextFloat() * 0.2F; + float zOffset = -0.2F - rand.nextFloat() * 0.6F; + + EntityFX fx = Minecraft.getMinecraft().renderGlobal.doSpawnParticle("spell", startX + xOffset, startY + yOffset, startZ + zOffset, 0.0D, 0.0D, 0.0D); + if(fx != null) { + fx.setRBGColorF(0.2f, 0.2f, 0.8f); + fx.motionY *= 0.5f; + } + + } + } + } + } diff --git a/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java b/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java index 875ebb1a..0e559a1b 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java +++ b/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java @@ -19,9 +19,12 @@ import com.mojang.authlib.GameProfile; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; +import crazypants.enderio.power.ICapacitor; import crazypants.render.BoundingBox; import crazypants.util.BlockCoord; import crazypants.vecmath.Vector3d; @@ -36,33 +39,46 @@ public class TileAttractor extends AbstractMachineEntity { private final Set tracking = new HashSet(); private int tickCounter = 0; + private ICapacitor capacitor; + public TileAttractor() { super(new SlotDefinition(12, 0)); - updateRange(); + setUpdrade(Capacitors.BASIC_CAPACITOR); } - private void updateRange() { - // //TODO: Config + @Override + public void setCapacitor(Capacitors capacitorType) { + setUpdrade(capacitorType); + super.setCapacitor(capacitorType); + } + + @Override + public ICapacitor getCapacitor() { + return capacitor; + } + + private void setUpdrade(Capacitors capacitorType) { switch (capacitorType) { case ACTIVATED_CAPACITOR: - range = 32; - powerPerTick = 60; + range = Config.attractorRangeLevelTwo; + powerPerTick = Config.attractorPowerPerTickLevelTwo; break; case ENDER_CAPACITOR: - range = 64; - powerPerTick = 180; + range = Config.attractorRangeLevelThree; + powerPerTick = Config.attractorPowerPerTickLevelThree; break; case BASIC_CAPACITOR: default: - range = 16; - powerPerTick = 20; + range = Config.attractorRangeLevelOne; + powerPerTick = Config.attractorPowerPerTickLevelOne; break; } rangeSqu = range * range; BoundingBox bb = new BoundingBox(new BlockCoord(this)); bb = bb.scale(range, range, range); - attractorBounds = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); + attractorBounds = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); + capacitor = new BasicCapacitor(powerPerTick * 8, capacitorType.capacitor.getMaxEnergyStored(), powerPerTick); } @Override @@ -135,13 +151,6 @@ public class TileAttractor extends AbstractMachineEntity { return powerPerTick; } - @Override - public void setCapacitor(Capacitors capacitorType) { - super.setCapacitor(capacitorType); - attractorBounds = null; - updateRange(); - } - FakePlayer getTarget() { if(target == null) { target = new Target(); @@ -156,14 +165,13 @@ public class TileAttractor extends AbstractMachineEntity { private boolean isMobInRange(EntityLiving mob) { return isMobInRange(mob, rangeSqu); } - + private boolean isMobInRange(EntityLiving mob, int range) { if(mob == null) { return false; } return new Vector3d(mob.posX, mob.posY, mob.posZ).distanceSquared(new Vector3d(xCoord, yCoord, zCoord)) <= range; } - private boolean isMobInFilter(EntityLiving ent) { return isMobInFilter(EntityList.getEntityString(ent)); @@ -180,14 +188,14 @@ public class TileAttractor extends AbstractMachineEntity { } return false; } - - private void trackMob(EntityLiving ent) { - if(ent instanceof EntityEnderman) { + + private void trackMob(EntityLiving ent) { + if(ent instanceof EntityEnderman) { ((EntityEnderman) ent).setTarget(getTarget()); } else { tracking.add(ent); ent.tasks.addTask(0, new AttractTask(ent, getTarget(), new BlockCoord(this))); - } + } } private class Target extends FakePlayer { @@ -211,7 +219,7 @@ public class TileAttractor extends AbstractMachineEntity { private String entityId; private boolean keepGoing = true; - + private AttractTask(EntityLiving mob, FakePlayer target, BlockCoord coord) { this.mob = mob; this.coord = coord; @@ -230,11 +238,11 @@ public class TileAttractor extends AbstractMachineEntity { TileEntity te = mob.worldObj.getTileEntity(coord.x, coord.y, coord.z); if(te instanceof TileAttractor) { TileAttractor attractor = (TileAttractor) te; - res = attractor.canAttract(entityId, mob); - if(attractor.isMobInRange(mob, 2)) { + res = attractor.canAttract(entityId, mob); + if(attractor.isMobInRange(mob, 2)) { res = false; } - } + } return res; } @@ -247,7 +255,7 @@ public class TileAttractor extends AbstractMachineEntity { public void updateTask() { int speed = 1; mob.getNavigator().setAvoidsWater(false); - mob.getNavigator().tryMoveToEntityLiving(target, speed); + mob.getNavigator().tryMoveToEntityLiving(target, speed); } } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java index 3361ec09..005e9605 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java @@ -19,7 +19,11 @@ import crazypants.enderio.material.Alloy; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.IconUtil; +import crazypants.render.VertexTransform; import crazypants.util.ForgeDirectionOffsets; +import crazypants.vecmath.Vector3d; +import crazypants.vecmath.Vector3f; +import crazypants.vecmath.Vertex; public class SoulBinderRenderer implements ISimpleBlockRenderingHandler { @@ -117,5 +121,6 @@ public class SoulBinderRenderer implements ISimpleBlockRenderingHandler { @Override public int getRenderId() { return BlockSoulBinder.renderId; - } + } + } diff --git a/src/main/java/crazypants/render/CubeRenderer.java b/src/main/java/crazypants/render/CubeRenderer.java index cef40dc2..6ef41cf3 100644 --- a/src/main/java/crazypants/render/CubeRenderer.java +++ b/src/main/java/crazypants/render/CubeRenderer.java @@ -16,11 +16,15 @@ public final class CubeRenderer { } public static void render(Block block, int meta) { + render(block, meta, null); + } + + public static void render(Block block, int meta, VertexTransform xForm) { IIcon[] icons = new IIcon[6]; for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { icons[dir.ordinal()] = block.getIcon(dir.ordinal(), meta); } - render(BoundingBox.UNIT_CUBE, icons, true); + render(BoundingBox.UNIT_CUBE, icons, xForm, true); } public static void render(BoundingBox bb, IIcon tex) { @@ -206,7 +210,7 @@ public final class CubeRenderer { float maxV; IIcon tex; - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.instance; tessellator.setNormal(0, 0, -1); if(brightnessPerSide != null) {