tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge pull request #497 from TheJulianJES/3D-Fix

Browse source 
Fixed 3D on powerd items
This commit is contained in:
thatsIch 2014-11-26 21:06:58 +01:00
commit 1aeac3b989
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/appeng/items/tools/powered/ToolPortableCell.java
View file

@ -25,12 +25,13 @@ import java.util.Set;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.config.FuzzyMode; import appeng.api.config.FuzzyMode;
import appeng.api.implementations.guiobjects.IGuiItem; import appeng.api.implementations.guiobjects.IGuiItem;
@ -63,6 +64,13 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell,
maxStoredPower = AEConfig.instance.portableCellBattery; maxStoredPower = AEConfig.instance.portableCellBattery;
} }
@SideOnly(Side.CLIENT)
@Override
public boolean isFull3D()
{
return false;
}
@Override @Override
public ItemStack onItemRightClick( ItemStack item, World w, EntityPlayer player ) public ItemStack onItemRightClick( ItemStack item, World w, EntityPlayer player )
{ {

10
src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java
View file

@ -24,12 +24,13 @@ import java.util.List;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.config.Settings; import appeng.api.config.Settings;
import appeng.api.config.SortDir; import appeng.api.config.SortDir;
@ -56,6 +57,13 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
maxStoredPower = AEConfig.instance.wirelessTerminalBattery; maxStoredPower = AEConfig.instance.wirelessTerminalBattery;
} }
@SideOnly(Side.CLIENT)
@Override
public boolean isFull3D()
{
return false;
}
@Override @Override
public ItemStack onItemRightClick( ItemStack item, World w, EntityPlayer player ) public ItemStack onItemRightClick( ItemStack item, World w, EntityPlayer player )
{ {

1
src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java
View file

@ -49,6 +49,7 @@ public class AERootPoweredItem extends AEBaseItem implements IAEItemPowerStorage
super( c, subName ); super( c, subName );
setMaxDamage( 32 ); setMaxDamage( 32 );
hasSubtypes = false; hasSubtypes = false;
setFull3D();
} }
@Override @Override