Update to Minecraft 1.19

By: md_5 <git@md-5.net>
2022-06-08 02:00:00 +10:00
parent 91d9aa9a89
commit 25f3b50f6b
332 changed files with 3628 additions and 2559 deletions
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CapturedBlockState.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CapturedBlockState.java
@@ -1,7 +1,7 @@
 package org.bukkit.craftbukkit.block;

-import java.util.Random;
 import net.minecraft.core.BlockPosition;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.entity.EntityTypes;
 import net.minecraft.world.entity.animal.EntityBee;
 import net.minecraft.world.level.GeneratorAccessSeed;
@@ -29,7 +29,7 @@ public final class CapturedBlockState extends CraftBlockState {
        if (this.treeBlock && getType() == Material.BEE_NEST) {
            GeneratorAccessSeed generatoraccessseed = this.world.getHandle();
            BlockPosition blockposition1 = this.getPosition();
-            Random random = generatoraccessseed.getRandom();
+            RandomSource random = generatoraccessseed.getRandom();

            // Begin copied block from WorldGenFeatureTreeBeehive
            TileEntity tileentity = generatoraccessseed.getBlockEntity(blockposition1);
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
@@ -11,7 +11,9 @@ import javax.annotation.Nullable;
 import net.minecraft.core.BlockPosition;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.level.GeneratorAccess;
+import net.minecraft.world.level.block.entity.SculkCatalystBlockEntity;
 import net.minecraft.world.level.block.entity.SculkSensorBlockEntity;
+import net.minecraft.world.level.block.entity.SculkShriekerBlockEntity;
 import net.minecraft.world.level.block.entity.TileEntity;
 import net.minecraft.world.level.block.entity.TileEntityBanner;
 import net.minecraft.world.level.block.entity.TileEntityBarrel;
@@ -130,6 +132,8 @@ public final class CraftBlockStates {
                        Material.DARK_OAK_WALL_SIGN,
                        Material.JUNGLE_SIGN,
                        Material.JUNGLE_WALL_SIGN,
+                        Material.MANGROVE_SIGN,
+                        Material.MANGROVE_WALL_SIGN,
                        Material.OAK_SIGN,
                        Material.OAK_WALL_SIGN,
                        Material.SPRUCE_SIGN,
@@ -279,7 +283,9 @@ public final class CraftBlockStates {
        register(Material.JUKEBOX, CraftJukebox.class, CraftJukebox::new, TileEntityJukeBox::new);
        register(Material.LECTERN, CraftLectern.class, CraftLectern::new, TileEntityLectern::new);
        register(Material.MOVING_PISTON, CraftMovingPiston.class, CraftMovingPiston::new, TileEntityPiston::new);
+        register(Material.SCULK_CATALYST, CraftSculkCatalyst.class, CraftSculkCatalyst::new, SculkCatalystBlockEntity::new);
        register(Material.SCULK_SENSOR, CraftSculkSensor.class, CraftSculkSensor::new, SculkSensorBlockEntity::new);
+        register(Material.SCULK_SHRIEKER, CraftSculkShrieker.class, CraftSculkShrieker::new, SculkShriekerBlockEntity::new);
        register(Material.SMOKER, CraftSmoker.class, CraftSmoker::new, TileEntitySmoker::new);
        register(Material.SPAWNER, CraftCreatureSpawner.class, CraftCreatureSpawner::new, TileEntityMobSpawner::new);
        register(Material.STRUCTURE_BLOCK, CraftStructureBlock.class, CraftStructureBlock::new, TileEntityStructure::new);
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkCatalyst.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkCatalyst.java
@@ -0,0 +1,12 @@
+package org.bukkit.craftbukkit.block;
+
+import net.minecraft.world.level.block.entity.SculkCatalystBlockEntity;
+import org.bukkit.World;
+import org.bukkit.block.SculkCatalyst;
+
+public class CraftSculkCatalyst extends CraftBlockEntityState<SculkCatalystBlockEntity> implements SculkCatalyst {
+
+    public CraftSculkCatalyst(World world, SculkCatalystBlockEntity tileEntity) {
+        super(world, tileEntity);
+    }
+}
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkShrieker.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSculkShrieker.java
@@ -0,0 +1,22 @@
+package org.bukkit.craftbukkit.block;
+
+import net.minecraft.world.level.block.entity.SculkShriekerBlockEntity;
+import org.bukkit.World;
+import org.bukkit.block.SculkShrieker;
+
+public class CraftSculkShrieker extends CraftBlockEntityState<SculkShriekerBlockEntity> implements SculkShrieker {
+
+    public CraftSculkShrieker(World world, SculkShriekerBlockEntity tileEntity) {
+        super(world, tileEntity);
+    }
+
+    @Override
+    public int getWarningLevel() {
+        return getSnapshot().warningLevel;
+    }
+
+    @Override
+    public void setWarningLevel(int level) {
+        getSnapshot().warningLevel = level;
+    }
+}
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
@@ -1,9 +1,7 @@
 package org.bukkit.craftbukkit.block;

 import com.google.common.base.Preconditions;
-import net.minecraft.network.chat.ChatComponentText;
 import net.minecraft.network.chat.IChatBaseComponent;
-import net.minecraft.server.level.EntityPlayer;
 import net.minecraft.world.item.EnumColor;
 import net.minecraft.world.level.block.entity.TileEntitySign;
 import org.bukkit.DyeColor;
@@ -109,7 +107,7 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
            if (i < lines.length && lines[i] != null) {
                components[i] = CraftChatMessage.fromString(lines[i])[0];
            } else {
-                components[i] = new ChatComponentText("");
+                components[i] = IChatBaseComponent.empty();
            }
        }

--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
@@ -477,9 +477,15 @@ public class CraftBlockData implements BlockData {
        register(net.minecraft.world.level.block.LayeredCauldronBlock.class, org.bukkit.craftbukkit.block.impl.CraftLayeredCauldron::new);
        register(net.minecraft.world.level.block.LightBlock.class, org.bukkit.craftbukkit.block.impl.CraftLight::new);
        register(net.minecraft.world.level.block.LightningRodBlock.class, org.bukkit.craftbukkit.block.impl.CraftLightningRod::new);
+        register(net.minecraft.world.level.block.MangroveLeavesBlock.class, org.bukkit.craftbukkit.block.impl.CraftMangroveLeaves::new);
+        register(net.minecraft.world.level.block.MangrovePropaguleBlock.class, org.bukkit.craftbukkit.block.impl.CraftMangrovePropagule::new);
+        register(net.minecraft.world.level.block.MangroveRootsBlock.class, org.bukkit.craftbukkit.block.impl.CraftMangroveRoots::new);
        register(net.minecraft.world.level.block.PointedDripstoneBlock.class, org.bukkit.craftbukkit.block.impl.CraftPointedDripstone::new);
        register(net.minecraft.world.level.block.PowderSnowCauldronBlock.class, org.bukkit.craftbukkit.block.impl.CraftPowderSnowCauldron::new);
+        register(net.minecraft.world.level.block.SculkCatalystBlock.class, org.bukkit.craftbukkit.block.impl.CraftSculkCatalyst::new);
        register(net.minecraft.world.level.block.SculkSensorBlock.class, org.bukkit.craftbukkit.block.impl.CraftSculkSensor::new);
+        register(net.minecraft.world.level.block.SculkShriekerBlock.class, org.bukkit.craftbukkit.block.impl.CraftSculkShrieker::new);
+        register(net.minecraft.world.level.block.SculkVeinBlock.class, org.bukkit.craftbukkit.block.impl.CraftSculkVein::new);
        register(net.minecraft.world.level.block.SmallDripleafBlock.class, org.bukkit.craftbukkit.block.impl.CraftSmallDripleaf::new);
        register(net.minecraft.world.level.block.TallSeagrassBlock.class, org.bukkit.craftbukkit.block.impl.CraftTallSeagrass::new);
        register(net.minecraft.world.level.block.WeatheringCopperSlabBlock.class, org.bukkit.craftbukkit.block.impl.CraftWeatheringCopperSlab::new);
@@ -510,11 +516,11 @@ public class CraftBlockData implements BlockData {
                }

                StringReader reader = new StringReader(data);
-                ArgumentBlock arg = new ArgumentBlock(reader, false).parse(false);
+                ArgumentBlock.a arg = ArgumentBlock.parseForBlock(IRegistry.BLOCK, reader, false);
                Preconditions.checkArgument(!reader.canRead(), "Spurious trailing data: " + data);

-                blockData = arg.getState();
-                parsed = arg.getProperties();
+                blockData = arg.blockState();
+                parsed = arg.properties();
            } catch (CommandSyntaxException ex) {
                throw new IllegalArgumentException("Could not parse data: " + data, ex);
            }
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftSculkCatalyst.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftSculkCatalyst.java
@@ -0,0 +1,19 @@
+package org.bukkit.craftbukkit.block.data.type;
+
+import org.bukkit.block.data.type.SculkCatalyst;
+import org.bukkit.craftbukkit.block.data.CraftBlockData;
+
+public abstract class CraftSculkCatalyst extends CraftBlockData implements SculkCatalyst {
+
+    private static final net.minecraft.world.level.block.state.properties.BlockStateBoolean BLOOM = getBoolean("bloom");
+
+    @Override
+    public boolean isBloom() {
+        return get(BLOOM);
+    }
+
+    @Override
+    public void setBloom(boolean bloom) {
+        set(BLOOM, bloom);
+    }
+}
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftSculkShrieker.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftSculkShrieker.java
@@ -0,0 +1,30 @@
+package org.bukkit.craftbukkit.block.data.type;
+
+import org.bukkit.block.data.type.SculkShrieker;
+import org.bukkit.craftbukkit.block.data.CraftBlockData;
+
+public abstract class CraftSculkShrieker extends CraftBlockData implements SculkShrieker {
+
+    private static final net.minecraft.world.level.block.state.properties.BlockStateBoolean CAN_SUMMON = getBoolean("can_summon");
+    private static final net.minecraft.world.level.block.state.properties.BlockStateBoolean SHRIEKING = getBoolean("shrieking");
+
+    @Override
+    public boolean isCanSummon() {
+        return get(CAN_SUMMON);
+    }
+
+    @Override
+    public void setCanSummon(boolean can_summon) {
+        set(CAN_SUMMON, can_summon);
+    }
+
+    @Override
+    public boolean isShrieking() {
+        return get(SHRIEKING);
+    }
+
+    @Override
+    public void setShrieking(boolean shrieking) {
+        set(SHRIEKING, shrieking);
+    }
+}
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBigDripleaf.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBigDripleaf.java
@@ -3,8 +3,6 @@
 */
 package org.bukkit.craftbukkit.block.impl;

-import org.bukkit.block.data.type.BigDripleaf.Tilt;
-
 public final class CraftBigDripleaf extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.type.BigDripleaf, org.bukkit.block.data.type.Dripleaf, org.bukkit.block.data.Directional, org.bukkit.block.data.Waterlogged {

    public CraftBigDripleaf() {
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCauldron.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCauldron.java
@@ -1,34 +0,0 @@
-/**
- * Automatically generated file, changes will be lost.
- */
-package org.bukkit.craftbukkit.block.impl;
-
-public final class CraftCauldron extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.Levelled {
-
-    public CraftCauldron() {
-        super();
-    }
-
-    public CraftCauldron(net.minecraft.world.level.block.state.IBlockData state) {
-        super(state);
-    }
-
-    // org.bukkit.craftbukkit.block.data.CraftLevelled
-
-    private static final net.minecraft.world.level.block.state.properties.BlockStateInteger LEVEL = getInteger(net.minecraft.world.level.block.BlockCauldron.class, "level");
-
-    @Override
-    public int getLevel() {
-        return get(LEVEL);
-    }
-
-    @Override
-    public void setLevel(int level) {
-        set(LEVEL, level);
-    }
-
-    @Override
-    public int getMaximumLevel() {
-        return getMax(LEVEL);
-    }
-}
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLantern.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLantern.java
@@ -3,7 +3,7 @@
 */
 package org.bukkit.craftbukkit.block.impl;

-public final class CraftLantern extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.type.Lantern, org.bukkit.block.data.Waterlogged {
+public final class CraftLantern extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.type.Lantern, org.bukkit.block.data.Hangable, org.bukkit.block.data.Waterlogged {

    public CraftLantern() {
        super();
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftMangroveLeaves.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftMangroveLeaves.java
@@ -0,0 +1,40 @@
+/**
+ * Automatically generated file, changes will be lost.
+ */
+package org.bukkit.craftbukkit.block.impl;
+
+public final class CraftMangroveLeaves extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.type.Leaves {
+
+    public CraftMangroveLeaves() {
+        super();
+    }
+
+    public CraftMangroveLeaves(net.minecraft.world.level.block.state.IBlockData state) {
+        super(state);
+    }
+
+    // org.bukkit.craftbukkit.block.data.type.CraftLeaves
+
+    private static final net.minecraft.world.level.block.state.properties.BlockStateInteger DISTANCE = getInteger(net.minecraft.world.level.block.MangroveLeavesBlock.class, "distance");
+    private static final net.minecraft.world.level.block.state.properties.BlockStateBoolean PERSISTENT = getBoolean(net.minecraft.world.level.block.MangroveLeavesBlock.class, "persistent");
+
+    @Override
+    public boolean isPersistent() {
+        return get(PERSISTENT);
+    }
+
+    @Override
+    public void setPersistent(boolean persistent) {
+        set(PERSISTENT, persistent);
+    }
+
+    @Override
+    public int getDistance() {
+        return get(DISTANCE);
+    }
+
+    @Override
+    public void setDistance(int distance) {
+        set(DISTANCE, distance);
+    }
+}
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftMangrovePropagule.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftMangrovePropagule.java
@@ -0,0 +1,67 @@
+/**
+ * Automatically generated file, changes will be lost.
+ */
+package org.bukkit.craftbukkit.block.impl;
+
+public final class CraftMangrovePropagule extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.type.MangrovePropagule, org.bukkit.block.data.Ageable, org.bukkit.block.data.type.Sapling, org.bukkit.block.data.Waterlogged {
+
+    public CraftMangrovePropagule() {
+        super();
+    }
+
+    public CraftMangrovePropagule(net.minecraft.world.level.block.state.IBlockData state) {
+        super(state);
+    }
+
+    // org.bukkit.craftbukkit.block.data.CraftAgeable
+
+    private static final net.minecraft.world.level.block.state.properties.BlockStateInteger AGE = getInteger(net.minecraft.world.level.block.MangrovePropaguleBlock.class, "age");
+
+    @Override
+    public int getAge() {
+        return get(AGE);
+    }
+
+    @Override
+    public void setAge(int age) {
+        set(AGE, age);
+    }
+
+    @Override
+    public int getMaximumAge() {
+        return getMax(AGE);
+    }
+
+    // org.bukkit.craftbukkit.block.data.type.CraftSapling
+
+    private static final net.minecraft.world.level.block.state.properties.BlockStateInteger STAGE = getInteger(net.minecraft.world.level.block.MangrovePropaguleBlock.class, "stage");
+
+    @Override
+    public int getStage() {
+        return get(STAGE);
+    }
+
+    @Override
+    public void setStage(int stage) {
+        set(STAGE, stage);
+    }
+
+    @Override
+    public int getMaximumStage() {
+        return getMax(STAGE);
+    }
+
+    // org.bukkit.craftbukkit.block.data.CraftWaterlogged
+
+    private static final net.minecraft.world.level.block.state.properties.BlockStateBoolean WATERLOGGED = getBoolean(net.minecraft.world.level.block.MangrovePropaguleBlock.class, "waterlogged");
+
+    @Override
+    public boolean isWaterlogged() {
+        return get(WATERLOGGED);
+    }
+
+    @Override
+    public void setWaterlogged(boolean waterlogged) {
+        set(WATERLOGGED, waterlogged);
+    }
+}
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftMangroveRoots.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftMangroveRoots.java
@@ -0,0 +1,29 @@
+/**
+ * Automatically generated file, changes will be lost.
+ */
+package org.bukkit.craftbukkit.block.impl;
+
+public final class CraftMangroveRoots extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.Waterlogged {
+
+    public CraftMangroveRoots() {
+        super();
+    }
+
+    public CraftMangroveRoots(net.minecraft.world.level.block.state.IBlockData state) {
+        super(state);
+    }
+
+    // org.bukkit.craftbukkit.block.data.CraftWaterlogged
+
+    private static final net.minecraft.world.level.block.state.properties.BlockStateBoolean WATERLOGGED = getBoolean(net.minecraft.world.level.block.MangroveRootsBlock.class, "waterlogged");
+
+    @Override
+    public boolean isWaterlogged() {
+        return get(WATERLOGGED);
+    }
+
+    @Override
+    public void setWaterlogged(boolean waterlogged) {
+        set(WATERLOGGED, waterlogged);
+    }
+}
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftSculkCatalyst.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftSculkCatalyst.java
@@ -0,0 +1,29 @@
+/**
+ * Automatically generated file, changes will be lost.
+ */
+package org.bukkit.craftbukkit.block.impl;
+
+public final class CraftSculkCatalyst extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.type.SculkCatalyst {
+
+    public CraftSculkCatalyst() {
+        super();
+    }
+
+    public CraftSculkCatalyst(net.minecraft.world.level.block.state.IBlockData state) {
+        super(state);
+    }
+
+    // org.bukkit.craftbukkit.block.data.type.CraftSculkCatalyst
+
+    private static final net.minecraft.world.level.block.state.properties.BlockStateBoolean BLOOM = getBoolean(net.minecraft.world.level.block.SculkCatalystBlock.class, "bloom");
+
+    @Override
+    public boolean isBloom() {
+        return get(BLOOM);
+    }
+
+    @Override
+    public void setBloom(boolean bloom) {
+        set(BLOOM, bloom);
+    }
+}
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftSculkShrieker.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftSculkShrieker.java
@@ -0,0 +1,54 @@
+/**
+ * Automatically generated file, changes will be lost.
+ */
+package org.bukkit.craftbukkit.block.impl;
+
+public final class CraftSculkShrieker extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.type.SculkShrieker, org.bukkit.block.data.Waterlogged {
+
+    public CraftSculkShrieker() {
+        super();
+    }
+
+    public CraftSculkShrieker(net.minecraft.world.level.block.state.IBlockData state) {
+        super(state);
+    }
+
+    // org.bukkit.craftbukkit.block.data.type.CraftSculkShrieker
+
+    private static final net.minecraft.world.level.block.state.properties.BlockStateBoolean CAN_SUMMON = getBoolean(net.minecraft.world.level.block.SculkShriekerBlock.class, "can_summon");
+    private static final net.minecraft.world.level.block.state.properties.BlockStateBoolean SHRIEKING = getBoolean(net.minecraft.world.level.block.SculkShriekerBlock.class, "shrieking");
+
+    @Override
+    public boolean isCanSummon() {
+        return get(CAN_SUMMON);
+    }
+
+    @Override
+    public void setCanSummon(boolean can_summon) {
+        set(CAN_SUMMON, can_summon);
+    }
+
+    @Override
+    public boolean isShrieking() {
+        return get(SHRIEKING);
+    }
+
+    @Override
+    public void setShrieking(boolean shrieking) {
+        set(SHRIEKING, shrieking);
+    }
+
+    // org.bukkit.craftbukkit.block.data.CraftWaterlogged
+
+    private static final net.minecraft.world.level.block.state.properties.BlockStateBoolean WATERLOGGED = getBoolean(net.minecraft.world.level.block.SculkShriekerBlock.class, "waterlogged");
+
+    @Override
+    public boolean isWaterlogged() {
+        return get(WATERLOGGED);
+    }
+
+    @Override
+    public void setWaterlogged(boolean waterlogged) {
+        set(WATERLOGGED, waterlogged);
+    }
+}
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftSculkVein.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/impl/CraftSculkVein.java
@@ -0,0 +1,29 @@
+/**
+ * Automatically generated file, changes will be lost.
+ */
+package org.bukkit.craftbukkit.block.impl;
+
+public final class CraftSculkVein extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.Waterlogged {
+
+    public CraftSculkVein() {
+        super();
+    }
+
+    public CraftSculkVein(net.minecraft.world.level.block.state.IBlockData state) {
+        super(state);
+    }
+
+    // org.bukkit.craftbukkit.block.data.CraftWaterlogged
+
+    private static final net.minecraft.world.level.block.state.properties.BlockStateBoolean WATERLOGGED = getBoolean(net.minecraft.world.level.block.SculkVeinBlock.class, "waterlogged");
+
+    @Override
+    public boolean isWaterlogged() {
+        return get(WATERLOGGED);
+    }
+
+    @Override
+    public void setWaterlogged(boolean waterlogged) {
+        set(WATERLOGGED, waterlogged);
+    }
+}