Fixed charge hud, and clocking device.
This commit is contained in:
parent
d56e6752c0
commit
f12725b4e0
13 changed files with 40 additions and 21 deletions
|
@ -3,6 +3,7 @@ package techreborn.client.hud;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.ScaledResolution;
|
import net.minecraft.client.gui.ScaledResolution;
|
||||||
import net.minecraft.client.renderer.RenderHelper;
|
import net.minecraft.client.renderer.RenderHelper;
|
||||||
|
import net.minecraft.client.renderer.entity.RenderItem;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.client.event.RenderGameOverlayEvent;
|
import net.minecraftforge.client.event.RenderGameOverlayEvent;
|
||||||
|
@ -58,9 +59,7 @@ public class ChargeHud {
|
||||||
RenderHelper.enableStandardItemLighting();
|
RenderHelper.enableStandardItemLighting();
|
||||||
RenderHelper.enableGUIStandardItemLighting();
|
RenderHelper.enableGUIStandardItemLighting();
|
||||||
//Render the stack
|
//Render the stack
|
||||||
// RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, armorstack, 0, y - 5);
|
renderItemStack(armorstack, 0, y - 5);
|
||||||
//Render Overlay //TODO 1.8 rendering
|
|
||||||
// RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, armorstack, 0, y - 5);
|
|
||||||
//Get the color depending on current charge
|
//Get the color depending on current charge
|
||||||
if (CurrentCharge <= half) {
|
if (CurrentCharge <= half) {
|
||||||
color = Color.YELLOW;
|
color = Color.YELLOW;
|
||||||
|
@ -83,9 +82,7 @@ public class ChargeHud {
|
||||||
GL11.glEnable(32826);
|
GL11.glEnable(32826);
|
||||||
RenderHelper.enableStandardItemLighting();
|
RenderHelper.enableStandardItemLighting();
|
||||||
RenderHelper.enableGUIStandardItemLighting();
|
RenderHelper.enableGUIStandardItemLighting();
|
||||||
//TODO 1.8 nope
|
renderItemStack(stack, 0, y - 5);
|
||||||
//RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, 0, y - 5);
|
|
||||||
// RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, stack, 0, y - 5);
|
|
||||||
if (CurrentCharge <= half) {
|
if (CurrentCharge <= half) {
|
||||||
color = Color.YELLOW;
|
color = Color.YELLOW;
|
||||||
}
|
}
|
||||||
|
@ -98,6 +95,21 @@ public class ChargeHud {
|
||||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void renderItemStack(ItemStack stack, int x, int y)
|
||||||
|
{
|
||||||
|
if (stack != null)
|
||||||
|
{
|
||||||
|
GL11.glEnable(GL11.GL_BLEND);
|
||||||
|
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
RenderHelper.enableGUIStandardItemLighting();
|
||||||
|
|
||||||
|
RenderItem itemRenderer = Minecraft.getMinecraft().getRenderItem();
|
||||||
|
itemRenderer.renderItemAndEffectIntoGUI(stack, x, y);
|
||||||
|
|
||||||
|
GL11.glDisable(GL11.GL_LIGHTING);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private String GetEUString(double euValue) {
|
private String GetEUString(double euValue) {
|
||||||
if (euValue > 1000000) {
|
if (euValue > 1000000) {
|
||||||
double tenX = Math.round(euValue / 100000);
|
double tenX = Math.round(euValue / 100000);
|
||||||
|
|
|
@ -1,20 +1,17 @@
|
||||||
package techreborn.items;
|
package techreborn.items;
|
||||||
|
|
||||||
import net.minecraft.block.properties.PropertyEnum;
|
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.IStringSerializable;
|
|
||||||
import net.minecraftforge.fluids.Fluid;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
import net.minecraftforge.fluids.FluidRegistry;
|
import net.minecraftforge.fluids.FluidRegistry;
|
||||||
import reborncore.api.TextureRegistry;
|
|
||||||
import techreborn.client.TechRebornCreativeTab;
|
import techreborn.client.TechRebornCreativeTab;
|
||||||
import techreborn.init.ModItems;
|
import techreborn.init.ModItems;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemCells extends ItemMetaBase {
|
public class ItemCells extends ItemTextureBase {
|
||||||
|
|
||||||
|
|
||||||
public static ItemStack getCellByName(String name, int count) {
|
public static ItemStack getCellByName(String name, int count) {
|
||||||
|
|
|
@ -10,7 +10,7 @@ import techreborn.lib.ModInfo;
|
||||||
import java.security.InvalidParameterException;
|
import java.security.InvalidParameterException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemCrushedOre extends ItemMetaBase {
|
public class ItemCrushedOre extends ItemTextureBase {
|
||||||
public static ItemStack getCrushedOreByName(String name, int count) {
|
public static ItemStack getCrushedOreByName(String name, int count) {
|
||||||
for (int i = 0; i < types.length; i++) {
|
for (int i = 0; i < types.length; i++) {
|
||||||
if (types[i].equalsIgnoreCase(name)) {
|
if (types[i].equalsIgnoreCase(name)) {
|
||||||
|
|
|
@ -11,7 +11,7 @@ import techreborn.lib.ModInfo;
|
||||||
import java.security.InvalidParameterException;
|
import java.security.InvalidParameterException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemDusts extends ItemMetaBase {
|
public class ItemDusts extends ItemTextureBase {
|
||||||
public static ItemStack getDustByName(String name, int count) {
|
public static ItemStack getDustByName(String name, int count) {
|
||||||
for (int i = 0; i < types.length; i++) {
|
for (int i = 0; i < types.length; i++) {
|
||||||
if (types[i].equalsIgnoreCase(name)) {
|
if (types[i].equalsIgnoreCase(name)) {
|
||||||
|
|
|
@ -10,7 +10,7 @@ import techreborn.lib.ModInfo;
|
||||||
import java.security.InvalidParameterException;
|
import java.security.InvalidParameterException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemDustsSmall extends ItemMetaBase {
|
public class ItemDustsSmall extends ItemTextureBase {
|
||||||
|
|
||||||
public static ItemStack getSmallDustByName(String name, int count) {
|
public static ItemStack getSmallDustByName(String name, int count) {
|
||||||
for (int i = 0; i < types.length; i++) {
|
for (int i = 0; i < types.length; i++) {
|
||||||
|
|
|
@ -10,7 +10,7 @@ import techreborn.lib.ModInfo;
|
||||||
import java.security.InvalidParameterException;
|
import java.security.InvalidParameterException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemGems extends ItemMetaBase {
|
public class ItemGems extends ItemTextureBase {
|
||||||
|
|
||||||
public static ItemStack getGemByName(String name, int count) {
|
public static ItemStack getGemByName(String name, int count) {
|
||||||
for (int i = 0; i < types.length; i++) {
|
for (int i = 0; i < types.length; i++) {
|
||||||
|
|
|
@ -10,7 +10,7 @@ import techreborn.lib.ModInfo;
|
||||||
import java.security.InvalidParameterException;
|
import java.security.InvalidParameterException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemIngots extends ItemMetaBase {
|
public class ItemIngots extends ItemTextureBase {
|
||||||
public static ItemStack getIngotByName(String name, int count) {
|
public static ItemStack getIngotByName(String name, int count) {
|
||||||
for (int i = 0; i < types.length; i++) {
|
for (int i = 0; i < types.length; i++) {
|
||||||
if (types[i].equalsIgnoreCase(name)) {
|
if (types[i].equalsIgnoreCase(name)) {
|
||||||
|
|
|
@ -10,7 +10,7 @@ import techreborn.lib.ModInfo;
|
||||||
import java.security.InvalidParameterException;
|
import java.security.InvalidParameterException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemNuggets extends ItemMetaBase {
|
public class ItemNuggets extends ItemTextureBase {
|
||||||
|
|
||||||
public static ItemStack getNuggetByName(String name, int count) {
|
public static ItemStack getNuggetByName(String name, int count) {
|
||||||
for (int i = 0; i < types.length; i++) {
|
for (int i = 0; i < types.length; i++) {
|
||||||
|
|
|
@ -14,7 +14,7 @@ import techreborn.lib.ModInfo;
|
||||||
import java.security.InvalidParameterException;
|
import java.security.InvalidParameterException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemParts extends ItemMetaBase {
|
public class ItemParts extends ItemTextureBase {
|
||||||
public static ItemStack getPartByName(String name, int count) {
|
public static ItemStack getPartByName(String name, int count) {
|
||||||
for (int i = 0; i < types.length; i++) {
|
for (int i = 0; i < types.length; i++) {
|
||||||
if (types[i].equalsIgnoreCase(name)) {
|
if (types[i].equalsIgnoreCase(name)) {
|
||||||
|
|
|
@ -10,7 +10,7 @@ import techreborn.lib.ModInfo;
|
||||||
import java.security.InvalidParameterException;
|
import java.security.InvalidParameterException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemPlates extends ItemMetaBase {
|
public class ItemPlates extends ItemTextureBase {
|
||||||
|
|
||||||
public static ItemStack getPlateByName(String name, int count) {
|
public static ItemStack getPlateByName(String name, int count) {
|
||||||
for (int i = 0; i < types.length; i++) {
|
for (int i = 0; i < types.length; i++) {
|
||||||
|
|
|
@ -10,7 +10,7 @@ import techreborn.lib.ModInfo;
|
||||||
import java.security.InvalidParameterException;
|
import java.security.InvalidParameterException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemPurifiedCrushedOre extends ItemMetaBase {
|
public class ItemPurifiedCrushedOre extends ItemTextureBase {
|
||||||
|
|
||||||
public static ItemStack getPurifiedCrushedOreByName(String name, int count) {
|
public static ItemStack getPurifiedCrushedOreByName(String name, int count) {
|
||||||
for (int i = 0; i < types.length; i++) {
|
for (int i = 0; i < types.length; i++) {
|
||||||
|
|
|
@ -4,7 +4,7 @@ package techreborn.items;
|
||||||
import reborncore.api.IItemTexture;
|
import reborncore.api.IItemTexture;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
|
|
||||||
public abstract class ItemMetaBase extends ItemTR implements IItemTexture {
|
public abstract class ItemTextureBase extends ItemTR implements IItemTexture {
|
||||||
@Override
|
@Override
|
||||||
public String getModID() {
|
public String getModID() {
|
||||||
return ModInfo.MOD_ID;
|
return ModInfo.MOD_ID;
|
|
@ -12,11 +12,12 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import techreborn.api.power.IEnergyItemInfo;
|
import techreborn.api.power.IEnergyItemInfo;
|
||||||
import techreborn.client.TechRebornCreativeTab;
|
import techreborn.client.TechRebornCreativeTab;
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
|
import techreborn.items.ItemTextureBase;
|
||||||
import techreborn.powerSystem.PoweredItem;
|
import techreborn.powerSystem.PoweredItem;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemCloakingDevice extends Item implements IEnergyItemInfo {
|
public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemInfo {
|
||||||
public static int Teir = ConfigTechReborn.CloakingDeviceTier;
|
public static int Teir = ConfigTechReborn.CloakingDeviceTier;
|
||||||
public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge;
|
public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge;
|
||||||
public static int Limit = 100;
|
public static int Limit = 100;
|
||||||
|
@ -105,4 +106,13 @@ public class ItemCloakingDevice extends Item implements IEnergyItemInfo {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getTextureName(int damage) {
|
||||||
|
return "techreborn:items/techreborn.cloakingdevice";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMaxMeta() {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue