From 6b4288d00f10169a57567f9ba0b6f47eb058aa19 Mon Sep 17 00:00:00 2001 From: LexManos Date: Sat, 11 Aug 2012 14:45:48 -0700 Subject: [PATCH] Updated FML, fixed custom tool hooks, and spawn protection/player reach hooks. --- .../net/minecraftforge/common/ForgeHooks.java | 42 +++---- .../entity/player/EntityInteractEvent.java | 16 +++ ...src-3.0.5.239.zip => fml-src-3.0.9.242.zip | Bin 780513 -> 780474 bytes .../net/minecraft/src/EntityPlayer.java.patch | 33 ++--- .../common/net/minecraft/src/Item.java.patch | 13 +- .../src/ItemInWorldManager.java.patch | 114 ++++++++++++++++++ .../minecraft/src/NetServerHandler.java.patch | 34 ++++++ .../net/minecraft/src/WorldServer.java.patch | 9 ++ .../minecraft/src/IntegratedServer.java.patch | 8 ++ .../net/minecraft/src/RenderItem.java.patch | 10 +- 10 files changed, 237 insertions(+), 42 deletions(-) create mode 100644 common/net/minecraftforge/event/entity/player/EntityInteractEvent.java rename fml-src-3.0.5.239.zip => fml-src-3.0.9.242.zip (95%) create mode 100644 patches/common/net/minecraft/src/ItemInWorldManager.java.patch create mode 100644 patches/common/net/minecraft/src/NetServerHandler.java.patch diff --git a/common/net/minecraftforge/common/ForgeHooks.java b/common/net/minecraftforge/common/ForgeHooks.java index baffa80745..8e1a09aa37 100644 --- a/common/net/minecraftforge/common/ForgeHooks.java +++ b/common/net/minecraftforge/common/ForgeHooks.java @@ -61,17 +61,19 @@ public class ForgeHooks { return true; } + ItemStack stack = player.inventory.getCurrentItem(); if (stack == null) { return player.canHarvestBlock(block); } - List info = (List)toolClasses.get(stack); + List info = (List)toolClasses.get(stack.getItem()); if (info == null) { return player.canHarvestBlock(block); } + Object[] tmp = info.toArray(); String toolClass = (String)tmp[0]; int harvestLevel = (Integer)tmp[1]; @@ -81,6 +83,7 @@ public class ForgeHooks { return player.canHarvestBlock(block); } + if (blockHarvestLevel > harvestLevel) { return false; @@ -103,7 +106,7 @@ public class ForgeHooks } else { - return player.getCurrentPlayerStrVsBlock(block, metadata) / hardness / 30F; + return player.getCurrentPlayerStrVsBlock(block, metadata) / hardness / 30F; } } @@ -143,21 +146,6 @@ public class ForgeHooks MinecraftForge.setToolClass(Item.shovelGold, "shovel", 0); MinecraftForge.setToolClass(Item.shovelDiamond, "shovel", 3); - MinecraftForge.setBlockHarvestLevel(Block.obsidian, "pickaxe", 3); - MinecraftForge.setBlockHarvestLevel(Block.oreDiamond, "pickaxe", 2); - MinecraftForge.setBlockHarvestLevel(Block.blockDiamond, "pickaxe", 2); - MinecraftForge.setBlockHarvestLevel(Block.oreGold, "pickaxe", 2); - MinecraftForge.setBlockHarvestLevel(Block.blockGold, "pickaxe", 2); - MinecraftForge.setBlockHarvestLevel(Block.oreIron, "pickaxe", 1); - MinecraftForge.setBlockHarvestLevel(Block.blockSteel, "pickaxe", 1); - MinecraftForge.setBlockHarvestLevel(Block.oreLapis, "pickaxe", 1); - MinecraftForge.setBlockHarvestLevel(Block.blockLapis, "pickaxe", 1); - MinecraftForge.setBlockHarvestLevel(Block.oreRedstone, "pickaxe", 2); - MinecraftForge.setBlockHarvestLevel(Block.oreRedstoneGlowing, "pickaxe", 2); - MinecraftForge.removeBlockEffectiveness(Block.oreRedstone, "pickaxe"); - MinecraftForge.removeBlockEffectiveness(Block.obsidian, "pickaxe"); - MinecraftForge.removeBlockEffectiveness(Block.oreRedstoneGlowing, "pickaxe"); - for (Block block : ItemPickaxe.blocksEffectiveAgainst) { MinecraftForge.setBlockHarvestLevel(block, "pickaxe", 0); @@ -173,6 +161,21 @@ public class ForgeHooks MinecraftForge.setBlockHarvestLevel(block, "axe", 0); } + MinecraftForge.setBlockHarvestLevel(Block.obsidian, "pickaxe", 3); + MinecraftForge.setBlockHarvestLevel(Block.oreEmerald, "pickaxe", 2); + MinecraftForge.setBlockHarvestLevel(Block.oreDiamond, "pickaxe", 2); + MinecraftForge.setBlockHarvestLevel(Block.blockDiamond, "pickaxe", 2); + MinecraftForge.setBlockHarvestLevel(Block.oreGold, "pickaxe", 2); + MinecraftForge.setBlockHarvestLevel(Block.blockGold, "pickaxe", 2); + MinecraftForge.setBlockHarvestLevel(Block.oreIron, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(Block.blockSteel, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(Block.oreLapis, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(Block.blockLapis, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(Block.oreRedstone, "pickaxe", 2); + MinecraftForge.setBlockHarvestLevel(Block.oreRedstoneGlowing, "pickaxe", 2); + MinecraftForge.removeBlockEffectiveness(Block.oreRedstone, "pickaxe"); + MinecraftForge.removeBlockEffectiveness(Block.obsidian, "pickaxe"); + MinecraftForge.removeBlockEffectiveness(Block.oreRedstoneGlowing, "pickaxe"); } public static String getTexture(String _default, Object obj) @@ -219,11 +222,6 @@ public class ForgeHooks ModLoader.getLogger().info(String.format("MinecraftForge v%s Initialized", ForgeVersion.getVersion())); } - public static boolean onEntityInteract(EntityPlayer entityPlayer, Entity par1Entity, boolean b) - { - return false; - } - /** * Called when a player uses 'pick block', calls new Entity and Block hooks. */ diff --git a/common/net/minecraftforge/event/entity/player/EntityInteractEvent.java b/common/net/minecraftforge/event/entity/player/EntityInteractEvent.java new file mode 100644 index 0000000000..c1c0c2eecb --- /dev/null +++ b/common/net/minecraftforge/event/entity/player/EntityInteractEvent.java @@ -0,0 +1,16 @@ +package net.minecraftforge.event.entity.player; + +import net.minecraft.src.Entity; +import net.minecraft.src.EntityPlayer; +import net.minecraftforge.event.Cancelable; + +@Cancelable +public class EntityInteractEvent extends PlayerEvent +{ + public final Entity target; + public EntityInteractEvent(EntityPlayer player, Entity target) + { + super(player); + this.target = target; + } +} diff --git a/fml-src-3.0.5.239.zip b/fml-src-3.0.9.242.zip similarity index 95% rename from fml-src-3.0.5.239.zip rename to fml-src-3.0.9.242.zip index 7c494d476924f16e813afa8e946952833f35c652..9ff8c61c4da5fc9057d98f1c84933ab06a837a1b 100644 GIT binary patch delta 23034 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 diff --git a/patches/common/net/minecraft/src/EntityPlayer.java.patch b/patches/common/net/minecraft/src/EntityPlayer.java.patch index 5d09d659d1..06a50836c8 100644 --- a/patches/common/net/minecraft/src/EntityPlayer.java.patch +++ b/patches/common/net/minecraft/src/EntityPlayer.java.patch @@ -1,6 +1,6 @@ --- ../src_base/common/net/minecraft/src/EntityPlayer.java +++ ../src_work/common/net/minecraft/src/EntityPlayer.java -@@ -7,6 +7,14 @@ +@@ -7,6 +7,15 @@ import java.util.Iterator; import java.util.List; @@ -10,12 +10,13 @@ +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.event.entity.player.AttackEntityEvent; ++import net.minecraftforge.event.entity.player.EntityInteractEvent; +import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; +import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent; public abstract class EntityPlayer extends EntityLiving implements ICommandSender { -@@ -222,6 +230,7 @@ +@@ -222,6 +231,7 @@ if (var1 == this.itemInUse) { @@ -23,7 +24,7 @@ if (this.itemInUseCount <= 25 && this.itemInUseCount % 4 == 0) { this.updateItemUse(var1, 5); -@@ -627,7 +636,16 @@ +@@ -627,7 +637,16 @@ */ public EntityItem dropOneItem() { @@ -41,7 +42,7 @@ } /** -@@ -693,13 +711,21 @@ +@@ -693,13 +712,21 @@ /** * Returns how strong the player is against the specified block at this moment @@ -66,7 +67,7 @@ { var2 += (float)(var3 * var3 + 1); } -@@ -992,12 +1018,23 @@ +@@ -992,12 +1019,23 @@ */ protected void damageEntity(DamageSource par1DamageSource, int par2) { @@ -91,18 +92,18 @@ par2 = this.applyPotionDamageCalculations(par1DamageSource, par2); this.addExhaustion(par1DamageSource.getHungerDamage()); this.health -= par2; -@@ -1032,6 +1069,10 @@ +@@ -1032,6 +1070,10 @@ public boolean interactWith(Entity par1Entity) { -+ if (!ForgeHooks.onEntityInteract(this, par1Entity, false)) ++ if (MinecraftForge.EVENT_BUS.post(new EntityInteractEvent(this, par1Entity))) + { + return false; + } if (par1Entity.interact(this)) { return true; -@@ -1075,7 +1116,9 @@ +@@ -1075,7 +1117,9 @@ */ public void destroyCurrentEquippedItem() { @@ -112,7 +113,7 @@ } /** -@@ -1104,6 +1147,15 @@ +@@ -1104,6 +1148,15 @@ */ public void attackTargetEntityWithCurrentItem(Entity par1Entity) { @@ -128,7 +129,7 @@ if (par1Entity.canAttackWithItem()) { int var2 = this.inventory.getDamageVsEntity(par1Entity); -@@ -1247,6 +1299,12 @@ +@@ -1247,6 +1300,12 @@ */ public EnumStatus sleepInBedAt(int par1, int par2, int par3) { @@ -141,7 +142,7 @@ if (!this.worldObj.isRemote) { if (this.isPlayerSleeping() || !this.isEntityAlive()) -@@ -1286,6 +1344,11 @@ +@@ -1286,6 +1345,11 @@ { int var9 = this.worldObj.getBlockMetadata(par1, par2, par3); int var5 = BlockBed.getDirection(var9); @@ -153,7 +154,7 @@ float var10 = 0.5F; float var7 = 0.5F; -@@ -1356,10 +1419,12 @@ +@@ -1356,10 +1420,12 @@ ChunkCoordinates var4 = this.playerLocation; ChunkCoordinates var5 = this.playerLocation; @@ -170,7 +171,7 @@ if (var5 == null) { -@@ -1396,7 +1461,9 @@ +@@ -1396,7 +1462,9 @@ */ private boolean isInBed() { @@ -181,7 +182,7 @@ } /** -@@ -1411,13 +1478,15 @@ +@@ -1411,13 +1479,15 @@ var2.loadChunk(par1ChunkCoordinates.posX - 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); var2.loadChunk(par1ChunkCoordinates.posX + 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); @@ -199,7 +200,7 @@ return var3; } } -@@ -1431,8 +1500,11 @@ +@@ -1431,8 +1501,11 @@ { if (this.playerLocation != null) { @@ -213,7 +214,7 @@ switch (var2) { -@@ -1725,6 +1797,7 @@ +@@ -1725,6 +1798,7 @@ return 101; } } diff --git a/patches/common/net/minecraft/src/Item.java.patch b/patches/common/net/minecraft/src/Item.java.patch index a840f6bce1..30105beade 100644 --- a/patches/common/net/minecraft/src/Item.java.patch +++ b/patches/common/net/minecraft/src/Item.java.patch @@ -18,7 +18,18 @@ } itemsList[256 + par1] = this; -@@ -650,4 +653,185 @@ +@@ -589,6 +592,10 @@ + float var18 = var15 * var16; + float var20 = var14 * var16; + double var21 = 5.0D; ++ if (par2EntityPlayer instanceof EntityPlayerMP) ++ { ++ var21 = ((EntityPlayerMP)par2EntityPlayer).theItemInWorldManager.getBlockReachDistance(); ++ } + Vec3 var23 = var13.addVector((double)var18 * var21, (double)var17 * var21, (double)var20 * var21); + return par1World.rayTraceBlocks_do_do(var13, var23, par3, !par3); + } +@@ -650,4 +657,185 @@ { StatList.initStats(); } diff --git a/patches/common/net/minecraft/src/ItemInWorldManager.java.patch b/patches/common/net/minecraft/src/ItemInWorldManager.java.patch new file mode 100644 index 0000000000..5ba7383d7c --- /dev/null +++ b/patches/common/net/minecraft/src/ItemInWorldManager.java.patch @@ -0,0 +1,114 @@ +--- ../src_base/common/net/minecraft/src/ItemInWorldManager.java ++++ ../src_work/common/net/minecraft/src/ItemInWorldManager.java +@@ -1,7 +1,13 @@ + package net.minecraft.src; ++ ++import net.minecraftforge.common.ForgeHooks; ++import net.minecraftforge.common.MinecraftForge; ++import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; + + public class ItemInWorldManager + { ++ /** Forge reach distance */ ++ private double blockReachDistance = 5.0d; + /** The world object that this object is connected to. */ + public World theWorld; + +@@ -222,7 +228,7 @@ + var4.onBlockHarvested(this.theWorld, par1, par2, par3, var5, this.thisPlayerMP); + } + +- boolean var6 = this.theWorld.setBlockWithNotify(par1, par2, par3, 0); ++ boolean var6 = (var4 != null && var4.removeBlockByPlayer(theWorld, thisPlayerMP, par1, par2, par3)); + + if (var4 != null && var6) + { +@@ -246,16 +252,22 @@ + int var4 = this.theWorld.getBlockId(par1, par2, par3); + int var5 = this.theWorld.getBlockMetadata(par1, par2, par3); + this.theWorld.playAuxSFXAtEntity(this.thisPlayerMP, 2001, par1, par2, par3, var4 + (this.theWorld.getBlockMetadata(par1, par2, par3) << 12)); +- boolean var6 = this.removeBlock(par1, par2, par3); ++ boolean var6 = false; + + if (this.isCreative()) + { ++ var6 = this.removeBlock(par1, par2, par3); + this.thisPlayerMP.serverForThisPlayer.sendPacketToPlayer(new Packet53BlockChange(par1, par2, par3, this.theWorld)); + } + else + { + ItemStack var7 = this.thisPlayerMP.getCurrentEquippedItem(); +- boolean var8 = this.thisPlayerMP.canHarvestBlock(Block.blocksList[var4]); ++ boolean var8 = false; ++ Block block = Block.blocksList[var4]; ++ if (block != null) ++ { ++ var8 = block.canHarvestBlock(thisPlayerMP, var5); ++ } + + if (var7 != null) + { +@@ -264,9 +276,11 @@ + if (var7.stackSize == 0) + { + this.thisPlayerMP.destroyCurrentEquippedItem(); ++ MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(thisPlayerMP, var7)); + } + } + ++ var6 = this.removeBlock(par1, par2, par3); + if (var6 && var8) + { + Block.blocksList[var4].harvestBlock(this.theWorld, this.thisPlayerMP, par1, par2, par3, var5); +@@ -303,6 +317,7 @@ + if (var6.stackSize == 0) + { + par1EntityPlayer.inventory.mainInventory[par1EntityPlayer.inventory.currentItem] = null; ++ MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(thisPlayerMP, var6)); + } + + return true; +@@ -315,6 +330,12 @@ + */ + public boolean activateBlockOrUseItem(EntityPlayer par1EntityPlayer, World par2World, ItemStack par3ItemStack, int par4, int par5, int par6, int par7, float par8, float par9, float par10) + { ++ if (par3ItemStack != null && ++ par3ItemStack.getItem() != null && ++ par3ItemStack.getItem().onItemUseFirst(par3ItemStack, par1EntityPlayer, par2World, par4, par5, par6, par7)) ++ { ++ return true; ++ } + int var11 = par2World.getBlockId(par4, par5, par6); + + if (var11 > 0 && Block.blocksList[var11].onBlockActivated(par2World, par4, par5, par6, par1EntityPlayer, par7, par8, par9, par10)) +@@ -336,7 +357,15 @@ + } + else + { +- return par3ItemStack.tryPlaceItemIntoWorld(par1EntityPlayer, par2World, par4, par5, par6, par7, par8, par9, par10); ++ if (!par3ItemStack.tryPlaceItemIntoWorld(par1EntityPlayer, par2World, par4, par5, par6, par7, par8, par9, par10)) ++ { ++ return false; ++ } ++ if (par3ItemStack.stackSize <= 0) ++ { ++ MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(thisPlayerMP, par3ItemStack)); ++ } ++ return true; + } + } + +@@ -347,4 +376,13 @@ + { + this.theWorld = par1WorldServer; + } ++ ++ public double getBlockReachDistance() ++ { ++ return blockReachDistance; ++ } ++ public void setBlockReachDistance(double distance) ++ { ++ blockReachDistance = distance; ++ } + } diff --git a/patches/common/net/minecraft/src/NetServerHandler.java.patch b/patches/common/net/minecraft/src/NetServerHandler.java.patch new file mode 100644 index 0000000000..ffd879a5e9 --- /dev/null +++ b/patches/common/net/minecraft/src/NetServerHandler.java.patch @@ -0,0 +1,34 @@ +--- ../src_base/common/net/minecraft/src/NetServerHandler.java ++++ ../src_work/common/net/minecraft/src/NetServerHandler.java +@@ -383,7 +383,10 @@ + double var12 = this.playerEntity.posZ - ((double)var7 + 0.5D); + double var14 = var8 * var8 + var10 * var10 + var12 * var12; + +- if (var14 > 36.0D) ++ double dist = playerEntity.theItemInWorldManager.getBlockReachDistance() + 1; ++ dist *= dist; ++ ++ if (var14 > dist) + { + return; + } +@@ -405,7 +408,7 @@ + + if (par1Packet14BlockDig.status == 0) + { +- if (var20 <= 16 && !var3) ++ if (var20 <= mcServer.spawnProtectionSize && !var3) + { + this.playerEntity.serverForThisPlayer.sendPacketToPlayer(new Packet53BlockChange(var5, var6, var7, var2)); + } +@@ -485,7 +488,9 @@ + var12 = var11; + } + +- if (this.hasMoved && this.playerEntity.getDistanceSq((double)var5 + 0.5D, (double)var6 + 0.5D, (double)var7 + 0.5D) < 64.0D && (var12 > 16 || var9)) ++ double dist = playerEntity.theItemInWorldManager.getBlockReachDistance() + 1; ++ dist *= dist; ++ if (this.hasMoved && this.playerEntity.getDistanceSq((double)var5 + 0.5D, (double)var6 + 0.5D, (double)var7 + 0.5D) < dist && (var12 > mcServer.spawnProtectionSize || var9)) + { + this.playerEntity.theItemInWorldManager.activateBlockOrUseItem(this.playerEntity, var2, var3, var5, var6, var7, var8, par1Packet15Place.getXOffset(), par1Packet15Place.getYOffset(), par1Packet15Place.getZOffset()); + } diff --git a/patches/common/net/minecraft/src/WorldServer.java.patch b/patches/common/net/minecraft/src/WorldServer.java.patch index 8ca34d4f07..975b2e6f17 100644 --- a/patches/common/net/minecraft/src/WorldServer.java.patch +++ b/patches/common/net/minecraft/src/WorldServer.java.patch @@ -55,6 +55,15 @@ } } +@@ -566,7 +582,7 @@ + var6 = var5; + } + +- return var6 > 16 || this.mcServer.getConfigurationManager().areCommandsAllowed(par1EntityPlayer.username) || this.mcServer.isSinglePlayer(); ++ return var6 > mcServer.spawnProtectionSize || this.mcServer.getConfigurationManager().areCommandsAllowed(par1EntityPlayer.username) || this.mcServer.isSinglePlayer(); + } + + protected void initialize(WorldSettings par1WorldSettings) @@ -689,6 +705,7 @@ } diff --git a/patches/minecraft/net/minecraft/src/IntegratedServer.java.patch b/patches/minecraft/net/minecraft/src/IntegratedServer.java.patch index e079f6b2fd..66b54c4ab7 100644 --- a/patches/minecraft/net/minecraft/src/IntegratedServer.java.patch +++ b/patches/minecraft/net/minecraft/src/IntegratedServer.java.patch @@ -63,3 +63,11 @@ this.setDifficultyForAllDimensions(this.getDifficulty()); this.initialWorldChunkLoad(); } +@@ -101,6 +78,7 @@ + this.loadAllDimensions(this.getFolderName(), this.getWorldName(), this.field_71350_m.getSeed(), this.field_71350_m.getTerrainType()); + this.setMOTD(this.getServerOwner() + " - " + this.theWorldServer[0].getWorldInfo().getWorldName()); + FMLCommonHandler.instance().handleServerStarting(this); ++ spawnProtectionSize = 0; + return true; + } + diff --git a/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/patches/minecraft/net/minecraft/src/RenderItem.java.patch index aff4bc2872..c9e531cec0 100644 --- a/patches/minecraft/net/minecraft/src/RenderItem.java.patch +++ b/patches/minecraft/net/minecraft/src/RenderItem.java.patch @@ -88,11 +88,15 @@ Block var15 = Block.blocksList[par3]; GL11.glPushMatrix(); GL11.glTranslatef((float)(par6 - 2), (float)(par7 + 3), -3.0F + this.zLevel); -@@ -225,7 +224,7 @@ +@@ -223,9 +222,9 @@ + if (Item.itemsList[par3].requiresMultipleRenderPasses()) + { GL11.glDisable(GL11.GL_LIGHTING); - par2RenderEngine.bindTexture(par2RenderEngine.getTexture("/gui/items.png")); - +- par2RenderEngine.bindTexture(par2RenderEngine.getTexture("/gui/items.png")); +- - for (var8 = 0; var8 <= 1; ++var8) ++ par2RenderEngine.bindTexture(par2RenderEngine.getTexture(Item.itemsList[par3].getTextureFile())); ++ + for (var8 = 0; var8 <= Item.itemsList[par3].getRenderPasses(par4); ++var8) { var9 = Item.itemsList[par3].getIconFromDamageForRenderPass(par4, var8);