1
1
package org .bukkit .craftbukkit .inventory ;
2
2
3
3
import net .minecraft .world .Container ;
4
+ import net .minecraft .world .inventory .HorseInventoryMenu ;
4
5
import org .bukkit .inventory .AbstractHorseInventory ;
5
6
import org .bukkit .inventory .ItemStack ;
6
7
@@ -16,12 +17,12 @@ public CraftInventoryAbstractHorse(Container inventory, final Container bodyArmo
16
17
17
18
@ Override
18
19
public ItemStack getSaddle () {
19
- return this .getItem (net . minecraft . world . entity . animal . horse . AbstractHorse . INV_SLOT_SADDLE ); // Paper
20
+ return this .getItem (HorseInventoryMenu . SLOT_SADDLE ); // Paper
20
21
}
21
22
22
23
@ Override
23
24
public void setSaddle (ItemStack stack ) {
24
- this .setItem (net . minecraft . world . entity . animal . horse . AbstractHorse . INV_SLOT_SADDLE , stack ); // Paper
25
+ this .setItem (HorseInventoryMenu . SLOT_SADDLE , stack ); // Paper
25
26
}
26
27
27
28
// Paper start - combine both horse inventories
@@ -55,10 +56,10 @@ public boolean isEmpty() {
55
56
public ItemStack [] getContents () {
56
57
ItemStack [] items = new ItemStack [this .getSize ()];
57
58
58
- items [net . minecraft . world . entity . animal . horse . AbstractHorse . INV_SLOT_SADDLE ] = this .getSaddle ();
59
- items [net . minecraft . world . inventory . HorseInventoryMenu .SLOT_BODY_ARMOR ] = this .getArmor ();
59
+ items [HorseInventoryMenu . SLOT_SADDLE ] = this .getSaddle ();
60
+ items [HorseInventoryMenu .SLOT_BODY_ARMOR ] = this .getArmor ();
60
61
61
- for (int i = net . minecraft . world . inventory . HorseInventoryMenu .SLOT_BODY_ARMOR + 1 ; i < items .length ; i ++) {
62
+ for (int i = HorseInventoryMenu .SLOT_HORSE_INVENTORY_START ; i < items .length ; i ++) {
62
63
net .minecraft .world .item .ItemStack item = this .getMainInventory ().getItem (i - 1 );
63
64
items [i ] = item .isEmpty () ? null : CraftItemStack .asCraftMirror (item );
64
65
}
@@ -70,23 +71,23 @@ public ItemStack[] getContents() {
70
71
public void setContents (ItemStack [] items ) {
71
72
com .google .common .base .Preconditions .checkArgument (items .length <= this .getSize (), "Invalid inventory size (%s); expected %s or less" , items .length , this .getSize ());
72
73
73
- this .setSaddle (org .apache .commons .lang3 .ArrayUtils .get (items , net . minecraft . world . entity . animal . horse . AbstractHorse . INV_SLOT_SADDLE ));
74
- this .setArmor (org .apache .commons .lang3 .ArrayUtils .get (items , net . minecraft . world . inventory . HorseInventoryMenu .SLOT_BODY_ARMOR ));
74
+ this .setSaddle (org .apache .commons .lang3 .ArrayUtils .get (items , HorseInventoryMenu . SLOT_SADDLE ));
75
+ this .setArmor (org .apache .commons .lang3 .ArrayUtils .get (items , HorseInventoryMenu .SLOT_BODY_ARMOR ));
75
76
76
- for (int i = net . minecraft . world . inventory . HorseInventoryMenu .SLOT_BODY_ARMOR + 1 ; i < this .getSize (); i ++) {
77
+ for (int i = HorseInventoryMenu .SLOT_BODY_ARMOR + 1 ; i < this .getSize (); i ++) {
77
78
net .minecraft .world .item .ItemStack item = i >= items .length ? net .minecraft .world .item .ItemStack .EMPTY : CraftItemStack .asNMSCopy (items [i ]);
78
79
this .getMainInventory ().setItem (i - 1 , item );
79
80
}
80
81
}
81
82
82
83
@ Override
83
84
public ItemStack getItem (final int index ) {
84
- if (index == net . minecraft . world . inventory . HorseInventoryMenu .SLOT_BODY_ARMOR ) {
85
+ if (index == HorseInventoryMenu .SLOT_BODY_ARMOR ) {
85
86
final net .minecraft .world .item .ItemStack item = this .getArmorInventory ().getItem (0 );
86
87
return item .isEmpty () ? null : CraftItemStack .asCraftMirror (item );
87
88
} else {
88
89
int shiftedIndex = index ;
89
- if (index > net . minecraft . world . inventory . HorseInventoryMenu .SLOT_BODY_ARMOR ) {
90
+ if (index > HorseInventoryMenu .SLOT_BODY_ARMOR ) {
90
91
shiftedIndex --;
91
92
}
92
93
@@ -97,11 +98,11 @@ public ItemStack getItem(final int index) {
97
98
98
99
@ Override
99
100
public void setItem (final int index , final ItemStack item ) {
100
- if (index == net . minecraft . world . inventory . HorseInventoryMenu .SLOT_BODY_ARMOR ) {
101
+ if (index == HorseInventoryMenu .SLOT_BODY_ARMOR ) {
101
102
this .getArmorInventory ().setItem (0 , CraftItemStack .asNMSCopy (item ));
102
103
} else {
103
104
int shiftedIndex = index ;
104
- if (index > net . minecraft . world . inventory . HorseInventoryMenu .SLOT_BODY_ARMOR ) {
105
+ if (index > HorseInventoryMenu .SLOT_BODY_ARMOR ) {
105
106
shiftedIndex --;
106
107
}
107
108
this .getMainInventory ().setItem (shiftedIndex , CraftItemStack .asNMSCopy (item ));
0 commit comments