diff --git a/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java b/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java index b0e6a86bd..4eb34f0ef 100644 --- a/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java @@ -28,6 +28,10 @@ public class KeyHandler { @SideOnly(Side.CLIENT) @SubscribeEvent public void key(InputEvent.KeyInputEvent event){ + checkAndPerformKeyActions(); + } + + private void checkAndPerformKeyActions(){ if (keyToggleRingOfLoki.isPressed()){ toggleRingLoki(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index b12a67040..37b8014bf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -82,6 +82,15 @@ public class BlockBifrost extends BlockModContainer implements ILex return 0; } + @SideOnly(Side.CLIENT) + public void loadTextures(TextureStitchEvent.Pre event) { + if(event.map.getTextureType() == 0) { + TextureAtlasSprite icon = new InterpolatedIcon("botania:bifrost"); + if(event.map.setTextureEntry("botania:bifrost", icon)) + blockIcon = icon; + } + } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) { @@ -101,12 +110,8 @@ public class BlockBifrost extends BlockModContainer implements ILex public class EventHandler { @SubscribeEvent @SideOnly(Side.CLIENT) - public void loadTextures(TextureStitchEvent.Pre event) { - if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new InterpolatedIcon("botania:bifrost"); - if(event.map.setTextureEntry("botania:bifrost", icon)) - blockIcon = icon; - } + public void loadTexturesWrapper(TextureStitchEvent.Pre event) { + BlockBifrost.this.loadTextures(event); } } } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 5811e2abc..09a0fd47a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -59,6 +59,19 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { // NO-OP } + @SideOnly(Side.CLIENT) + public void loadTextures(TextureStitchEvent.Pre event) { + if(event.map.getTextureType() == 0) { + TextureAtlasSprite icon = new InterpolatedIcon("botania:enchantedSoil0"); + if(event.map.setTextureEntry("botania:enchantedSoil0", icon)) + blockIcon = icon; + + icon = new InterpolatedIcon("botania:enchantedSoil1"); + if(event.map.setTextureEntry("botania:enchantedSoil1", icon)) + iconSide = icon; + } + } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { @@ -88,16 +101,8 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { public class EventHandler{ @SubscribeEvent @SideOnly(Side.CLIENT) - public void loadTextures(TextureStitchEvent.Pre event) { - if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new InterpolatedIcon("botania:enchantedSoil0"); - if(event.map.setTextureEntry("botania:enchantedSoil0", icon)) - blockIcon = icon; - - icon = new InterpolatedIcon("botania:enchantedSoil1"); - if(event.map.setTextureEntry("botania:enchantedSoil1", icon)) - iconSide = icon; - } + public void loadTexturesWrapper(TextureStitchEvent.Pre event) { + BlockEnchantedSoil.this.loadTextures(event); } } } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 099f47b01..b429f4708 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -85,22 +85,26 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { blockIcon = Blocks.pumpkin.getIcon(2, 0); } + public void onDrops(LivingDropsEvent event) { + if(event.entity instanceof EntityBlaze && event.entity.getEntityData().getBoolean(TAG_FEL_SPAWNED)) + if(event.drops.isEmpty()) + event.drops.add(new EntityItem(event.entity.worldObj, event.entity.posX, event.entity.posY, event.entity.posZ, new ItemStack(Items.blaze_powder, 6))); + else for(EntityItem item : event.drops) { + ItemStack stack = item.getEntityItem(); + if(stack.getItem() == Items.blaze_rod) + item.setEntityItemStack(new ItemStack(Items.blaze_powder, stack.stackSize * 10)); + } + } + @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { return LexiconData.gardenOfGlass; } - public static class EventHandler { + public class EventHandler { @SubscribeEvent - public void onDrops(LivingDropsEvent event) { - if(event.entity instanceof EntityBlaze && event.entity.getEntityData().getBoolean(TAG_FEL_SPAWNED)) - if(event.drops.isEmpty()) - event.drops.add(new EntityItem(event.entity.worldObj, event.entity.posX, event.entity.posY, event.entity.posZ, new ItemStack(Items.blaze_powder, 6))); - else for(EntityItem item : event.drops) { - ItemStack stack = item.getEntityItem(); - if(stack.getItem() == Items.blaze_rod) - item.setEntityItemStack(new ItemStack(Items.blaze_powder, stack.stackSize * 10)); - } + public void onDropsWrapper(LivingDropsEvent event) { + BlockFelPumpkin.this.onDrops(event); } } } diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 85f829aab..a8e168323 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -54,6 +54,36 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { blockIcon = IconHelper.forBlock(par1IconRegister, this); } + public void onMinecartUpdate(MinecartUpdateEvent event) { + int x = MathHelper.floor_double(event.entity.posX); + int y = MathHelper.floor_double(event.entity.posY); + int z = MathHelper.floor_double(event.entity.posZ); + Block block = event.entity.worldObj.getBlock(x, y, z); + boolean air = block.isAir(event.entity.worldObj, x, y, z); + int floatTicks = event.entity.getEntityData().getInteger(TAG_FLOAT_TICKS); + + if(block == this) + event.entity.getEntityData().setInteger(TAG_FLOAT_TICKS, 20); + else if(block instanceof BlockRailBase || block == ModBlocks.dreamwood) { + event.entity.getEntityData().setInteger(TAG_FLOAT_TICKS, 0); + if(floatTicks > 0) + event.entity.worldObj.playAuxSFX(2003, x, y, z, 0); + } + floatTicks = event.entity.getEntityData().getInteger(TAG_FLOAT_TICKS); + + if(floatTicks > 0) { + Block blockBelow = event.entity.worldObj.getBlock(x, y - 1, z); + boolean airBelow = blockBelow.isAir(event.entity.worldObj, x, y - 1, z); + if(air && airBelow || !air && !airBelow) + event.entity.noClip = true; + event.entity.motionY = 0.2; + event.entity.motionX *= 1.4; + event.entity.motionZ *= 1.4; + event.entity.getEntityData().setInteger(TAG_FLOAT_TICKS, floatTicks - 1); + event.entity.worldObj.playAuxSFX(2000, x, y, z, 0); + } else event.entity.noClip = false; + } + @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { return LexiconData.ghostRail; @@ -61,34 +91,8 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { public class EventHandler { @SubscribeEvent - public void onMinecartUpdate(MinecartUpdateEvent event) { - int x = MathHelper.floor_double(event.entity.posX); - int y = MathHelper.floor_double(event.entity.posY); - int z = MathHelper.floor_double(event.entity.posZ); - Block block = event.entity.worldObj.getBlock(x, y, z); - boolean air = block.isAir(event.entity.worldObj, x, y, z); - int floatTicks = event.entity.getEntityData().getInteger(TAG_FLOAT_TICKS); - - if(block == BlockGhostRail.this) - event.entity.getEntityData().setInteger(TAG_FLOAT_TICKS, 20); - else if(block instanceof BlockRailBase || block == ModBlocks.dreamwood) { - event.entity.getEntityData().setInteger(TAG_FLOAT_TICKS, 0); - if(floatTicks > 0) - event.entity.worldObj.playAuxSFX(2003, x, y, z, 0); - } - floatTicks = event.entity.getEntityData().getInteger(TAG_FLOAT_TICKS); - - if(floatTicks > 0) { - Block blockBelow = event.entity.worldObj.getBlock(x, y - 1, z); - boolean airBelow = blockBelow.isAir(event.entity.worldObj, x, y - 1, z); - if(air && airBelow || !air && !airBelow) - event.entity.noClip = true; - event.entity.motionY = 0.2; - event.entity.motionX *= 1.4; - event.entity.motionZ *= 1.4; - event.entity.getEntityData().setInteger(TAG_FLOAT_TICKS, floatTicks - 1); - event.entity.worldObj.playAuxSFX(2000, x, y, z, 0); - } else event.entity.noClip = false; + public void onMinecartUpdateWrapper(MinecartUpdateEvent event) { + BlockGhostRail.this.onMinecartUpdate(event); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index ae2bce046..916a63c37 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -141,6 +141,14 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl return true; } + public void onWorldLoad(WorldEvent.Load event) { + WorldData.get(event.world); + } + + public void onWorldUnload(WorldEvent.Unload event) { + WorldData.get(event.world).markDirty(); + } + public static class WorldData extends WorldSavedData { private static final String ID = "PistonRelayPairs"; @@ -185,6 +193,79 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } } + public void tickEnd(TickEvent event) { + if(event.type == Type.SERVER && event.phase == Phase.END) { + List coordsToCheckCopy = new ArrayList<>(coordsToCheck.keySet()); + for(String s : coordsToCheckCopy) { + decrCoords(s); + if(checkedCoords.contains(s)) + continue; + + Block block = getBlockAt(s); + if(block == Blocks.piston_extension) { + int meta = getBlockMetaAt(s); + boolean sticky = (meta & 8) == 8; + ForgeDirection dir = ForgeDirection.getOrientation(meta & ~8); + + MinecraftServer server = MinecraftServer.getServer(); + + if(server != null && getTimeInCoords(s) == 0) { + String newPos; + + { + String[] tokens = s.split(":"); + int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); + World world = server.worldServerForDimension(worldId); + if(world.isAirBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)) + world.setBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, ModBlocks.pistonRelay); + else if(!world.isRemote) { + ItemStack stack = new ItemStack(ModBlocks.pistonRelay); + world.spawnEntityInWorld(new EntityItem(world, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, stack)); + } + checkedCoords.add(s); + newPos = getCoordsAsString(world.provider.dimensionId, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ); + } + + if(mappedPositions.containsKey(s)) { + String pos = mappedPositions.get(s); + String[] tokens = pos.split(":"); + int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); + World world = server.worldServerForDimension(worldId); + + Block srcBlock = world.getBlock(x, y, z); + int srcMeta = world.getBlockMetadata(x, y, z); + TileEntity tile = world.getTileEntity(x, y, z); + Material mat = srcBlock.getMaterial(); + + if(!sticky && tile == null && mat.getMaterialMobility() == 0 && srcBlock.getBlockHardness(world, x, y, z) != -1 && !srcBlock.isAir(world, x, y, z)) { + Material destMat = world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ).getMaterial(); + if(world.isAirBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ) || destMat.isReplaceable()) { + world.setBlock(x, y, z, Blocks.air); + world.setBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, srcBlock, srcMeta, 1 | 2); + mappedPositions.put(s, getCoordsAsString(world.provider.dimensionId, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)); + } + } + + pos = mappedPositions.get(s); + mappedPositions.remove(s); + mappedPositions.put(newPos, pos); + save(world); + } + } + } + } + } + + // ConcurrentModificationException failsafe + ArrayList remove = new ArrayList<>(removeThese); + for(String s : remove) { + coordsToCheck.remove(s); + if(checkedCoords.contains(s)) + checkedCoords.remove(s); + } + removeThese.clear(); + } + public void save(World world) { WorldData data = WorldData.get(world); if(data != null) @@ -198,87 +279,18 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl public class EventHandler { @SubscribeEvent - public void onWorldLoad(WorldEvent.Load event) { - WorldData.get(event.world); + public void onWorldLoadWrapper(WorldEvent.Load event) { + BlockPistonRelay.this.onWorldLoad(event); } @SubscribeEvent - public void onWorldUnload(WorldEvent.Unload event) { - WorldData.get(event.world).markDirty(); + public void onWorldUnloadWrapper(WorldEvent.Unload event) { + BlockPistonRelay.this.onWorldUnload(event); } @SubscribeEvent - public void tickEnd(TickEvent event) { - if(event.type == Type.SERVER && event.phase == Phase.END) { - List coordsToCheckCopy = new ArrayList<>(coordsToCheck.keySet()); - for(String s : coordsToCheckCopy) { - decrCoords(s); - if(checkedCoords.contains(s)) - continue; - - Block block = getBlockAt(s); - if(block == Blocks.piston_extension) { - int meta = getBlockMetaAt(s); - boolean sticky = (meta & 8) == 8; - ForgeDirection dir = ForgeDirection.getOrientation(meta & ~8); - - MinecraftServer server = MinecraftServer.getServer(); - - if(server != null && getTimeInCoords(s) == 0) { - String newPos; - - { - String[] tokens = s.split(":"); - int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); - World world = server.worldServerForDimension(worldId); - if(world.isAirBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)) - world.setBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, ModBlocks.pistonRelay); - else if(!world.isRemote) { - ItemStack stack = new ItemStack(ModBlocks.pistonRelay); - world.spawnEntityInWorld(new EntityItem(world, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, stack)); - } - checkedCoords.add(s); - newPos = getCoordsAsString(world.provider.dimensionId, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ); - } - - if(mappedPositions.containsKey(s)) { - String pos = mappedPositions.get(s); - String[] tokens = pos.split(":"); - int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); - World world = server.worldServerForDimension(worldId); - - Block srcBlock = world.getBlock(x, y, z); - int srcMeta = world.getBlockMetadata(x, y, z); - TileEntity tile = world.getTileEntity(x, y, z); - Material mat = srcBlock.getMaterial(); - - if(!sticky && tile == null && mat.getMaterialMobility() == 0 && srcBlock.getBlockHardness(world, x, y, z) != -1 && !srcBlock.isAir(world, x, y, z)) { - Material destMat = world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ).getMaterial(); - if(world.isAirBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ) || destMat.isReplaceable()) { - world.setBlock(x, y, z, Blocks.air); - world.setBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, srcBlock, srcMeta, 1 | 2); - mappedPositions.put(s, getCoordsAsString(world.provider.dimensionId, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)); - } - } - - pos = mappedPositions.get(s); - mappedPositions.remove(s); - mappedPositions.put(newPos, pos); - save(world); - } - } - } - } - } - - // ConcurrentModificationException failsafe - ArrayList remove = new ArrayList<>(removeThese); - for(String s : remove) { - coordsToCheck.remove(s); - if(checkedCoords.contains(s)) - checkedCoords.remove(s); - } - removeThese.clear(); + public void tickEndWrapper(TickEvent event) { + BlockPistonRelay.this.tickEnd(event); } } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index ea4fa6742..0c5e61355 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -82,6 +82,15 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { icons[i] = IconHelper.forBlock(par1IconRegister, this, i); } + @SideOnly(Side.CLIENT) + public void loadTextures(TextureStitchEvent.Pre event) { + if(event.map.getTextureType() == 0) { + TextureAtlasSprite icon = new InterpolatedIcon("botania:prismarine0"); + if(event.map.setTextureEntry("botania:prismarine0", icon)) + icons[0] = icon; + } + } + @Override public IIcon getIcon(int par1, int par2) { return icons[Math.min(TYPES - 1, par2)]; @@ -101,12 +110,8 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { public class EventHandler { @SubscribeEvent @SideOnly(Side.CLIENT) - public void loadTextures(TextureStitchEvent.Pre event) { - if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new InterpolatedIcon("botania:prismarine0"); - if(event.map.setTextureEntry("botania:prismarine0", icon)) - icons[0] = icon; - } + public void loadTexturesWrapper(TextureStitchEvent.Pre event) { + BlockPrismarine.this.loadTextures(event); } } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java index 2b4e4565c..47d5fd30c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -39,6 +39,15 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable { MinecraftForge.EVENT_BUS.register(new EventHandler()); } + @SideOnly(Side.CLIENT) + public void loadTextures(TextureStitchEvent.Pre event) { + if(event.map.getTextureType() == 0) { + TextureAtlasSprite icon = new InterpolatedIcon("botania:shimmerrock"); + if(event.map.setTextureEntry("botania:shimmerrock", icon)) + blockIcon = icon; + } + } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) { @@ -53,12 +62,8 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable { public class EventHandler { @SubscribeEvent @SideOnly(Side.CLIENT) - public void loadTextures(TextureStitchEvent.Pre event) { - if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new InterpolatedIcon("botania:shimmerrock"); - if(event.map.setTextureEntry("botania:shimmerrock", icon)) - blockIcon = icon; - } + public void loadTexturesWrapper(TextureStitchEvent.Pre event) { + BlockShimmerrock.this.loadTextures(event); } } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java index 6ed63ad5b..f13935a5c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -38,6 +38,15 @@ public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { MinecraftForge.EVENT_BUS.register(new EventHandler()); } + @SideOnly(Side.CLIENT) + public void loadTextures(TextureStitchEvent.Pre event) { + if(event.map.getTextureType() == 0) { + TextureAtlasSprite icon = new InterpolatedIcon("botania:shimmerwoodPlanks"); + if(event.map.setTextureEntry("botania:shimmerwoodPlanks", icon)) + blockIcon = icon; + } + } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) { @@ -52,12 +61,8 @@ public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { public class EventHandler { @SubscribeEvent @SideOnly(Side.CLIENT) - public void loadTextures(TextureStitchEvent.Pre event) { - if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new InterpolatedIcon("botania:shimmerwoodPlanks"); - if(event.map.setTextureEntry("botania:shimmerwoodPlanks", icon)) - blockIcon = icon; - } + public void loadTexturesWrapper(TextureStitchEvent.Pre event) { + BlockShimmerwoodPlanks.this.loadTextures(event); } } } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index 653c063cd..2bc654b00 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -27,6 +27,15 @@ public class BlockBifrostPane extends BlockModPane { MinecraftForge.EVENT_BUS.register(new EventHandler()); } + @SideOnly(Side.CLIENT) + public void loadTextures(TextureStitchEvent.Pre event) { + if(event.map.getTextureType() == 0) { + TextureAtlasSprite icon = new InterpolatedIcon("botania:bifrostPermPane"); + if(event.map.setTextureEntry("botania:bifrostPermPane", icon)) + iconTop = icon; + } + } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister reg) { @@ -36,12 +45,8 @@ public class BlockBifrostPane extends BlockModPane { public class EventHandler { @SubscribeEvent @SideOnly(Side.CLIENT) - public void loadTextures(TextureStitchEvent.Pre event) { - if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new InterpolatedIcon("botania:bifrostPermPane"); - if(event.map.setTextureEntry("botania:bifrostPermPane", icon)) - iconTop = icon; - } + public void loadTexturesWrapper(TextureStitchEvent.Pre event) { + BlockBifrostPane.this.loadTextures(event); } } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 73a656d3e..2fe1ace31 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -29,6 +29,11 @@ public class BlockRedStringInterceptor extends BlockRedString { MinecraftForge.EVENT_BUS.register(new EventHandler()); } + public void onInteract(PlayerInteractEvent event) { + if(event.action == Action.RIGHT_CLICK_BLOCK) + TileRedStringInterceptor.onInteract(event.entityPlayer, event.world, event.x, event.y, event.z); + } + @Override public boolean canProvidePower() { return true; @@ -54,12 +59,11 @@ public class BlockRedStringInterceptor extends BlockRedString { return new TileRedStringInterceptor(); } - public static class EventHandler { + public class EventHandler { @SubscribeEvent - public void onInteract(PlayerInteractEvent event) { - if(event.action == Action.RIGHT_CLICK_BLOCK) - TileRedStringInterceptor.onInteract(event.entityPlayer, event.world, event.x, event.y, event.z); + public void onInteractWrapper(PlayerInteractEvent event) { + BlockRedStringInterceptor.this.onInteract(event); } } } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java index 7399ceb97..f72c0bc80 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -26,15 +26,19 @@ public class PotionAllure extends PotionMod { MinecraftForge.EVENT_BUS.register(new EventHandler()); } + public void onEntityUpdate(LivingUpdateEvent event) { + EntityLivingBase e = event.entityLiving; + if(e instanceof EntityPlayer && hasEffect(e)) { + EntityFishHook hook = ((EntityPlayer) e).fishEntity; + if(hook != null) + hook.onUpdate(); + } + } + public class EventHandler{ @SubscribeEvent - public void onEntityUpdate(LivingUpdateEvent event) { - EntityLivingBase e = event.entityLiving; - if(e instanceof EntityPlayer && hasEffect(e)) { - EntityFishHook hook = ((EntityPlayer) e).fishEntity; - if(hook != null) - hook.onUpdate(); - } + public void onEntityUpdateWrapper(LivingUpdateEvent event) { + PotionAllure.this.onEntityUpdate(event); } } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java index 04d954aec..1dd8f0548 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -29,20 +29,24 @@ public class PotionBloodthirst extends PotionMod { MinecraftForge.EVENT_BUS.register(new EventHandler()); } - public class EventHandler { - @SubscribeEvent - public void onSpawn(LivingSpawnEvent.CheckSpawn event) { - if (event.getResult() != Result.ALLOW && event.entityLiving instanceof IMob) { - double rangeSq = RANGE * RANGE; - for (Object o : event.world.playerEntities) { - EntityPlayer player = (EntityPlayer) o; - if (player.getDistanceSq(event.x, event.y, event.z) <= rangeSq - && hasEffect(player) && !hasEffect(player, ModPotions.emptiness)) { - event.setResult(Result.ALLOW); - return; - } + public void onSpawn(LivingSpawnEvent.CheckSpawn event) { + if (event.getResult() != Result.ALLOW && event.entityLiving instanceof IMob) { + double rangeSq = RANGE * RANGE; + for (Object o : event.world.playerEntities) { + EntityPlayer player = (EntityPlayer) o; + if (player.getDistanceSq(event.x, event.y, event.z) <= rangeSq + && hasEffect(player) && !hasEffect(player, ModPotions.emptiness)) { + event.setResult(Result.ALLOW); + return; } } } } + + public class EventHandler { + @SubscribeEvent + public void onSpawnWrapper(LivingSpawnEvent.CheckSpawn event) { + PotionBloodthirst.this.onSpawn(event); + } + } } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java index 847a03f76..0acb0a135 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -28,20 +28,24 @@ public class PotionEmptiness extends PotionMod { MinecraftForge.EVENT_BUS.register(new EventHandler()); } - public class EventHandler { - @SubscribeEvent - public void onSpawn(LivingSpawnEvent.CheckSpawn event) { - if (event.getResult() != Result.ALLOW && event.entityLiving instanceof IMob) { - double rangeSq = RANGE * RANGE; - for (Object o : event.world.playerEntities) { - EntityPlayer player = (EntityPlayer) o; - if (player.getDistanceSq(event.x, event.y, event.z) <= rangeSq + public void onSpawn(LivingSpawnEvent.CheckSpawn event) { + if (event.getResult() != Result.ALLOW && event.entityLiving instanceof IMob) { + double rangeSq = RANGE * RANGE; + for (Object o : event.world.playerEntities) { + EntityPlayer player = (EntityPlayer) o; + if (player.getDistanceSq(event.x, event.y, event.z) <= rangeSq && hasEffect(player)) { - event.setResult(Result.DENY); - return; - } + event.setResult(Result.DENY); + return; } } } } + + public class EventHandler { + @SubscribeEvent + public void onSpawnWrapper(LivingSpawnEvent.CheckSpawn event) { + PotionEmptiness.this.onSpawn(event); + } + } } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java index f339f027f..76790a01c 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -24,12 +24,16 @@ public class PotionFeatherfeet extends PotionMod { MinecraftForge.EVENT_BUS.register(new EventHandler()); } + public void onEntityUpdate(LivingUpdateEvent event) { + EntityLivingBase e = event.entityLiving; + if(hasEffect(e)) + e.fallDistance = 2.5F; + } + public class EventHandler { @SubscribeEvent - public void onEntityUpdate(LivingUpdateEvent event) { - EntityLivingBase e = event.entityLiving; - if(hasEffect(e)) - e.fallDistance = 2.5F; + public void onEntityUpdateWrapper(LivingUpdateEvent event) { + PotionFeatherfeet.this.onEntityUpdate(event); } } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java index a30d362cd..8b1148e5c 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -25,15 +25,19 @@ public class PotionSoulCross extends PotionMod { MinecraftForge.EVENT_BUS.register(new EventHandler()); } + public void onEntityKill(LivingDeathEvent event) { + Entity e = event.source.getEntity(); + if(e != null && e instanceof EntityLivingBase) { + EntityLivingBase living = (EntityLivingBase) e; + if(hasEffect(living)) + living.heal(event.entityLiving.getMaxHealth() / 20); + } + } + public class EventHandler { @SubscribeEvent - public void onEntityKill(LivingDeathEvent event) { - Entity e = event.source.getEntity(); - if(e != null && e instanceof EntityLivingBase) { - EntityLivingBase living = (EntityLivingBase) e; - if(hasEffect(living)) - living.heal(event.entityLiving.getMaxHealth() / 20); - } + public void onEntityKillWrapper(LivingDeathEvent event) { + PotionSoulCross.this.onEntityKill(event); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index e6705d37a..f978aafe9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -301,6 +301,17 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { ItemNBTHelper.setCompound(stack, TAG_STORED_RECIPE_PREFIX + pos, getLastCraftingCompound(stack, false)); } + public void onItemCrafted(ItemCraftedEvent event) { + if(!(event.craftMatrix instanceof InventoryCraftingHalo)) + return; + + for(int i = 0; i < event.player.inventory.getSizeInventory(); i++) { + ItemStack stack = event.player.inventory.getStackInSlot(i); + if(stack != null && stack.getItem() instanceof ItemCraftingHalo) + saveRecipeToStack(event, stack); + } + } + private void saveRecipeToStack(ItemCraftedEvent event, ItemStack stack) { NBTTagCompound cmp = new NBTTagCompound(); NBTTagCompound cmp1 = new NBTTagCompound(); @@ -380,6 +391,14 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { ItemNBTHelper.setFloat(stack, TAG_ROTATION_BASE, rotation); } + @SideOnly(Side.CLIENT) + public void onRenderWorldLast(RenderWorldLastEvent event) { + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + ItemStack stack = player.getCurrentEquippedItem(); + if(stack != null && stack.getItem() instanceof ItemCraftingHalo) + render(stack, player, event.partialTicks); + } + @SideOnly(Side.CLIENT) public void render(ItemStack stack, EntityPlayer player, float partialTicks) { Minecraft mc = Minecraft.getMinecraft(); @@ -587,24 +606,14 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { public class EventHandler{ @SubscribeEvent - public void onItemCrafted(ItemCraftedEvent event) { - if(!(event.craftMatrix instanceof InventoryCraftingHalo)) - return; - - for(int i = 0; i < event.player.inventory.getSizeInventory(); i++) { - ItemStack stack = event.player.inventory.getStackInSlot(i); - if(stack != null && stack.getItem() instanceof ItemCraftingHalo) - saveRecipeToStack(event, stack); - } + public void onItemCraftedWrapper(ItemCraftedEvent event) { + ItemCraftingHalo.this.onItemCrafted(event); } @SideOnly(Side.CLIENT) @SubscribeEvent - public void onRenderWorldLast(RenderWorldLastEvent event) { - EntityPlayer player = Minecraft.getMinecraft().thePlayer; - ItemStack stack = player.getCurrentEquippedItem(); - if(stack != null && stack.getItem() instanceof ItemCraftingHalo) - render(stack, player, event.partialTicks); + public void onRenderWorldLastWrapper(RenderWorldLastEvent event) { + ItemCraftingHalo.this.onRenderWorldLast(event); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 665edaaad..5b048cd22 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -170,6 +170,21 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { return true; } + public void onTickEnd(TickEvent.WorldTickEvent event) { + // Block swapper updates should only occur on the server + if(event.world.isRemote) + return; + + if(event.phase == Phase.END) { + int dim = event.world.provider.dimensionId; + if(blockSwappers.containsKey(dim)) { + Set swappers = blockSwappers.get(dim); + + swappers.removeIf(next -> next == null || !next.tick()); + } + } + } + /** * Adds a grass seed block swapper to the world at the provided positiona * and with the provided meta (which designates the type of the grass @@ -352,21 +367,10 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { return ISLAND_TYPES[Math.min(stack.getItemDamage(), ISLAND_TYPES.length - 1)]; } - public static class EventHandler { + public class EventHandler { @SubscribeEvent - public void onTickEnd(TickEvent.WorldTickEvent event) { - // Block swapper updates should only occur on the server - if(event.world.isRemote) - return; - - if(event.phase == Phase.END) { - int dim = event.world.provider.dimensionId; - if(blockSwappers.containsKey(dim)) { - Set swappers = blockSwappers.get(dim); - - swappers.removeIf(next -> next == null || !next.tick()); - } - } + public void onTickEndWrapper(TickEvent.WorldTickEvent event) { + ItemGrassSeeds.this.onTickEnd(event); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 742a7cfd6..d67b28e94 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -46,61 +46,69 @@ public class ItemKeepIvy extends ItemMod { FMLCommonHandler.instance().bus().register(handler); } - public static class EventHandler { - @SubscribeEvent - public void onPlayerDrops(PlayerDropsEvent event) { - List keeps = new ArrayList<>(); - for (EntityItem item : event.drops) { - ItemStack stack = item.getEntityItem(); - if (stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_KEEP, false)) - keeps.add(item); + public void onPlayerDrops(PlayerDropsEvent event) { + List keeps = new ArrayList<>(); + for (EntityItem item : event.drops) { + ItemStack stack = item.getEntityItem(); + if (stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_KEEP, false)) + keeps.add(item); + } + + if (!keeps.isEmpty()) { + event.drops.removeAll(keeps); + + + NBTTagCompound cmp = new NBTTagCompound(); + cmp.setInteger(TAG_DROP_COUNT, keeps.size()); + + int i = 0; + for (EntityItem keep : keeps) { + ItemStack stack = keep.getEntityItem(); + NBTTagCompound cmp1 = new NBTTagCompound(); + stack.writeToNBT(cmp1); + cmp.setTag(TAG_DROP_PREFIX + i, cmp1); + i++; } - if (!keeps.isEmpty()) { - event.drops.removeAll(keeps); + NBTTagCompound data = event.entityPlayer.getEntityData(); + if (!data.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) + data.setTag(EntityPlayer.PERSISTED_NBT_TAG, new NBTTagCompound()); + NBTTagCompound persist = data.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG); + persist.setTag(TAG_PLAYER_KEPT_DROPS, cmp); + } + } - NBTTagCompound cmp = new NBTTagCompound(); - cmp.setInteger(TAG_DROP_COUNT, keeps.size()); + public void onPlayerRespawn(PlayerRespawnEvent event) { + NBTTagCompound data = event.player.getEntityData(); + if (data.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) { + NBTTagCompound cmp = data.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG); + NBTTagCompound cmp1 = cmp.getCompoundTag(TAG_PLAYER_KEPT_DROPS); - int i = 0; - for (EntityItem keep : keeps) { - ItemStack stack = keep.getEntityItem(); - NBTTagCompound cmp1 = new NBTTagCompound(); - stack.writeToNBT(cmp1); - cmp.setTag(TAG_DROP_PREFIX + i, cmp1); - i++; + int count = cmp1.getInteger(TAG_DROP_COUNT); + for (int i = 0; i < count; i++) { + NBTTagCompound cmp2 = cmp1.getCompoundTag(TAG_DROP_PREFIX + i); + ItemStack stack = ItemStack.loadItemStackFromNBT(cmp2); + if (stack != null) { + ItemStack copy = stack.copy(); + ItemNBTHelper.setBoolean(copy, TAG_KEEP, false); + event.player.inventory.addItemStackToInventory(copy); } - - NBTTagCompound data = event.entityPlayer.getEntityData(); - if (!data.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) - data.setTag(EntityPlayer.PERSISTED_NBT_TAG, new NBTTagCompound()); - - NBTTagCompound persist = data.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG); - persist.setTag(TAG_PLAYER_KEPT_DROPS, cmp); } + + cmp.setTag(TAG_PLAYER_KEPT_DROPS, new NBTTagCompound()); + } + } + + public class EventHandler { + @SubscribeEvent + public void onPlayerDropsWrapper(PlayerDropsEvent event) { + ItemKeepIvy.this.onPlayerDrops(event); } @SubscribeEvent - public void onPlayerRespawn(PlayerRespawnEvent event) { - NBTTagCompound data = event.player.getEntityData(); - if (data.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) { - NBTTagCompound cmp = data.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG); - NBTTagCompound cmp1 = cmp.getCompoundTag(TAG_PLAYER_KEPT_DROPS); - - int count = cmp1.getInteger(TAG_DROP_COUNT); - for (int i = 0; i < count; i++) { - NBTTagCompound cmp2 = cmp1.getCompoundTag(TAG_DROP_PREFIX + i); - ItemStack stack = ItemStack.loadItemStackFromNBT(cmp2); - if (stack != null) { - ItemStack copy = stack.copy(); - ItemNBTHelper.setBoolean(copy, TAG_KEEP, false); - event.player.inventory.addItemStackToInventory(copy); - } - } - - cmp.setTag(TAG_PLAYER_KEPT_DROPS, new NBTTagCompound()); - } + public void onPlayerRespawnWrapper(PlayerRespawnEvent event) { + ItemKeepIvy.this.onPlayerRespawn(event); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java index b6875216c..05f3705b0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java @@ -36,15 +36,19 @@ public class ItemRegenIvy extends ItemMod { FMLCommonHandler.instance().bus().register(new EventHandler()); } - public static class EventHandler { + public void onTick(PlayerTickEvent event) { + if(event.phase == Phase.END && !event.player.worldObj.isRemote) + for(int i = 0; i < event.player.inventory.getSizeInventory(); i++) { + ItemStack stack = event.player.inventory.getStackInSlot(i); + if(stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_REGEN, false) && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, event.player, MANA_PER_DAMAGE, true)) + stack.setItemDamage(stack.getItemDamage() - 1); + } + } + + public class EventHandler { @SubscribeEvent(priority = EventPriority.LOWEST) - public void onTick(PlayerTickEvent event) { - if(event.phase == Phase.END && !event.player.worldObj.isRemote) - for(int i = 0; i < event.player.inventory.getSizeInventory(); i++) { - ItemStack stack = event.player.inventory.getStackInSlot(i); - if(stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_REGEN, false) && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, event.player, MANA_PER_DAMAGE, true)) - stack.setItemDamage(stack.getItemDamage() - 1); - } + public void onTickWrapper(PlayerTickEvent event) { + ItemRegenIvy.this.onTick(event); } } } diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index d6892b17d..f15e2faef 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -70,6 +70,18 @@ public class ItemVirus extends ItemMod { return false; } + public void onLivingHurt(LivingHurtEvent event) { + EntityLivingBase entity = event.entityLiving; + if(entity.ridingEntity instanceof EntityLivingBase) + entity = (EntityLivingBase) entity.ridingEntity; + + if(entity instanceof EntityHorse && event.source == DamageSource.fall) { + EntityHorse horse = (EntityHorse) entity; + if((horse.getHorseType() == 3 || horse.getHorseType() == 4) && horse.isTame()) + event.setCanceled(true); + } + } + @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tab, List list) { @@ -100,18 +112,10 @@ public class ItemVirus extends ItemMod { icons[i] = IconHelper.forItem(par1IconRegister, this, i); } - public static class EventHandler{ + public class EventHandler{ @SubscribeEvent - public void onLivingHurt(LivingHurtEvent event) { - EntityLivingBase entity = event.entityLiving; - if(entity.ridingEntity instanceof EntityLivingBase) - entity = (EntityLivingBase) entity.ridingEntity; - - if(entity instanceof EntityHorse && event.source == DamageSource.fall) { - EntityHorse horse = (EntityHorse) entity; - if((horse.getHorseType() == 3 || horse.getHorseType() == 4) && horse.isTame()) - event.setCanceled(true); - } + public void onLivingHurtWrapper(LivingHurtEvent event) { + ItemVirus.this.onLivingHurt(event); } } diff --git a/src/main/java/vazkii/botania/common/item/bag/ItemBagBase.java b/src/main/java/vazkii/botania/common/item/bag/ItemBagBase.java index 82f803ea3..deefef71e 100644 --- a/src/main/java/vazkii/botania/common/item/bag/ItemBagBase.java +++ b/src/main/java/vazkii/botania/common/item/bag/ItemBagBase.java @@ -30,6 +30,48 @@ public abstract class ItemBagBase extends ItemMod { MinecraftForge.EVENT_BUS.register(new EventHandler()); } + public void onPickupItem(EntityItemPickupEvent event) { + ItemStack stack = event.item.getEntityItem(); + if(stack.getItem() == Item.getItemFromBlock(getValidPickUp()) && stack.stackSize > 0) { + int color = stack.getItemDamage(); + if(color > 15) + return; + + for(int i = 0; i < event.entityPlayer.inventory.getSizeInventory(); i++) { + if(i == event.entityPlayer.inventory.currentItem) + continue; // prevent item deletion + + ItemStack invStack = event.entityPlayer.inventory.getStackInSlot(i); + if(invStack != null && invStack.getItem() == ItemBagBase.this) { + ItemStack[] bagInv = loadStacks(invStack); + ItemStack stackAt = bagInv[color]; + boolean didChange = false; + if(stackAt == null) { + bagInv[color] = stack.copy(); + stack.stackSize = 0; + didChange = true; + } else { + int stackAtSize = stackAt.stackSize; + int stackSize = stack.stackSize; + int spare = 64 - stackAtSize; + int pass = Math.min(spare, stackSize); + if(pass > 0) { + stackAt.stackSize += pass; + stack.stackSize -= pass; + didChange = true; + } + } + + if(didChange) + setStacks(invStack, bagInv); + } + + if(stack.stackSize == 0) + return; + } + } + } + @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { player.openGui(Botania.instance, getGuiID(), world, 0, 0, 0); @@ -108,46 +150,8 @@ public abstract class ItemBagBase extends ItemMod { public class EventHandler{ @SubscribeEvent - public void onPickupItem(EntityItemPickupEvent event) { - ItemStack stack = event.item.getEntityItem(); - if(stack.getItem() == Item.getItemFromBlock(getValidPickUp()) && stack.stackSize > 0) { - int color = stack.getItemDamage(); - if(color > 15) - return; - - for(int i = 0; i < event.entityPlayer.inventory.getSizeInventory(); i++) { - if(i == event.entityPlayer.inventory.currentItem) - continue; // prevent item deletion - - ItemStack invStack = event.entityPlayer.inventory.getStackInSlot(i); - if(invStack != null && invStack.getItem() == ItemBagBase.this) { - ItemStack[] bagInv = loadStacks(invStack); - ItemStack stackAt = bagInv[color]; - boolean didChange = false; - if(stackAt == null) { - bagInv[color] = stack.copy(); - stack.stackSize = 0; - didChange = true; - } else { - int stackAtSize = stackAt.stackSize; - int stackSize = stack.stackSize; - int spare = 64 - stackAtSize; - int pass = Math.min(spare, stackSize); - if(pass > 0) { - stackAt.stackSize += pass; - stack.stackSize -= pass; - didChange = true; - } - } - - if(didChange) - setStacks(invStack, bagInv); - } - - if(stack.stackSize == 0) - return; - } - } + public void onPickupItemWrapper(EntityItemPickupEvent event) { + ItemBagBase.this.onPickupItem(event); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 8f1c77d20..3bee65979 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -130,40 +130,43 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc } } - public class EventHandler { + public void onEntityAttacked(LivingHurtEvent event) { + Entity attacker = event.source.getEntity(); + if (attacker instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) attacker; + if (hasArmorSet(player)) { + boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Potion.blindness) && player.ridingEntity == null; + ItemStack stack = player.inventory.armorItemInSlot(3); + if (crit && stack != null && stack.getItem() instanceof ItemTerrasteelHelm) { + boolean ahrim = hasAncientWill(stack, 0); + boolean dharok = hasAncientWill(stack, 1); + boolean guthan = hasAncientWill(stack, 2); + boolean torag = hasAncientWill(stack, 3); + boolean verac = hasAncientWill(stack, 4); + boolean karil = hasAncientWill(stack, 5); - @SubscribeEvent - public void onEntityAttacked(LivingHurtEvent event) { - Entity attacker = event.source.getEntity(); - if (attacker instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) attacker; - if (hasArmorSet(player)) { - boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Potion.blindness) && player.ridingEntity == null; - ItemStack stack = player.inventory.armorItemInSlot(3); - if (crit && stack != null && stack.getItem() instanceof ItemTerrasteelHelm) { - boolean ahrim = hasAncientWill(stack, 0); - boolean dharok = hasAncientWill(stack, 1); - boolean guthan = hasAncientWill(stack, 2); - boolean torag = hasAncientWill(stack, 3); - boolean verac = hasAncientWill(stack, 4); - boolean karil = hasAncientWill(stack, 5); - - if (ahrim) - event.entityLiving.addPotionEffect(new PotionEffect(Potion.weakness.id, 20, 1)); - if (dharok) - event.ammount *= 1F + (1F - player.getHealth() / player.getMaxHealth()) * 0.5F; - if (guthan) - player.heal(event.ammount * 0.25F); - if (torag) - event.entityLiving.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 60, 1)); - if (verac) - event.source.setDamageBypassesArmor(); - if (karil) - event.entityLiving.addPotionEffect(new PotionEffect(Potion.wither.id, 60, 1)); - } + if (ahrim) + event.entityLiving.addPotionEffect(new PotionEffect(Potion.weakness.id, 20, 1)); + if (dharok) + event.ammount *= 1F + (1F - player.getHealth() / player.getMaxHealth()) * 0.5F; + if (guthan) + player.heal(event.ammount * 0.25F); + if (torag) + event.entityLiving.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 60, 1)); + if (verac) + event.source.setDamageBypassesArmor(); + if (karil) + event.entityLiving.addPotionEffect(new PotionEffect(Potion.wither.id, 60, 1)); } } } } + + public class EventHandler { + @SubscribeEvent + public void onEntityAttackedWrapper(LivingHurtEvent event) { + ItemTerrasteelHelm.this.onEntityAttacked(event); + } + } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index e5f9354e3..59feb5d73 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -49,6 +49,40 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble MinecraftForge.EVENT_BUS.register(new EventHandler()); } + public void onEntityDamaged(LivingHurtEvent event) { + if(event.source.getEntity() instanceof EntityPlayer && event.entityLiving instanceof EntityLiving && !event.entityLiving.worldObj.isRemote && Math.random() < 0.6F) { + EntityPlayer player = (EntityPlayer) event.source.getEntity(); + ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); + if(amulet != null && amulet.getItem() == this) { + final int cost = 250; + if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { + final int range = 20; + + List mobs = player.worldObj.getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range)); + if(mobs.size() > 1) { + if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.entityLiving, mobs)) { + if(event.entityLiving instanceof EntityCreeper) + ReflectionHelper.setPrivateValue(EntityCreeper.class, (EntityCreeper) event.entityLiving, 2, LibObfuscation.TIME_SINCE_IGNITED); + event.entityLiving.heal(event.entityLiving.getMaxHealth()); + if(event.entityLiving.isDead) + event.entityLiving.isDead = false; + + ManaItemHandler.requestManaExact(amulet, player, cost, true); + player.worldObj.playSoundAtEntity(player, "botania:divaCharm", 1F, 1F); + + double x = event.entityLiving.posX; + double y = event.entityLiving.posY; + double z = event.entityLiving.posZ; + + for(int i = 0; i < 50; i++) + Botania.proxy.sparkleFX(event.entityLiving.worldObj, x + Math.random() * event.entityLiving.width, y + Math.random() * event.entityLiving.height, z + Math.random() * event.entityLiving.width, 1F, 1F, 0.25F, 1F, 3); + } + } + } + } + } + } + @Override public BaubleType getBaubleType(ItemStack arg0) { return BaubleType.AMULET; @@ -81,37 +115,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble public class EventHandler { @SubscribeEvent public void onEntityDamaged(LivingHurtEvent event) { - if(event.source.getEntity() instanceof EntityPlayer && event.entityLiving instanceof EntityLiving && !event.entityLiving.worldObj.isRemote && Math.random() < 0.6F) { - EntityPlayer player = (EntityPlayer) event.source.getEntity(); - ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); - if(amulet != null && amulet.getItem() == ItemDivaCharm.this) { - final int cost = 250; - if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { - final int range = 20; - - List mobs = player.worldObj.getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range)); - if(mobs.size() > 1) { - if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.entityLiving, mobs)) { - if(event.entityLiving instanceof EntityCreeper) - ReflectionHelper.setPrivateValue(EntityCreeper.class, (EntityCreeper) event.entityLiving, 2, LibObfuscation.TIME_SINCE_IGNITED); - event.entityLiving.heal(event.entityLiving.getMaxHealth()); - if(event.entityLiving.isDead) - event.entityLiving.isDead = false; - - ManaItemHandler.requestManaExact(amulet, player, cost, true); - player.worldObj.playSoundAtEntity(player, "botania:divaCharm", 1F, 1F); - - double x = event.entityLiving.posX; - double y = event.entityLiving.posY; - double z = event.entityLiving.posZ; - - for(int i = 0; i < 50; i++) - Botania.proxy.sparkleFX(event.entityLiving.worldObj, x + Math.random() * event.entityLiving.width, y + Math.random() * event.entityLiving.height, z + Math.random() * event.entityLiving.width, 1F, 1F, 0.25F, 1F, 3); - } - } - } - } - } + ItemDivaCharm.this.onEntityDamaged(event); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 58827da10..ffc2e5e72 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -219,6 +219,101 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } } + public void updatePlayerFlyStatus(LivingUpdateEvent event) { + if(event.entityLiving instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.entityLiving; + ItemStack tiara = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); + int left = ItemNBTHelper.getInt(tiara, TAG_TIME_LEFT, MAX_FLY_TIME); + + if(playersWithFlight.contains(playerStr(player))) { + if(shouldPlayerHaveFlight(player)) { + player.capabilities.allowFlying = true; + if(player.capabilities.isFlying) { + if(!player.worldObj.isRemote) + ManaItemHandler.requestManaExact(tiara, player, getCost(tiara, left), true); + else if(Math.abs(player.motionX) > 0.1 || Math.abs(player.motionZ) > 0.1) { + double x = event.entityLiving.posX - 0.5; + double y = event.entityLiving.posY - 1.7; + double z = event.entityLiving.posZ - 0.5; + + player.getGameProfile().getName(); + float r = 1F; + float g = 1F; + float b = 1F; + + switch(tiara.getItemDamage()) { + case 2 : { + r = 0.1F; + g = 0.1F; + b = 0.1F; + break; + } + case 3 : { + r = 0F; + g = 0.6F; + break; + } + case 4 : { + g = 0.3F; + b = 0.3F; + break; + } + case 5 : { + r = 0.6F; + g = 0F; + b = 0.6F; + break; + } + case 6 : { + r = 0.4F; + g = 0F; + b = 0F; + break; + } + case 7 : { + r = 0.2F; + g = 0.6F; + b = 0.2F; + break; + } + case 8 : { + r = 0.85F; + g = 0.85F; + b = 0F; + break; + } + case 9 : { + r = 0F; + b = 0F; + break; + } + } + + for(int i = 0; i < 2; i++) + Botania.proxy.sparkleFX(event.entityLiving.worldObj, x + Math.random() * event.entityLiving.width, y + Math.random() * 0.4, z + Math.random() * event.entityLiving.width, r, g, b, 2F * (float) Math.random(), 20); + } + } + } else { + if(!player.capabilities.isCreativeMode) { + player.capabilities.allowFlying = false; + player.capabilities.isFlying = false; + player.capabilities.disableDamage = false; + } + playersWithFlight.remove(playerStr(player)); + } + } else if(shouldPlayerHaveFlight(player)) { + playersWithFlight.add(playerStr(player)); + player.capabilities.allowFlying = true; + } + } + } + + public void playerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { + String username = event.player.getGameProfile().getName(); + playersWithFlight.remove(username + ":false"); + playersWithFlight.remove(username + ":true"); + } + public static String playerStr(EntityPlayer player) { return player.getGameProfile().getName() + ":" + player.worldObj.isRemote; } @@ -453,102 +548,15 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub return stack.getItemDamage() == 1 ? ModAchievements.tiaraWings : null; } - public class EventHandler{ + public class EventHandler { @SubscribeEvent - public void updatePlayerFlyStatus(LivingUpdateEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - ItemStack tiara = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); - int left = ItemNBTHelper.getInt(tiara, TAG_TIME_LEFT, MAX_FLY_TIME); - - if(playersWithFlight.contains(playerStr(player))) { - if(shouldPlayerHaveFlight(player)) { - player.capabilities.allowFlying = true; - if(player.capabilities.isFlying) { - if(!player.worldObj.isRemote) - ManaItemHandler.requestManaExact(tiara, player, getCost(tiara, left), true); - else if(Math.abs(player.motionX) > 0.1 || Math.abs(player.motionZ) > 0.1) { - double x = event.entityLiving.posX - 0.5; - double y = event.entityLiving.posY - 1.7; - double z = event.entityLiving.posZ - 0.5; - - player.getGameProfile().getName(); - float r = 1F; - float g = 1F; - float b = 1F; - - switch(tiara.getItemDamage()) { - case 2 : { - r = 0.1F; - g = 0.1F; - b = 0.1F; - break; - } - case 3 : { - r = 0F; - g = 0.6F; - break; - } - case 4 : { - g = 0.3F; - b = 0.3F; - break; - } - case 5 : { - r = 0.6F; - g = 0F; - b = 0.6F; - break; - } - case 6 : { - r = 0.4F; - g = 0F; - b = 0F; - break; - } - case 7 : { - r = 0.2F; - g = 0.6F; - b = 0.2F; - break; - } - case 8 : { - r = 0.85F; - g = 0.85F; - b = 0F; - break; - } - case 9 : { - r = 0F; - b = 0F; - break; - } - } - - for(int i = 0; i < 2; i++) - Botania.proxy.sparkleFX(event.entityLiving.worldObj, x + Math.random() * event.entityLiving.width, y + Math.random() * 0.4, z + Math.random() * event.entityLiving.width, r, g, b, 2F * (float) Math.random(), 20); - } - } - } else { - if(!player.capabilities.isCreativeMode) { - player.capabilities.allowFlying = false; - player.capabilities.isFlying = false; - player.capabilities.disableDamage = false; - } - playersWithFlight.remove(playerStr(player)); - } - } else if(shouldPlayerHaveFlight(player)) { - playersWithFlight.add(playerStr(player)); - player.capabilities.allowFlying = true; - } - } + public void updatePlayerFlyStatusWrapper(LivingUpdateEvent event) { + ItemFlightTiara.this.updatePlayerFlyStatus(event); } @SubscribeEvent - public void playerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { - String username = event.player.getGameProfile().getName(); - playersWithFlight.remove(username + ":false"); - playersWithFlight.remove(username + ":true"); + public void playerLoggedOutWrapper(PlayerEvent.PlayerLoggedOutEvent event) { + ItemFlightTiara.this.playerLoggedOut(event); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java index 4d617a21e..c2f977645 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java @@ -41,6 +41,22 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { MinecraftForge.EVENT_BUS.register(new EventHandler()); } + public void onPlayerDeath(LivingDeathEvent event) { + if(event.entity instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.entity; + ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); + + if(amulet != null && amulet.getItem() == ItemGoldenLaurel.this) { + event.setCanceled(true); + player.setHealth(player.getMaxHealth()); + player.addPotionEffect(new PotionEffect(Potion.resistance.id, 300, 6)); + player.addChatMessage(new ChatComponentTranslation("botaniamisc.savedByLaurel")); + player.worldObj.playSoundAtEntity(player, "botania:goldenLaurel", 1F, 0.3F); + PlayerHandler.getPlayerBaubles(player).setInventorySlotContents(0, null); + } + } + } + @Override public BaubleType getBaubleType(ItemStack itemstack) { return BaubleType.AMULET; @@ -71,20 +87,8 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { public class EventHandler{ @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onPlayerDeath(LivingDeathEvent event) { - if(event.entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entity; - ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); - - if(amulet != null && amulet.getItem() == ItemGoldenLaurel.this) { - event.setCanceled(true); - player.setHealth(player.getMaxHealth()); - player.addPotionEffect(new PotionEffect(Potion.resistance.id, 300, 6)); - player.addChatMessage(new ChatComponentTranslation("botaniamisc.savedByLaurel")); - player.worldObj.playSoundAtEntity(player, "botania:goldenLaurel", 1F, 0.3F); - PlayerHandler.getPlayerBaubles(player).setInventorySlotContents(0, null); - } - } + public void onPlayerDeathWrapper(LivingDeathEvent event) { + ItemGoldenLaurel.this.onPlayerDeath(event); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 4e021a86e..d2829b6a8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -52,6 +52,24 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { super(name); } + public void onPlayerDamage(LivingHurtEvent event) { + if(event.entityLiving instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.entityLiving; + InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); + ItemStack belt = baubles.getStackInSlot(3); + if(belt != null && belt.getItem() instanceof ItemHolyCloak && !isInEffect(belt)) { + ItemHolyCloak cloak = (ItemHolyCloak) belt.getItem(); + int cooldown = getCooldown(belt); + + // Used to prevent StackOverflows with mobs that deal damage when damaged + setInEffect(belt, true); + if(cooldown == 0 && cloak.effectOnDamage(event, player, belt)) + setCooldown(belt, cloak.getCooldownTime(belt)); + setInEffect(belt, false); + } + } + } + @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { int cooldown = getCooldown(stack); @@ -124,24 +142,10 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { } } - public static class EventHandler{ + public class EventHandler{ @SubscribeEvent - public void onPlayerDamage(LivingHurtEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); - ItemStack belt = baubles.getStackInSlot(3); - if(belt != null && belt.getItem() instanceof ItemHolyCloak && !isInEffect(belt)) { - ItemHolyCloak cloak = (ItemHolyCloak) belt.getItem(); - int cooldown = getCooldown(belt); - - // Used to prevent StackOverflows with mobs that deal damage when damaged - setInEffect(belt, true); - if(cooldown == 0 && cloak.effectOnDamage(event, player, belt)) - setCooldown(belt, cloak.getCooldownTime(belt)); - setInEffect(belt, false); - } - } + public void onPlayerDamageWrapper(LivingHurtEvent event) { + ItemHolyCloak.this.onPlayerDamage(event); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index f40b74657..fd727a2f1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -75,6 +75,17 @@ public class ItemMagnetRing extends ItemBauble { return getCooldown(stack) <= 0 ? itemIcon : iconOff; } + public void onTossItem(ItemTossEvent event) { + InventoryBaubles inv = PlayerHandler.getPlayerBaubles(event.player); + for(int i = 0; i < inv.getSizeInventory(); i++) { + ItemStack stack = inv.getStackInSlot(i); + if(stack != null && stack.getItem() instanceof ItemMagnetRing) { + setCooldown(stack, 100); + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(event.player, i); + } + } + } + @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { super.onWornTick(stack, player); @@ -154,17 +165,10 @@ public class ItemMagnetRing extends ItemBauble { return BaubleType.RING; } - public static class EventHandler{ + public class EventHandler{ @SubscribeEvent - public void onTossItem(ItemTossEvent event) { - InventoryBaubles inv = PlayerHandler.getPlayerBaubles(event.player); - for(int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack stack = inv.getStackInSlot(i); - if(stack != null && stack.getItem() instanceof ItemMagnetRing) { - setCooldown(stack, 100); - BotaniaAPI.internalHandler.sendBaubleUpdatePacket(event.player, i); - } - } + public void onTossItemWrapper(ItemTossEvent event) { + ItemMagnetRing.this.onTossItem(event); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 9550da7b7..de424bead 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -70,6 +70,40 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs return BaubleType.BELT; } + public void updatePlayerStepStatus(LivingUpdateEvent event) { + if(event.entityLiving instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.entityLiving; + String s = playerStr(player); + + ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); + if(playersWithStepup.contains(s)) { + if(shouldPlayerHaveStepup(player)) { + ItemTravelBelt beltItem = (ItemTravelBelt) belt.getItem(); + + if((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F && !player.isInsideOfMaterial(Material.water)) { + float speed = beltItem.getSpeed(belt); + player.moveFlying(0F, 1F, player.capabilities.isFlying ? speed : speed); + beltItem.onMovedTick(belt, player); + + if(player.ticksExisted % COST_INTERVAL == 0) + ManaItemHandler.requestManaExact(belt, player, COST, true); + } else beltItem.onNotMovingTick(belt, player); + + if(player.isSneaking()) + player.stepHeight = 0.50001F; // Not 0.5F because that is the default + else player.stepHeight = 1F; + + } else { + player.stepHeight = 0.5F; + playersWithStepup.remove(s); + } + } else if(shouldPlayerHaveStepup(player)) { + playersWithStepup.add(s); + player.stepHeight = 1F; + } + } + } + public float getSpeed(ItemStack stack) { return speed; } @@ -82,11 +116,29 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs // NO-OP } + public void onPlayerJump(LivingJumpEvent event) { + if(event.entityLiving instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.entityLiving; + ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); + + if(belt != null && belt.getItem() instanceof ItemTravelBelt && ManaItemHandler.requestManaExact(belt, player, COST, false)) { + player.motionY += ((ItemTravelBelt) belt.getItem()).jump; + player.fallDistance = -((ItemTravelBelt) belt.getItem()).fallBuffer; + } + } + } + private boolean shouldPlayerHaveStepup(EntityPlayer player) { ItemStack armor = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); return armor != null && armor.getItem() instanceof ItemTravelBelt && ManaItemHandler.requestManaExact(armor, player, COST, false); } + public void playerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { + String username = event.player.getGameProfile().getName(); + playersWithStepup.remove(username + ":false"); + playersWithStepup.remove(username + ":true"); + } + public static String playerStr(EntityPlayer player) { return player.getGameProfile().getName() + ":" + player.worldObj.isRemote; } @@ -120,58 +172,18 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs public class EventHandler{ @SubscribeEvent - public void updatePlayerStepStatus(LivingUpdateEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - String s = playerStr(player); - - ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); - if(playersWithStepup.contains(s)) { - if(shouldPlayerHaveStepup(player)) { - ItemTravelBelt beltItem = (ItemTravelBelt) belt.getItem(); - - if((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F && !player.isInsideOfMaterial(Material.water)) { - float speed = beltItem.getSpeed(belt); - player.moveFlying(0F, 1F, player.capabilities.isFlying ? speed : speed); - beltItem.onMovedTick(belt, player); - - if(player.ticksExisted % COST_INTERVAL == 0) - ManaItemHandler.requestManaExact(belt, player, COST, true); - } else beltItem.onNotMovingTick(belt, player); - - if(player.isSneaking()) - player.stepHeight = 0.50001F; // Not 0.5F because that is the default - else player.stepHeight = 1F; - - } else { - player.stepHeight = 0.5F; - playersWithStepup.remove(s); - } - } else if(shouldPlayerHaveStepup(player)) { - playersWithStepup.add(s); - player.stepHeight = 1F; - } - } + public void updatePlayerStepStatusWrapper(LivingUpdateEvent event) { + ItemTravelBelt.this.updatePlayerStepStatus(event); } @SubscribeEvent - public void onPlayerJump(LivingJumpEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); - - if(belt != null && belt.getItem() instanceof ItemTravelBelt && ManaItemHandler.requestManaExact(belt, player, COST, false)) { - player.motionY += ((ItemTravelBelt) belt.getItem()).jump; - player.fallDistance = -((ItemTravelBelt) belt.getItem()).fallBuffer; - } - } + public void onPlayerJumpWrapper(LivingJumpEvent event) { + ItemTravelBelt.this.onPlayerJump(event); } @SubscribeEvent - public void playerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { - String username = event.player.getGameProfile().getName(); - playersWithStepup.remove(username + ":false"); - playersWithStepup.remove(username + ":true"); + public void playerLoggedOutWrapper(PlayerEvent.PlayerLoggedOutEvent event) { + ItemTravelBelt.this.playerLoggedOut(event); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java index d2199aef9..e1db8b391 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java @@ -31,6 +31,14 @@ public class ItemGlassPick extends ItemManasteelPick { MinecraftForge.EVENT_BUS.register(new EventHandler()); } + public void onBlockDrops(HarvestDropsEvent event) { + if (event.harvester != null && event.block != null && event.drops.isEmpty() && event.harvester.getCurrentEquippedItem() != null + && event.harvester.getCurrentEquippedItem().getItem() == this && event.block.getMaterial() == Material.glass + && event.block.canSilkHarvest(event.world, event.harvester, event.x, event.y, event.z, event.blockMetadata)) { + event.drops.add(new ItemStack(event.block, 1, event.blockMetadata)); + } + } + @Override public int getManaPerDmg() { return MANA_PER_DAMAGE; @@ -48,12 +56,8 @@ public class ItemGlassPick extends ItemManasteelPick { public class EventHandler{ @SubscribeEvent - public void onBlockDrops(HarvestDropsEvent event) { - if (event.harvester != null && event.block != null && event.drops.isEmpty() && event.harvester.getCurrentEquippedItem() != null - && event.harvester.getCurrentEquippedItem().getItem() == ItemGlassPick.this && event.block.getMaterial() == Material.glass - && event.block.canSilkHarvest(event.world, event.harvester, event.x, event.y, event.z, event.blockMetadata)) { - event.drops.add(new ItemStack(event.block, 1, event.blockMetadata)); - } + public void onBlockDropsWrapper(HarvestDropsEvent event) { + ItemGlassPick.this.onBlockDrops(event); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java index eee57ec58..04c48df80 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java @@ -32,6 +32,29 @@ public class ItemElementiumAxe extends ItemManasteelAxe { // Thanks to SpitefulFox for the drop rates // https://github.com/SpitefulFox/ForbiddenMagic/blob/master/src/com/spiteful/forbidden/FMEventHandler.java + public void onEntityDrops(LivingDropsEvent event) { + if(event.recentlyHit && event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) { + ItemStack weapon = ((EntityPlayer) event.source.getEntity()).getCurrentEquippedItem(); + if(weapon != null && weapon.getItem() == this) { + Random rand = event.entity.worldObj.rand; + int looting = EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, weapon); + + if(event.entityLiving instanceof EntitySkeleton && rand.nextInt(26) <= 3 + looting) + addDrop(event, new ItemStack(Items.skull, 1, ((EntitySkeleton)event.entityLiving).getSkeletonType())); + else if(event.entityLiving instanceof EntityZombie && !(event.entityLiving instanceof EntityPigZombie) && rand.nextInt(26) <= 2 + 2 * looting) + addDrop(event, new ItemStack(Items.skull, 1, 2)); + else if(event.entityLiving instanceof EntityCreeper && rand.nextInt(26) <= 2 + 2 * looting) + addDrop(event, new ItemStack(Items.skull, 1, 4)); + else if(event.entityLiving instanceof EntityPlayer && rand.nextInt(11) <= 1 + looting) { + ItemStack stack = new ItemStack(Items.skull, 1, 3); + ItemNBTHelper.setString(stack, "SkullOwner", ((EntityPlayer)event.entityLiving).getCommandSenderName()); + addDrop(event, stack); + } else if(event.entityLiving instanceof EntityDoppleganger && rand.nextInt(13) < 1 + looting) + addDrop(event, new ItemStack(ModItems.gaiaHead)); + } + } + } + private void addDrop(LivingDropsEvent event, ItemStack drop) { EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, drop); entityitem.delayBeforeCanPickup = 10; @@ -40,27 +63,8 @@ public class ItemElementiumAxe extends ItemManasteelAxe { public class EventHandler{ @SubscribeEvent - public void onEntityDrops(LivingDropsEvent event) { - if(event.recentlyHit && event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) { - ItemStack weapon = ((EntityPlayer) event.source.getEntity()).getCurrentEquippedItem(); - if(weapon != null && weapon.getItem() == ItemElementiumAxe.this) { - Random rand = event.entity.worldObj.rand; - int looting = EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, weapon); - - if(event.entityLiving instanceof EntitySkeleton && rand.nextInt(26) <= 3 + looting) - addDrop(event, new ItemStack(Items.skull, 1, ((EntitySkeleton)event.entityLiving).getSkeletonType())); - else if(event.entityLiving instanceof EntityZombie && !(event.entityLiving instanceof EntityPigZombie) && rand.nextInt(26) <= 2 + 2 * looting) - addDrop(event, new ItemStack(Items.skull, 1, 2)); - else if(event.entityLiving instanceof EntityCreeper && rand.nextInt(26) <= 2 + 2 * looting) - addDrop(event, new ItemStack(Items.skull, 1, 4)); - else if(event.entityLiving instanceof EntityPlayer && rand.nextInt(11) <= 1 + looting) { - ItemStack stack = new ItemStack(Items.skull, 1, 3); - ItemNBTHelper.setString(stack, "SkullOwner", ((EntityPlayer)event.entityLiving).getCommandSenderName()); - addDrop(event, stack); - } else if(event.entityLiving instanceof EntityDoppleganger && rand.nextInt(13) < 1 + looting) - addDrop(event, new ItemStack(ModItems.gaiaHead)); - } - } + public void onEntityDropsWrapper(LivingDropsEvent event) { + ItemElementiumAxe.this.onEntityDrops(event); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 040804823..f2ab2f241 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -20,6 +20,24 @@ public class ItemElementiumPick extends ItemManasteelPick { } + public void onHarvestDrops(HarvestDropsEvent event) { + if(event.harvester != null) { + ItemStack stack = event.harvester.getCurrentEquippedItem(); + if(stack != null && (stack.getItem() == this || stack.getItem() == ModItems.terraPick && ItemTerraPick.isTipped(stack))) { + for(int i = 0; i < event.drops.size(); i++) { + ItemStack drop = event.drops.get(i); + if(drop != null) { + Block block = Block.getBlockFromItem(drop.getItem()); + if(block != null){ + if(isDisposable(block) || (isSemiDisposable(block) && !event.harvester.isSneaking())) + event.drops.remove(i); + } + } + } + } + } + } + public static boolean isDisposable(Block block) { for(int id : OreDictionary.getOreIDs(new ItemStack(block))) { String name = OreDictionary.getOreName(id); @@ -28,7 +46,7 @@ public class ItemElementiumPick extends ItemManasteelPick { } return false; } - + public static boolean isSemiDisposable(Block block) { for(int id : OreDictionary.getOreIDs(new ItemStack(block))) { String name = OreDictionary.getOreName(id); @@ -40,22 +58,8 @@ public class ItemElementiumPick extends ItemManasteelPick { public class EventHandler{ @SubscribeEvent - public void onHarvestDrops(HarvestDropsEvent event) { - if(event.harvester != null) { - ItemStack stack = event.harvester.getCurrentEquippedItem(); - if(stack != null && (stack.getItem() == ItemElementiumPick.this || stack.getItem() == ModItems.terraPick && ItemTerraPick.isTipped(stack))) { - for(int i = 0; i < event.drops.size(); i++) { - ItemStack drop = event.drops.get(i); - if(drop != null) { - Block block = Block.getBlockFromItem(drop.getItem()); - if(block != null){ - if(isDisposable(block) || (isSemiDisposable(block) && !event.harvester.isSneaking())) - event.drops.remove(i); - } - } - } - } - } + public void onHarvestDropsWrapper(HarvestDropsEvent event) { + ItemElementiumPick.this.onHarvestDrops(event); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index fa7c8ad4c..06d1a58cb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -133,6 +133,24 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker return false; } + public void onTickEnd(TickEvent.WorldTickEvent event) { + // Block Swapping ticking should only occur on the server + if(event.world.isRemote) + return; + + if(event.phase == Phase.END) { + int dim = event.world.provider.dimensionId; + if(blockSwappers.containsKey(dim)) { + Set swappers = blockSwappers.get(dim); + + // Iterate through all of our swappers, removing any + // which no longer need to tick. + // If a null sneaks in or the swapper is done, remove it + swappers.removeIf(next -> next == null || !next.tick()); + } + } + } + /** * Adds a new block swapper to the provided world as the provided player. * Block swappers are only added on the server, and a marker instance @@ -386,25 +404,11 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker } } - public static class EventHandler{ + public class EventHandler{ @SubscribeEvent - public void onTickEnd(TickEvent.WorldTickEvent event) { - // Block Swapping ticking should only occur on the server - if(event.world.isRemote) - return; - - if(event.phase == Phase.END) { - int dim = event.world.provider.dimensionId; - if(blockSwappers.containsKey(dim)) { - Set swappers = blockSwappers.get(dim); - - // Iterate through all of our swappers, removing any - // which no longer need to tick. - // If a null sneaks in or the swapper is done, remove it - swappers.removeIf(next -> next == null || !next.tick()); - } - } + public void onTickEndWrapper(TickEvent.WorldTickEvent event) { + ItemTerraAxe.this.onTickEnd(event); } } } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 3d3ab97b8..03675ff42 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -62,6 +62,33 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve MinecraftForge.EVENT_BUS.register(new EventHandler()); } + public void onPlayerInteract(PlayerInteractEvent event) { + boolean rightEvent = event.action == Action.RIGHT_CLICK_AIR; + ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); + boolean correctStack = stack != null && stack.getItem() == Items.glass_bottle; + boolean ender = event.world.provider.dimensionId == 1; + + if(rightEvent && correctStack && ender) { + MovingObjectPosition pos = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, false, 5F); + + if(pos == null) { + ItemStack stack1 = new ItemStack(this, 1, 15); + event.entityPlayer.addStat(ModAchievements.enderAirMake, 1); + + if(!event.entityPlayer.inventory.addItemStackToInventory(stack1)) + event.entityPlayer.dropPlayerItemWithRandomChoice(stack1, true); + + stack.stackSize--; + if(stack.stackSize == 0) + event.entityPlayer.inventory.setInventorySlotContents(event.entityPlayer.inventory.currentItem, null); + + if(event.world.isRemote) + event.entityPlayer.swingItem(); + else event.world.playSoundAtEntity(event.entityPlayer, "random.pop", 0.5F, 1F); + } + } + } + @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { if(par1ItemStack.getItemDamage() == 4 || par1ItemStack.getItemDamage() == 14) @@ -162,31 +189,8 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve public class EventHandler { @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent event) { - boolean rightEvent = event.action == Action.RIGHT_CLICK_AIR; - ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); - boolean correctStack = stack != null && stack.getItem() == Items.glass_bottle; - boolean ender = event.world.provider.dimensionId == 1; - - if(rightEvent && correctStack && ender) { - MovingObjectPosition pos = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, false, 5F); - - if(pos == null) { - ItemStack stack1 = new ItemStack(ItemManaResource.this, 1, 15); - event.entityPlayer.addStat(ModAchievements.enderAirMake, 1); - - if(!event.entityPlayer.inventory.addItemStackToInventory(stack1)) - event.entityPlayer.dropPlayerItemWithRandomChoice(stack1, true); - - stack.stackSize--; - if(stack.stackSize == 0) - event.entityPlayer.inventory.setInventorySlotContents(event.entityPlayer.inventory.currentItem, null); - - if(event.world.isRemote) - event.entityPlayer.swingItem(); - else event.world.playSoundAtEntity(event.entityPlayer, "random.pop", 0.5F, 1F); - } - } + public void onPlayerInteractWrapper(PlayerInteractEvent event) { + ItemManaResource.this.onPlayerInteract(event); } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 81a86cbf4..ad76869eb 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -52,6 +52,28 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe MinecraftForge.EVENT_BUS.register(new EventHandler()); } + public void onDropped(ItemTossEvent event) { + if(event.entityItem != null && event.entityItem.getEntityItem() != null && !event.entityItem.worldObj.isRemote) { + ItemStack stack = event.entityItem.getEntityItem(); + if(stack.getItem() != null && stack.getItem() == this) { + event.entityItem.setDead(); + + String user = getSoulbindUsername(stack); + for(Item item : new Item[] { ModItems.thorRing, ModItems.lokiRing, ModItems.odinRing }) { + ItemStack stack1 = new ItemStack(item); + bindToUsername(user, stack1); + EntityItem entity = new EntityItem(event.entityItem.worldObj, event.entityItem.posX, event.entityItem.posY, event.entityItem.posZ, stack1); + entity.motionX = event.entityItem.motionX; + entity.motionY = event.entityItem.motionY; + entity.motionZ = event.entityItem.motionZ; + entity.age = event.entityItem.age; + entity.delayBeforeCanPickup = event.entityItem.delayBeforeCanPickup; + entity.worldObj.spawnEntityInWorld(entity); + } + } + } + } + @Override public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) { ((ItemOdinRing) ModItems.odinRing).onValidPlayerWornTick(stack, player); @@ -98,26 +120,8 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe public class EventHandler { @SubscribeEvent - public void onDropped(ItemTossEvent event) { - if(event.entityItem != null && event.entityItem.getEntityItem() != null && !event.entityItem.worldObj.isRemote) { - ItemStack stack = event.entityItem.getEntityItem(); - if(stack.getItem() != null && stack.getItem() == ItemAesirRing.this) { - event.entityItem.setDead(); - - String user = getSoulbindUsername(stack); - for(Item item : new Item[] { ModItems.thorRing, ModItems.lokiRing, ModItems.odinRing }) { - ItemStack stack1 = new ItemStack(item); - bindToUsername(user, stack1); - EntityItem entity = new EntityItem(event.entityItem.worldObj, event.entityItem.posX, event.entityItem.posY, event.entityItem.posZ, stack1); - entity.motionX = event.entityItem.motionX; - entity.motionY = event.entityItem.motionY; - entity.motionZ = event.entityItem.motionZ; - entity.age = event.entityItem.age; - entity.delayBeforeCanPickup = event.entityItem.delayBeforeCanPickup; - entity.worldObj.spawnEntityInWorld(entity); - } - } - } + public void onDroppedWrapper(ItemTossEvent event) { + ItemAesirRing.this.onDropped(event); } } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 0608446c2..b858bf9cc 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -84,6 +84,185 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC MinecraftForge.EVENT_BUS.register(new EventHandler()); } + public void onBlockBreak(BlockEvent.BreakEvent event) { + EntityPlayer player = event.getPlayer(); + int x = event.x; + int y = event.y; + int z = event.z; + int side = event.blockMetadata; + ItemStack stack = player.getCurrentEquippedItem(); + if(stack == null) return; + Item item = player.getCurrentEquippedItem().getItem(); + breakOnAllCursors(player, item, stack, x, y, z, side); + } + + public void onPlayerInteract(PlayerInteractEvent event) { + if(recursion) return; + + EntityPlayer player = event.entityPlayer; + ItemStack lokiRing = getLokiRing(player); + if (lokiRing == null || player.worldObj.isRemote) + return; + + ItemStack heldItemStack = player.getCurrentEquippedItem(); + ChunkCoordinates originCoords = getOriginPos(lokiRing); + MovingObjectPosition lookPos = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10F); + List cursors = getCursorList(lokiRing); + int cursorCount = cursors.size(); + //I don`t think mana for placing should be cruel , so I just made graph with funny line + int cost = (int)(50*Math.sin(0.04* cursorCount)+cursorCount+120+20*Math.cos(0.2*cursorCount)); + + if (heldItemStack == null && event.action == Action.RIGHT_CLICK_BLOCK && player.isSneaking() && isRingEnabled(lokiRing)) { + if(originCoords.posY == -1 && lookPos != null) { + setOriginPos(lokiRing, lookPos.blockX, lookPos.blockY, lookPos.blockZ); + if(player instanceof EntityPlayerMP) + syncLokiRing(player); + } else if(lookPos != null) { + if(originCoords.posX == lookPos.blockX && originCoords.posY == lookPos.blockY && originCoords.posZ == lookPos.blockZ) { + clearMasterCursor(lokiRing); + if(player instanceof EntityPlayerMP) + syncLokiRing(player); + } else { + addCursor : { + int relX = lookPos.blockX - originCoords.posX; + int relY = lookPos.blockY - originCoords.posY; + int relZ = lookPos.blockZ - originCoords.posZ; + + for(LokiCursor cursor : cursors) + if(cursor.getX() == relX && cursor.getY() == relY && cursor.getZ() == relZ) { + cursors.remove(cursor); + setCursorList(lokiRing, cursors); + if(player instanceof EntityPlayerMP) + syncLokiRing(player); + break addCursor; + } + + addCursor(lokiRing, relX, relY, relZ, getRingMirrorMode(lokiRing) ); + if(player instanceof EntityPlayerMP) + syncLokiRing(player); + } + } + } + } else if (heldItemStack != null && event.action == Action.RIGHT_CLICK_BLOCK && lookPos != null && isRingEnabled(lokiRing)) { + if(!ManaItemHandler.requestManaExact(lokiRing, player, cost, true)){ + if(player instanceof EntityPlayerMP){ + vazkii.botania.common.network.PacketHandler.INSTANCE.sendTo(new PacketLokiHudNotificationAck(HUD_MESSAGE.INSUFFICIENT_MANA),(EntityPlayerMP) player); + } + else + { + renderHUDNotification(HUD_MESSAGE.INSUFFICIENT_MANA); + } + return; + } + + recursion = true; + + double oldPosX = player.posX; + double oldPosY = player.posY; + double oldPosZ = player.posZ; + float oldPitch = player.rotationPitch; + float oldYaw = player.rotationYaw; + + int masterOffsetX = originCoords.posY == -1 ? 0 :lookPos.blockX - originCoords.posX; + int masterOffsetY = originCoords.posY == -1 ? 0 :lookPos.blockY - originCoords.posY; + int masterOffsetZ = originCoords.posY == -1 ? 0 :lookPos.blockZ - originCoords.posZ; + + double playerOffsetX = player.posX - originCoords.posX; + double playerOffsetY = player.posY - originCoords.posY; + double playerOffsetZ = player.posZ - originCoords.posZ; + + for(LokiCursor cursor : cursors) { + + int x = lookPos.blockX + cursor.getX(); + int y = lookPos.blockY + cursor.getY(); + int z = lookPos.blockZ + cursor.getZ(); + + if(cursor.isMirrorX()){ + x -= 2*masterOffsetX; + } + if(cursor.isMirrorY()){ + y -= 2*masterOffsetY; + } + if(cursor.isMirrorZ()){ + z -= 2*masterOffsetZ; + } + + if (player.worldObj.isAirBlock(x, y, z) ) { + continue; + } + + player.posX = cursor.getX()+oldPosX; + player.posY = cursor.getY()+oldPosY; + player.posZ = cursor.getZ()+oldPosZ; + player.rotationYaw = oldYaw; + + if(cursor.isMirrorX()){ + player.posX -= 2*playerOffsetX; + player.rotationYaw = player.rotationYaw * (-1); + } + if(cursor.isMirrorY()){ + player.posY -= 2*playerOffsetY; + player.rotationPitch = oldPitch * (-1); + } + if(cursor.isMirrorZ()){ + player.posZ -= 2*playerOffsetZ; + player.rotationYaw = 180 - (Math.abs(player.rotationYaw)); + if(oldYaw < 0){ + player.rotationYaw *= -1; + } + } + + float hitX = (float) (lookPos.hitVec.xCoord - lookPos.blockX); + float hitY = (float) (lookPos.hitVec.yCoord - lookPos.blockY); + float hitZ = (float) (lookPos.hitVec.zCoord - lookPos.blockZ); + if(cursor.isMirrorX()){ + hitX = 1-hitX; + } + if(cursor.isMirrorY()){ + hitY = 1-hitY; + } + if(cursor.isMirrorZ()){ + hitZ = 1-hitZ; + } + + int hitSide = lookPos.sideHit; + if(cursor.isMirrorX() && (hitSide == ForgeDirection.EAST.ordinal() || hitSide == ForgeDirection.WEST.ordinal()) ){ + hitSide = hitSide ^ 1; + } + if(cursor.isMirrorY() && (hitSide == ForgeDirection.DOWN.ordinal() || hitSide == ForgeDirection.UP.ordinal()) ){ + hitSide = hitSide ^ 1; + } + if(cursor.isMirrorZ() && (hitSide == ForgeDirection.NORTH.ordinal() || hitSide == ForgeDirection.SOUTH.ordinal()) ){ + hitSide = hitSide ^ 1; + } + + Item item = heldItemStack.getItem(); + Block markedBlock = player.worldObj.getBlock(x, y, z); + + boolean wasActivated = markedBlock.onBlockActivated(player.worldObj, x, y, z, player, hitSide, hitX,hitY,hitZ); + + if (heldItemStack.stackSize == 0 ) { + event.setCanceled(true); + break; + } + if (!wasActivated) { + item.onItemUse(player.capabilities.isCreativeMode ? heldItemStack.copy() : heldItemStack, player, player.worldObj, x, y, z, hitSide, (float) lookPos.hitVec.xCoord - x, (float) lookPos.hitVec.yCoord - y, (float) lookPos.hitVec.zCoord - z); + if(heldItemStack.stackSize == 0) { + event.setCanceled(true); + break; + } + } + + } + recursion = false; + player.posX = oldPosX; + player.posY = oldPosY; + player.posZ = oldPosZ; + player.rotationPitch = oldPitch; + player.rotationYaw = oldYaw; + } + } + public static void setMode(ItemStack stack, boolean state) { stack.stackTagCompound.setBoolean(TAG_MODE, state); } @@ -508,184 +687,13 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC public class EventHandler{ @SubscribeEvent - public void onBlockBreak(BlockEvent.BreakEvent event) { - EntityPlayer player = event.getPlayer(); - int x = event.x; - int y = event.y; - int z = event.z; - int side = event.blockMetadata; - ItemStack stack = player.getCurrentEquippedItem(); - if(stack == null) return; - Item item = player.getCurrentEquippedItem().getItem(); - breakOnAllCursors(player, item, stack, x, y, z, side); + public void onBlockBreakWrapper(BlockEvent.BreakEvent event) { + ItemLokiRing.this.onBlockBreak(event); } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent event) { - if(recursion) return; - - EntityPlayer player = event.entityPlayer; - ItemStack lokiRing = getLokiRing(player); - if (lokiRing == null || player.worldObj.isRemote) - return; - - ItemStack heldItemStack = player.getCurrentEquippedItem(); - ChunkCoordinates originCoords = getOriginPos(lokiRing); - MovingObjectPosition lookPos = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10F); - List cursors = getCursorList(lokiRing); - int cursorCount = cursors.size(); - //I don`t think mana for placing should be cruel , so I just made graph with funny line - int cost = (int)(50*Math.sin(0.04* cursorCount)+cursorCount+120+20*Math.cos(0.2*cursorCount)); - - if (heldItemStack == null && event.action == Action.RIGHT_CLICK_BLOCK && player.isSneaking() && isRingEnabled(lokiRing)) { - if(originCoords.posY == -1 && lookPos != null) { - setOriginPos(lokiRing, lookPos.blockX, lookPos.blockY, lookPos.blockZ); - if(player instanceof EntityPlayerMP) - syncLokiRing(player); - } else if(lookPos != null) { - if(originCoords.posX == lookPos.blockX && originCoords.posY == lookPos.blockY && originCoords.posZ == lookPos.blockZ) { - clearMasterCursor(lokiRing); - if(player instanceof EntityPlayerMP) - syncLokiRing(player); - } else { - addCursor : { - int relX = lookPos.blockX - originCoords.posX; - int relY = lookPos.blockY - originCoords.posY; - int relZ = lookPos.blockZ - originCoords.posZ; - - for(LokiCursor cursor : cursors) - if(cursor.getX() == relX && cursor.getY() == relY && cursor.getZ() == relZ) { - cursors.remove(cursor); - setCursorList(lokiRing, cursors); - if(player instanceof EntityPlayerMP) - syncLokiRing(player); - break addCursor; - } - - addCursor(lokiRing, relX, relY, relZ, getRingMirrorMode(lokiRing) ); - if(player instanceof EntityPlayerMP) - syncLokiRing(player); - } - } - } - } else if (heldItemStack != null && event.action == Action.RIGHT_CLICK_BLOCK && lookPos != null && isRingEnabled(lokiRing)) { - if(!ManaItemHandler.requestManaExact(lokiRing, player, cost, true)){ - if(player instanceof EntityPlayerMP){ - vazkii.botania.common.network.PacketHandler.INSTANCE.sendTo(new PacketLokiHudNotificationAck(HUD_MESSAGE.INSUFFICIENT_MANA),(EntityPlayerMP) player); - } - else - { - renderHUDNotification(HUD_MESSAGE.INSUFFICIENT_MANA); - } - return; - } - - recursion = true; - - double oldPosX = player.posX; - double oldPosY = player.posY; - double oldPosZ = player.posZ; - float oldPitch = player.rotationPitch; - float oldYaw = player.rotationYaw; - - int masterOffsetX = originCoords.posY == -1 ? 0 :lookPos.blockX - originCoords.posX; - int masterOffsetY = originCoords.posY == -1 ? 0 :lookPos.blockY - originCoords.posY; - int masterOffsetZ = originCoords.posY == -1 ? 0 :lookPos.blockZ - originCoords.posZ; - - double playerOffsetX = player.posX - originCoords.posX; - double playerOffsetY = player.posY - originCoords.posY; - double playerOffsetZ = player.posZ - originCoords.posZ; - - for(LokiCursor cursor : cursors) { - - int x = lookPos.blockX + cursor.getX(); - int y = lookPos.blockY + cursor.getY(); - int z = lookPos.blockZ + cursor.getZ(); - - if(cursor.isMirrorX()){ - x -= 2*masterOffsetX; - } - if(cursor.isMirrorY()){ - y -= 2*masterOffsetY; - } - if(cursor.isMirrorZ()){ - z -= 2*masterOffsetZ; - } - - if (player.worldObj.isAirBlock(x, y, z) ) { - continue; - } - - player.posX = cursor.getX()+oldPosX; - player.posY = cursor.getY()+oldPosY; - player.posZ = cursor.getZ()+oldPosZ; - player.rotationYaw = oldYaw; - - if(cursor.isMirrorX()){ - player.posX -= 2*playerOffsetX; - player.rotationYaw = player.rotationYaw * (-1); - } - if(cursor.isMirrorY()){ - player.posY -= 2*playerOffsetY; - player.rotationPitch = oldPitch * (-1); - } - if(cursor.isMirrorZ()){ - player.posZ -= 2*playerOffsetZ; - player.rotationYaw = 180 - (Math.abs(player.rotationYaw)); - if(oldYaw < 0){ - player.rotationYaw *= -1; - } - } - - float hitX = (float) (lookPos.hitVec.xCoord - lookPos.blockX); - float hitY = (float) (lookPos.hitVec.yCoord - lookPos.blockY); - float hitZ = (float) (lookPos.hitVec.zCoord - lookPos.blockZ); - if(cursor.isMirrorX()){ - hitX = 1-hitX; - } - if(cursor.isMirrorY()){ - hitY = 1-hitY; - } - if(cursor.isMirrorZ()){ - hitZ = 1-hitZ; - } - - int hitSide = lookPos.sideHit; - if(cursor.isMirrorX() && (hitSide == ForgeDirection.EAST.ordinal() || hitSide == ForgeDirection.WEST.ordinal()) ){ - hitSide = hitSide ^ 1; - } - if(cursor.isMirrorY() && (hitSide == ForgeDirection.DOWN.ordinal() || hitSide == ForgeDirection.UP.ordinal()) ){ - hitSide = hitSide ^ 1; - } - if(cursor.isMirrorZ() && (hitSide == ForgeDirection.NORTH.ordinal() || hitSide == ForgeDirection.SOUTH.ordinal()) ){ - hitSide = hitSide ^ 1; - } - - Item item = heldItemStack.getItem(); - Block markedBlock = player.worldObj.getBlock(x, y, z); - - boolean wasActivated = markedBlock.onBlockActivated(player.worldObj, x, y, z, player, hitSide, hitX,hitY,hitZ); - - if (heldItemStack.stackSize == 0 ) { - event.setCanceled(true); - break; - } - if (!wasActivated) { - item.onItemUse(player.capabilities.isCreativeMode ? heldItemStack.copy() : heldItemStack, player, player.worldObj, x, y, z, hitSide, (float) lookPos.hitVec.xCoord - x, (float) lookPos.hitVec.yCoord - y, (float) lookPos.hitVec.zCoord - z); - if(heldItemStack.stackSize == 0) { - event.setCanceled(true); - break; - } - } - - } - recursion = false; - player.posX = oldPosX; - player.posY = oldPosY; - player.posZ = oldPosZ; - player.rotationPitch = oldPitch; - player.rotationYaw = oldYaw; - } + public void onPlayerInteractWrapper(PlayerInteractEvent event) { + ItemLokiRing.this.onPlayerInteract(event); } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 8e3fa1eae..be60d6cc6 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -61,6 +61,14 @@ public class ItemOdinRing extends ItemRelicBauble { player.extinguish(); } + public void onPlayerAttacked(LivingAttackEvent event) { + if(event.entityLiving instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.entityLiving; + if(getOdinRing(player) != null && damageNegations.contains(event.source.damageType)) + event.setCanceled(true); + } + } + @Override public BaubleType getBaubleType(ItemStack arg0) { return BaubleType.RING; @@ -96,14 +104,10 @@ public class ItemOdinRing extends ItemRelicBauble { attributes.put(SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); } - public static class EventHandler{ + public class EventHandler{ @SubscribeEvent - public void onPlayerAttacked(LivingAttackEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - if(getOdinRing(player) != null && damageNegations.contains(event.source.damageType)) - event.setCanceled(true); - } + public void onPlayerAttackedWrapper(LivingAttackEvent event) { + ItemOdinRing.this.onPlayerAttacked(event); } } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 3a8517f01..8040fef3e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -105,6 +105,16 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return false; } + public void onLeftClick(PlayerInteractEvent event) { + if(event.action == Action.LEFT_CLICK_BLOCK) { + ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); + if(stack != null && stack.getItem() == this && canExchange(stack) && ManaItemHandler.requestManaExactForTool(stack, event.entityPlayer, COST, false)) { + if(exchange(event.world, event.entityPlayer, event.x, event.y, event.z, stack, getBlock(stack), getBlockMeta(stack))) + ManaItemHandler.requestManaExactForTool(stack, event.entityPlayer, COST, true); + } + } + } + @Override public void onUpdate(ItemStack stack, World world, Entity entity, int something, boolean somethingelse) { if(!canExchange(stack) || !(entity instanceof EntityPlayer)) @@ -418,14 +428,8 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra public class EventHandler{ @SubscribeEvent - public void onLeftClick(PlayerInteractEvent event) { - if(event.action == Action.LEFT_CLICK_BLOCK) { - ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); - if(stack != null && stack.getItem() == ItemExchangeRod.this && canExchange(stack) && ManaItemHandler.requestManaExactForTool(stack, event.entityPlayer, COST, false)) { - if(exchange(event.world, event.entityPlayer, event.x, event.y, event.z, stack, getBlock(stack), getBlockMeta(stack))) - ManaItemHandler.requestManaExactForTool(stack, event.entityPlayer, COST, true); - } - } + public void onLeftClickWrapper(PlayerInteractEvent event) { + ItemExchangeRod.this.onLeftClick(event); } } }