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

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/inventory/ContainerGrindstone.java
+++ b/net/minecraft/world/inventory/ContainerGrindstone.java
@@ -17,8 +17,30 @@
import net.minecraft.world.level.World;
@@ -20,8 +20,30 @@
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.phys.Vec3D;
+// CraftBukkit start
+import org.bukkit.Location;
@@ -23,15 +23,15 @@
+ return bukkitEntity;
+ }
+
+ CraftInventoryGrindstone inventory = new CraftInventoryGrindstone(this.craftInventory, this.resultInventory);
+ CraftInventoryGrindstone inventory = new CraftInventoryGrindstone(this.repairSlots, this.resultSlots);
+ bukkitEntity = new CraftInventoryView(this.player, inventory, this);
+ return bukkitEntity;
+ }
+ // CraftBukkit end
private final IInventory resultInventory;
private final IInventory craftInventory;
private final ContainerAccess containerAccess;
@@ -36,6 +58,13 @@
public static final int MAX_NAME_LENGTH = 35;
public static final int INPUT_SLOT = 0;
public static final int ADDITIONAL_SLOT = 1;
@@ -47,6 +69,13 @@
super.update();
ContainerGrindstone.this.a((IInventory) this);
}
@@ -43,9 +43,9 @@
+ }
+ // CraftBukkit end
};
this.containerAccess = containeraccess;
this.a(new Slot(this.craftInventory, 0, 49, 19) {
@@ -120,6 +149,7 @@
this.access = containeraccess;
this.a(new Slot(this.repairSlots, 0, 49, 19) {
@@ -125,6 +154,7 @@
this.a(new Slot(playerinventory, j, 8 + j * 18, 142));
}
@@ -53,11 +53,11 @@
}
@Override
@@ -247,6 +277,7 @@
@@ -252,6 +282,7 @@
@Override
public boolean canUse(EntityHuman entityhuman) {
+ if (!this.checkReachable) return true; // CraftBukkit
return a(this.containerAccess, entityhuman, Blocks.GRINDSTONE);
return a(this.access, entityhuman, Blocks.GRINDSTONE);
}