Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finished ItemDDKey.

Browse source 
Refactored render manager since it only handles items.
This commit is contained in:
Michael Zanga 2016-08-02 15:32:28 -04:00
parent 0735aa7722
commit 17e9921bb4
4 changed files with 95 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/zixiken/dimdoors/DimDoors.java
View file

@ -5,7 +5,7 @@ import java.util.List;
import com.zixiken.dimdoors.items.*; import com.zixiken.dimdoors.items.*;
import com.zixiken.dimdoors.network.DimDoorsNetwork; import com.zixiken.dimdoors.network.DimDoorsNetwork;
import com.zixiken.dimdoors.render.BlockRenderManager; import com.zixiken.dimdoors.render.ItemRenderManager;
import com.zixiken.dimdoors.schematic.BlockRotator; import com.zixiken.dimdoors.schematic.BlockRotator;
import com.zixiken.dimdoors.blocks.TransientDoor; import com.zixiken.dimdoors.blocks.TransientDoor;
import com.zixiken.dimdoors.commands.CommandListDungeons; import com.zixiken.dimdoors.commands.CommandListDungeons;
@ -228,7 +228,7 @@ public class DimDoors {
DimDoorsNetwork.init(); DimDoorsNetwork.init();
BlockRenderManager.addModelVariants(); ItemRenderManager.addModelVariants();
} }
@Mod.EventHandler @Mod.EventHandler
@ -271,7 +271,7 @@ public class DimDoors {
DDLoot.registerInfo(properties); DDLoot.registerInfo(properties);
MinecraftForge.EVENT_BUS.register(new ConnectionHandler()); MinecraftForge.EVENT_BUS.register(new ConnectionHandler());
BlockRenderManager.registerBlockRenderers(); ItemRenderManager.registerItemRenderers();
} }
@Mod.EventHandler @Mod.EventHandler

177
src/main/java/com/zixiken/dimdoors/items/ItemDDKey.java
View file

