This commit is contained in:
brandon3055 committed 2015-05-08 03:12:50 +10:00
1 parent c662bf9cfa
commit 5e56056999
26 files changed
+31 -16

No files matched your search

@@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11;
/**
* Created by Brandon on 9/02/2015.
*/
public class ParticleEnergyField extends EntityFX {//todo Fancy Animated Particle? Maby?
public class ParticleEnergyField extends EntityFX {
/**
* Particle Type 0 = Energy Ring, 1 = single particle
*/
@@ -51,7 +51,6 @@ public class RenderTileCrystal extends TileEntitySpecialRenderer {
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
GL11.glScalef(0.5f, 0.5f, 0.5f);
//GL11.glDisable(GL11.GL_LIGHTING); //todo disable?
RenderHelper.disableStandardItemLighting();
GL11.glEnable(GL11.GL_BLEND);
float innerLight = 100f;
@@ -30,7 +30,7 @@ public class InventoryTool implements IInventory {
this.player = player;
if (stack != null && stack.getItem() instanceof IInventoryTool){
this.size = ((IInventoryTool) stack.getItem()).getInventorySlots();
readFromNBT(ItemNBTHelper.getCompound(inventoryItem));
readFromNBT(ItemNBTHelper.getCompound(stack));
}
this.inventoryStacks = new ItemStack[size + 5];
}
@@ -126,10 +126,11 @@ public class InventoryTool implements IInventory {
inventoryStacks[i] = null;
}
}
if (player.getCommandSenderName().equals("brandon3055")) player.addChatComponentMessage(new ChatComponentText("markDirty " + inventoryItem + (player.worldObj.isRemote ? ":client" : ":server")));
if (inventoryItem != null) {
writeToNBT(ItemNBTHelper.getCompound(inventoryItem));
readFromNBT(ItemNBTHelper.getCompound(inventoryItem));
if (player.getCommandSenderName().equals("brandon3055")) player.addChatComponentMessage(new ChatComponentText("markDirty " + getItem() + (player.worldObj.isRemote ? ":client" : ":server")));
if (getItem() != null) {
writeToNBT(ItemNBTHelper.getCompound(getItem()));
readFromNBT(ItemNBTHelper.getCompound(getItem()));
}
else {
LogHelper.error("[InventoryItem] storage item == null This is not a good thing...");
@@ -146,6 +147,17 @@ public class InventoryTool implements IInventory {
return true;
}
private ItemStack getItem(){
if (slot != -1 && player.inventory.getStackInSlot(slot) != null && player.getHeldItem().getItem() == inventoryItem.getItem()){
return player.inventory.getStackInSlot(slot);
}
else {
LogHelper.error("Error getting inventory item [InventoryTool#getItem() - "+ slot +"]");
if (player.getCommandSenderName().equalsIgnoreCase("brandon3055")) player.addChatComponentMessage(new ChatComponentText("Error getting inventory item [InventoryTool#getItem() - "+ slot +"]"));
return null;
}
}
@Override
public void openInventory()
{
@@ -6,6 +6,7 @@ import com.brandon3055.draconicevolution.common.ModItems;
import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem;
import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.utills.*;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.ReflectionHelper;
@@ -277,6 +278,7 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo
{
list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorNVActive").readFromItem(stack, false));
list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorNVLock").readFromItem(stack, true));
if (Loader.isModLoaded("Thaumcraft"))list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "GogglesOfRevealing").readFromItem(stack, true));
}
else if (armorType == 1)
{
@@ -316,12 +318,12 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo
@Optional.Method(modid = "Thaumcraft")
@Override
public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player) {
return true;
return ItemNBTHelper.getBoolean(itemstack, "GogglesOfRevealing", true);
}
@Optional.Method(modid = "Thaumcraft")
@Override
public boolean showNodes(ItemStack itemstack, EntityLivingBase player) {
return true;
return ItemNBTHelper.getBoolean(itemstack, "GogglesOfRevealing", true);
}
}
@@ -5,7 +5,7 @@ package com.brandon3055.draconicevolution.common.lib;
*/
public class VersionHandler
{
public static final String VERSION = "1.0.1";
public static final String VERSION = "1.0.1a";
public static final int SNAPSHOT = 0;
public static final String MCVERSION = "1.7.10";