Random small stuff

paper-server/patches/unapplied/net/minecraft/server/bossevents/CustomBossEvent.java.patch

@@ -1,31 +0,0 @@
---- a/net/minecraft/server/bossevents/CustomBossEvent.java
-+++ b/net/minecraft/server/bossevents/CustomBossEvent.java
-@@ -18,6 +18,10 @@
- import net.minecraft.server.level.ServerPlayer;
- import net.minecraft.util.Mth;
- import net.minecraft.world.BossEvent;
-+// CraftBukkit start
-+import org.bukkit.boss.KeyedBossBar;
-+import org.bukkit.craftbukkit.boss.CraftKeyedBossbar;
-+// CraftBukkit end
- 
- public class CustomBossEvent extends ServerBossEvent {
- 
-@@ -25,7 +29,17 @@
-     private final Set<UUID> players = Sets.newHashSet();
-     private int value;
-     private int max = 100;
-+    // CraftBukkit start
-+    private KeyedBossBar bossBar;
- 
-+    public KeyedBossBar getBukkitEntity() {
-+        if (this.bossBar == null) {
-+            this.bossBar = new CraftKeyedBossbar(this);
-+        }
-+        return this.bossBar;
-+    }
-+    // CraftBukkit end
-+
-     public CustomBossEvent(ResourceLocation id, Component displayName) {
-         super(displayName, BossEvent.BossBarColor.WHITE, BossEvent.BossBarOverlay.PROGRESS);
-         this.id = id;

paper-server/patches/unapplied/net/minecraft/world/entity/ai/gossip/GossipContainer.java.patch

@@ -1,46 +0,0 @@
---- a/net/minecraft/world/entity/ai/gossip/GossipContainer.java
-+++ b/net/minecraft/world/entity/ai/gossip/GossipContainer.java
-@@ -216,6 +216,43 @@
-         public void remove(GossipType gossipType) {
-             this.entries.removeInt(gossipType);
-         }
-+
-+        // Paper start - Add villager reputation API
-+        private static final GossipType[] TYPES = GossipType.values();
-+        public com.destroystokyo.paper.entity.villager.Reputation getPaperReputation() {
-+            Map<com.destroystokyo.paper.entity.villager.ReputationType, Integer> map = new java.util.EnumMap<>(com.destroystokyo.paper.entity.villager.ReputationType.class);
-+            for (Object2IntMap.Entry<GossipType> type : this.entries.object2IntEntrySet()) {
-+                map.put(toApi(type.getKey()), type.getIntValue());
-+            }
-+
-+            return new com.destroystokyo.paper.entity.villager.Reputation(map);
-+        }
-+
-+        public void assignFromPaperReputation(com.destroystokyo.paper.entity.villager.Reputation rep) {
-+            for (GossipType type : TYPES) {
-+                com.destroystokyo.paper.entity.villager.ReputationType api = toApi(type);
-+
-+                if (rep.hasReputationSet(api)) {
-+                    int reputation = rep.getReputation(api);
-+                    if (reputation == 0) {
-+                        this.entries.removeInt(type);
-+                    } else {
-+                        this.entries.put(type, reputation);
-+                    }
-+                }
-+            }
-+        }
-+
-+        private static com.destroystokyo.paper.entity.villager.ReputationType toApi(GossipType type) {
-+            return switch (type) {
-+                case MAJOR_NEGATIVE -> com.destroystokyo.paper.entity.villager.ReputationType.MAJOR_NEGATIVE;
-+                case MINOR_NEGATIVE -> com.destroystokyo.paper.entity.villager.ReputationType.MINOR_NEGATIVE;
-+                case MINOR_POSITIVE -> com.destroystokyo.paper.entity.villager.ReputationType.MINOR_POSITIVE;
-+                case MAJOR_POSITIVE -> com.destroystokyo.paper.entity.villager.ReputationType.MAJOR_POSITIVE;
-+                case TRADING -> com.destroystokyo.paper.entity.villager.ReputationType.TRADING;
-+            };
-+        }
-+        // Paper end - Add villager reputation API
-     }
- 
-     static record GossipEntry(UUID target, GossipType type, int value) {

paper-server/patches/unapplied/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java.patch

@@ -1,10 +0,0 @@
---- a/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java
-+++ b/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java
-@@ -26,6 +26,7 @@
- 
-     @Override
-     public void place(TreeDecorator.Context generator) {
-+        if (generator.logs().isEmpty()) return; // Paper - Fix crash when trying to generate without logs
-         RandomSource randomSource = generator.random();
-         if (!(randomSource.nextFloat() >= this.probability)) {
-             List<BlockPos> list = generator.logs();

paper-server/patches/unapplied/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java.patch

@@ -1,21 +0,0 @@
---- a/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java
-+++ b/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java
-@@ -83,8 +83,17 @@
-             Vec3 vec3 = context.getOptionalParameter(LootContextParams.ORIGIN);
-             if (vec3 != null) {
-                 ServerLevel serverLevel = context.getLevel();
-+                // Paper start - Configurable cartographer treasure maps
-+                if (!serverLevel.paperConfig().environment.treasureMaps.enabled) {
-+                    /*
-+                     * NOTE: I fear users will just get a plain map as their "treasure"
-+                     * This is preferable to disrespecting the config.
-+                     */
-+                    return stack;
-+                }
-+                // Paper end - Configurable cartographer treasure maps
-                 BlockPos blockPos = serverLevel.findNearestMapStructure(
--                    this.destination, BlockPos.containing(vec3), this.searchRadius, this.skipKnownStructures
-+                    this.destination, BlockPos.containing(vec3), this.searchRadius, !serverLevel.paperConfig().environment.treasureMaps.findAlreadyDiscoveredLootTable.or(!this.skipKnownStructures) // Paper - Configurable cartographer treasure maps
-                 );
-                 if (blockPos != null) {
-                     ItemStack itemStack = MapItem.create(serverLevel, blockPos.getX(), blockPos.getZ(), this.zoom, true, true);