161 lines
6.4 KiB
Diff
161 lines
6.4 KiB
Diff
--- ../src_base/minecraft/net/minecraft/client/Minecraft.java
|
|
+++ ../src_work/minecraft/net/minecraft/client/Minecraft.java
|
|
@@ -122,6 +122,10 @@
|
|
|
|
import com.google.common.collect.MapDifference;
|
|
|
|
+import net.minecraftforge.common.ForgeHooks;
|
|
+import net.minecraftforge.event.ForgeEventFactory;
|
|
+import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
|
|
+
|
|
@SideOnly(Side.CLIENT)
|
|
public abstract class Minecraft implements Runnable, IPlayerUsage
|
|
{
|
|
@@ -1239,7 +1243,7 @@
|
|
|
|
if (this.thePlayer.canCurrentToolHarvestBlock(j, k, l))
|
|
{
|
|
- this.effectRenderer.addBlockHitEffects(j, k, l, this.objectMouseOver.sideHit);
|
|
+ this.effectRenderer.addBlockHitEffects(j, k, l, this.objectMouseOver);
|
|
this.thePlayer.swingItem();
|
|
}
|
|
}
|
|
@@ -1305,7 +1309,8 @@
|
|
{
|
|
int j1 = itemstack != null ? itemstack.stackSize : 0;
|
|
|
|
- if (this.playerController.onPlayerRightClick(this.thePlayer, this.theWorld, itemstack, j, k, l, i1, this.objectMouseOver.hitVec))
|
|
+ boolean result = !ForgeEventFactory.onPlayerInteract(thePlayer, Action.RIGHT_CLICK_BLOCK, j, k, l, i1).isCanceled();
|
|
+ if (result && this.playerController.onPlayerRightClick(this.thePlayer, this.theWorld, itemstack, j, k, l, i1, this.objectMouseOver.hitVec))
|
|
{
|
|
flag = false;
|
|
this.thePlayer.swingItem();
|
|
@@ -1331,7 +1336,8 @@
|
|
{
|
|
ItemStack itemstack1 = this.thePlayer.inventory.getCurrentItem();
|
|
|
|
- if (itemstack1 != null && this.playerController.sendUseItem(this.thePlayer, this.theWorld, itemstack1))
|
|
+ boolean result = !ForgeEventFactory.onPlayerInteract(thePlayer, Action.RIGHT_CLICK_AIR, 0, 0, 0, -1).isCanceled();
|
|
+ if (result && itemstack1 != null && this.playerController.sendUseItem(this.thePlayer, this.theWorld, itemstack1))
|
|
{
|
|
this.entityRenderer.itemRenderer.resetEquippedProgress2();
|
|
}
|
|
@@ -2028,6 +2034,18 @@
|
|
if (this.theIntegratedServer != null)
|
|
{
|
|
this.theIntegratedServer.initiateShutdown();
|
|
+ if (loadingScreen!=null)
|
|
+ {
|
|
+ this.loadingScreen.resetProgresAndWorkingMessage("Shutting down internal server...");
|
|
+ }
|
|
+ while (!theIntegratedServer.isServerStopped())
|
|
+ {
|
|
+ try
|
|
+ {
|
|
+ Thread.sleep(10);
|
|
+ }
|
|
+ catch (InterruptedException ie) {}
|
|
+ }
|
|
}
|
|
|
|
this.theIntegratedServer = null;
|
|
@@ -2339,95 +2357,12 @@
|
|
if (this.objectMouseOver != null)
|
|
{
|
|
boolean flag = this.thePlayer.capabilities.isCreativeMode;
|
|
- int i = 0;
|
|
- boolean flag1 = false;
|
|
- int j;
|
|
int k;
|
|
|
|
- if (this.objectMouseOver.typeOfHit == EnumMovingObjectType.TILE)
|
|
- {
|
|
- k = this.objectMouseOver.blockX;
|
|
- int l = this.objectMouseOver.blockY;
|
|
- int i1 = this.objectMouseOver.blockZ;
|
|
- Block block = Block.blocksList[this.theWorld.getBlockId(k, l, i1)];
|
|
-
|
|
- if (block == null)
|
|
- {
|
|
- return;
|
|
- }
|
|
-
|
|
- j = block.idPicked(this.theWorld, k, l, i1);
|
|
-
|
|
- if (j == 0)
|
|
- {
|
|
- return;
|
|
- }
|
|
-
|
|
- flag1 = Item.itemsList[j].getHasSubtypes();
|
|
- int j1 = j < 256 && !Block.blocksList[block.blockID].func_82505_u_() ? j : block.blockID;
|
|
- i = Block.blocksList[j1].getDamageValue(this.theWorld, k, l, i1);
|
|
- }
|
|
- else
|
|
- {
|
|
- if (this.objectMouseOver.typeOfHit != EnumMovingObjectType.ENTITY || this.objectMouseOver.entityHit == null || !flag)
|
|
- {
|
|
- return;
|
|
- }
|
|
-
|
|
- if (this.objectMouseOver.entityHit instanceof EntityPainting)
|
|
- {
|
|
- j = Item.painting.itemID;
|
|
- }
|
|
- else if (this.objectMouseOver.entityHit instanceof EntityItemFrame)
|
|
- {
|
|
- EntityItemFrame entityitemframe = (EntityItemFrame)this.objectMouseOver.entityHit;
|
|
-
|
|
- if (entityitemframe.getDisplayedItem() == null)
|
|
- {
|
|
- j = Item.itemFrame.itemID;
|
|
- }
|
|
- else
|
|
- {
|
|
- j = entityitemframe.getDisplayedItem().itemID;
|
|
- i = entityitemframe.getDisplayedItem().getItemDamage();
|
|
- flag1 = true;
|
|
- }
|
|
- }
|
|
- else if (this.objectMouseOver.entityHit instanceof EntityMinecart)
|
|
- {
|
|
- EntityMinecart entityminecart = (EntityMinecart)this.objectMouseOver.entityHit;
|
|
-
|
|
- if (entityminecart.func_94087_l() == 2)
|
|
- {
|
|
- j = Item.minecartPowered.itemID;
|
|
- }
|
|
- else if (entityminecart.func_94087_l() == 1)
|
|
- {
|
|
- j = Item.minecartCrate.itemID;
|
|
- }
|
|
- else
|
|
- {
|
|
- j = Item.minecartEmpty.itemID;
|
|
- }
|
|
- }
|
|
- else if (this.objectMouseOver.entityHit instanceof EntityBoat)
|
|
- {
|
|
- j = Item.boat.itemID;
|
|
- }
|
|
- else
|
|
- {
|
|
- j = Item.monsterPlacer.itemID;
|
|
- i = EntityList.getEntityID(this.objectMouseOver.entityHit);
|
|
- flag1 = true;
|
|
-
|
|
- if (i <= 0 || !EntityList.entityEggs.containsKey(Integer.valueOf(i)))
|
|
- {
|
|
- return;
|
|
- }
|
|
- }
|
|
- }
|
|
-
|
|
- this.thePlayer.inventory.setCurrentItem(j, i, flag1, flag);
|
|
+ if (!ForgeHooks.onPickBlock(this.objectMouseOver, this.thePlayer, this.theWorld))
|
|
+ {
|
|
+ return;
|
|
+ }
|
|
|
|
if (flag)
|
|
{
|