37 lines
2.3 KiB
Diff
37 lines
2.3 KiB
Diff
--- a/net/minecraft/world/inventory/Containers.java
|
|
+++ b/net/minecraft/world/inventory/Containers.java
|
|
@@ -8,6 +8,10 @@
|
|
import net.minecraft.world.flag.FeatureFlagSet;
|
|
import net.minecraft.world.flag.FeatureFlags;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.world.entity.player.PlayerInventory;
|
|
+// CraftBukkit end
|
|
+
|
|
public class Containers<T extends Container> implements FeatureElement {
|
|
|
|
public static final Containers<ContainerChest> GENERIC_9x1 = register("generic_9x1", ContainerChest::oneRow);
|
|
@@ -28,7 +32,7 @@
|
|
public static final Containers<ContainerGrindstone> GRINDSTONE = register("grindstone", ContainerGrindstone::new);
|
|
public static final Containers<ContainerHopper> HOPPER = register("hopper", ContainerHopper::new);
|
|
public static final Containers<ContainerLectern> LECTERN = register("lectern", (i, playerinventory) -> {
|
|
- return new ContainerLectern(i);
|
|
+ return new ContainerLectern(i, playerinventory); // CraftBukkit
|
|
});
|
|
public static final Containers<ContainerLoom> LOOM = register("loom", ContainerLoom::new);
|
|
public static final Containers<ContainerMerchant> MERCHANT = register("merchant", ContainerMerchant::new);
|
|
@@ -41,11 +45,11 @@
|
|
private final Containers.Supplier<T> constructor;
|
|
|
|
private static <T extends Container> Containers<T> register(String s, Containers.Supplier<T> containers_supplier) {
|
|
- return (Containers) IRegistry.register(BuiltInRegistries.MENU, s, new Containers(containers_supplier, FeatureFlags.VANILLA_SET));
|
|
+ return (Containers) IRegistry.register(BuiltInRegistries.MENU, s, new Containers<>(containers_supplier, FeatureFlags.VANILLA_SET)); // CraftBukkit - decompile error
|
|
}
|
|
|
|
private static <T extends Container> Containers<T> register(String s, Containers.Supplier<T> containers_supplier, FeatureFlag... afeatureflag) {
|
|
- return (Containers) IRegistry.register(BuiltInRegistries.MENU, s, new Containers(containers_supplier, FeatureFlags.REGISTRY.subset(afeatureflag)));
|
|
+ return (Containers) IRegistry.register(BuiltInRegistries.MENU, s, new Containers<>(containers_supplier, FeatureFlags.REGISTRY.subset(afeatureflag))); // CraftBukkit - decompile error
|
|
}
|
|
|
|
private Containers(Containers.Supplier<T> containers_supplier, FeatureFlagSet featureflagset) {
|