Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3.git

ee3_client/ee3/client/core/handlers/DrawBlockHighlightHandler.java

@@ -16,6 +16,9 @@ import net.minecraftforge.event.ForgeSubscribe;
 
 public class DrawBlockHighlightHandler {
     
+    private static int pulse = 0;
+    private static boolean doInc = true;
+
     @ForgeSubscribe
     public void onDrawBlockHighlightEvent(DrawBlockHighlightEvent event) {
 
@@ -40,66 +43,69 @@ public class DrawBlockHighlightHandler {
         double iPZ = event.player.prevPosZ + (event.player.posZ - event.player.prevPosZ) * event.partialTicks;
         int texture = event.context.renderEngine.getTexture(Sprites.SPRITE_SHEET_LOCATION + Sprites.WORLD_TRANSMUTATION_TEXTURE);
 
-        int xScale = 1;
+        float xScale = 1;
-        int yScale = 1;
+        float yScale = 1;
-        int zScale = 1;
+        float zScale = 1;
+        float xShift = 0.1F;
+        float yShift = 0.1F;
+        float zShift = 0.1F;
         int chargeLevel;
         int itemChargeLevel = 0;
 
         if (event.currentItem.getItem() instanceof IChargeable) {
             itemChargeLevel = ((IChargeable) event.currentItem.getItem()).getCharge(event.currentItem);
         }
-
         chargeLevel = 1 + itemChargeLevel * 2;
         
-        if ((event.target.sideHit == 0) || (event.target.sideHit == 1)) {
+        ForgeDirection sideHit = ForgeDirection.getOrientation(event.target.sideHit);
-            xScale = chargeLevel;
-            zScale = chargeLevel;
-        }
-        else if ((event.target.sideHit == 2) || (event.target.sideHit == 3)) {
-            xScale = chargeLevel;
-            yScale = chargeLevel;
-        }
-        else if ((event.target.sideHit == 4) || (event.target.sideHit == 5)) {
-            yScale = chargeLevel;
-            zScale = chargeLevel;
-        }
         
-        float xShift = 0.1F;
+        switch (sideHit) {
-        float yShift = 0.1F;
+            case UP: {
-        float zShift = 0.1F;
+                xScale = chargeLevel + 0.1F;
-
+                zScale = chargeLevel + 0.1F;
-        if (event.target.sideHit == 0) {
+                xShift = 0;
-            xShift = 0;
+                zShift = 0;
-            yShift = -yShift;
+                break;
-            zShift = 0;
-        }
-        else if (event.target.sideHit == 1) {
-            xShift = 0;
-            zShift = 0;
-        }
-        else if (event.target.sideHit == 2) {
-            xShift = 0;
-            yShift = 0;
-            if (chargeLevel > 1) {
-                zShift = -zShift - 1;
             }
-            else {
+            case DOWN: {
+                xScale = chargeLevel + 0.1F;
+                zScale = chargeLevel + 0.1F;
+                xShift = 0;
+                yShift = -yShift;
+                zShift = 0;
+                break;
+            }
+            case NORTH: {
+                xScale = chargeLevel + 0.1F;
+                yScale = chargeLevel + 0.1F;
+                xShift = 0;
+                yShift = 0;
                 zShift = -zShift;
+                break;
             }
-        }
+            case SOUTH: {
-        else if (event.target.sideHit == 3) {
+                xScale = chargeLevel + 0.1F;
-            xShift = 0;
+                yScale = chargeLevel + 0.1F;
-            yShift = 0;
+                xShift = 0;
-        }
+                yShift = 0;
-        else if (event.target.sideHit == 4) {
+                break;
-            xShift = -xShift;
+            }
-            yShift = 0;
+            case EAST: {
-            zShift = 0;
+                yScale = chargeLevel + 0.1F;
-        }
+                zScale = chargeLevel + 0.1F;
-        else if (event.target.sideHit == 5) {
+                yShift = 0;
-            yShift = 0;
+                zShift = 0;
-            zShift = 0;
+                break;
+            }
+            case WEST: {
+                yScale = chargeLevel + 0.1F;
+                zScale = chargeLevel + 0.1F;
+                xShift = -xShift;
+                yShift = 0;
+                zShift = 0;
+                break;
+            }
+            default: break;
         }
 
         GL11.glDepthMask(false);
@@ -107,13 +113,14 @@ public class DrawBlockHighlightHandler {
 
         for (int i = 0; i < 6; i++) {
             ForgeDirection forgeDir = ForgeDirection.getOrientation(i);
+            int zCorrection = (i == 2) ? -1 : 1;
             GL11.glPushMatrix();
             GL11.glTranslated(-iPX + x + xShift, -iPY + y + yShift, -iPZ + z + zShift);
             GL11.glScalef(1F * xScale, 1F * yScale, 1F * zScale);
             GL11.glRotatef(90, forgeDir.offsetX, forgeDir.offsetY, forgeDir.offsetZ);
-            GL11.glTranslated(0, 0, 0.5f);
+            GL11.glTranslated(0, 0, 0.5f * zCorrection);
             GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT);
-            renderSlidingQuad(texture, 0.75F);
+            renderPulsingQuad(texture, 0.75F);
             GL11.glPopMatrix();
         }
 
@@ -121,9 +128,8 @@ public class DrawBlockHighlightHandler {
         GL11.glDepthMask(true);
     }
 
-    public static void renderSlidingQuad(int texture, float transparency) {
+    public static void renderPulsingQuad(int texture, float maxTransparency) {
-
+        float pulseTransparency = (getPulseValue() * maxTransparency) / 3000f;
-        float pulse = (System.currentTimeMillis() % 3000) / 3000f;
 
         GL11.glBindTexture(GL11.GL_TEXTURE_2D, texture);
         Tessellator tessellator = Tessellator.instance;
@@ -131,10 +137,10 @@ public class DrawBlockHighlightHandler {
         GL11.glEnable(GL12.GL_RESCALE_NORMAL);
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        GL11.glColor4f(1, 1, 1, pulse);
+        GL11.glColor4f(1, 1, 1, pulseTransparency);
 
         tessellator.startDrawingQuads();
-        tessellator.setColorRGBA_F(1, 1, 1, pulse);
+        tessellator.setColorRGBA_F(1, 1, 1, pulseTransparency);
 
         tessellator.addVertexWithUV(-0.5D, 0.5D, 0F, 0, 1);
         tessellator.addVertexWithUV(0.5D, 0.5D, 0F, 1, 1);
@@ -146,4 +152,24 @@ public class DrawBlockHighlightHandler {
         GL11.glDisable(GL12.GL_RESCALE_NORMAL);
     }
     
+    private static int getPulseValue() {
+        
+        if (doInc) {
+            pulse += 8;
+        }
+        else {
+            pulse -= 8;
+        }
+        
+        if (pulse == 3000) {
+            doInc = false;
+        }
+        
+        if (pulse == 0) {
+            doInc = true;
+        }
+        
+        return pulse;
+    }
+
 }

ee3_client/ee3/client/core/handlers/RenderTickHandler.java

@@ -65,9 +65,9 @@ public class RenderTickHandler implements ITickHandler {
 
     private static void renderStoneHUD(Minecraft minecraft, EntityPlayer player, ItemStack stack, float partialTicks) {
 
-        float overlayScale = 2F; // TODO config option
+        float overlayScale = 2F;
         float blockScale = overlayScale / 2;
-        float overlayOpacity = 1F; // TODO config option
+        float overlayOpacity = 0.5F;
 
         MovingObjectPosition rayTrace = minecraft.objectMouseOver;
         ItemStack currentBlock = null;
@@ -92,9 +92,15 @@ public class RenderTickHandler implements ITickHandler {
         GL11.glEnable(GL12.GL_RESCALE_NORMAL);
         GL11.glEnable(GL11.GL_COLOR_MATERIAL);
         GL11.glEnable(GL11.GL_LIGHTING);
-        RenderUtils.renderItemIntoGUI(minecraft.fontRenderer, minecraft.renderEngine, stack, (int) (sr.getScaledWidth() - (16 * overlayScale)), (int) (sr.getScaledHeight() - (16 * overlayScale)), overlayOpacity / 2, overlayScale);
+        
+        int hudOverlayX = (int) (sr.getScaledWidth() - (16 * overlayScale));
+        int hudOverlayY = (int) (sr.getScaledHeight() - (16 * overlayScale));
+        int hudBlockX = (int) (sr.getScaledWidth() - (16 * overlayScale) / 2 - 8);
+        int hudBlockY = (int) (sr.getScaledHeight() - (16 * overlayScale) / 2 - 8);
+        
+        RenderUtils.renderItemIntoGUI(minecraft.fontRenderer, minecraft.renderEngine, stack, hudOverlayX, hudOverlayY, overlayOpacity, overlayScale);
         if ((currentBlock != null) && (currentBlock.getItem() instanceof ItemBlock)) {
-            RenderUtils.renderRotatingBlockIntoGUI(minecraft.fontRenderer, minecraft.renderEngine, currentBlock, (int) (sr.getScaledWidth() - (16 * overlayScale) / 2 - 8), (int) (sr.getScaledHeight() - (16 * overlayScale) / 2 - 8), -90, blockScale);
+            RenderUtils.renderRotatingBlockIntoGUI(minecraft.fontRenderer, minecraft.renderEngine, currentBlock, hudBlockX, hudBlockY, -90, blockScale);
         }
         GL11.glDisable(GL11.GL_LIGHTING);
         GL11.glPopMatrix();

ee3_common/ee3/common/network/PacketWorldEvent.java

@@ -4,7 +4,9 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.INetworkManager;
+import net.minecraft.src.World;
 import cpw.mods.fml.common.network.Player;
 
 public class PacketWorldEvent extends PacketEE {
@@ -91,6 +93,7 @@ public class PacketWorldEvent extends PacketEE {
     public void execute(INetworkManager manager, Player player) {
 
         System.out.println("World Event Packet received");
+        System.out.println("eventType: " + eventType);
         System.out.println("originX: " + originX);
         System.out.println("originY: " + originY);
         System.out.println("originZ: " + originZ);
@@ -99,6 +102,21 @@ public class PacketWorldEvent extends PacketEE {
         System.out.println("rangeY: " + rangeY);
         System.out.println("rangeZ: " + rangeZ);
         System.out.println("data: " + data);
+        
+        EntityPlayer thePlayer = (EntityPlayer) player;
+        World world = thePlayer.worldObj;
+        
+        /*
+         * Server knows the world, the player, and all the packet data
+         * Server checks (for each block);
+         *  1) If the action on that block is allowed for the player
+         *  2) If the action is a valid action
+         *  
+         *  AoE options are; 1x1, 3x3, 5x5, and 7x7
+         *  Charge options; 0, 1, 2, 3
+         *  so Range would be 1, 2, 4, 6
+         *  1 + 0, 1 + 1, 1 + 3, 1 + 5 
+         */
     }
 
 }