diff --git a/gradle.properties b/gradle.properties index f0286df0d..1fa45f524 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=com.lokamc.slice version=1.18.2-R0.1-SNAPSHOT mcVersion=1.18.2 -paperRef=63aa4d33194cae156d1bed840868336cda6bc52b +paperRef=2eeca6f108e9c130c47e8259d92124e5e36580e8 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0005-Add-provided-Material-to-getDrops.patch b/patches/api/0005-Add-provided-Material-to-getDrops.patch index f492ec642..7e0be4f6b 100644 --- a/patches/api/0005-Add-provided-Material-to-getDrops.patch +++ b/patches/api/0005-Add-provided-Material-to-getDrops.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add provided Material to getDrops diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index fe23d144175b3bd55564a4a266b98cd2fc70a08a..dfa5762c500bd3798fc6e40bd786fd61c88f9e3a 100644 +index 3fc35a559ea53f045f2f72b272bc8ba34d1b2994..7fbd9c223bf34feb35f7836b42a3bd220c4cbbc5 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java -@@ -612,6 +612,20 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran +@@ -624,6 +624,20 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran @NotNull Collection getDrops(@NotNull ItemStack tool, @Nullable Entity entity); diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index e8d83173e..d61c71588 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -42,10 +42,10 @@ index 4beb35d1e5b013395f5df101e843f41c2ce174ad..cc2e1f98da222117d378a10912464441 standardInput = System.`in` workingDir = rootProject.layout.projectDirectory diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 07c382f30ed3736ed15b5b71f48dc4a1de958242..2e8ec4dce4962420840d04600ec0ce2ae40f585c 100644 +index c8d56947305c981a3268ce4ae3e975db350ceff2..ce51ebeb5df07abc4a8bb31bc737ab3e4214ce83 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1683,7 +1683,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop getDrops(ItemStack item, Entity entity) { @@ -28,7 +28,7 @@ index f3894c3eb83b67a03a401a1fcebfdc9e95e9e4b7..c13a49ea2886b4fa18bbe01df62b378b net.minecraft.world.item.ItemStack nms = CraftItemStack.asNMSCopy(item); // Modelled off EntityHuman#hasBlock -@@ -558,6 +569,7 @@ public class CraftBlock implements Block { +@@ -602,6 +613,7 @@ public class CraftBlock implements Block { return Collections.emptyList(); } } diff --git a/patches/server/0012-Packet-obfuscation-and-reduction.patch b/patches/server/0012-Packet-obfuscation-and-reduction.patch index fb7dae16f..755343339 100644 --- a/patches/server/0012-Packet-obfuscation-and-reduction.patch +++ b/patches/server/0012-Packet-obfuscation-and-reduction.patch @@ -168,7 +168,7 @@ index a57d8aa70fe3df462279c494686056459dc70271..172d8008c2f5558962e889dd49f205b9 } diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 09d649f1b3236805cad461f2d826758daf41d14e..8cba5b6479792e46de5dfa566936bf28a482db3c 100644 +index e909d2cc08a5cea3a8b98ad6faf8eb65c33a35ef..e3725c380839257fa5b08c34b339ce30c8f3143f 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -632,7 +632,7 @@ public abstract class Player extends LivingEntity { @@ -181,10 +181,10 @@ index 09d649f1b3236805cad461f2d826758daf41d14e..8cba5b6479792e46de5dfa566936bf28 public void startAutoSpinAttack(int riptideTicks) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 603e9234294c01f1cde4bfc0b0053e69b99861d9..cc32c47e90b412950c810fef29ac097366a8f07f 100644 +index 6feeadad9aecb7d63e24d5daae115a93e39aeb3d..75faffa82241e5ed97f0a66dbb86f42a7f8c8c27 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2113,7 +2113,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2102,7 +2102,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { this.sendHealthUpdate(); } } diff --git a/patches/server/0019-Disable-Azalea-generation.patch b/patches/server/0019-Disable-Azalea-generation.patch new file mode 100644 index 000000000..7e6500dc8 --- /dev/null +++ b/patches/server/0019-Disable-Azalea-generation.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cryptite +Date: Tue, 15 Mar 2022 16:29:29 -0500 +Subject: [PATCH] Disable Azalea generation + + +diff --git a/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java b/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java +index 8609ad84a64c5ecbeef1746942cf7dcffdd2ef86..eae556c5c120971c93ff633c77e86ae0c7594268 100644 +--- a/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java ++++ b/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java +@@ -151,7 +151,7 @@ public class BiomeDefaultFeatures { + builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.CAVE_VINES); + builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.LUSH_CAVES_CLAY); + builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.LUSH_CAVES_VEGETATION); +- builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.ROOTED_AZALEA_TREE); ++// builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.ROOTED_AZALEA_TREE); // Slice + builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.SPORE_BLOSSOM); + builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.CLASSIC_VINES); + } +diff --git a/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java b/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java +index 34b67673fe1616f0c9990f62e311241bc62036e4..6e5ee21aa5e5c72d66b25c1287ce1e0c155003b2 100644 +--- a/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java ++++ b/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java +@@ -66,7 +66,7 @@ public class CaveFeatures { + private static final RandomizedIntStateProvider CAVE_VINES_HEAD_PROVIDER = new RandomizedIntStateProvider(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.CAVE_VINES.defaultBlockState(), 4).add(Blocks.CAVE_VINES.defaultBlockState().setValue(CaveVines.BERRIES, Boolean.valueOf(true)), 1)), CaveVinesBlock.AGE, UniformInt.of(23, 25)); + public static final Holder> CAVE_VINE = FeatureUtils.register("cave_vine", Feature.BLOCK_COLUMN, new BlockColumnConfiguration(List.of(BlockColumnConfiguration.layer(new WeightedListInt(SimpleWeightedRandomList.builder().add(UniformInt.of(0, 19), 2).add(UniformInt.of(0, 2), 3).add(UniformInt.of(0, 6), 10).build()), CAVE_VINES_BODY_PROVIDER), BlockColumnConfiguration.layer(ConstantInt.of(1), CAVE_VINES_HEAD_PROVIDER)), Direction.DOWN, BlockPredicate.ONLY_IN_AIR_PREDICATE, true)); + public static final Holder> CAVE_VINE_IN_MOSS = FeatureUtils.register("cave_vine_in_moss", Feature.BLOCK_COLUMN, new BlockColumnConfiguration(List.of(BlockColumnConfiguration.layer(new WeightedListInt(SimpleWeightedRandomList.builder().add(UniformInt.of(0, 3), 5).add(UniformInt.of(1, 7), 1).build()), CAVE_VINES_BODY_PROVIDER), BlockColumnConfiguration.layer(ConstantInt.of(1), CAVE_VINES_HEAD_PROVIDER)), Direction.DOWN, BlockPredicate.ONLY_IN_AIR_PREDICATE, true)); +- public static final Holder> MOSS_VEGETATION = FeatureUtils.register("moss_vegetation", Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.FLOWERING_AZALEA.defaultBlockState(), 4).add(Blocks.AZALEA.defaultBlockState(), 7).add(Blocks.MOSS_CARPET.defaultBlockState(), 25).add(Blocks.GRASS.defaultBlockState(), 50).add(Blocks.TALL_GRASS.defaultBlockState(), 10)))); ++ public static final Holder> MOSS_VEGETATION = FeatureUtils.register("moss_vegetation", Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.MOSS_CARPET.defaultBlockState(), 25).add(Blocks.GRASS.defaultBlockState(), 50).add(Blocks.TALL_GRASS.defaultBlockState(), 10)))); + public static final Holder> MOSS_PATCH = FeatureUtils.register("moss_patch", Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(Blocks.MOSS_BLOCK), PlacementUtils.inlinePlaced(MOSS_VEGETATION), CaveSurface.FLOOR, ConstantInt.of(1), 0.0F, 5, 0.8F, UniformInt.of(4, 7), 0.3F)); + public static final Holder> MOSS_PATCH_BONEMEAL = FeatureUtils.register("moss_patch_bonemeal", Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(Blocks.MOSS_BLOCK), PlacementUtils.inlinePlaced(MOSS_VEGETATION), CaveSurface.FLOOR, ConstantInt.of(1), 0.0F, 5, 0.6F, UniformInt.of(1, 2), 0.75F)); + public static final Holder> DRIPLEAF = FeatureUtils.register("dripleaf", Feature.SIMPLE_RANDOM_SELECTOR, new SimpleRandomFeatureConfiguration(HolderSet.direct(makeSmallDripleaf(), makeDripleaf(Direction.EAST), makeDripleaf(Direction.WEST), makeDripleaf(Direction.SOUTH), makeDripleaf(Direction.NORTH))));