keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
ForgePatch/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.java.patch

63 lines
2.2 KiB
Diff
Raw Normal View History

TileEntity and TileEntityHopper rejects fixed, GuiOverlayDebug patch fixed.
2015-11-12 16:27:14 +00:00
--- ../src-base/minecraft/net/minecraft/tileentity/TileEntityHopper.java
+++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityHopper.java
Update to 1.10
2016-06-23 06:39:36 +00:00
@@ -251,6 +251,7 @@
Add IItemHandler capability Add the actual patches that I forgot. Add simple implementations of IStorage and the factory methods. Add ItemStackHandler. A simple IItemHandler implementaton. return nulls, not throw nulls. Move the vanilla wrappers to a separate class for now. Minor clean ups of VanillaWrapper code. Inline static methods. Add comments. Minor cleanup of code. Remove redundant size field and add a validate slot index method. Minor formatting issues. Break early If stacksize to insert is 0. Remove setByte() methods. Throw exception if IItemHandler can't be modifyed in NBT loading. Replace event handler with patches Add capability to mine cart inventory entities. Change formatting and registration of capability. Make InventoryPlayer implements IItemHandler because why not. Also added a field to allow mods that add additional player inventory space to publicly expose them. Reduce patch sizes Lazy initialization of the item handler for vanilla tiles. Minor formatting changes. Create a single vanilla chest item handler that will merge with adjacent chests when detected. Added hooks to reset the cached adjacent value when a block update is detected and when a chunk loads. Revert "Make InventoryPlayer implements IItemHandler because why not. Also added a field to allow mods that add additional player inventory space to publicly expose them." This reverts commit 306d4a37fd0e8c8a0754411c013b750dfe8e2c87. Fix furnace derp Replace double chest code with a simpler method. Vanilla wrappers implement IItemHandlerModifiable (since they are modifiable) Minor code cleanups Add an onContentsChanged() and onLoad() callback methods.to the default implementation. Add slot as a parameter in the callback method. Change IItemHandlerModifiable.setStackInSlot() to void, and added a note about not being intended for cross-mod use. Improve ItemStackHandler handling of errored NBT. Make the stacks array protected. Fix a lot of derps in SlotItemHandler. Fix derp in ItemStackHandler Clarify comments on IItemHandler ItemStackHandler no longer caches the stack array in local variable. Clean up the Chests code to make intentions clearer Vanilla hoppers have their cooldown activated when an item is inserted. Made this behavior part of an item handler (rather than the insertion code) Fix mistake in ItemStackHandler More documentation of potential edge cases in getStackInSlot() Make limit checking more resiliant.
2016-01-17 16:41:34 +00:00
private boolean func_145883_k()
{
+ if (net.minecraftforge.items.VanillaInventoryCodeHooks.insertHook(this)) { return true; }
IInventory iinventory = this.func_145895_l();
if (iinventory == null)
Update to 1.10
2016-06-23 06:39:36 +00:00
@@ -357,6 +358,7 @@
Add IItemHandler capability Add the actual patches that I forgot. Add simple implementations of IStorage and the factory methods. Add ItemStackHandler. A simple IItemHandler implementaton. return nulls, not throw nulls. Move the vanilla wrappers to a separate class for now. Minor clean ups of VanillaWrapper code. Inline static methods. Add comments. Minor cleanup of code. Remove redundant size field and add a validate slot index method. Minor formatting issues. Break early If stacksize to insert is 0. Remove setByte() methods. Throw exception if IItemHandler can't be modifyed in NBT loading. Replace event handler with patches Add capability to mine cart inventory entities. Change formatting and registration of capability. Make InventoryPlayer implements IItemHandler because why not. Also added a field to allow mods that add additional player inventory space to publicly expose them. Reduce patch sizes Lazy initialization of the item handler for vanilla tiles. Minor formatting changes. Create a single vanilla chest item handler that will merge with adjacent chests when detected. Added hooks to reset the cached adjacent value when a block update is detected and when a chunk loads. Revert "Make InventoryPlayer implements IItemHandler because why not. Also added a field to allow mods that add additional player inventory space to publicly expose them." This reverts commit 306d4a37fd0e8c8a0754411c013b750dfe8e2c87. Fix furnace derp Replace double chest code with a simpler method. Vanilla wrappers implement IItemHandlerModifiable (since they are modifiable) Minor code cleanups Add an onContentsChanged() and onLoad() callback methods.to the default implementation. Add slot as a parameter in the callback method. Change IItemHandlerModifiable.setStackInSlot() to void, and added a note about not being intended for cross-mod use. Improve ItemStackHandler handling of errored NBT. Make the stacks array protected. Fix a lot of derps in SlotItemHandler. Fix derp in ItemStackHandler Clarify comments on IItemHandler ItemStackHandler no longer caches the stack array in local variable. Clean up the Chests code to make intentions clearer Vanilla hoppers have their cooldown activated when an item is inserted. Made this behavior part of an item handler (rather than the insertion code) Fix mistake in ItemStackHandler More documentation of potential edge cases in getStackInSlot() Make limit checking more resiliant.
2016-01-17 16:41:34 +00:00
public static boolean func_145891_a(IHopper p_145891_0_)
{
+ if (net.minecraftforge.items.VanillaInventoryCodeHooks.extractHook(p_145891_0_)) { return true; }
IInventory iinventory = func_145884_b(p_145891_0_);
if (iinventory != null)
Update to 1.10
2016-06-23 06:39:36 +00:00
@@ -506,17 +508,31 @@
TileEntity and TileEntityHopper rejects fixed, GuiOverlayDebug patch fixed.
2015-11-12 16:27:14 +00:00
if (itemstack == null)
{
+ //Forge: BUGFIX: Again, make things respect max stack sizes.
Back to srgnames for patches. We should be starting to look OK now.
2015-11-22 05:46:26 +00:00
+ int max = Math.min(p_174916_1_.func_77976_d(), p_174916_0_.func_70297_j_());
+ if (max >= p_174916_1_.field_77994_a)
TileEntity and TileEntityHopper rejects fixed, GuiOverlayDebug patch fixed.
2015-11-12 16:27:14 +00:00
+ {
Back to srgnames for patches. We should be starting to look OK now.
2015-11-22 05:46:26 +00:00
p_174916_0_.func_70299_a(p_174916_2_, p_174916_1_);
TileEntity and TileEntityHopper rejects fixed, GuiOverlayDebug patch fixed.
2015-11-12 16:27:14 +00:00
p_174916_1_ = null;
+ }
+ else
+ {
Back to srgnames for patches. We should be starting to look OK now.
2015-11-22 05:46:26 +00:00
+ p_174916_0_.func_70299_a(p_174916_2_, p_174916_1_.func_77979_a(max));
TileEntity and TileEntityHopper rejects fixed, GuiOverlayDebug patch fixed.
2015-11-12 16:27:14 +00:00
+ }
flag = true;
}
Back to srgnames for patches. We should be starting to look OK now.
2015-11-22 05:46:26 +00:00
else if (func_145894_a(itemstack, p_174916_1_))
TileEntity and TileEntityHopper rejects fixed, GuiOverlayDebug patch fixed.
2015-11-12 16:27:14 +00:00
{
Back to srgnames for patches. We should be starting to look OK now.
2015-11-22 05:46:26 +00:00
- int i = p_174916_1_.func_77976_d() - itemstack.field_77994_a;
TileEntity and TileEntityHopper rejects fixed, GuiOverlayDebug patch fixed.
2015-11-12 16:27:14 +00:00
+ //Forge: BUGFIX: Again, make things respect max stack sizes.
Back to srgnames for patches. We should be starting to look OK now.
2015-11-22 05:46:26 +00:00
+ int max = Math.min(p_174916_1_.func_77976_d(), p_174916_0_.func_70297_j_());
+ if (max > itemstack.field_77994_a)
TileEntity and TileEntityHopper rejects fixed, GuiOverlayDebug patch fixed.
2015-11-12 16:27:14 +00:00
+ {
Back to srgnames for patches. We should be starting to look OK now.
2015-11-22 05:46:26 +00:00
+ int i = max - itemstack.field_77994_a;
int j = Math.min(p_174916_1_.field_77994_a, i);
p_174916_1_.field_77994_a -= j;
itemstack.field_77994_a += j;
TileEntity and TileEntityHopper rejects fixed, GuiOverlayDebug patch fixed.
2015-11-12 16:27:14 +00:00
flag = j > 0;
+ }
}
if (flag)
Update to 1.10
2016-06-23 06:39:36 +00:00
@@ -662,4 +678,10 @@
Add IItemHandler capability Add the actual patches that I forgot. Add simple implementations of IStorage and the factory methods. Add ItemStackHandler. A simple IItemHandler implementaton. return nulls, not throw nulls. Move the vanilla wrappers to a separate class for now. Minor clean ups of VanillaWrapper code. Inline static methods. Add comments. Minor cleanup of code. Remove redundant size field and add a validate slot index method. Minor formatting issues. Break early If stacksize to insert is 0. Remove setByte() methods. Throw exception if IItemHandler can't be modifyed in NBT loading. Replace event handler with patches Add capability to mine cart inventory entities. Change formatting and registration of capability. Make InventoryPlayer implements IItemHandler because why not. Also added a field to allow mods that add additional player inventory space to publicly expose them. Reduce patch sizes Lazy initialization of the item handler for vanilla tiles. Minor formatting changes. Create a single vanilla chest item handler that will merge with adjacent chests when detected. Added hooks to reset the cached adjacent value when a block update is detected and when a chunk loads. Revert "Make InventoryPlayer implements IItemHandler because why not. Also added a field to allow mods that add additional player inventory space to publicly expose them." This reverts commit 306d4a37fd0e8c8a0754411c013b750dfe8e2c87. Fix furnace derp Replace double chest code with a simpler method. Vanilla wrappers implement IItemHandlerModifiable (since they are modifiable) Minor code cleanups Add an onContentsChanged() and onLoad() callback methods.to the default implementation. Add slot as a parameter in the callback method. Change IItemHandlerModifiable.setStackInSlot() to void, and added a note about not being intended for cross-mod use. Improve ItemStackHandler handling of errored NBT. Make the stacks array protected. Fix a lot of derps in SlotItemHandler. Fix derp in ItemStackHandler Clarify comments on IItemHandler ItemStackHandler no longer caches the stack array in local variable. Clean up the Chests code to make intentions clearer Vanilla hoppers have their cooldown activated when an item is inserted. Made this behavior part of an item handler (rather than the insertion code) Fix mistake in ItemStackHandler More documentation of potential edge cases in getStackInSlot() Make limit checking more resiliant.
2016-01-17 16:41:34 +00:00
this.field_145900_a[i] = null;
}
}
+
+
+ protected net.minecraftforge.items.IItemHandler createUnSidedHandler()
+ {
+ return new net.minecraftforge.items.VanillaHopperItemHandler(this);
+ }
}
Reference in a new issue Copy permalink