diff --git a/versions/26.1-snapshot-1/build.gradle.kts b/versions/26.1-snapshot-1/build.gradle.kts index 645cb5d9..3bb12f8d 100644 --- a/versions/26.1-snapshot-1/build.gradle.kts +++ b/versions/26.1-snapshot-1/build.gradle.kts @@ -4,6 +4,10 @@ plugins { id("io.papermc.sculptor.version") version "2.0.0-SNAPSHOT" } +repositories { + maven("https://central.sonatype.com/repository/maven-snapshots/") +} + val generateReportsProperty = providers.gradleProperty("generateReports") mache { minecraftVersion = "26.1-snapshot-1" @@ -33,7 +37,7 @@ tasks.withType().configureEach { dependencies { codebook("2.0.0-SNAPSHOT") - decompiler(vineflower("1.11.2")) + decompiler(vineflower("1.12.0-SNAPSHOT")) constants("io.papermc.parchment.data:parchment:1.21.11+build.3") } diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/TracingExecutor.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/TracingExecutor.java.patch deleted file mode 100644 index d55770b3..00000000 --- a/versions/26.1-snapshot-1/patches/net/minecraft/TracingExecutor.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/TracingExecutor.java -+++ b/net/minecraft/TracingExecutor.java -@@ -21,7 +_,7 @@ - } - }); - } else { -- return (Executor)(TracyClient.isAvailable() ? command -> this.service.execute(() -> { -+ return (TracyClient.isAvailable() ? command -> this.service.execute(() -> { - try (Zone ignored = TracyClient.beginZone(name, SharedConstants.IS_RUNNING_IN_IDE)) { - command.run(); - } diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/advancements/criterion/PlayerPredicate.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/advancements/criterion/PlayerPredicate.java.patch index 7a15e335..5212eab1 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/advancements/criterion/PlayerPredicate.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/advancements/criterion/PlayerPredicate.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/advancements/criterion/PlayerPredicate.java +++ b/net/minecraft/advancements/criterion/PlayerPredicate.java -@@ -243,11 +_,11 @@ +@@ -259,11 +_,11 @@ private static MapCodec> createTypedCodec(final StatType type) { return RecordCodecBuilder.mapCodec( i -> i.group( diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/commands/arguments/OperationArgument.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/commands/arguments/OperationArgument.java.patch deleted file mode 100644 index 0b73ba81..00000000 --- a/versions/26.1-snapshot-1/patches/net/minecraft/commands/arguments/OperationArgument.java.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/net/minecraft/commands/arguments/OperationArgument.java -+++ b/net/minecraft/commands/arguments/OperationArgument.java -@@ -57,11 +_,11 @@ - } - - private static OperationArgument.Operation getOperation(final String op) throws CommandSyntaxException { -- return (OperationArgument.Operation)(op.equals("><") ? (a, b) -> { -+ return op.equals("><") ? (a, b) -> { - int swap = a.get(); - a.set(b.get()); - b.set(swap); -- } : getSimpleOperation(op)); -+ } : getSimpleOperation(op); - } - - private static OperationArgument.SimpleOperation getSimpleOperation(final String op) throws CommandSyntaxException { diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/core/RegistrySetBuilder.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/core/RegistrySetBuilder.java.patch index 1808e12f..a5cb6d7d 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/core/RegistrySetBuilder.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/core/RegistrySetBuilder.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/core/RegistrySetBuilder.java +++ b/net/minecraft/core/RegistrySetBuilder.java -@@ -420,13 +_,13 @@ +@@ -421,13 +_,13 @@ } private Holder.Reference getOrCreate(final ResourceKey id) { diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/core/registries/BuiltInRegistries.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/core/registries/BuiltInRegistries.java.patch index 2fd759aa..07941bf5 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/core/registries/BuiltInRegistries.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/core/registries/BuiltInRegistries.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/core/registries/BuiltInRegistries.java +++ b/net/minecraft/core/registries/BuiltInRegistries.java -@@ -385,7 +_,7 @@ +@@ -387,7 +_,7 @@ Bootstrap.checkBootstrapCalled(() -> "registry " + name.identifier()); Identifier key = name.identifier(); LOADERS.put(key, () -> loader.run(registry)); diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/data/loot/packs/VanillaBlockLoot.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/data/loot/packs/VanillaBlockLoot.java.patch new file mode 100644 index 00000000..5b66ad93 --- /dev/null +++ b/versions/26.1-snapshot-1/patches/net/minecraft/data/loot/packs/VanillaBlockLoot.java.patch @@ -0,0 +1,785 @@ +--- a/net/minecraft/data/loot/packs/VanillaBlockLoot.java ++++ b/net/minecraft/data/loot/packs/VanillaBlockLoot.java +@@ -316,8 +_,7 @@ + this.dropSelf(Blocks.CRACKED_STONE_BRICKS); + this.dropSelf(Blocks.CHISELED_STONE_BRICKS); + this.dropSelf(Blocks.IRON_BARS); +- VanillaBlockLoot isBeetrootMaxAge = this; +- Blocks.COPPER_BARS.forEach(x$0 -> isBeetrootMaxAge.dropSelf(x$0)); ++ Blocks.COPPER_BARS.forEach(this::dropSelf); + this.dropSelf(Blocks.OAK_FENCE_GATE); + this.dropSelf(Blocks.MANGROVE_FENCE_GATE); + this.dropSelf(Blocks.BAMBOO_FENCE_GATE); +@@ -580,8 +_,7 @@ + this.dropSelf(Blocks.CRACKED_NETHER_BRICKS); + this.dropSelf(Blocks.QUARTZ_BRICKS); + this.dropSelf(Blocks.IRON_CHAIN); +- isBeetrootMaxAge = this; +- Blocks.COPPER_CHAIN.forEach(x$0 -> isBeetrootMaxAge.dropSelf(x$0)); ++ Blocks.COPPER_CHAIN.forEach(this::dropSelf); + this.dropSelf(Blocks.WARPED_ROOTS); + this.dropSelf(Blocks.CRIMSON_ROOTS); + this.dropSelf(Blocks.MUD_BRICKS); +@@ -641,10 +_,8 @@ + this.add(Blocks.LEAF_LITTER, this.createSegmentedBlockDrops(Blocks.LEAF_LITTER)); + this.dropSelf(Blocks.BIG_DRIPLEAF); + this.dropSelf(Blocks.MOSS_BLOCK); +- isBeetrootMaxAge = this; +- this.add(Blocks.PALE_MOSS_CARPET, x$0 -> isBeetrootMaxAge.createMossyCarpetBlockDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.PALE_HANGING_MOSS, x$0 -> isBeetrootMaxAge.createShearsOrSilkTouchOnlyDrop(x$0)); ++ this.add(Blocks.PALE_MOSS_CARPET, this::createMossyCarpetBlockDrops); ++ this.add(Blocks.PALE_HANGING_MOSS, this::createShearsOrSilkTouchOnlyDrop); + this.dropSelf(Blocks.PALE_MOSS_BLOCK); + this.dropSelf(Blocks.ROOTED_DIRT); + this.dropSelf(Blocks.COBBLED_DEEPSLATE); +@@ -683,12 +_,9 @@ + this.dropSelf(Blocks.TUFF_BRICK_STAIRS); + this.dropSelf(Blocks.TUFF_BRICK_WALL); + this.dropSelf(Blocks.CHISELED_TUFF_BRICKS); +- isBeetrootMaxAge = this; +- this.add(Blocks.TUFF_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.TUFF_BRICK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.POLISHED_TUFF_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); ++ this.add(Blocks.TUFF_SLAB, this::createSlabItemTable); ++ this.add(Blocks.TUFF_BRICK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.POLISHED_TUFF_SLAB, this::createSlabItemTable); + this.dropSelf(Blocks.CHISELED_COPPER); + this.dropSelf(Blocks.EXPOSED_CHISELED_COPPER); + this.dropSelf(Blocks.WEATHERED_CHISELED_COPPER); +@@ -713,22 +_,14 @@ + this.dropSelf(Blocks.WAXED_EXPOSED_COPPER_BULB); + this.dropSelf(Blocks.WAXED_WEATHERED_COPPER_BULB); + this.dropSelf(Blocks.WAXED_OXIDIZED_COPPER_BULB); +- isBeetrootMaxAge = this; +- this.add(Blocks.COPPER_GOLEM_STATUE, x$0 -> isBeetrootMaxAge.createCopperGolemStatueBlock(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.EXPOSED_COPPER_GOLEM_STATUE, x$0 -> isBeetrootMaxAge.createCopperGolemStatueBlock(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WEATHERED_COPPER_GOLEM_STATUE, x$0 -> isBeetrootMaxAge.createCopperGolemStatueBlock(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.OXIDIZED_COPPER_GOLEM_STATUE, x$0 -> isBeetrootMaxAge.createCopperGolemStatueBlock(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_COPPER_GOLEM_STATUE, x$0 -> isBeetrootMaxAge.createCopperGolemStatueBlock(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_EXPOSED_COPPER_GOLEM_STATUE, x$0 -> isBeetrootMaxAge.createCopperGolemStatueBlock(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_WEATHERED_COPPER_GOLEM_STATUE, x$0 -> isBeetrootMaxAge.createCopperGolemStatueBlock(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_OXIDIZED_COPPER_GOLEM_STATUE, x$0 -> isBeetrootMaxAge.createCopperGolemStatueBlock(x$0)); ++ this.add(Blocks.COPPER_GOLEM_STATUE, this::createCopperGolemStatueBlock); ++ this.add(Blocks.EXPOSED_COPPER_GOLEM_STATUE, this::createCopperGolemStatueBlock); ++ this.add(Blocks.WEATHERED_COPPER_GOLEM_STATUE, this::createCopperGolemStatueBlock); ++ this.add(Blocks.OXIDIZED_COPPER_GOLEM_STATUE, this::createCopperGolemStatueBlock); ++ this.add(Blocks.WAXED_COPPER_GOLEM_STATUE, this::createCopperGolemStatueBlock); ++ this.add(Blocks.WAXED_EXPOSED_COPPER_GOLEM_STATUE, this::createCopperGolemStatueBlock); ++ this.add(Blocks.WAXED_WEATHERED_COPPER_GOLEM_STATUE, this::createCopperGolemStatueBlock); ++ this.add(Blocks.WAXED_OXIDIZED_COPPER_GOLEM_STATUE, this::createCopperGolemStatueBlock); + this.dropSelf(Blocks.HEAVY_CORE); + this.dropSelf(Blocks.FIREFLY_BUSH); + this.dropSelf(Blocks.CACTUS_FLOWER); +@@ -795,166 +_,86 @@ + this.dropPottedContents(Blocks.POTTED_AZALEA); + this.dropPottedContents(Blocks.POTTED_FLOWERING_AZALEA); + this.dropPottedContents(Blocks.POTTED_TORCHFLOWER); +- isBeetrootMaxAge = this; +- this.add(Blocks.OAK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.PETRIFIED_OAK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.SPRUCE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BIRCH_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.JUNGLE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.ACACIA_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.DARK_OAK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.PALE_OAK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.MANGROVE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.CHERRY_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BAMBOO_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BAMBOO_MOSAIC_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BRICK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.COBBLESTONE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.DARK_PRISMARINE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.NETHER_BRICK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.PRISMARINE_BRICK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.PRISMARINE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.PURPUR_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.QUARTZ_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.RED_SANDSTONE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.SANDSTONE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.CUT_RED_SANDSTONE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.CUT_SANDSTONE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.STONE_BRICK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.STONE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.SMOOTH_STONE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.POLISHED_GRANITE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.SMOOTH_RED_SANDSTONE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.MOSSY_STONE_BRICK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.POLISHED_DIORITE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.MOSSY_COBBLESTONE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.END_STONE_BRICK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.SMOOTH_SANDSTONE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.SMOOTH_QUARTZ_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.GRANITE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.ANDESITE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.RED_NETHER_BRICK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.POLISHED_ANDESITE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.DIORITE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.CRIMSON_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WARPED_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BLACKSTONE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.POLISHED_BLACKSTONE_BRICK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.POLISHED_BLACKSTONE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.OXIDIZED_CUT_COPPER_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WEATHERED_CUT_COPPER_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.EXPOSED_CUT_COPPER_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.CUT_COPPER_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_OXIDIZED_CUT_COPPER_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_WEATHERED_CUT_COPPER_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_EXPOSED_CUT_COPPER_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_CUT_COPPER_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.COBBLED_DEEPSLATE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.POLISHED_DEEPSLATE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.DEEPSLATE_TILE_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.DEEPSLATE_BRICK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.MUD_BRICK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.RESIN_BRICK_SLAB, x$0 -> isBeetrootMaxAge.createSlabItemTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.OAK_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.SPRUCE_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BIRCH_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.JUNGLE_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.ACACIA_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.DARK_OAK_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.PALE_OAK_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.MANGROVE_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.CHERRY_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BAMBOO_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WARPED_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.CRIMSON_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.IRON_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.COPPER_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.EXPOSED_COPPER_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WEATHERED_COPPER_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.OXIDIZED_COPPER_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_COPPER_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_EXPOSED_COPPER_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_WEATHERED_COPPER_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_OXIDIZED_COPPER_DOOR, x$0 -> isBeetrootMaxAge.createDoorTable(x$0)); ++ this.add(Blocks.OAK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.PETRIFIED_OAK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.SPRUCE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.BIRCH_SLAB, this::createSlabItemTable); ++ this.add(Blocks.JUNGLE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.ACACIA_SLAB, this::createSlabItemTable); ++ this.add(Blocks.DARK_OAK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.PALE_OAK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.MANGROVE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.CHERRY_SLAB, this::createSlabItemTable); ++ this.add(Blocks.BAMBOO_SLAB, this::createSlabItemTable); ++ this.add(Blocks.BAMBOO_MOSAIC_SLAB, this::createSlabItemTable); ++ this.add(Blocks.BRICK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.COBBLESTONE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.DARK_PRISMARINE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.NETHER_BRICK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.PRISMARINE_BRICK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.PRISMARINE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.PURPUR_SLAB, this::createSlabItemTable); ++ this.add(Blocks.QUARTZ_SLAB, this::createSlabItemTable); ++ this.add(Blocks.RED_SANDSTONE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.SANDSTONE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.CUT_RED_SANDSTONE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.CUT_SANDSTONE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.STONE_BRICK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.STONE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.SMOOTH_STONE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.POLISHED_GRANITE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.SMOOTH_RED_SANDSTONE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.MOSSY_STONE_BRICK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.POLISHED_DIORITE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.MOSSY_COBBLESTONE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.END_STONE_BRICK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.SMOOTH_SANDSTONE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.SMOOTH_QUARTZ_SLAB, this::createSlabItemTable); ++ this.add(Blocks.GRANITE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.ANDESITE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.RED_NETHER_BRICK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.POLISHED_ANDESITE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.DIORITE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.CRIMSON_SLAB, this::createSlabItemTable); ++ this.add(Blocks.WARPED_SLAB, this::createSlabItemTable); ++ this.add(Blocks.BLACKSTONE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.POLISHED_BLACKSTONE_BRICK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.POLISHED_BLACKSTONE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.OXIDIZED_CUT_COPPER_SLAB, this::createSlabItemTable); ++ this.add(Blocks.WEATHERED_CUT_COPPER_SLAB, this::createSlabItemTable); ++ this.add(Blocks.EXPOSED_CUT_COPPER_SLAB, this::createSlabItemTable); ++ this.add(Blocks.CUT_COPPER_SLAB, this::createSlabItemTable); ++ this.add(Blocks.WAXED_OXIDIZED_CUT_COPPER_SLAB, this::createSlabItemTable); ++ this.add(Blocks.WAXED_WEATHERED_CUT_COPPER_SLAB, this::createSlabItemTable); ++ this.add(Blocks.WAXED_EXPOSED_CUT_COPPER_SLAB, this::createSlabItemTable); ++ this.add(Blocks.WAXED_CUT_COPPER_SLAB, this::createSlabItemTable); ++ this.add(Blocks.COBBLED_DEEPSLATE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.POLISHED_DEEPSLATE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.DEEPSLATE_TILE_SLAB, this::createSlabItemTable); ++ this.add(Blocks.DEEPSLATE_BRICK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.MUD_BRICK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.RESIN_BRICK_SLAB, this::createSlabItemTable); ++ this.add(Blocks.OAK_DOOR, this::createDoorTable); ++ this.add(Blocks.SPRUCE_DOOR, this::createDoorTable); ++ this.add(Blocks.BIRCH_DOOR, this::createDoorTable); ++ this.add(Blocks.JUNGLE_DOOR, this::createDoorTable); ++ this.add(Blocks.ACACIA_DOOR, this::createDoorTable); ++ this.add(Blocks.DARK_OAK_DOOR, this::createDoorTable); ++ this.add(Blocks.PALE_OAK_DOOR, this::createDoorTable); ++ this.add(Blocks.MANGROVE_DOOR, this::createDoorTable); ++ this.add(Blocks.CHERRY_DOOR, this::createDoorTable); ++ this.add(Blocks.BAMBOO_DOOR, this::createDoorTable); ++ this.add(Blocks.WARPED_DOOR, this::createDoorTable); ++ this.add(Blocks.CRIMSON_DOOR, this::createDoorTable); ++ this.add(Blocks.IRON_DOOR, this::createDoorTable); ++ this.add(Blocks.COPPER_DOOR, this::createDoorTable); ++ this.add(Blocks.EXPOSED_COPPER_DOOR, this::createDoorTable); ++ this.add(Blocks.WEATHERED_COPPER_DOOR, this::createDoorTable); ++ this.add(Blocks.OXIDIZED_COPPER_DOOR, this::createDoorTable); ++ this.add(Blocks.WAXED_COPPER_DOOR, this::createDoorTable); ++ this.add(Blocks.WAXED_EXPOSED_COPPER_DOOR, this::createDoorTable); ++ this.add(Blocks.WAXED_WEATHERED_COPPER_DOOR, this::createDoorTable); ++ this.add(Blocks.WAXED_OXIDIZED_COPPER_DOOR, this::createDoorTable); + this.add(Blocks.BLACK_BED, block -> this.createSinglePropConditionTable(block, BedBlock.PART, BedPart.HEAD)); + this.add(Blocks.BLUE_BED, block -> this.createSinglePropConditionTable(block, BedBlock.PART, BedPart.HEAD)); + this.add(Blocks.BROWN_BED, block -> this.createSinglePropConditionTable(block, BedBlock.PART, BedPart.HEAD)); +@@ -1026,11 +_,11 @@ + LootItem.lootTableItem(block) + .apply( + List.of(2, 3, 4), +- count -> SetItemCountFunction.setCount(ConstantValue.exactly(count.intValue())) ++ count -> SetItemCountFunction.setCount(ConstantValue.exactly(count)) + .when( + LootItemBlockStatePropertyCondition.hasBlockStateProperties(block) + .setProperties( +- StatePropertiesPredicate.Builder.properties().hasProperty(SeaPickleBlock.PICKLES, count.intValue()) ++ StatePropertiesPredicate.Builder.properties().hasProperty(SeaPickleBlock.PICKLES, count) + ) + ) + ) +@@ -1051,84 +_,45 @@ + ) + ) + ); +- isBeetrootMaxAge = this; +- this.add(Blocks.CAVE_VINES, x$0 -> isBeetrootMaxAge.createCaveVinesDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.CAVE_VINES_PLANT, x$0 -> isBeetrootMaxAge.createCaveVinesDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WHITE_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.ORANGE_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.MAGENTA_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.LIGHT_BLUE_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.YELLOW_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.LIME_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.PINK_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.GRAY_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.LIGHT_GRAY_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.CYAN_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.PURPLE_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BLUE_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BROWN_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.GREEN_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.RED_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BLACK_CANDLE, x$0 -> isBeetrootMaxAge.createCandleDrops(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BEACON, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BREWING_STAND, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.CHEST, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.COPPER_CHEST, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.EXPOSED_COPPER_CHEST, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WEATHERED_COPPER_CHEST, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.OXIDIZED_COPPER_CHEST, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_COPPER_CHEST, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_EXPOSED_COPPER_CHEST, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_WEATHERED_COPPER_CHEST, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WAXED_OXIDIZED_COPPER_CHEST, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.DISPENSER, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.DROPPER, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.ENCHANTING_TABLE, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.FURNACE, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.HOPPER, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.TRAPPED_CHEST, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.SMOKER, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BLAST_FURNACE, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BARREL, x$0 -> isBeetrootMaxAge.createNameableBlockEntityTable(x$0)); ++ this.add(Blocks.CAVE_VINES, this::createCaveVinesDrop); ++ this.add(Blocks.CAVE_VINES_PLANT, this::createCaveVinesDrop); ++ this.add(Blocks.CANDLE, this::createCandleDrops); ++ this.add(Blocks.WHITE_CANDLE, this::createCandleDrops); ++ this.add(Blocks.ORANGE_CANDLE, this::createCandleDrops); ++ this.add(Blocks.MAGENTA_CANDLE, this::createCandleDrops); ++ this.add(Blocks.LIGHT_BLUE_CANDLE, this::createCandleDrops); ++ this.add(Blocks.YELLOW_CANDLE, this::createCandleDrops); ++ this.add(Blocks.LIME_CANDLE, this::createCandleDrops); ++ this.add(Blocks.PINK_CANDLE, this::createCandleDrops); ++ this.add(Blocks.GRAY_CANDLE, this::createCandleDrops); ++ this.add(Blocks.LIGHT_GRAY_CANDLE, this::createCandleDrops); ++ this.add(Blocks.CYAN_CANDLE, this::createCandleDrops); ++ this.add(Blocks.PURPLE_CANDLE, this::createCandleDrops); ++ this.add(Blocks.BLUE_CANDLE, this::createCandleDrops); ++ this.add(Blocks.BROWN_CANDLE, this::createCandleDrops); ++ this.add(Blocks.GREEN_CANDLE, this::createCandleDrops); ++ this.add(Blocks.RED_CANDLE, this::createCandleDrops); ++ this.add(Blocks.BLACK_CANDLE, this::createCandleDrops); ++ this.add(Blocks.BEACON, this::createNameableBlockEntityTable); ++ this.add(Blocks.BREWING_STAND, this::createNameableBlockEntityTable); ++ this.add(Blocks.CHEST, this::createNameableBlockEntityTable); ++ this.add(Blocks.COPPER_CHEST, this::createNameableBlockEntityTable); ++ this.add(Blocks.EXPOSED_COPPER_CHEST, this::createNameableBlockEntityTable); ++ this.add(Blocks.WEATHERED_COPPER_CHEST, this::createNameableBlockEntityTable); ++ this.add(Blocks.OXIDIZED_COPPER_CHEST, this::createNameableBlockEntityTable); ++ this.add(Blocks.WAXED_COPPER_CHEST, this::createNameableBlockEntityTable); ++ this.add(Blocks.WAXED_EXPOSED_COPPER_CHEST, this::createNameableBlockEntityTable); ++ this.add(Blocks.WAXED_WEATHERED_COPPER_CHEST, this::createNameableBlockEntityTable); ++ this.add(Blocks.WAXED_OXIDIZED_COPPER_CHEST, this::createNameableBlockEntityTable); ++ this.add(Blocks.DISPENSER, this::createNameableBlockEntityTable); ++ this.add(Blocks.DROPPER, this::createNameableBlockEntityTable); ++ this.add(Blocks.ENCHANTING_TABLE, this::createNameableBlockEntityTable); ++ this.add(Blocks.FURNACE, this::createNameableBlockEntityTable); ++ this.add(Blocks.HOPPER, this::createNameableBlockEntityTable); ++ this.add(Blocks.TRAPPED_CHEST, this::createNameableBlockEntityTable); ++ this.add(Blocks.SMOKER, this::createNameableBlockEntityTable); ++ this.add(Blocks.BLAST_FURNACE, this::createNameableBlockEntityTable); ++ this.add(Blocks.BARREL, this::createNameableBlockEntityTable); + this.dropSelf(Blocks.CARTOGRAPHY_TABLE); + this.dropSelf(Blocks.FLETCHING_TABLE); + this.dropSelf(Blocks.GRINDSTONE); +@@ -1151,72 +_,39 @@ + this.add(Blocks.LANTERN, this::createSingleItemTable); + this.add(Blocks.SOUL_LANTERN, this::createSingleItemTable); + Blocks.COPPER_LANTERN.forEach(block -> this.add(block, this::createSingleItemTable)); +- isBeetrootMaxAge = this; +- this.add(Blocks.SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BLACK_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BLUE_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BROWN_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.CYAN_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.GRAY_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.GREEN_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.LIGHT_BLUE_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.LIGHT_GRAY_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.LIME_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.MAGENTA_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.ORANGE_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.PINK_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.PURPLE_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.RED_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WHITE_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.YELLOW_SHULKER_BOX, x$0 -> isBeetrootMaxAge.createShulkerBoxDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BLACK_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BLUE_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BROWN_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.CYAN_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.GRAY_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.GREEN_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.LIGHT_BLUE_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.LIGHT_GRAY_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.LIME_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.MAGENTA_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.ORANGE_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.PINK_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.PURPLE_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.RED_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.WHITE_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.YELLOW_BANNER, x$0 -> isBeetrootMaxAge.createBannerDrop(x$0)); ++ this.add(Blocks.SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.BLACK_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.BLUE_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.BROWN_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.CYAN_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.GRAY_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.GREEN_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.LIGHT_BLUE_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.LIGHT_GRAY_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.LIME_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.MAGENTA_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.ORANGE_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.PINK_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.PURPLE_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.RED_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.WHITE_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.YELLOW_SHULKER_BOX, this::createShulkerBoxDrop); ++ this.add(Blocks.BLACK_BANNER, this::createBannerDrop); ++ this.add(Blocks.BLUE_BANNER, this::createBannerDrop); ++ this.add(Blocks.BROWN_BANNER, this::createBannerDrop); ++ this.add(Blocks.CYAN_BANNER, this::createBannerDrop); ++ this.add(Blocks.GRAY_BANNER, this::createBannerDrop); ++ this.add(Blocks.GREEN_BANNER, this::createBannerDrop); ++ this.add(Blocks.LIGHT_BLUE_BANNER, this::createBannerDrop); ++ this.add(Blocks.LIGHT_GRAY_BANNER, this::createBannerDrop); ++ this.add(Blocks.LIME_BANNER, this::createBannerDrop); ++ this.add(Blocks.MAGENTA_BANNER, this::createBannerDrop); ++ this.add(Blocks.ORANGE_BANNER, this::createBannerDrop); ++ this.add(Blocks.PINK_BANNER, this::createBannerDrop); ++ this.add(Blocks.PURPLE_BANNER, this::createBannerDrop); ++ this.add(Blocks.RED_BANNER, this::createBannerDrop); ++ this.add(Blocks.WHITE_BANNER, this::createBannerDrop); ++ this.add(Blocks.YELLOW_BANNER, this::createBannerDrop); + this.add( + Blocks.PLAYER_HEAD, + block -> LootTable.lootTable() +@@ -1243,10 +_,8 @@ + this.add(Blocks.CREEPER_HEAD, this::createMobSkullDrop); + this.add(Blocks.PIGLIN_HEAD, this::createMobSkullDrop); + this.add(Blocks.DRAGON_HEAD, this::createMobSkullDrop); +- isBeetrootMaxAge = this; +- this.add(Blocks.BEE_NEST, x$0 -> isBeetrootMaxAge.createBeeNestDrop(x$0)); +- isBeetrootMaxAge = this; +- this.add(Blocks.BEEHIVE, x$0 -> isBeetrootMaxAge.createBeeHiveDrop(x$0)); ++ this.add(Blocks.BEE_NEST, this::createBeeNestDrop); ++ this.add(Blocks.BEEHIVE, this::createBeeHiveDrop); + this.add(Blocks.OAK_LEAVES, block -> this.createOakLeavesDrops(block, Blocks.OAK_SAPLING, NORMAL_LEAVES_SAPLING_CHANCES)); + this.add(Blocks.SPRUCE_LEAVES, block -> this.createLeavesDrops(block, Blocks.SPRUCE_SAPLING, NORMAL_LEAVES_SAPLING_CHANCES)); + this.add(Blocks.BIRCH_LEAVES, block -> this.createLeavesDrops(block, Blocks.BIRCH_SAPLING, NORMAL_LEAVES_SAPLING_CHANCES)); +@@ -1378,10 +_,8 @@ + this.add(Blocks.NETHER_QUARTZ_ORE, block -> this.createOreDrop(block, Items.QUARTZ)); + this.add(Blocks.DIAMOND_ORE, block -> this.createOreDrop(block, Items.DIAMOND)); + this.add(Blocks.DEEPSLATE_DIAMOND_ORE, block -> this.createOreDrop(block, Items.DIAMOND)); +- VanillaBlockLoot var8 = this; +- this.add(Blocks.COPPER_ORE, x$0 -> var8.createCopperOreDrops(x$0)); +- var8 = this; +- this.add(Blocks.DEEPSLATE_COPPER_ORE, x$0 -> var8.createCopperOreDrops(x$0)); ++ this.add(Blocks.COPPER_ORE, this::createCopperOreDrops); ++ this.add(Blocks.DEEPSLATE_COPPER_ORE, this::createCopperOreDrops); + this.add(Blocks.IRON_ORE, block -> this.createOreDrop(block, Items.RAW_IRON)); + this.add(Blocks.DEEPSLATE_IRON_ORE, block -> this.createOreDrop(block, Items.RAW_IRON)); + this.add(Blocks.GOLD_ORE, block -> this.createOreDrop(block, Items.RAW_GOLD)); +@@ -1390,7 +_,7 @@ + Blocks.NETHER_GOLD_ORE, + block -> this.createSilkTouchDispatchTable( + block, +- (LootPoolEntryContainer.Builder)this.applyExplosionDecay( ++ this.applyExplosionDecay( + block, + LootItem.lootTableItem(Items.GOLD_NUGGET) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(2.0F, 6.0F))) +@@ -1398,46 +_,34 @@ + ) + ) + ); +- var8 = this; +- this.add(Blocks.LAPIS_ORE, x$0 -> var8.createLapisOreDrops(x$0)); +- var8 = this; +- this.add(Blocks.DEEPSLATE_LAPIS_ORE, x$0 -> var8.createLapisOreDrops(x$0)); ++ this.add(Blocks.LAPIS_ORE, this::createLapisOreDrops); ++ this.add(Blocks.DEEPSLATE_LAPIS_ORE, this::createLapisOreDrops); + this.add( + Blocks.COBWEB, + block -> this.createSilkTouchOrShearsDispatchTable( +- block, (LootPoolEntryContainer.Builder)this.applyExplosionCondition(block, LootItem.lootTableItem(Items.STRING)) ++ block, this.applyExplosionCondition(block, LootItem.lootTableItem(Items.STRING)) + ) + ); + this.add( + Blocks.DEAD_BUSH, + block -> this.createShearsDispatchTable( + block, +- (LootPoolEntryContainer.Builder)this.applyExplosionDecay( ++ this.applyExplosionDecay( + block, LootItem.lootTableItem(Items.STICK).apply(SetItemCountFunction.setCount(UniformGenerator.between(0.0F, 2.0F))) + ) + ) + ); +- var8 = this; +- this.add(Blocks.SHORT_DRY_GRASS, x$0 -> var8.createShearsOrSilkTouchOnlyDrop(x$0)); +- var8 = this; +- this.add(Blocks.TALL_DRY_GRASS, x$0 -> var8.createShearsOrSilkTouchOnlyDrop(x$0)); +- var8 = this; +- this.add(Blocks.BUSH, x$0 -> var8.createShearsOrSilkTouchOnlyDrop(x$0)); +- var8 = this; +- this.add(Blocks.NETHER_SPROUTS, x$0 -> var8.createShearsOnlyDrop(x$0)); +- var8 = this; +- this.add(Blocks.SEAGRASS, x$0 -> var8.createShearsOnlyDrop(x$0)); +- var8 = this; +- this.add(Blocks.VINE, x$0 -> var8.createShearsOnlyDrop(x$0)); ++ this.add(Blocks.SHORT_DRY_GRASS, this::createShearsOrSilkTouchOnlyDrop); ++ this.add(Blocks.TALL_DRY_GRASS, this::createShearsOrSilkTouchOnlyDrop); ++ this.add(Blocks.BUSH, this::createShearsOrSilkTouchOnlyDrop); ++ this.add(Blocks.NETHER_SPROUTS, this::createShearsOnlyDrop); ++ this.add(Blocks.SEAGRASS, this::createShearsOnlyDrop); ++ this.add(Blocks.VINE, this::createShearsOnlyDrop); + this.add(Blocks.GLOW_LICHEN, block -> this.createMultifaceBlockDrops(block, this.hasShears())); +- var8 = this; +- this.add(Blocks.RESIN_CLUMP, x$0 -> var8.createMultifaceBlockDrops(x$0)); +- var8 = this; +- this.add(Blocks.HANGING_ROOTS, x$0 -> var8.createShearsOnlyDrop(x$0)); +- var8 = this; +- this.add(Blocks.SMALL_DRIPLEAF, x$0 -> var8.createShearsOnlyDrop(x$0)); +- var8 = this; +- this.add(Blocks.MANGROVE_LEAVES, x$0 -> var8.createMangroveLeavesDrops(x$0)); ++ this.add(Blocks.RESIN_CLUMP, this::createMultifaceBlockDrops); ++ this.add(Blocks.HANGING_ROOTS, this::createShearsOnlyDrop); ++ this.add(Blocks.SMALL_DRIPLEAF, this::createShearsOnlyDrop); ++ this.add(Blocks.MANGROVE_LEAVES, this::createShearsOnlyDrop); + this.add(Blocks.TALL_SEAGRASS, this.createDoublePlantShearsDrop(Blocks.SEAGRASS)); + this.add(Blocks.LARGE_FERN, block -> this.createDoublePlantWithSeedDrops(block, Blocks.FERN)); + this.add(Blocks.TALL_GRASS, block -> this.createDoublePlantWithSeedDrops(block, Blocks.SHORT_GRASS)); +@@ -1452,20 +_,18 @@ + LootPool.lootPool() + .setRolls(ConstantValue.exactly(1.0F)) + .add( +- ((LootPoolSingletonContainer.Builder)this.applyExplosionCondition(block, LootItem.lootTableItem(block))) ++ ((LootPoolSingletonContainer.Builder)this.applyExplosionCondition(block, LootItem.lootTableItem(block))) + .when(LootItemEntityPropertyCondition.entityPresent(LootContext.EntityTarget.THIS)) + ) + ) + ); +- var8 = this; +- this.add(Blocks.FERN, x$0 -> var8.createGrassDrops(x$0)); +- var8 = this; +- this.add(Blocks.SHORT_GRASS, x$0 -> var8.createGrassDrops(x$0)); ++ this.add(Blocks.FERN, this::createGrassDrops); ++ this.add(Blocks.SHORT_GRASS, this::createGrassDrops); + this.add( + Blocks.GLOWSTONE, + block -> this.createSilkTouchDispatchTable( + block, +- (LootPoolEntryContainer.Builder)this.applyExplosionDecay( ++ this.applyExplosionDecay( + block, + LootItem.lootTableItem(Items.GLOWSTONE_DUST) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(2.0F, 4.0F))) +@@ -1478,7 +_,7 @@ + Blocks.MELON, + block -> this.createSilkTouchDispatchTable( + block, +- (LootPoolEntryContainer.Builder)this.applyExplosionDecay( ++ this.applyExplosionDecay( + block, + LootItem.lootTableItem(Items.MELON_SLICE) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(3.0F, 7.0F))) +@@ -1487,15 +_,13 @@ + ) + ) + ); +- var8 = this; +- this.add(Blocks.REDSTONE_ORE, x$0 -> var8.createRedstoneOreDrops(x$0)); +- var8 = this; +- this.add(Blocks.DEEPSLATE_REDSTONE_ORE, x$0 -> var8.createRedstoneOreDrops(x$0)); ++ this.add(Blocks.REDSTONE_ORE, this::createRedstoneOreDrops); ++ this.add(Blocks.DEEPSLATE_REDSTONE_ORE, this::createRedstoneOreDrops); + this.add( + Blocks.SEA_LANTERN, + block -> this.createSilkTouchDispatchTable( + block, +- (LootPoolEntryContainer.Builder)this.applyExplosionDecay( ++ this.applyExplosionDecay( + block, + LootItem.lootTableItem(Items.PRISMARINE_CRYSTALS) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(2.0F, 3.0F))) +@@ -1508,7 +_,7 @@ + Blocks.CREAKING_HEART, + block -> this.createSilkTouchDispatchTable( + block, +- (LootPoolEntryContainer.Builder)this.applyExplosionDecay( ++ this.applyExplosionDecay( + block, + LootItem.lootTableItem(Items.RESIN_CLUMP) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1.0F, 3.0F))) +@@ -1559,10 +_,10 @@ + .when( + LootItemBlockStatePropertyCondition.hasBlockStateProperties(block) + .setProperties( +- StatePropertiesPredicate.Builder.properties().hasProperty(SnowLayerBlock.LAYERS, layers.intValue()) ++ StatePropertiesPredicate.Builder.properties().hasProperty(SnowLayerBlock.LAYERS, layers) + ) + ) +- .apply(SetItemCountFunction.setCount(ConstantValue.exactly(layers.intValue()))) ++ .apply(SetItemCountFunction.setCount(ConstantValue.exactly(layers))) + ) + .when(this.doesNotHaveSilkTouch()), + AlternativesEntry.alternatives( +@@ -1570,11 +_,11 @@ + layers -> layers == 8 + ? LootItem.lootTableItem(Blocks.SNOW_BLOCK) + : LootItem.lootTableItem(Blocks.SNOW) +- .apply(SetItemCountFunction.setCount(ConstantValue.exactly(layers.intValue()))) ++ .apply(SetItemCountFunction.setCount(ConstantValue.exactly(layers))) + .when( + LootItemBlockStatePropertyCondition.hasBlockStateProperties(block) + .setProperties( +- StatePropertiesPredicate.Builder.properties().hasProperty(SnowLayerBlock.LAYERS, layers.intValue()) ++ StatePropertiesPredicate.Builder.properties().hasProperty(SnowLayerBlock.LAYERS, layers) + ) + ) + ) +@@ -1620,7 +_,7 @@ + Blocks.SOUL_CAMPFIRE, + block -> this.createSilkTouchDispatchTable( + block, +- (LootPoolEntryContainer.Builder)this.applyExplosionCondition( ++ this.applyExplosionCondition( + block, LootItem.lootTableItem(Items.SOUL_SOIL).apply(SetItemCountFunction.setCount(ConstantValue.exactly(1.0F))) + ) + ) +@@ -1634,7 +_,7 @@ + .apply(ApplyBonusCount.addOreBonusCount(enchantments.getOrThrow(Enchantments.FORTUNE))) + .when(MatchTool.toolMatches(ItemPredicate.Builder.item().of(items, ItemTags.CLUSTER_MAX_HARVESTABLES))) + .otherwise( +- (LootPoolEntryContainer.Builder)this.applyExplosionDecay( ++ this.applyExplosionDecay( + block, LootItem.lootTableItem(Items.AMETHYST_SHARD).apply(SetItemCountFunction.setCount(ConstantValue.exactly(2.0F))) + ) + ) +@@ -1783,7 +_,7 @@ + LootItemBlockStatePropertyCondition.Builder isAge = LootItemBlockStatePropertyCondition.hasBlockStateProperties( + Blocks.PITCHER_CROP + ) +- .setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(PitcherCropBlock.AGE, age.intValue())); ++ .setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(PitcherCropBlock.AGE, age)); + return age == 4 + ? LootItem.lootTableItem(Items.PITCHER_PLANT) + .when(isAge) diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/network/syncher/EntityDataSerializer.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/network/syncher/EntityDataSerializer.java.patch index 49b90fbd..cbef0726 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/network/syncher/EntityDataSerializer.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/network/syncher/EntityDataSerializer.java.patch @@ -8,4 +8,4 @@ + return (ForValueType) () -> codec; } - public interface ForValueType extends EntityDataSerializer { + interface ForValueType extends EntityDataSerializer { diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/resources/RegistryDataLoader.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/resources/RegistryDataLoader.java.patch index e9bb571e..f78210b7 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/resources/RegistryDataLoader.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/resources/RegistryDataLoader.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/resources/RegistryDataLoader.java +++ b/net/minecraft/resources/RegistryDataLoader.java -@@ -85,7 +_,7 @@ +@@ -97,7 +_,7 @@ public class RegistryDataLoader { private static final Logger LOGGER = LogUtils.getLogger(); diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/server/ServerScoreboard.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/server/ServerScoreboard.java.patch new file mode 100644 index 00000000..68a08c74 --- /dev/null +++ b/versions/26.1-snapshot-1/patches/net/minecraft/server/ServerScoreboard.java.patch @@ -0,0 +1,25 @@ +--- a/net/minecraft/server/ServerScoreboard.java ++++ b/net/minecraft/server/ServerScoreboard.java +@@ -34,19 +_,13 @@ + } + + public void load(final ScoreboardSaveData.Packed data) { +- List var10000 = data.objectives(); +- ServerScoreboard var2 = this; +- var10000.forEach(x$0 -> var2.loadObjective(x$0)); +- var10000 = data.scores(); +- var2 = this; +- var10000.forEach(x$0 -> var2.loadPlayerScore(x$0)); ++ data.objectives().forEach(this::loadObjective); ++ data.scores().forEach(this::loadPlayerScore); + data.displaySlots().forEach((slot, name) -> { + Objective objective = this.getObjective(name); + this.setDisplayObjective(slot, objective); + }); +- var10000 = data.teams(); +- var2 = this; +- var10000.forEach(x$0 -> var2.loadPlayerTeam(x$0)); ++ data.teams().forEach(this::loadPlayerTeam); + } + + private ScoreboardSaveData.Packed store() { diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/server/level/ServerLevel.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/server/level/ServerLevel.java.patch deleted file mode 100644 index d6e7d960..00000000 --- a/versions/26.1-snapshot-1/patches/net/minecraft/server/level/ServerLevel.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/server/level/ServerLevel.java -+++ b/net/minecraft/server/level/ServerLevel.java -@@ -1723,7 +_,7 @@ - - return countByType.object2IntEntrySet() - .stream() -- .sorted(Comparator.comparing(Entry::getIntValue).reversed()) -+ .sorted(Comparator., Integer>comparing(Entry::getIntValue).reversed()) - .limit(5L) - .map(ex -> (String)ex.getKey() + ":" + ex.getIntValue()) - .collect(Collectors.joining(",")); diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch index 57f023bc..a897453a 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch @@ -1,23 +1,6 @@ --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -463,6 +_,7 @@ - } - - vehicle.move(MoverType.PLAYER, new Vec3(xDist, yDist, zDist)); -+ double oyDist = yDist; - xDist = targetX - vehicle.getX(); - yDist = targetY - vehicle.getY(); - if (yDist > -0.5 || yDist < 0.5) { -@@ -491,7 +_,7 @@ - vehicle.setOnGroundWithMovement(packet.onGround(), clientDeltaMovement); - vehicle.doCheckFallDamage(clientDeltaMovement.x, clientDeltaMovement.y, clientDeltaMovement.z, packet.onGround()); - this.player.checkMovementStatistics(clientDeltaMovement.x, clientDeltaMovement.y, clientDeltaMovement.z); -- this.clientVehicleIsFloating = yDist >= -0.03125 -+ this.clientVehicleIsFloating = oyDist >= -0.03125 - && !vehicleRestsOnSomething - && !this.server.allowFlight() - && !vehicle.isFlyingVehicle() -@@ -956,7 +_,7 @@ +@@ -961,7 +_,7 @@ if (carried.has(DataComponents.WRITABLE_BOOK_CONTENT)) { ItemStack writtenBook = carried.transmuteCopy(Items.WRITTEN_BOOK); writtenBook.remove(DataComponents.WRITABLE_BOOK_CONTENT); @@ -26,20 +9,3 @@ writtenBook.set( DataComponents.WRITTEN_BOOK_CONTENT, new WrittenBookContent(this.filterableFromOutgoing(title), this.player.getPlainTextName(), 0, pages, true) ); -@@ -1078,6 +_,7 @@ - - boolean playerStandsOnSomething = this.player.verticalCollisionBelow; - this.player.move(MoverType.PLAYER, new Vec3(xDist, yDist, zDist)); -+ double oyDist = yDist; - xDist = targetX - this.player.getX(); - yDist = targetY - this.player.getY(); - if (yDist > -0.5 || yDist < 0.5) { -@@ -1102,7 +_,7 @@ - && !this.isEntityCollidingWithAnythingNew(level, this.player, oldAABB, targetX, targetY, targetZ)) { - this.player.absSnapTo(targetX, targetY, targetZ, targetYRot, targetXRot); - boolean isAutoSpinAttack = this.player.isAutoSpinAttack(); -- this.clientIsFloating = yDist >= -0.03125 -+ this.clientIsFloating = oyDist >= -0.03125 - && !playerStandsOnSomething - && !this.player.isSpectator() - && !this.server.allowFlight() diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/util/ExtraCodecs.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/util/ExtraCodecs.java.patch index 35cabed8..a96fc669 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/util/ExtraCodecs.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/util/ExtraCodecs.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/util/ExtraCodecs.java +++ b/net/minecraft/util/ExtraCodecs.java -@@ -276,7 +_,7 @@ +@@ -280,7 +_,7 @@ P max = l.get(1); return makeInterval.apply(min, max); }), p -> ImmutableList.of(getMin.apply((I)p), getMax.apply((I)p))); diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/DataFixers.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/DataFixers.java.patch index 3873f784..e38ee4fa 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/DataFixers.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/DataFixers.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/util/datafix/DataFixers.java +++ b/net/minecraft/util/datafix/DataFixers.java -@@ -1149,7 +_,7 @@ +@@ -1153,7 +_,7 @@ ); Schema v3086 = fixerUpper.addSchema(3086, SAME_NAMESPACED); fixerUpper.addFixer( @@ -9,7 +9,7 @@ m.defaultReturnValue("minecraft:tabby"); m.put(0, "minecraft:tabby"); m.put(1, "minecraft:black"); -@@ -1185,7 +_,7 @@ +@@ -1189,7 +_,7 @@ Schema v3087 = fixerUpper.addSchema(3087, SAME_NAMESPACED); fixerUpper.addFixer( new EntityVariantFix( diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/fixes/ChunkHeightAndBiomeFix.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/fixes/ChunkHeightAndBiomeFix.java.patch deleted file mode 100644 index bffd2438..00000000 --- a/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/fixes/ChunkHeightAndBiomeFix.java.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/net/minecraft/util/datafix/fixes/ChunkHeightAndBiomeFix.java -+++ b/net/minecraft/util/datafix/fixes/ChunkHeightAndBiomeFix.java -@@ -231,7 +_,8 @@ - } else if (oldBiomes != null && oldBiomes.length == 1024) { - for (int sectionY = 0; sectionY < 16; sectionY++) { - int sectionYIndex = sectionY - minSection; -- biomeContainers[sectionYIndex] = makeBiomeContainer(tag, ix -> getOldBiome(oldBiomes, sectionY * 64 + ix)); -+ int finalSectionY = sectionY; -+ biomeContainers[sectionYIndex] = makeBiomeContainer(tag, ix -> getOldBiome(oldBiomes, finalSectionY * 64 + ix)); - } - - if (increaseHeight) { diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/fixes/FixProjectileStoredItem.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/fixes/FixProjectileStoredItem.java.patch deleted file mode 100644 index cc499e1d..00000000 --- a/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/fixes/FixProjectileStoredItem.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/util/datafix/fixes/FixProjectileStoredItem.java -+++ b/net/minecraft/util/datafix/fixes/FixProjectileStoredItem.java -@@ -46,7 +_,7 @@ - final String entityName, final FixProjectileStoredItem.SubFixer fixer, final Type inputEntityChoiceType, final Type outputEntityChoiceType - ) { - OpticFinder entityF = DSL.namedChoice(entityName, inputEntityChoiceType); -- return input -> input.updateTyped(entityF, outputEntityChoiceType, typed -> fixer.fix(typed, outputEntityChoiceType)); -+ return input -> input.updateTyped(entityF, outputEntityChoiceType, typed -> fixer.fix(typed, (Type) outputEntityChoiceType)); - } - - private static Typed fixArrow(final Typed typed, final Type outputType) { diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/fixes/LeavesFix.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/fixes/LeavesFix.java.patch index a4663b19..d9ae108c 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/fixes/LeavesFix.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/util/datafix/fixes/LeavesFix.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/util/datafix/fixes/LeavesFix.java +++ b/net/minecraft/util/datafix/fixes/LeavesFix.java -@@ -347,7 +_,7 @@ +@@ -345,7 +_,7 @@ return this.isSkippable() ? section : section.update(DSL.remainderFinder(), tag -> tag.set("BlockStates", tag.createLongList(Arrays.stream(this.storage.getRaw())))) diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/attribute/modifier/FloatModifier.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/attribute/modifier/FloatModifier.java.patch index 562b2b57..38edec5c 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/attribute/modifier/FloatModifier.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/attribute/modifier/FloatModifier.java.patch @@ -14,4 +14,4 @@ + FloatModifier MAXIMUM = (Simple) Math::max; @FunctionalInterface - public interface Simple extends FloatModifier { + interface Simple extends FloatModifier { diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/AgeableMob.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/AgeableMob.java.patch deleted file mode 100644 index 72d511d0..00000000 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/AgeableMob.java.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/net/minecraft/world/entity/AgeableMob.java -+++ b/net/minecraft/world/entity/AgeableMob.java -@@ -69,12 +_,13 @@ - - public void ageUp(final int seconds, final boolean forced) { - int age = this.getAge(); -+ int oldAge = age; - age += seconds * 20; - if (age > 0) { - age = 0; - } - -- int delta = age - age; -+ int delta = age - oldAge; - this.setAge(age); - if (forced) { - this.forcedAge += delta; diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/LivingEntity.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/LivingEntity.java.patch deleted file mode 100644 index a67616f7..00000000 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/LivingEntity.java.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/net/minecraft/world/entity/LivingEntity.java -+++ b/net/minecraft/world/entity/LivingEntity.java -@@ -1169,6 +_,7 @@ - } - - ItemStack itemInUse = this.getUseItem(); -+ float originalDamage = damage; - float damageBlocked = this.applyItemBlocking(level, source, damage); - damage -= damageBlocked; - boolean blocked = damageBlocked > 0.0F; -@@ -1260,14 +_,14 @@ - } - - if (this instanceof ServerPlayer serverPlayer) { -- CriteriaTriggers.ENTITY_HURT_PLAYER.trigger(serverPlayer, source, damage, damage, blocked); -+ CriteriaTriggers.ENTITY_HURT_PLAYER.trigger(serverPlayer, source, originalDamage, damage, blocked); - if (damageBlocked > 0.0F && damageBlocked < 3.4028235E37F) { - serverPlayer.awardStat(Stats.DAMAGE_BLOCKED_BY_SHIELD, Math.round(damageBlocked * 10.0F)); - } - } - - if (source.getEntity() instanceof ServerPlayer sourcePlayer) { -- CriteriaTriggers.PLAYER_HURT_ENTITY.trigger(sourcePlayer, this, source, damage, damage, blocked); -+ CriteriaTriggers.PLAYER_HURT_ENTITY.trigger(sourcePlayer, this, source, originalDamage, damage, blocked); - } - - return success; diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/SpawnPlacements.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/SpawnPlacements.java.patch index 11854af7..60a7c53d 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/SpawnPlacements.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/SpawnPlacements.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/entity/SpawnPlacements.java +++ b/net/minecraft/world/entity/SpawnPlacements.java -@@ -77,7 +_,7 @@ +@@ -78,7 +_,7 @@ final EntityType type, final ServerLevelAccessor level, final EntitySpawnReason spawnReason, final BlockPos pos, final RandomSource random ) { SpawnPlacements.Data data = DATA_BY_TYPE.get(type); diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/animal/HappyGhastAi.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/animal/happyghast/HappyGhastAi.java.patch similarity index 72% rename from versions/26.1-snapshot-1/patches/net/minecraft/world/entity/animal/HappyGhastAi.java.patch rename to versions/26.1-snapshot-1/patches/net/minecraft/world/entity/animal/happyghast/HappyGhastAi.java.patch index fa64af0f..e0482bc4 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/animal/HappyGhastAi.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/animal/happyghast/HappyGhastAi.java.patch @@ -1,5 +1,5 @@ ---- a/net/minecraft/world/entity/animal/HappyGhastAi.java -+++ b/net/minecraft/world/entity/animal/HappyGhastAi.java +--- a/net/minecraft/world/entity/animal/happyghast/HappyGhastAi.java ++++ b/net/minecraft/world/entity/animal/happyghast/HappyGhastAi.java @@ -69,7 +_,7 @@ 0, ImmutableList.of( diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/monster/creaking/CreakingAi.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/monster/creaking/CreakingAi.java.patch deleted file mode 100644 index f608fe53..00000000 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/monster/creaking/CreakingAi.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/world/entity/monster/creaking/CreakingAi.java -+++ b/net/minecraft/world/entity/monster/creaking/CreakingAi.java -@@ -50,7 +_,7 @@ - brain.addActivity(Activity.CORE, 0, ImmutableList.of(new Swim(0.8F) { - @Override - protected boolean checkExtraStartConditions(final ServerLevel level, final Creaking body) { -- return body.canMove() && super.checkExtraStartConditions(level, (LivingEntity)body); -+ return body.canMove() && super.checkExtraStartConditions(level, body); - } - }, new LookAtTargetSink(45, 90), new MoveToTargetSink())); - } diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch index 404dd2fe..faeb10d2 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch @@ -1,15 +1,15 @@ --- a/net/minecraft/world/entity/monster/piglin/PiglinAi.java +++ b/net/minecraft/world/entity/monster/piglin/PiglinAi.java -@@ -174,7 +_,7 @@ - BehaviorBuilder.triggerIf(PiglinAi::hasCrossbow, BackUpIfTooClose.create(5, 0.75F)), - SetWalkTargetFromAttackTargetIfTargetOutOfReach.create(1.0F), +@@ -181,7 +_,7 @@ + new SpearAttack(1.0, 1.0, 2.0F), + new SpearRetreat(1.0), MeleeAttack.create(20), - new CrossbowAttack(), + new CrossbowAttack<>(), RememberIfHoglinWasKilled.create(), EraseMemoryIf.create(PiglinAi::isNearZombified, MemoryModuleType.ATTACK_TARGET) ), -@@ -192,7 +_,7 @@ +@@ -199,7 +_,7 @@ StartAttacking.create((level, piglin) -> piglin.isAdult(), PiglinAi::findNearestValidAttackTarget), BehaviorBuilder.triggerIf(body -> !body.isDancing(), GoToTargetLocation.create(MemoryModuleType.CELEBRATE_LOCATION, 2, 1.0F)), BehaviorBuilder.triggerIf(Piglin::isDancing, GoToTargetLocation.create(MemoryModuleType.CELEBRATE_LOCATION, 4, 0.6F)), @@ -18,7 +18,7 @@ ImmutableList.of( Pair.of(SetEntityLookTarget.create(EntityType.PIGLIN, 8.0F), 1), Pair.of(RandomStroll.stroll(0.6F, 2, 1), 1), -@@ -225,7 +_,7 @@ +@@ -232,7 +_,7 @@ SetWalkTargetAwayFrom.entity(MemoryModuleType.AVOID_TARGET, 1.0F, 12, true), createIdleLookBehaviors(), createIdleMovementBehaviors(), @@ -27,7 +27,7 @@ ), MemoryModuleType.AVOID_TARGET ); -@@ -247,7 +_,7 @@ +@@ -254,7 +_,7 @@ .build() ) ), diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/variant/PriorityProvider.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/variant/PriorityProvider.java.patch index db697e76..e5a834e9 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/variant/PriorityProvider.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/entity/variant/PriorityProvider.java.patch @@ -3,7 +3,7 @@ @@ -103,7 +_,7 @@ } - public record UnpackedEntry(T entry, int priority, PriorityProvider.SelectorCondition condition) { + record UnpackedEntry(T entry, int priority, PriorityProvider.SelectorCondition condition) { - public static final Comparator> HIGHEST_PRIORITY_FIRST = Comparator.comparingInt( + public static final Comparator> HIGHEST_PRIORITY_FIRST = Comparator.>comparingInt( PriorityProvider.UnpackedEntry::priority diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/item/AdventureModePredicate.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/item/AdventureModePredicate.java.patch index daeea257..8f948952 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/item/AdventureModePredicate.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/item/AdventureModePredicate.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/item/AdventureModePredicate.java +++ b/net/minecraft/world/item/AdventureModePredicate.java -@@ -113,7 +_,7 @@ +@@ -119,7 +_,7 @@ return predicates.stream() .flatMap(predicatex -> predicatex.blocks().orElseThrow().stream()) .distinct() diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/item/HoneycombItem.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/item/HoneycombItem.java.patch index a50f249e..e4fc9785 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/item/HoneycombItem.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/item/HoneycombItem.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/item/HoneycombItem.java +++ b/net/minecraft/world/item/HoneycombItem.java -@@ -89,7 +_,7 @@ +@@ -143,7 +_,7 @@ Level level = context.getLevel(); BlockPos pos = context.getClickedPos(); BlockState oldState = level.getBlockState(pos); diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/item/component/KineticWeapon.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/item/component/KineticWeapon.java.patch new file mode 100644 index 00000000..1e8c7c60 --- /dev/null +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/item/component/KineticWeapon.java.patch @@ -0,0 +1,19 @@ +--- a/net/minecraft/world/item/component/KineticWeapon.java ++++ b/net/minecraft/world/item/component/KineticWeapon.java +@@ -6,6 +_,7 @@ + import java.util.Collection; + import java.util.List; + import java.util.Optional; ++import java.util.function.Function; + import net.minecraft.advancements.CriteriaTriggers; + import net.minecraft.core.Holder; + import net.minecraft.network.RegistryFriendlyByteBuf; +@@ -113,7 +_,7 @@ + for (EntityHitResult hitResult : ProjectileUtil.getHitEntitiesAlong( + livingEntity, attackRange, e -> PiercingWeapon.canHitEntity(livingEntity, e), ClipContext.Block.COLLIDER + ) +- .map(a -> List.of(), e -> (Collection)e)) { ++ .map(a -> List.of(), Function.identity())) { + Entity otherEntity = hitResult.getEntity(); + if (otherEntity instanceof EnderDragonPart dragonPart) { + otherEntity = dragonPart.parentMob; diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/item/component/PiercingWeapon.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/item/component/PiercingWeapon.java.patch new file mode 100644 index 00000000..aaf0ba7f --- /dev/null +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/item/component/PiercingWeapon.java.patch @@ -0,0 +1,19 @@ +--- a/net/minecraft/world/item/component/PiercingWeapon.java ++++ b/net/minecraft/world/item/component/PiercingWeapon.java +@@ -5,6 +_,7 @@ + import java.util.Collection; + import java.util.List; + import java.util.Optional; ++import java.util.function.Function; + import net.minecraft.core.Holder; + import net.minecraft.network.RegistryFriendlyByteBuf; + import net.minecraft.network.codec.ByteBufCodecs; +@@ -74,7 +_,7 @@ + boolean hitSomething = false; + + for (EntityHitResult hitResult : ProjectileUtil.getHitEntitiesAlong(attacker, attackRange, e1 -> canHitEntity(attacker, e1), ClipContext.Block.COLLIDER) +- .map(a -> List.of(), e -> (Collection)e)) { ++ .map(a -> List.of(), Function.identity())) { + hitSomething |= attacker.stabAttack(hand, hitResult.getEntity(), damage, true, this.dealsKnockback, this.dismounts); + } + diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/item/crafting/Ingredient.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/item/crafting/Ingredient.java.patch index 0c47cd48..fb4513d0 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/item/crafting/Ingredient.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/item/crafting/Ingredient.java.patch @@ -4,8 +4,8 @@ public static final StreamCodec> OPTIONAL_CONTENTS_STREAM_CODEC = ByteBufCodecs.holderSet(Registries.ITEM) .map( ingredient -> ingredient.size() == 0 ? Optional.empty() : Optional.of(new Ingredient((HolderSet)ingredient)), -- ingredient -> ingredient.>map(i -> i.values).orElse(HolderSet.direct()) -+ ingredient -> ingredient.map(i -> i.values).orElse(HolderSet.direct()) +- ingredient -> ingredient.>map(i -> i.values).orElse(HolderSet.empty()) ++ ingredient -> ingredient.map(i -> i.values).orElse(HolderSet.empty()) ); public static final Codec> NON_AIR_HOLDER_SET_CODEC = HolderSetCodec.create(Registries.ITEM, Item.CODEC, false); public static final Codec CODEC = ExtraCodecs.nonEmptyHolderSet(NON_AIR_HOLDER_SET_CODEC).xmap(Ingredient::new, i -> i.values); diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/level/biome/Climate.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/level/biome/Climate.java.patch index 5eb90ece..1be47e21 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/level/biome/Climate.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/level/biome/Climate.java.patch @@ -1,11 +1,11 @@ --- a/net/minecraft/world/level/biome/Climate.java +++ b/net/minecraft/world/level/biome/Climate.java -@@ -268,7 +_,7 @@ - throw new IllegalStateException("Expecting parameter space to be 7, got " + dimensions); - } else { - List> leaves = values.stream() -- .map(p -> new Climate.RTree.Leaf(p.getFirst(), p.getSecond())) -+ .map(p -> new Climate.RTree.Leaf<>(p.getFirst(), p.getSecond())) - .collect(Collectors.toCollection(ArrayList::new)); - return new Climate.RTree<>(build(dimensions, leaves)); - } +@@ -270,7 +_,7 @@ + } + + List> leaves = values.stream() +- .map(p -> new Climate.RTree.Leaf(p.getFirst(), p.getSecond())) ++ .map(p -> new Climate.RTree.Leaf<>(p.getFirst(), p.getSecond())) + .collect(Collectors.toCollection(ArrayList::new)); + return new Climate.RTree<>(build(dimensions, leaves)); + } diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/level/block/Block.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/level/block/Block.java.patch index 08c41b25..b49969b4 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/level/block/Block.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/level/block/Block.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/level/block/Block.java +++ b/net/minecraft/world/level/block/Block.java -@@ -602,7 +_,7 @@ +@@ -608,7 +_,7 @@ } private static , T extends Comparable> S setValueHelper(final S state, final Property property, final Object value) { diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/level/block/ChiseledBookShelfBlock.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/level/block/ChiseledBookShelfBlock.java.patch new file mode 100644 index 00000000..d9104370 --- /dev/null +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/level/block/ChiseledBookShelfBlock.java.patch @@ -0,0 +1,14 @@ +--- a/net/minecraft/world/level/block/ChiseledBookShelfBlock.java ++++ b/net/minecraft/world/level/block/ChiseledBookShelfBlock.java +@@ -168,10 +_,8 @@ + @Override + protected void createBlockStateDefinition(final StateDefinition.Builder builder) { + builder.add(FACING); +- List var10000 = SLOT_OCCUPIED_PROPERTIES; + Objects.requireNonNull(builder); +- StateDefinition.Builder var2 = builder; +- var10000.forEach(xva$0 -> var2.add(xva$0)); ++ SLOT_OCCUPIED_PROPERTIES.forEach(property -> builder.add(property)); + } + + @Override diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/level/block/state/StateHolder.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/level/block/state/StateHolder.java.patch index 16913ec1..1f171614 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/level/block/state/StateHolder.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/level/block/state/StateHolder.java.patch @@ -1,11 +1,11 @@ --- a/net/minecraft/world/level/block/state/StateHolder.java +++ b/net/minecraft/world/level/block/state/StateHolder.java -@@ -142,7 +_,7 @@ - for (Entry, Comparable> entry : this.values.entrySet()) { - Property property = entry.getKey(); - neighbours.put( -- property, property.getPossibleValues().stream().map(value -> statesByValues.get(this.makeNeighbourValues(property, value))).toArray() +@@ -143,7 +_,7 @@ + for (Entry, Comparable> entry : this.values.entrySet()) { + Property property = entry.getKey(); + neighbours.put( +- property, property.getPossibleValues().stream().map(value -> statesByValues.get(this.makeNeighbourValues(property, value))).toArray() + property, (S[]) property.getPossibleValues().stream().map(value -> statesByValues.get(this.makeNeighbourValues(property, value))).toArray() - ); - } + ); + } diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/level/pathfinder/PathFinder.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/level/pathfinder/PathFinder.java.patch deleted file mode 100644 index efdbb2a4..00000000 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/level/pathfinder/PathFinder.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/world/level/pathfinder/PathFinder.java -+++ b/net/minecraft/world/level/pathfinder/PathFinder.java -@@ -75,7 +_,7 @@ - this.openSet.clear(); - this.openSet.insert(from); - boolean captureDebug = this.captureDebug.getAsBoolean(); -- Set closedSet = (Set)(captureDebug ? new HashSet<>() : Set.of()); -+ Set closedSet = captureDebug ? new HashSet<>() : Set.of(); - int count = 0; - Set reachedTargets = Sets.newHashSetWithExpectedSize(targets.size()); - int maxVisitedNodesAdjusted = (int)(this.maxVisitedNodes * maxVisitedNodesMultiplier); diff --git a/versions/26.1-snapshot-1/patches/net/minecraft/world/level/storage/loot/functions/SetCustomModelDataFunction.java.patch b/versions/26.1-snapshot-1/patches/net/minecraft/world/level/storage/loot/functions/SetCustomModelDataFunction.java.patch index 04fe102c..fb722ba0 100644 --- a/versions/26.1-snapshot-1/patches/net/minecraft/world/level/storage/loot/functions/SetCustomModelDataFunction.java.patch +++ b/versions/26.1-snapshot-1/patches/net/minecraft/world/level/storage/loot/functions/SetCustomModelDataFunction.java.patch @@ -1,11 +1,11 @@ --- a/net/minecraft/world/level/storage/loot/functions/SetCustomModelDataFunction.java +++ b/net/minecraft/world/level/storage/loot/functions/SetCustomModelDataFunction.java -@@ -22,7 +_,7 @@ +@@ -20,7 +_,7 @@ public class SetCustomModelDataFunction extends LootItemConditionalFunction { private static final Codec COLOR_PROVIDER_CODEC = Codec.withAlternative( - NumberProviders.CODEC, ExtraCodecs.RGB_COLOR_CODEC, ConstantValue::new + NumberProviders.CODEC, ExtraCodecs.RGB_COLOR_CODEC, f -> new ConstantValue(f) ); - public static final MapCodec CODEC = RecordCodecBuilder.mapCodec( + public static final MapCodec MAP_CODEC = RecordCodecBuilder.mapCodec( i -> commonFields(i)