From 9c864e469f4667e37dbb6557ffdb6c22571ad4dd Mon Sep 17 00:00:00 2001 From: erocs Date: Sun, 8 Sep 2013 12:06:15 -0700 Subject: [PATCH] Hopper Customisations Allows editing hopper cooldowns and amount transferred per tick. diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java index 7fe1f46..f4dc9c7 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -193,12 +193,18 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU } if (flag) { - this.d(8); + this.d(world.spigotConfig.hopperTransfer); // Spigot this.update(); return true; } } + // Spigot start + if ( !this.n() ) + { + this.d( world.spigotConfig.hopperCheck ); + } + // Spigot end return false; } else { return false; @@ -252,7 +258,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU // ItemStack itemstack1 = addItem(iinventory, this.splitStack(i, 1), enumdirection); // CraftBukkit start - Call event when pushing items into other inventories - CraftItemStack oitemstack = CraftItemStack.asCraftMirror(this.splitStack(i, 1)); + CraftItemStack oitemstack = CraftItemStack.asCraftMirror(this.splitStack(i, world.spigotConfig.hopperAmount)); // Spigot Inventory destinationInventory; // Have to special case large chests as they work oddly @@ -266,9 +272,10 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU this.getWorld().getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { this.setItem(i, itemstack); - this.d(8); // Delay hopper checks + this.d(world.spigotConfig.hopperTransfer); // Spigot return false; } + int origCount = event.getItem().getAmount(); // Spigot ItemStack itemstack1 = addItem(iinventory, CraftItemStack.asNMSCopy(event.getItem()), enumdirection); if (itemstack1 == null || itemstack1.count == 0) { @@ -280,7 +287,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU // CraftBukkit end return true; } - + itemstack.count -= origCount - itemstack1.count; // Spigot this.setItem(i, itemstack); } } @@ -386,7 +393,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU ItemStack itemstack1 = itemstack.cloneItemStack(); // ItemStack itemstack2 = addItem(ihopper, iinventory.splitStack(i, 1), (EnumDirection) null); // CraftBukkit start - Call event on collection of items from inventories into the hopper - CraftItemStack oitemstack = CraftItemStack.asCraftMirror(iinventory.splitStack(i, 1)); + CraftItemStack oitemstack = CraftItemStack.asCraftMirror(iinventory.splitStack(i, ihopper.getWorld().spigotConfig.hopperAmount)); // Spigot Inventory sourceInventory; // Have to special case large chests as they work oddly @@ -403,13 +410,14 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU iinventory.setItem(i, itemstack1); if (ihopper instanceof TileEntityHopper) { - ((TileEntityHopper) ihopper).d(8); // Delay hopper checks + ((TileEntityHopper) ihopper).d(ihopper.getWorld().spigotConfig.hopperTransfer); // Spigot } else if (ihopper instanceof EntityMinecartHopper) { - ((EntityMinecartHopper) ihopper).l(4); // Delay hopper minecart checks + ((EntityMinecartHopper) ihopper).l(ihopper.getWorld().spigotConfig.hopperTransfer / 2); // Spigot } return false; } + int origCount = event.getItem().getAmount(); // Spigot ItemStack itemstack2 = addItem(ihopper, CraftItemStack.asNMSCopy(event.getItem()), null); if (itemstack2 == null || itemstack2.count == 0) { @@ -421,6 +429,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU // CraftBukkit end return true; } + itemstack1.count -= origCount - itemstack2.count; // Spigot iinventory.setItem(i, itemstack1); } @@ -511,7 +520,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU TileEntityHopper tileentityhopper = (TileEntityHopper) iinventory; if (tileentityhopper.o()) { - tileentityhopper.d(8); + tileentityhopper.d(tileentityhopper.world.spigotConfig.hopperTransfer); // Spigot } iinventory.update(); diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java index 6421bf2..956c628 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -164,4 +164,19 @@ public class SpigotWorldConfig otherTrackingRange = getInt( "entity-tracking-range.other", otherTrackingRange ); log( "Entity Tracking Range: Pl " + playerTrackingRange + " / An " + animalTrackingRange + " / Mo " + monsterTrackingRange + " / Mi " + miscTrackingRange + " / Other " + otherTrackingRange ); } + + public int hopperTransfer; + public int hopperCheck; + public int hopperAmount; + private void hoppers() + { + // Set the tick delay between hopper item movements + hopperTransfer = getInt( "ticks-per.hopper-transfer", 8 ); + // Set the tick delay between checking for items after the associated + // container is empty. Default to the hopperTransfer value to prevent + // hopper sorting machines from becoming out of sync. + hopperCheck = getInt( "ticks-per.hopper-check", hopperTransfer ); + hopperAmount = getInt( "hopper-amount", 1 ); + log( "Hopper Transfer: " + hopperTransfer + " Hopper Check: " + hopperCheck + " Hopper Amount: " + hopperAmount ); + } } -- 2.1.0