From 52bc4b9b2a1e188714b7d4f54c4cf4672d893ce6 Mon Sep 17 00:00:00 2001 From: cp Date: Fri, 21 Mar 2014 16:46:10 +0800 Subject: [PATCH] Armor looking pretty good. --- .../java/crazypants/enderio/ClientProxy.java | 7 ++ src/main/java/crazypants/enderio/Config.java | 18 +++ .../enderio/item/DarkSteelArmorRenderer.java | 98 ++++++++++++++++ .../enderio/item/DarkSteelController.java | 90 +++++++++++++-- .../enderio/item/ItemDarkSteelArmor.java | 108 +++++++++++++++++- .../crazypants/enderio/item/ItemRecipes.java | 15 +++ .../item/PacketDarkSteelPowerPacket.java | 43 +++++++ .../enderio/material/ItemMaterial.java | 12 ++ .../power/RedstoneFluxPowerReceptor.java | 5 - .../java/crazypants/render/RenderUtil.java | 43 +++++-- .../java/crazypants/vecmath/Vector4f.java | 7 ++ 11 files changed, 420 insertions(+), 26 deletions(-) create mode 100644 src/main/java/crazypants/enderio/item/DarkSteelArmorRenderer.java create mode 100644 src/main/java/crazypants/enderio/item/PacketDarkSteelPowerPacket.java delete mode 100644 src/main/java/crazypants/enderio/power/RedstoneFluxPowerReceptor.java diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index ebe9d965..dfbc5c7c 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -36,6 +36,7 @@ import crazypants.enderio.conduit.render.DefaultConduitRenderer; import crazypants.enderio.conduit.render.ItemConduitRenderer; import crazypants.enderio.enderface.EnderIoRenderer; import crazypants.enderio.enderface.TileEnderIO; +import crazypants.enderio.item.DarkSteelArmorRenderer; import crazypants.enderio.item.YetaWrenchOverlayRenderer; import crazypants.enderio.item.YetaWrenchTickHandler; import crazypants.enderio.machine.hypercube.HyperCubeRenderer; @@ -180,6 +181,12 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(TravelController.instance); FMLCommonHandler.instance().bus().register(TravelController.instance); + DarkSteelArmorRenderer dsr = new DarkSteelArmorRenderer(); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelBoots, dsr); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelLeggings, dsr); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelChestplate, dsr); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelHelmet, dsr); + } @Override diff --git a/src/main/java/crazypants/enderio/Config.java b/src/main/java/crazypants/enderio/Config.java index 1d069f25..1d87f618 100644 --- a/src/main/java/crazypants/enderio/Config.java +++ b/src/main/java/crazypants/enderio/Config.java @@ -89,6 +89,12 @@ public final class Config { public static double darkSteelLeggingSprintModifier = 0.5; public static double darkSteelBootsJumpModifier = 1.5; + public static int darkSteelPowerStorage = 100000; + public static int darkSteelWalkPowerCost = darkSteelPowerStorage / 3000; + public static int darkSteelSprintPowerCost = darkSteelWalkPowerCost * 4; + public static boolean darkSteelDrainPowerFromInventory = true; + public static int darkSteelBootsJumpPowerCost = 100; + public static void load(FMLPreInitializationEvent event) { configDirectory = new File(event.getModConfigurationDirectory(), "enderio"); if(!configDirectory.exists()) { @@ -252,6 +258,18 @@ public final class Config { darkSteelBootsJumpModifier = config.get("Settings", "darkSteelBootsJumpModifier", darkSteelBootsJumpModifier, "Jump height modifier applied when jumping with Dark Steel Boots equipped").getDouble(darkSteelBootsJumpModifier); + darkSteelPowerStorage = config.get("Settings", "darkSteelPowerStorage", darkSteelPowerStorage, + "Amount of power stored (RF) per crystal in the armor items recipe.").getInt(darkSteelPowerStorage); + darkSteelWalkPowerCost = config.get("Settings", "darkSteelWalkPowerCost", darkSteelWalkPowerCost, + "Amount of power stored (RF) per block walked when wearing the dark steel boots.").getInt(darkSteelWalkPowerCost); + darkSteelSprintPowerCost = config.get("Settings", "darkSteelSprintPowerCost", darkSteelWalkPowerCost, + "Amount of power stored (RF) per block walked when wearing the dark stell boots.").getInt(darkSteelSprintPowerCost); + darkSteelDrainPowerFromInventory = config.get("Settings", "darkSteelDrainPowerFromInventory", darkSteelDrainPowerFromInventory, + "If true, drak steel armor will drain power stored (RF) in power containers in the players invenotry.").getBoolean(darkSteelDrainPowerFromInventory); + + darkSteelBootsJumpPowerCost = config.get("Settings", "darkSteelBootsJumpPowerCost", darkSteelBootsJumpPowerCost, + "Base amount of power used per jump (RF) dark steel boots. The second jump in a 'double jump' uses 2x this etc").getInt(darkSteelBootsJumpPowerCost); + //TODO: Debug renderCapBankGauge = config.get("Debug", "renderCapBankGauge", renderCapBankGauge, "If not true capacitor banks will not render the level gauge at all.") .getBoolean(renderCapBankGauge); diff --git a/src/main/java/crazypants/enderio/item/DarkSteelArmorRenderer.java b/src/main/java/crazypants/enderio/item/DarkSteelArmorRenderer.java new file mode 100644 index 00000000..6e5b38d6 --- /dev/null +++ b/src/main/java/crazypants/enderio/item/DarkSteelArmorRenderer.java @@ -0,0 +1,98 @@ +package crazypants.enderio.item; + +import java.awt.Color; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +import crazypants.render.ColorUtil; +import crazypants.render.RenderUtil; +import crazypants.vecmath.Vector4f; + +public class DarkSteelArmorRenderer implements IItemRenderer { + + private RenderItem ri = new RenderItem(); + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return type == ItemRenderType.INVENTORY; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return false; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + if(data != null && data.length > 0) { + renderToInventory(item, (RenderBlocks) data[0]); + } + } + + public void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { + + Minecraft mc = Minecraft.getMinecraft(); + ri.renderItemIntoGUI(mc.fontRenderer, mc.getTextureManager(), item, 0, 0, true); + + ItemDarkSteelArmor armor = (ItemDarkSteelArmor) item.getItem(); + if(armor.isJustCrafted(item)) { + return; + } + + // GL11.glEnable(GL11.GL_BLEND); + // GL11.glBlendFunc(GL11.GL_CONSTANT_ALPHA, GL11.GL_CONSTANT_ALPHA); + // GL14.glBlendColor(1, 1, 1, 0.75f); + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderUtil.renderQuad2D(2, 13, 0, 13, 3, ColorUtil.getRGB(Color.black)); + + double maxDam = item.getMaxDamage(); + double dispDamage = item.getItemDamageForDisplay(); + float r = 0.0f; + float g = 1f; + float b = 0.0f; + int y = 14; + renderBar(y, maxDam, dispDamage, Color.green, Color.red); + + maxDam = armor.getMaxEnergyStored(item); + dispDamage = armor.getEnergyStored(item); + r = 0.4f; + g = 0.4f; + b = 1f; + y = 13; + renderBar(y, maxDam, maxDam - dispDamage, new Color(200, 100, 10), Color.red); + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + } + + private void renderBar(int y, double maxDam, double dispDamage, Color full, Color empty) { + double ratio = dispDamage / maxDam; + Vector4f fg = ColorUtil.toFloat(full); + Vector4f ec = ColorUtil.toFloat(empty); + + fg.interpolate(ec, (float) ratio); + + Vector4f bg = new Vector4f(fg); + bg.scale(0.25 + (0.75 * 1 - ratio)); + + int barLength = (int) Math.round(12.0 * (1 - ratio)); + RenderUtil.renderQuad2D(2, y, 0, 12, 1, bg); + RenderUtil.renderQuad2D(2, y, 0, barLength, 1, fg); + } + + private void renderBar(int y, double maxDam, double dispDamage) { + int ratio = (int) Math.round(255.0D - dispDamage * 255.0D / maxDam); + int fgCol = 255 - ratio << 16 | ratio << 8; + int bgCol = (255 - ratio) / 4 << 16 | 16128; + int barLength = (int) Math.round(12.0D - dispDamage * 12.0D / maxDam); + RenderUtil.renderQuad2D(2, y, 0, 12, 1, bgCol); + RenderUtil.renderQuad2D(2, y, 0, barLength, 1, fgCol); + } +} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/item/DarkSteelController.java b/src/main/java/crazypants/enderio/item/DarkSteelController.java index e701c2fd..1b5fc90e 100644 --- a/src/main/java/crazypants/enderio/item/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/DarkSteelController.java @@ -10,6 +10,7 @@ import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MovementInput; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; @@ -31,6 +32,7 @@ public class DarkSteelController { private int ticksSinceLastJump; private DarkSteelController() { + EnderIO.packetPipeline.registerPacket(PacketDarkSteelPowerPacket.class); } @SubscribeEvent @@ -52,15 +54,70 @@ public class DarkSteelController { ItemStack leggings = player.getEquipmentInSlot(2); if(leggings != null && leggings.getItem() == EnderIO.itemDarkSteelLeggings) { - if(player.isSprinting()) { - moveInst.applyModifier(sprintModifier); - } else { - moveInst.applyModifier(walkModifier); + + double horzMovement = Math.sqrt(player.motionX * player.motionX + player.motionZ * player.motionZ); + double costModifier = player.isSprinting() ? (Config.darkSteelSprintPowerCost * 1.25) : Config.darkSteelWalkPowerCost; + int cost = (int) (horzMovement * costModifier); + + int totalEnergy = getPlayerEnergy(player, EnderIO.itemDarkSteelLeggings); + if(totalEnergy > 0 && totalEnergy >= cost) { + usePlayerEnergy(player, EnderIO.itemDarkSteelLeggings, cost); + if(player.isSprinting()) { + moveInst.applyModifier(sprintModifier); + } else { + moveInst.applyModifier(walkModifier); + } } } } + void usePlayerEnergy(EntityPlayer player, ItemDarkSteelArmor armor, int cost) { + + if(cost == 0) { + return; + } + + int remaining = cost; + if(Config.darkSteelDrainPowerFromInventory) { + for (ItemStack stack : player.inventory.mainInventory) { + if(stack != null && stack.getItem() instanceof IEnergyContainerItem) { + IEnergyContainerItem cont = (IEnergyContainerItem) stack.getItem(); + remaining -= cont.extractEnergy(stack, remaining, false); + if(remaining <= 0) { + return; + } + } + } + } + + if(armor != null) { + ItemStack stack = player.inventory.armorInventory[3 - armor.armorType]; + if(stack != null) { + armor.extractEnergy(stack, remaining, false); + //player.inventory.markDirty(); + } + } + } + + private int getPlayerEnergy(EntityPlayer player, ItemDarkSteelArmor armor) { + int res = 0; + + if(Config.darkSteelDrainPowerFromInventory) { + for (ItemStack stack : player.inventory.mainInventory) { + if(stack != null && stack.getItem() instanceof IEnergyContainerItem) { + IEnergyContainerItem cont = (IEnergyContainerItem) stack.getItem(); + res += cont.extractEnergy(stack, Integer.MAX_VALUE, true); + } + } + } + if(armor != null) { + ItemStack stack = player.inventory.armorInventory[3 - armor.armorType]; + res = armor.getEnergyStored(stack); + } + return res; + } + @SideOnly(Side.CLIENT) @SubscribeEvent public void onClientTick(TickEvent.ClientTickEvent event) { @@ -71,13 +128,9 @@ public class DarkSteelController { } MovementInput input = player.movementInput; if(input.jump && !wasJumping) { - jumpCount = 1; - player.motionY += 0.15 * Config.darkSteelBootsJumpModifier; - ticksSinceLastJump = 0; - } else if(input.jump && jumpCount < 2 && ticksSinceLastJump > 5) { - player.motionY += 0.15 * Config.darkSteelBootsJumpModifier * 2; - jumpCount = 2; - ticksSinceLastJump = 0; + doJump(player); + } else if(input.jump && jumpCount < 3 && ticksSinceLastJump > 5) { + doJump(player); } wasJumping = !player.isCollidedVertically; @@ -88,4 +141,19 @@ public class DarkSteelController { } } + @SideOnly(Side.CLIENT) + private void doJump(EntityClientPlayerMP player) { + int requiredPower = Config.darkSteelBootsJumpPowerCost * (int) Math.pow(jumpCount + 1, 2.5); + int availablePower = getPlayerEnergy(player, EnderIO.itemDarkSteelBoots); + + if(availablePower > 0 && requiredPower <= availablePower) { + jumpCount++; + player.motionY += 0.15 * Config.darkSteelBootsJumpModifier * jumpCount; + ticksSinceLastJump = 0; + usePlayerEnergy(player, EnderIO.itemDarkSteelBoots, requiredPower); + EnderIO.packetPipeline.sendToServer(new PacketDarkSteelPowerPacket(requiredPower, EnderIO.itemDarkSteelBoots.armorType)); + } + + } + } diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java index c83434d1..1a7e56b6 100644 --- a/src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java @@ -6,12 +6,17 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.EnumHelper; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.Config; +import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; +import crazypants.enderio.machine.power.PowerDisplayUtil; -public class ItemDarkSteelArmor extends ItemArmor { +public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerItem { public static final ArmorMaterial MATERIAL = EnumHelper.addArmorMaterial("darkSteel", 45, new int[] { 3, 8, 6, 3 }, 25); @@ -21,12 +26,30 @@ public class ItemDarkSteelArmor extends ItemArmor { FMLCommonHandler.instance().bus().register(DarkSteelController.instance); } + public static ItemDarkSteelArmor forArmorType(short armorType) { + switch (armorType) { + case 0: + return EnderIO.itemDarkSteelHelmet; + case 1: + return EnderIO.itemDarkSteelLeggings; + case 2: + return EnderIO.itemDarkSteelChestplate; + case 3: + return EnderIO.itemDarkSteelBoots; + } + return null; + } + public static ItemDarkSteelArmor create(int armorType) { ItemDarkSteelArmor res = new ItemDarkSteelArmor(armorType); res.init(); return res; } + private int capacity; + private int maxReceive; + private int maxExtract; + protected ItemDarkSteelArmor(int armorType) { super(MATERIAL, 0, armorType); setCreativeTab(EnderIOTab.tabEnderIO); @@ -34,6 +57,13 @@ public class ItemDarkSteelArmor extends ItemArmor { String str = "darkSteel_" + NAMES[armorType]; setUnlocalizedName(str); setTextureName("enderIO:" + str); + + capacity = Config.darkSteelPowerStorage; + maxReceive = capacity / 5; + maxExtract = maxReceive; + if(armorType < 2) { + capacity *= 2; + } } protected void init() { @@ -42,7 +72,15 @@ public class ItemDarkSteelArmor extends ItemArmor { @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add("Durability: " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); + list.add("Durability: " + (itemstack.getMaxDamage() - itemstack.getItemDamage()) + "/" + itemstack.getMaxDamage()); + String str = "Power: " + PowerDisplayUtil.formatPower(getEnergyStored(itemstack)) + "/" + + PowerDisplayUtil.formatPower(getMaxEnergyStored(itemstack)) + " " + PowerDisplayUtil.abrevation(); + list.add(str); + } + + @Override + public boolean isDamaged(ItemStack stack) { + return false; } @Override @@ -53,6 +91,72 @@ public class ItemDarkSteelArmor extends ItemArmor { return "enderio:textures/models/armor/darkSteel_layer_1.png"; } + public ItemStack createItemStack() { + ItemStack res = new ItemStack(this); + setEnergy(res, 0); + return res; + } + + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + + if(container.stackTagCompound == null) { + container.stackTagCompound = new NBTTagCompound(); + } + int energy = container.stackTagCompound.getInteger("Energy"); + int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); + + if(!simulate) { + energy += energyReceived; + container.stackTagCompound.setInteger("Energy", energy); + } + return energyReceived; + } + + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + + if(container == null || container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { + return 0; + } + int energy = container.stackTagCompound.getInteger("Energy"); + int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); + + if(!simulate) { + energy -= energyExtracted; + container.stackTagCompound.setInteger("Energy", energy); + } + return energyExtracted; + } + + @Override + public int getEnergyStored(ItemStack container) { + if(container == null || container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { + return 0; + } + return container.stackTagCompound.getInteger("Energy"); + } + + @Override + public int getMaxEnergyStored(ItemStack container) { + return capacity; + } + + void setEnergy(ItemStack container, int energy) { + if(container.stackTagCompound == null) { + container.stackTagCompound = new NBTTagCompound(); + } + container.stackTagCompound.setInteger("Energy", energy); + } + + public void setFull(ItemStack container) { + setEnergy(container, capacity); + } + + public boolean isJustCrafted(ItemStack stack) { + return getEnergyStored(stack) == 0 && getDisplayDamage(stack) == 0; + } + //Idea from Mekanism // @ForgeSubscribe // public void onLivingSpecialSpawn(LivingSpawnEvent event) diff --git a/src/main/java/crazypants/enderio/item/ItemRecipes.java b/src/main/java/crazypants/enderio/item/ItemRecipes.java index b0c5409f..2aec5853 100644 --- a/src/main/java/crazypants/enderio/item/ItemRecipes.java +++ b/src/main/java/crazypants/enderio/item/ItemRecipes.java @@ -5,6 +5,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.MachinePart; +import crazypants.enderio.material.Material; public class ItemRecipes { @@ -15,6 +16,20 @@ public class ItemRecipes { // Wrench GameRegistry.addShapedRecipe(wrench, "s s", " b ", " s ", 's', electricalSteel, 'b', basicGear); + + ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()); + ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); + + GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelHelmet.createItemStack(), "scs", "s s", " ", 's', darkSteel, 'c', vibCry); + GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelHelmet.createItemStack(), " ", "scs", "s s", 's', darkSteel, 'c', vibCry); + + GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelChestplate.createItemStack(), "s s", "scs", "sss", 's', darkSteel, 'c', vibCry); + + GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelLeggings.createItemStack(), "csc", "s s", "s s", 's', darkSteel, 'c', vibCry); + + GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelBoots.createItemStack(), "s s", "c c", " ", 's', darkSteel, 'c', vibCry); + GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelBoots.createItemStack(), " ", "s s", "c c", 's', darkSteel, 'c', vibCry); + } } diff --git a/src/main/java/crazypants/enderio/item/PacketDarkSteelPowerPacket.java b/src/main/java/crazypants/enderio/item/PacketDarkSteelPowerPacket.java new file mode 100644 index 00000000..77b86a8d --- /dev/null +++ b/src/main/java/crazypants/enderio/item/PacketDarkSteelPowerPacket.java @@ -0,0 +1,43 @@ +package crazypants.enderio.item; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import net.minecraft.entity.player.EntityPlayer; +import crazypants.enderio.network.IPacketEio; + +public class PacketDarkSteelPowerPacket implements IPacketEio { + + private int powerUse; + private short armorType; + + public PacketDarkSteelPowerPacket() { + } + + public PacketDarkSteelPowerPacket(int powerUse, int armorType) { + this.powerUse = powerUse; + this.armorType = (short) armorType; + } + + @Override + public void encode(ChannelHandlerContext ctx, ByteBuf buffer) { + buffer.writeInt(powerUse); + buffer.writeShort(armorType); + } + + @Override + public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + powerUse = buffer.readInt(); + armorType = buffer.readShort(); + } + + @Override + public void handleClientSide(EntityPlayer player) { + } + + @Override + public void handleServerSide(EntityPlayer player) { + DarkSteelController.instance.usePlayerEnergy(player, ItemDarkSteelArmor.forArmorType(armorType), powerUse); + player.fallDistance = 0; + } + +} diff --git a/src/main/java/crazypants/enderio/material/ItemMaterial.java b/src/main/java/crazypants/enderio/material/ItemMaterial.java index 5c48d5e7..ed77206a 100644 --- a/src/main/java/crazypants/enderio/material/ItemMaterial.java +++ b/src/main/java/crazypants/enderio/material/ItemMaterial.java @@ -63,4 +63,16 @@ public class ItemMaterial extends Item { } } + @Override + public boolean hasEffect(ItemStack par1ItemStack, int pass) { + if(par1ItemStack == null) { + return false; + } + int damage = par1ItemStack.getItemDamage(); + if(damage == Material.VIBRANT_CYSTAL.ordinal() || damage == Material.PULSATING_CYSTAL.ordinal()) { + return true; + } + return false; + } + } diff --git a/src/main/java/crazypants/enderio/power/RedstoneFluxPowerReceptor.java b/src/main/java/crazypants/enderio/power/RedstoneFluxPowerReceptor.java deleted file mode 100644 index 8fa32dde..00000000 --- a/src/main/java/crazypants/enderio/power/RedstoneFluxPowerReceptor.java +++ /dev/null @@ -1,5 +0,0 @@ -package crazypants.enderio.power; - -public class RedstoneFluxPowerReceptor { - -} diff --git a/src/main/java/crazypants/render/RenderUtil.java b/src/main/java/crazypants/render/RenderUtil.java index bfa1ef15..79bd2d15 100644 --- a/src/main/java/crazypants/render/RenderUtil.java +++ b/src/main/java/crazypants/render/RenderUtil.java @@ -1,7 +1,17 @@ package crazypants.render; -import crazypants.util.BlockCoord; -import crazypants.vecmath.*; +import static net.minecraftforge.common.util.ForgeDirection.DOWN; +import static net.minecraftforge.common.util.ForgeDirection.EAST; +import static net.minecraftforge.common.util.ForgeDirection.NORTH; +import static net.minecraftforge.common.util.ForgeDirection.SOUTH; +import static net.minecraftforge.common.util.ForgeDirection.UP; +import static net.minecraftforge.common.util.ForgeDirection.WEST; + +import java.nio.FloatBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -15,14 +25,18 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + import org.lwjgl.opengl.GL11; -import java.nio.FloatBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import static net.minecraftforge.common.util.ForgeDirection.*; +import crazypants.util.BlockCoord; +import crazypants.vecmath.Matrix4d; +import crazypants.vecmath.VecmathUtil; +import crazypants.vecmath.Vector2f; +import crazypants.vecmath.Vector3d; +import crazypants.vecmath.Vector3f; +import crazypants.vecmath.Vector4d; +import crazypants.vecmath.Vector4f; +import crazypants.vecmath.Vertex; public class RenderUtil { @@ -147,6 +161,19 @@ public class RenderUtil { GL11.glEnable(GL11.GL_TEXTURE_2D); } + public static void renderQuad2D(double x, double y, double z, double width, double height, Vector4f colorRGBA) { + GL11.glColor4f(colorRGBA.x, colorRGBA.y, colorRGBA.z, colorRGBA.w); + GL11.glDisable(GL11.GL_TEXTURE_2D); + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.addVertex(x, y + height, z); + tessellator.addVertex(x + width, y + height, z); + tessellator.addVertex(x + width, y, z); + tessellator.addVertex(x, y, z); + tessellator.draw(); + GL11.glEnable(GL11.GL_TEXTURE_2D); + } + /** * left, bottom, right, top * diff --git a/src/main/java/crazypants/vecmath/Vector4f.java b/src/main/java/crazypants/vecmath/Vector4f.java index 851082f9..901edf84 100644 --- a/src/main/java/crazypants/vecmath/Vector4f.java +++ b/src/main/java/crazypants/vecmath/Vector4f.java @@ -31,6 +31,13 @@ public class Vector4f { this(other.x, other.y, other.z, other.w); } + public void interpolate(Vector4f destination, float factor) { + x = (1 - factor) * x + factor * destination.x; + y = (1 - factor) * y + factor * destination.y; + z = (1 - factor) * z + factor * destination.z; + w = (1 - factor) * w + factor * destination.w; + } + public void set(Vector4f vec) { x = vec.x; y = vec.y;