@ -7,18 +7,18 @@ import com.zixiken.dimdoors.blocks.IDimDoor;
import com.zixiken.dimdoors.core.DDLock; import com.zixiken.dimdoors.core.DDLock;
import com.zixiken.dimdoors.core.DimLink; import com.zixiken.dimdoors.core.DimLink;
import com.zixiken.dimdoors.core.PocketManager; import com.zixiken.dimdoors.core.PocketManager;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction; import net.minecraft.item.EnumAction;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
import com.zixiken.dimdoors.watcher.ClientLinkData; import com.zixiken.dimdoors.watcher.ClientLinkData;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemDDKey extends Item { public class ItemDDKey extends Item {
public static final int TIME_TO_UNLOCK = 30; public static final int TIME_TO_UNLOCK = 30;
@ -31,98 +31,47 @@ public class ItemDDKey extends Item {
setUnlocalizedName(ID); setUnlocalizedName(ID);
} }
public void onCreated(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
{ if (DDLock.hasCreatedLock(stack)) tooltip.add(StatCollector.translateToLocal("info.riftkey.bound"));
else tooltip.add(StatCollector.translateToLocal("info.riftkey.unbound"));
}
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
{
if (DDLock.hasCreatedLock(par1ItemStack))
{
par3List.add(StatCollector.translateToLocal("info.riftkey.bound"));
}
else
{
par3List.add(StatCollector.translateToLocal("info.riftkey.unbound"));
}
}
@Override
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(DimDoors.modid + ":" + this.getUnlocalizedName().replace("item.", ""));
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack par1ItemStack) public boolean hasEffect(ItemStack stack) {return !DDLock.hasCreatedLock(stack);}
{
return !DDLock.hasCreatedLock(par1ItemStack);
}
public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World par3World, int par4, int par5, int par6, int par7, float par8, float par9,
float par10)
{
player.setItemInUse(itemStack, this.getMaxItemUseDuration(itemStack));
@Override
public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos,
EnumFacing side, float hitX, float hitY, float hitZ) {
playerIn.setItemInUse(stack, this.getMaxItemUseDuration(stack));
return false; return false;
} }
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float playerX, float playerY, @Override
float playerZ) public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos,
{ EnumFacing side, float hitX, float hitY, float hitZ) {
if (world.isRemote) if (world.isRemote) return false;
{ if (player.inventory.getCurrentItem() != null) return true;
return false;
}
if (player.inventory.getCurrentItem() != null)
{
return true;
}
Block block = world.getBlock(x, y, z);
// make sure we are dealing with a door // make sure we are dealing with a door
if (!(block instanceof IDimDoor)) if (!(world.getBlockState(pos).getBlock() instanceof IDimDoor)) return false;
{
return false;
}
DimLink link = PocketManager.getLink(x, y, z, world); DimLink link = PocketManager.getLink(pos, world);
// dont do anything to doors without links // dont do anything to doors without links
if (link == null) if (link == null) return false;
{
return false;
}
// what to do if the door has a lock already // what to do if the door has a lock already
if (link.hasLock()) if (link.hasLock()) {
{ if (link.doesKeyUnlock(stack)) {
if (link.doesKeyUnlock(itemStack)) if (link.getLockState()) world.playSoundAtEntity(player, DimDoors.MODID + ":keyUnlock", 1F, 1F);
{ else world.playSoundAtEntity(player, DimDoors.MODID + ":keyLock", 1F, 1F);
if (link.getLockState())
{
world.playSoundAtEntity(player, DimDoors.modid + ":keyUnlock", 1F, 1F);
}
else
{
world.playSoundAtEntity(player, DimDoors.modid + ":keyLock", 1F, 1F);
}
PocketManager.getDimensionData(world).lock(link, !link.getLockState()); PocketManager.getDimensionData(world).lock(link, !link.getLockState());
PocketManager.getLinkWatcher().update(new ClientLinkData(link)); PocketManager.getLinkWatcher().update(new ClientLinkData(link));
} else world.playSoundAtEntity(player, DimDoors.MODID + ":doorLocked", 1F, 1F);
} } else {
else if (!DDLock.hasCreatedLock(stack)) {
{ world.playSoundAtEntity(player, DimDoors.MODID + ":keyLock", 1F, 1F);
world.playSoundAtEntity(player, DimDoors.modid + ":doorLocked", 1F, 1F); PocketManager.getDimensionData(world).createLock(link, stack, world.rand.nextInt(Integer.MAX_VALUE));
}
}
else
{
if (!DDLock.hasCreatedLock(itemStack))
{
world.playSoundAtEntity(player, DimDoors.modid + ":keyLock", 1F, 1F);
PocketManager.getDimensionData(world).createLock(link, itemStack, world.rand.nextInt(Integer.MAX_VALUE));
PocketManager.getLinkWatcher().update(new ClientLinkData(link)); PocketManager.getLinkWatcher().update(new ClientLinkData(link));
} }
} }
@ -133,75 +82,45 @@ public class ItemDDKey extends Item {
* Handle removal of locks here * Handle removal of locks here
*/ */
@Override @Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int heldTime) public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int heldTime) {
{ if(world.isRemote) return;
int j = this.getMaxItemUseDuration(itemStack) - heldTime; int j = this.getMaxItemUseDuration(itemStack) - heldTime;
if (j >= TIME_TO_UNLOCK) if (j >= TIME_TO_UNLOCK) {
{
//Raytrace to make sure we are still looking at a door //Raytrace to make sure we are still looking at a door
MovingObjectPosition pos = getMovingObjectPositionFromPlayer(player.worldObj, player, true); MovingObjectPosition pos = getMovingObjectPositionFromPlayer(player.worldObj, player, true);
if (pos != null && pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) if (pos != null && pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
{ //make sure we have a link, it has a lock, and the given key is able to access the lock
//make sure we have a link and it has a lock DimLink link = PocketManager.getLink(pos.getBlockPos(), player.worldObj);
DimLink link = PocketManager.getLink(pos.blockX, pos.blockY, pos.blockZ, player.worldObj); if (link != null && link.hasLock() && link.doesKeyUnlock(itemStack)) {
if (link != null && link.hasLock()) PocketManager.getDimensionData(world).removeLock(link, itemStack);
{ world.playSoundAtEntity(player, DimDoors.MODID + ":doorLockRemoved", 1F, 1F);
//make sure the given key is able to access the lock
if (link.doesKeyUnlock(itemStack) && !world.isRemote)
{
PocketManager.getDimensionData(world).removeLock(link, itemStack);
world.playSoundAtEntity(player, DimDoors.modid + ":doorLockRemoved", 1F, 1F);
}
} }
} }
} }
player.clearItemInUse(); player.clearItemInUse();
} }
/** /**
* Raytrace to make sure we are still looking at the right block while preparing to remove the lock * Raytrace to make sure we are still looking at the right block while preparing to remove the lock
*/ */
@Override @Override
public void onUsingTick(ItemStack stack, EntityPlayer player, int count) public void onUsingTick(ItemStack stack, EntityPlayer player, int count) {
{
// no need to check every tick, twice a second instead // no need to check every tick, twice a second instead
if (count % 10 == 0) if (count % 10 == 0) {
{
MovingObjectPosition pos = getMovingObjectPositionFromPlayer(player.worldObj, player, true); MovingObjectPosition pos = getMovingObjectPositionFromPlayer(player.worldObj, player, true);
if (pos != null && pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) if (pos != null && pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
{ DimLink link = PocketManager.getLink(pos.getBlockPos(), player.worldObj);
DimLink link = PocketManager.getLink(pos.blockX, pos.blockY, pos.blockZ, player.worldObj); if (link != null && link.hasLock() && link.doesKeyUnlock(stack)) return;
if (link != null && link.hasLock())
{
if (link.doesKeyUnlock(stack))
{
return;
}
}
} }
player.clearItemInUse(); player.clearItemInUse();
} }
} }
public EnumAction getItemUseAction(ItemStack par1ItemStack) public EnumAction getItemUseAction(ItemStack par1ItemStack) {return EnumAction.BOW;}
{
return EnumAction.bow;
}
public ItemStack onEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) public int getMaxItemUseDuration(ItemStack par1ItemStack) {return 72000;}
{
return par1ItemStack;
}
public int getMaxItemUseDuration(ItemStack par1ItemStack) public String getItemStackDisplayName(ItemStack stack) {
{ return StatCollector.translateToLocal(this.getUnlocalizedName(stack));
return 72000;
}
public String getItemStackDisplayName(ItemStack par1ItemStack)
{
return StatCollector.translateToLocal(this.getUnlocalizedName(par1ItemStack));
} }
} }

