diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 697e4259..80867165 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -19,7 +19,7 @@ enderio.blockConduitBundle=Conduit Bundle enderio.blockConduitFacade=Conduit Facade item.enderio.itemConduitFacade.name=Conduit Facade item.enderio.itemConduitFacade.tooltip.detailed.line1=Painted in the Painting Machine -item.enderio.itemConduitFacade.tooltip.detailed.line2=Right click on a conduit to place +item.enderio.itemConduitFacade.tooltip.detailed.line2=R-Click on a conduit to place item.enderio.itemConduitFacade.tooltip.detailed.line3=Hidden when a wrench or conduit item.enderio.itemConduitFacade.tooltip.detailed.line4=is equipped @@ -196,7 +196,7 @@ tile.blockReservoir.tooltip.detailed.line1=Formed when placed 2x2x1 tile.blockReservoir.tooltip.detailed.line2=Add two buckets of water for tile.blockReservoir.tooltip.detailed.line3=an infinite water source tile.blockReservoir.tooltip.detailed.line4=Produces one bucket per second -tile.blockReservoir.tooltip.detailed.line5=Right click with a wrench to +tile.blockReservoir.tooltip.detailed.line5=R-Click with a wrench to tile.blockReservoir.tooltip.detailed.line6=enable auto-output tile.blockAlloySmelter.name=Alloy Smelter @@ -353,6 +353,11 @@ tile.blockSpawnGuard.name=Aversion Obelisk tile.blockSpawnGuard.tooltip.detailed.line1=Prevents mobs from spawning tile.blockSpawnGuard.tooltip.detailed.line2=within its area of effect +tile.blockExperienceObelisk.name=Experience Obelisk +tile.blockExperienceObelisk.tooltip.detailed.line1=When placed on a fluid tank +tile.blockExperienceObelisk.tooltip.detailed.line2=R-Click to use stored Liquid XP +tile.blockExperienceObelisk.tooltip.detailed.line3=Shift-R-Click with an empty hand +tile.blockExperienceObelisk.tooltip.detailed.line4=to drain player XP into the tank enderio.machine.tooltip.configured=(Configured) @@ -384,8 +389,8 @@ enderio.blockTravelPlatform.outOfRange=Destination out of range item.itemTravelStaff.name=Staff of Traveling item.itemTravelStaff.tooltip.detailed.line1=When held Travel Anchors and EnderIO item.itemTravelStaff.tooltip.detailed.line2=blocks become visible and can be -item.itemTravelStaff.tooltip.detailed.line3=activated by -item.itemTravelStaff.tooltip.detailed.line4= will teleport the +item.itemTravelStaff.tooltip.detailed.line3=activated by R-Click +item.itemTravelStaff.tooltip.detailed.line4=Shift-R-Click will teleport the item.itemTravelStaff.tooltip.detailed.line5=player a short distance enderio.itemTravelStaff.notEnoughPower=Not enough power @@ -420,7 +425,7 @@ item.itemYetaWrench.tooltip.detailed.line7=render a single conduit type item.itemMagnet.name=Electromagnet item.itemMagnet.tooltip.detailed.line1=Pulls nearby item towards you -item.itemMagnet.tooltip.detailed.line2=Shift+R-Click to enable / disable +item.itemMagnet.tooltip.detailed.line2=Shift-R-Click to enable / disable item.itemMagnet.tooltip.detailed.line3=Must be powered, active and in the item.itemMagnet.tooltip.detailed.line4=hot bar to function @@ -433,14 +438,14 @@ item.enderio.itemConduitProbe.tooltip.detailed.line5=R-Click to paste them item.enderio.itemConduitProbe.tooltip.detailed.line6=Use Shift-Mouse Wheel or 'Y' to change mode item.itemSoulVessel.name=Soul Vial -item.itemSoulVessel.tooltip.detailed.line1=Right-Click on a mob to +item.itemSoulVessel.tooltip.detailed.line1=R-Click on a mob to item.itemSoulVessel.tooltip.detailed.line2=capture its soul -item.itemSoulVessel.tooltip.detailed.line3=Click again to release it +item.itemSoulVessel.tooltip.detailed.line3=R-Click again to release it item.itemXpTransfer.name=Experience Rod item.itemXpTransfer.tooltip.detailed.line1=R-Click on a fluid tank containing item.itemXpTransfer.tooltip.detailed.line2=liquid XP to gain levels -item.itemXpTransfer.tooltip.detailed.line3=Shift R-Click to transfer levels to +item.itemXpTransfer.tooltip.detailed.line3=Shift-R-Click to transfer levels to item.itemXpTransfer.tooltip.detailed.line4=the tank skullZombieElectrode.name=Zombie Electrode @@ -498,7 +503,7 @@ enderio.darksteel.upgrade.jump_one.name=Jump enderio.darksteel.upgrade.jump_one.tooltip.detailed.line1=Increases step and jump height enderio.darksteel.upgrade.travel.name=Travel -enderio.darksteel.upgrade.travel.tooltip.detailed.line1=Hold shift and r-click to teleport or +enderio.darksteel.upgrade.travel.tooltip.detailed.line1=Hold shift and R-Click to teleport or enderio.darksteel.upgrade.travel.tooltip.detailed.line2=activate a travel anchor or Ender IO enderio.darksteel.upgrade.spoon.name=Spoon diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 230d6696..803afa07 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -104,6 +104,9 @@ import crazypants.enderio.machine.tank.TankItemRenderer; import crazypants.enderio.machine.tank.TileTank; import crazypants.enderio.machine.vacuum.BlockVacuumChest; import crazypants.enderio.machine.vacuum.VacuumChestRenderer; +import crazypants.enderio.machine.xp.BlockExperianceObelisk; +import crazypants.enderio.machine.xp.ExperienceObliskRenderer; +import crazypants.enderio.machine.xp.TileExperianceOblisk; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.FusedQuartzFrameRenderer; import crazypants.enderio.material.FusedQuartzRenderer; @@ -221,13 +224,16 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerBlockHandler(attRen); ClientRegistry.bindTileEntitySpecialRenderer(TileAttractor.class, attRen); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockAttractor), attRen); - - + SpawnGuardRenderer sgr = new SpawnGuardRenderer(); BlockSpawnGuard.renderId = BlockAttractor.renderId; ClientRegistry.bindTileEntitySpecialRenderer(TileSpawnGuard.class, sgr); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockSpawnGuard), sgr); - + + ExperienceObliskRenderer eor = new ExperienceObliskRenderer(); + BlockExperianceObelisk.renderId = BlockAttractor.renderId; + ClientRegistry.bindTileEntitySpecialRenderer(TileExperianceOblisk.class, eor); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockExperianceOblisk), eor); if(Config.useCombustionGenModel) { CombustionGeneratorModelRenderer cgmr = new CombustionGeneratorModelRenderer(); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 2f317e76..0bd21126 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -106,6 +106,7 @@ import crazypants.enderio.machine.still.VatRecipeManager; import crazypants.enderio.machine.tank.BlockTank; import crazypants.enderio.machine.vacuum.BlockVacuumChest; import crazypants.enderio.machine.wireless.BlockWirelessCharger; +import crazypants.enderio.machine.xp.BlockExperianceObelisk; import crazypants.enderio.machine.xp.ItemXpTransfer; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.BlockDarkIronBars; @@ -208,6 +209,7 @@ public class EnderIO { public static BlockSoulBinder blockSoulFuser; public static BlockAttractor blockAttractor; public static BlockSpawnGuard blockSpawnGuard; + public static BlockExperianceObelisk blockExperianceOblisk; public static BlockKillerJoe blockKillerJoe; @@ -309,6 +311,7 @@ public class EnderIO { blockKillerJoe = BlockKillerJoe.create(); blockAttractor = BlockAttractor.create(); blockSpawnGuard = BlockSpawnGuard.create(); + blockExperianceOblisk = BlockExperianceObelisk.create(); blockEnchanter = BlockEnchanter.create(); blockDarkSteelPressurePlate = BlockDarkSteelPressurePlate.create(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 578fa425..21ae1e58 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -55,6 +55,7 @@ public enum ModObject { blockSliceAndSplice, blockAttractor, blockSpawnGuard, + blockExperienceObelisk, blockPoweredSpawner, itemBrokenSpawner, diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 19dd9997..e470fd64 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -219,6 +219,12 @@ public class MachineRecipes { GameRegistry .addShapedRecipe(aversion, " c ", "ese", "sms", 's', soularium, 'm', machineChassi, 'c', tormentedEnderman, 'e', energeticAlloy); + //Experience + ItemStack xp = new ItemStack(EnderIO.blockExperianceOblisk); + ItemStack xpItem = new ItemStack(EnderIO.itemXpTransfer); + GameRegistry + .addShapedRecipe(aversion, " x ", " s ", "sms", 's', soularium, 'm', machineChassi, 'x', xpItem); + ClearConfigRecipe inst = new ClearConfigRecipe(); MinecraftForge.EVENT_BUS.register(inst); GameRegistry.addRecipe(inst); diff --git a/src/main/java/crazypants/enderio/machine/xp/BlockExperianceObelisk.java b/src/main/java/crazypants/enderio/machine/xp/BlockExperianceObelisk.java new file mode 100644 index 00000000..287b1aa6 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/xp/BlockExperianceObelisk.java @@ -0,0 +1,72 @@ +package crazypants.enderio.machine.xp; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.gui.IResourceTooltipProvider; +import crazypants.enderio.xp.IHaveExperience; +import crazypants.render.IconUtil; + +public class BlockExperianceObelisk extends BlockEio implements IResourceTooltipProvider { + + public static BlockExperianceObelisk create() { + BlockExperianceObelisk res = new BlockExperianceObelisk(); + res.init(); + return res; + } + + public static int renderId; + + private BlockExperianceObelisk() { + super(ModObject.blockExperienceObelisk.unlocalisedName, TileExperianceOblisk.class); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + if(ForgeDirection.getOrientation(side) == ForgeDirection.UP){ + return EnderIO.blockAttractor.getIcon(side,0); + } + return EnderIO.blockAttractor.getOnIcon(); + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public int getLightOpacity() { + return 0; + } + + @Override + public int getRenderType() { + return renderId; + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + ItemXpTransfer.onActivated(player, world, x, y - 1, z, side); + return true; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/xp/ExperienceObliskRenderer.java b/src/main/java/crazypants/enderio/machine/xp/ExperienceObliskRenderer.java new file mode 100644 index 00000000..4462210b --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/xp/ExperienceObliskRenderer.java @@ -0,0 +1,19 @@ +package crazypants.enderio.machine.xp; + +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import crazypants.enderio.EnderIO; +import crazypants.enderio.item.skull.BlockEndermanSkull; +import crazypants.enderio.machine.attractor.AttractorRenderer; +import crazypants.enderio.machine.spawnguard.TileSpawnGuard; + +public class ExperienceObliskRenderer extends AttractorRenderer { + + private ItemStack stack = new ItemStack(EnderIO.itemXpTransfer); + + @Override + protected ItemStack getFloatingStack(TileEntity te, double x, double y, double z, float tick) { + return stack; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/xp/ItemXpTransfer.java b/src/main/java/crazypants/enderio/machine/xp/ItemXpTransfer.java index 08c9897c..2727bc98 100644 --- a/src/main/java/crazypants/enderio/machine/xp/ItemXpTransfer.java +++ b/src/main/java/crazypants/enderio/machine/xp/ItemXpTransfer.java @@ -43,6 +43,10 @@ public class ItemXpTransfer extends Item implements IResourceTooltipProvider { @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { + return onActivated(player, world, x, y, z, side); + } + + public static boolean onActivated(EntityPlayer player, World world, int x, int y, int z, int side) { if(world.isRemote) { return false; } @@ -67,7 +71,7 @@ public class ItemXpTransfer extends Item implements IResourceTooltipProvider { return res; } - private boolean tranferFromBlockToPlayer(EntityPlayer player, World world, int x, int y, int z, int side) { + public static boolean tranferFromBlockToPlayer(EntityPlayer player, World world, int x, int y, int z, int side) { TileEntity te = world.getTileEntity(x, y, z); if(!(te instanceof IFluidHandler)) { return false; @@ -94,7 +98,7 @@ public class ItemXpTransfer extends Item implements IResourceTooltipProvider { return true; } - private boolean tranferFromPlayerToBlock(EntityPlayer player, World world, int x, int y, int z, int side) { + public static boolean tranferFromPlayerToBlock(EntityPlayer player, World world, int x, int y, int z, int side) { if(player.experienceTotal <= 0) { return false; diff --git a/src/main/java/crazypants/enderio/machine/xp/TileExperianceOblisk.java b/src/main/java/crazypants/enderio/machine/xp/TileExperianceOblisk.java new file mode 100644 index 00000000..715d1440 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/xp/TileExperianceOblisk.java @@ -0,0 +1,7 @@ +package crazypants.enderio.machine.xp; + +import net.minecraft.tileentity.TileEntity; + +public class TileExperianceOblisk extends TileEntity { + +}