1
0
forked from xjboss/KCauldronX

增加对mod消息与物品左右键的方块放置监听

This commit is contained in:
2017-07-04 14:30:21 +08:00
parent bfe43ae465
commit f1db52bb04
5 changed files with 151 additions and 46 deletions

View File

@ -1,47 +1,38 @@
--- ../src-base/minecraft/net/minecraft/item/ItemStack.java
+++ ../src-work/minecraft/net/minecraft/item/ItemStack.java
@@ -2,14 +2,18 @@
@@ -1,15 +1,18 @@
package net.minecraft.item;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
+
+import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Random;
-import java.util.Random;
import java.util.Map.Entry;
+import java.util.Random;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+
+import cc.capture.type.CaptureBlock;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentDurability;
@@ -35,6 +39,21 @@
import net.minecraft.world.World;
import net.minecraftforge.event.ForgeEventFactory;
+import org.bukkit.craftbukkit.util.CraftMagicNumbers; // CraftBukkit
+
@@ -21,6 +24,7 @@
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.item.EntityItemFrame;
import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP; // Spigot
+// Cauldron start
+import net.minecraft.block.BlockSapling;
+import net.minecraft.block.BlockMushroom;
+
+import org.bukkit.Location;
+import org.bukkit.TreeType;
+import org.bukkit.block.BlockState;
+import org.bukkit.craftbukkit.block.CraftBlockState;
+import org.bukkit.entity.Player;
+import org.bukkit.event.world.StructureGrowEvent;
+// Cauldron end
+
public final class ItemStack
{
public static final DecimalFormat field_111284_a = new DecimalFormat("#.###");
@@ -43,7 +62,12 @@
import net.minecraft.event.HoverEvent;
import net.minecraft.init.Items;
import net.minecraft.nbt.NBTBase;
@@ -43,7 +47,12 @@
private Item field_151002_e;
public NBTTagCompound stackTagCompound;
int itemDamage;
@ -55,7 +46,7 @@
private static final String __OBFID = "CL_00000043";
private cpw.mods.fml.common.registry.RegistryDelegate<Item> delegate;
@@ -126,12 +150,14 @@
@@ -126,12 +135,14 @@
public boolean tryPlaceItemIntoWorld(EntityPlayer p_77943_1_, World p_77943_2_, int p_77943_3_, int p_77943_4_, int p_77943_5_, int p_77943_6_, float p_77943_7_, float p_77943_8_, float p_77943_9_)
{
if (!p_77943_2_.isRemote) return net.minecraftforge.common.ForgeHooks.onPlaceItemIntoWorld(this, p_77943_1_, p_77943_2_, p_77943_3_, p_77943_4_, p_77943_5_, p_77943_6_, p_77943_7_, p_77943_8_, p_77943_9_);
@ -71,7 +62,18 @@
return flag;
}
@@ -227,8 +253,22 @@
@@ -143,7 +154,9 @@
public ItemStack useItemRightClick(World p_77957_1_, EntityPlayer p_77957_2_)
{
- return this.getItem().onItemRightClick(this, p_77957_1_, p_77957_2_);
+ CaptureBlock tCapture=p_77957_1_.mCapture.startCapture(p_77957_2_,this);
+ ItemStack tResult=this.getItem().onItemRightClick(this, p_77957_1_, p_77957_2_);
+ return !tCapture.endCapture()?this:tResult;
}
public ItemStack onFoodEaten(World p_77950_1_, EntityPlayer p_77950_2_)
@@ -227,8 +240,22 @@
return getItem().getMaxDamage(this);
}
@ -94,7 +96,7 @@
if (!this.isItemStackDamageable())
{
return false;
@@ -250,6 +290,23 @@
@@ -250,6 +277,23 @@
p_96631_1_ -= k;
@ -118,7 +120,7 @@
if (p_96631_1_ <= 0)
{
return false;
@@ -267,7 +324,7 @@
@@ -267,7 +311,7 @@
{
if (this.isItemStackDamageable())
{
@ -127,7 +129,7 @@
{
p_77972_2_.renderBrokenItemStack(this);
--this.stackSize;
@@ -288,6 +345,12 @@
@@ -288,6 +332,12 @@
this.stackSize = 0;
}
@ -140,7 +142,7 @@
this.itemDamage = 0;
}
}
@@ -419,6 +482,7 @@
@@ -419,6 +469,7 @@
public void setTagCompound(NBTTagCompound p_77982_1_)
{
@ -148,7 +150,7 @@
this.stackTagCompound = p_77982_1_;
}
@@ -768,4 +832,12 @@
@@ -768,4 +819,12 @@
return ichatcomponent;
}