Update to Minecraft 1.17

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-06-11 15:00:00 +10:00
parent 75faba7fde
commit b3a8254758
619 changed files with 10708 additions and 8451 deletions

View File

@@ -23,17 +23,17 @@
+ return bukkitEntity;
+ }
+
+ CraftInventoryLoom inventory = new CraftInventoryLoom(this.craftInventory, this.resultInventory);
+ CraftInventoryLoom inventory = new CraftInventoryLoom(this.inputContainer, this.outputContainer);
+ bukkitEntity = new CraftInventoryView(this.player, inventory, this);
+ return bukkitEntity;
+ }
+ // CraftBukkit end
private final ContainerAccess containerAccess;
private final ContainerProperty d;
private Runnable e;
@@ -45,6 +67,13 @@
private static final int INV_SLOT_START = 4;
private static final int INV_SLOT_END = 31;
private static final int USE_ROW_SLOT_START = 31;
@@ -49,6 +71,13 @@
ContainerLoom.this.a((IInventory) this);
ContainerLoom.this.e.run();
ContainerLoom.this.slotUpdateListener.run();
}
+
+ // CraftBukkit start
@@ -43,11 +43,11 @@
+ }
+ // CraftBukkit end
};
this.resultInventory = new InventorySubcontainer(1) {
this.outputContainer = new InventorySubcontainer(1) {
@Override
@@ -52,6 +81,13 @@
@@ -56,6 +85,13 @@
super.update();
ContainerLoom.this.e.run();
ContainerLoom.this.slotUpdateListener.run();
}
+
+ // CraftBukkit start
@@ -57,22 +57,25 @@
+ }
+ // CraftBukkit end
};
this.containerAccess = containeraccess;
this.f = this.a(new Slot(this.craftInventory, 0, 13, 26) {
@@ -112,10 +148,12 @@
this.access = containeraccess;
this.bannerSlot = this.a(new Slot(this.inputContainer, 0, 13, 26) {
@@ -116,6 +152,7 @@
}
this.a(this.d);
this.a(this.selectedBannerPatternIndex);
+ player = (Player) playerinventory.player.getBukkitEntity(); // CraftBukkit
}
public int i() {
@@ -124,6 +161,7 @@
@Override
public boolean canUse(EntityHuman entityhuman) {
+ if (!this.checkReachable) return true; // CraftBukkit
return a(this.containerAccess, entityhuman, Blocks.LOOM);
return a(this.access, entityhuman, Blocks.LOOM);
}
@@ -234,6 +272,11 @@
@@ -246,6 +284,11 @@
if (nbttagcompound.hasKeyOfType("Patterns", 9)) {
nbttaglist = nbttagcompound.getList("Patterns", 10);