41
src/main/java/com/zixiken/dimdoors/render/BlockRenderManager.java
View file

@ -1,41 +0,0 @@
package com.zixiken.dimdoors.render;
import com.zixiken.dimdoors.DimDoors;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
public class BlockRenderManager {
private static final String ID = DimDoors.MODID;
public static void registerBlockRenderers() {
register(DimDoors.blockDimWall);
register(DimDoors.blockDimWall, 1, "Ancient");
register(DimDoors.blockDimWall, 2, "Altered");
register(DimDoors.blockDimWallPerm);
register(DimDoors.blockLimbo);
}
public static void addModelVariants() {
ModelBakery.registerItemVariants(Item.getItemFromBlock(DimDoors.blockDimWall),
new ResourceLocation(ID + ":blockDimWall"),
new ResourceLocation(ID + ":blockDimWallAncient"),
new ResourceLocation(ID + ":blockDimWallAltered"));
}
private static void register(Block block) {
Minecraft.getMinecraft().getRenderItem().getItemModelMesher()
.register(Item.getItemFromBlock(block), 0,
new ModelResourceLocation(ID + ':' + block.getUnlocalizedName().substring(5), "inventory"));
}
private static void register(Block block, int meta, String name) {
Minecraft.getMinecraft().getRenderItem().getItemModelMesher()
.register(Item.getItemFromBlock(block), meta, new ModelResourceLocation(ID + ':' +
block.getUnlocalizedName().substring(5) + name, "inventory"));
}
}

44
src/main/java/com/zixiken/dimdoors/render/ItemRenderManager.java Normal file
View file

@ -0,0 +1,44 @@
package com.zixiken.dimdoors.render;
import com.zixiken.dimdoors.DimDoors;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import static net.minecraft.item.Item.getItemFromBlock;
public class ItemRenderManager {
private static final String ID = DimDoors.MODID;
public static void registerItemRenderers() {
//ItemBlock registration
register(getItemFromBlock(DimDoors.blockDimWall));
register(getItemFromBlock(DimDoors.blockDimWall), 1, "Ancient");
register(getItemFromBlock(DimDoors.blockDimWall), 2, "Altered");
register(getItemFromBlock(DimDoors.blockDimWallPerm));
register(getItemFromBlock(DimDoors.blockLimbo));
//Item registration
register(DimDoors.itemDDKey);
}
public static void addModelVariants() {
ModelBakery.registerItemVariants(getItemFromBlock(DimDoors.blockDimWall),
new ResourceLocation(ID + ":blockDimWall"),
new ResourceLocation(ID + ":blockDimWallAncient"),
new ResourceLocation(ID + ":blockDimWallAltered"));
}
private static void register(Item item) {
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0,
new ModelResourceLocation(ID + ':' + item.getUnlocalizedName().substring(5), "inventory"));
}
private static void register(Item item, int meta, String name) {
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, meta,
new ModelResourceLocation(ID + ':' + item.getUnlocalizedName().substring(5) + name, "inventory"));
}
}