sasheg/DeltaZern
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.21.7-rc2

Browse Source
This commit is contained in:
Bjarne Koll
2025-06-25 17:41:26 +02:00
committed by Nassim Jahnke
parent 4d854e66b8
commit dda39a0f05
290 changed files with 447 additions and 31172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -2
View File
@@ -40,7 +40,7 @@ How To (Plugin Developers)
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.21.6-R0.1-SNAPSHOT</version>
<version>1.21.7-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
```
@@ -53,7 +53,7 @@ repositories {
}
dependencies {
compileOnly("io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT")
compileOnly("io.papermc.paper:paper-api:1.21.7-R0.1-SNAPSHOT")
}
java {
gradle.properties
+3 -3
View File
@@ -1,9 +1,9 @@
group=io.papermc.paper
version=1.21.6-R0.1-SNAPSHOT
mcVersion=1.21.6
version=1.21.7-R0.1-SNAPSHOT
mcVersion=1.21.7-rc2
# Set to true while updating Minecraft version
updatingMinecraft=false
updatingMinecraft=true
org.gradle.configuration-cache=true
org.gradle.caching=true
paper-api/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+1 -1
View File
@@ -68,7 +68,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public interface VanillaGoal<T extends Mob> extends Goal<T> {
GoalKey<AbstractHorse> HORSE_RANDOM_STAND = create("horse_random_stand", AbstractHorse.class);
paper-api/src/generated/java/io/papermc/paper/registry/keys/AttributeKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class AttributeKeys {
/**
* {@code minecraft:armor}
paper-api/src/generated/java/io/papermc/paper/registry/keys/BannerPatternKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class BannerPatternKeys {
/**
* {@code minecraft:base}
paper-api/src/generated/java/io/papermc/paper/registry/keys/BiomeKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class BiomeKeys {
/**
* {@code minecraft:badlands}
paper-api/src/generated/java/io/papermc/paper/registry/keys/BlockTypeKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class BlockTypeKeys {
/**
* {@code minecraft:acacia_button}
paper-api/src/generated/java/io/papermc/paper/registry/keys/CatVariantKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class CatVariantKeys {
/**
* {@code minecraft:all_black}
paper-api/src/generated/java/io/papermc/paper/registry/keys/ChickenVariantKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class ChickenVariantKeys {
/**
* {@code minecraft:cold}
paper-api/src/generated/java/io/papermc/paper/registry/keys/CowVariantKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class CowVariantKeys {
/**
* {@code minecraft:cold}
paper-api/src/generated/java/io/papermc/paper/registry/keys/DamageTypeKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class DamageTypeKeys {
/**
* {@code minecraft:arrow}
paper-api/src/generated/java/io/papermc/paper/registry/keys/DataComponentTypeKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class DataComponentTypeKeys {
/**
* {@code minecraft:attribute_modifiers}
paper-api/src/generated/java/io/papermc/paper/registry/keys/EnchantmentKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class EnchantmentKeys {
/**
* {@code minecraft:aqua_affinity}
paper-api/src/generated/java/io/papermc/paper/registry/keys/FluidKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class FluidKeys {
/**
* {@code minecraft:empty}
paper-api/src/generated/java/io/papermc/paper/registry/keys/FrogVariantKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class FrogVariantKeys {
/**
* {@code minecraft:cold}
paper-api/src/generated/java/io/papermc/paper/registry/keys/GameEventKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class GameEventKeys {
/**
* {@code minecraft:block_activate}
paper-api/src/generated/java/io/papermc/paper/registry/keys/InstrumentKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class InstrumentKeys {
/**
* {@code minecraft:admire_goat_horn}
paper-api/src/generated/java/io/papermc/paper/registry/keys/ItemTypeKeys.java
+8 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class ItemTypeKeys {
/**
* {@code minecraft:acacia_boat}
@@ -5604,6 +5604,13 @@ public final class ItemTypeKeys {
*/
public static final TypedKey<ItemType> MUSIC_DISC_FAR = create(key("music_disc_far"));
/**
* {@code minecraft:music_disc_lava_chicken}
*
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
*/
public static final TypedKey<ItemType> MUSIC_DISC_LAVA_CHICKEN = create(key("music_disc_lava_chicken"));
/**
* {@code minecraft:music_disc_mall}
*
paper-api/src/generated/java/io/papermc/paper/registry/keys/JukeboxSongKeys.java
+8 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class JukeboxSongKeys {
/**
* {@code minecraft:11}
@@ -88,6 +88,13 @@ public final class JukeboxSongKeys {
*/
public static final TypedKey<JukeboxSong> FAR = create(key("far"));
/**
* {@code minecraft:lava_chicken}
*
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
*/
public static final TypedKey<JukeboxSong> LAVA_CHICKEN = create(key("lava_chicken"));
/**
* {@code minecraft:mall}
*
paper-api/src/generated/java/io/papermc/paper/registry/keys/MapDecorationTypeKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class MapDecorationTypeKeys {
/**
* {@code minecraft:banner_black}
paper-api/src/generated/java/io/papermc/paper/registry/keys/MenuTypeKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class MenuTypeKeys {
/**
* {@code minecraft:anvil}
paper-api/src/generated/java/io/papermc/paper/registry/keys/MobEffectKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class MobEffectKeys {
/**
* {@code minecraft:absorption}
paper-api/src/generated/java/io/papermc/paper/registry/keys/PaintingVariantKeys.java
+8 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class PaintingVariantKeys {
/**
* {@code minecraft:alban}
@@ -123,6 +123,13 @@ public final class PaintingVariantKeys {
*/
public static final TypedKey<Art> CREEBET = create(key("creebet"));
/**
* {@code minecraft:dennis}
*
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
*/
public static final TypedKey<Art> DENNIS = create(key("dennis"));
/**
* {@code minecraft:donkey_kong}
*
paper-api/src/generated/java/io/papermc/paper/registry/keys/PigVariantKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class PigVariantKeys {
/**
* {@code minecraft:cold}
paper-api/src/generated/java/io/papermc/paper/registry/keys/SoundEventKeys.java
+8 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class SoundEventKeys {
/**
* {@code minecraft:ambient.basalt_deltas.additions}
@@ -11946,6 +11946,13 @@ public final class SoundEventKeys {
*/
public static final TypedKey<Sound> MUSIC_DISC_FAR = create(key("music_disc.far"));
/**
* {@code minecraft:music_disc.lava_chicken}
*
* @apiNote This field is version-dependant and may be removed in future Minecraft versions
*/
public static final TypedKey<Sound> MUSIC_DISC_LAVA_CHICKEN = create(key("music_disc.lava_chicken"));
/**
* {@code minecraft:music_disc.mall}
*
paper-api/src/generated/java/io/papermc/paper/registry/keys/StructureKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class StructureKeys {
/**
* {@code minecraft:ancient_city}
paper-api/src/generated/java/io/papermc/paper/registry/keys/StructureTypeKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class StructureTypeKeys {
/**
* {@code minecraft:buried_treasure}
paper-api/src/generated/java/io/papermc/paper/registry/keys/TrimMaterialKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class TrimMaterialKeys {
/**
* {@code minecraft:amethyst}
paper-api/src/generated/java/io/papermc/paper/registry/keys/TrimPatternKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class TrimPatternKeys {
/**
* {@code minecraft:bolt}
paper-api/src/generated/java/io/papermc/paper/registry/keys/VillagerProfessionKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class VillagerProfessionKeys {
/**
* {@code minecraft:armorer}
paper-api/src/generated/java/io/papermc/paper/registry/keys/VillagerTypeKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class VillagerTypeKeys {
/**
* {@code minecraft:desert}
paper-api/src/generated/java/io/papermc/paper/registry/keys/WolfSoundVariantKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class WolfSoundVariantKeys {
/**
* {@code minecraft:angry}
paper-api/src/generated/java/io/papermc/paper/registry/keys/WolfVariantKeys.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
public final class WolfVariantKeys {
/**
* {@code minecraft:ashen}
paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/BannerPatternTagKeys.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
@ApiStatus.Experimental
public final class BannerPatternTagKeys {
/**
paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/BiomeTagKeys.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
@ApiStatus.Experimental
public final class BiomeTagKeys {
/**
paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/BlockTypeTagKeys.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
@ApiStatus.Experimental
public final class BlockTypeTagKeys {
/**
paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/DamageTypeTagKeys.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
@ApiStatus.Experimental
public final class DamageTypeTagKeys {
/**
paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/EnchantmentTagKeys.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
@ApiStatus.Experimental
public final class EnchantmentTagKeys {
/**
paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/EntityTypeTagKeys.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
@ApiStatus.Experimental
public final class EntityTypeTagKeys {
/**
paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/FluidTagKeys.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
@ApiStatus.Experimental
public final class FluidTagKeys {
/**
paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/GameEventTagKeys.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
@ApiStatus.Experimental
public final class GameEventTagKeys {
/**
paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/InstrumentTagKeys.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
@ApiStatus.Experimental
public final class InstrumentTagKeys {
/**
paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/ItemTypeTagKeys.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
@ApiStatus.Experimental
public final class ItemTypeTagKeys {
/**
paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/PaintingVariantTagKeys.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
@ApiStatus.Experimental
public final class PaintingVariantTagKeys {
/**
paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/StructureTagKeys.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
"SpellCheckingInspection"
})
@NullMarked
@GeneratedFrom("1.21.6")
@GeneratedFrom("1.21.7-rc2")
@ApiStatus.Experimental
public final class StructureTagKeys {
/**
paper-api/src/main/java/io/papermc/paper/datacomponent/item/consumable/ItemUseAnimation.java
+1 -1
View File
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.ApiStatus;
@ApiStatus.Experimental
public enum ItemUseAnimation {
// Start generate - ItemUseAnimation
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
NONE,
EAT,
DRINK,
paper-api/src/main/java/io/papermc/paper/registry/event/RegistryEvents.java
+1 -1
View File
@@ -35,7 +35,7 @@ import static io.papermc.paper.registry.event.RegistryEventProviderImpl.create;
public final class RegistryEvents {
// Start generate - RegistryEvents
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
public static final RegistryEventProvider<GameEvent, GameEventRegistryEntry.Builder> GAME_EVENT = create(RegistryKey.GAME_EVENT);
public static final RegistryEventProvider<DamageType, DamageTypeRegistryEntry.Builder> DAMAGE_TYPE = create(RegistryKey.DAMAGE_TYPE);
public static final RegistryEventProvider<Wolf.Variant, WolfVariantRegistryEntry.Builder> WOLF_VARIANT = create(RegistryKey.WOLF_VARIANT);
paper-api/src/main/java/org/bukkit/Art.java
+3 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
public interface Art extends OldEnum<Art>, Keyed {
// Start generate - Art
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
Art ALBAN = getArt("alban");
Art AZTEC = getArt("aztec");
@@ -54,6 +54,8 @@ public interface Art extends OldEnum<Art>, Keyed {
Art CREEBET = getArt("creebet");
Art DENNIS = getArt("dennis");
Art DONKEY_KONG = getArt("donkey_kong");
Art EARTH = getArt("earth");
paper-api/src/main/java/org/bukkit/FeatureFlag.java
+1 -1
View File
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.ApiStatus;
public interface FeatureFlag extends Keyed {
// Start generate - FeatureFlag
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
@ApiStatus.Experimental
FeatureFlag MINECART_IMPROVEMENTS = create("minecart_improvements");
paper-api/src/main/java/org/bukkit/Fluid.java
+1 -1
View File
@@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull;
public interface Fluid extends OldEnum<Fluid>, Keyed {
// Start generate - Fluid
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
Fluid EMPTY = getFluid("empty");
Fluid FLOWING_LAVA = getFluid("flowing_lava");
paper-api/src/main/java/org/bukkit/GameEvent.java
+1 -1
View File
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable;
public abstract class GameEvent implements Keyed {
// Start generate - GameEvent
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
public static final GameEvent BLOCK_ACTIVATE = getEvent("block_activate");
public static final GameEvent BLOCK_ATTACH = getEvent("block_attach");
paper-api/src/main/java/org/bukkit/JukeboxSong.java
+3 -1
View File
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
public interface JukeboxSong extends Keyed, Translatable {
// Start generate - JukeboxSong
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
JukeboxSong ELEVEN = get("11");
JukeboxSong THIRTEEN = get("13");
@@ -31,6 +31,8 @@ public interface JukeboxSong extends Keyed, Translatable {
JukeboxSong FAR = get("far");
JukeboxSong LAVA_CHICKEN = get("lava_chicken");
JukeboxSong MALL = get("mall");
JukeboxSong MELLOHI = get("mellohi");
paper-api/src/main/java/org/bukkit/Material.java
+3 -2
View File
@@ -145,7 +145,7 @@ import org.jetbrains.annotations.Nullable;
public enum Material implements Keyed, Translatable, net.kyori.adventure.translation.Translatable { // Paper
//<editor-fold desc="Materials" defaultstate="collapsed">
// Start generate - Items
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
ACACIA_BOAT(-1, 1),
ACACIA_CHEST_BOAT(-1, 1),
AIR(-1),
@@ -418,6 +418,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
MUSIC_DISC_CREATOR(-1, 1),
MUSIC_DISC_CREATOR_MUSIC_BOX(-1, 1),
MUSIC_DISC_FAR(-1, 1),
MUSIC_DISC_LAVA_CHICKEN(-1, 1),
MUSIC_DISC_MALL(-1, 1),
MUSIC_DISC_MELLOHI(-1, 1),
MUSIC_DISC_OTHERSIDE(-1, 1),
@@ -611,7 +612,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
ZOMBIFIED_PIGLIN_SPAWN_EGG(-1),
// End generate - Items
// Start generate - Blocks
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
ACACIA_BUTTON(-1, Switch.class),
ACACIA_DOOR(-1, Door.class),
ACACIA_FENCE(-1, Fence.class),
paper-api/src/main/java/org/bukkit/MusicInstrument.java
+1 -1
View File
@@ -13,7 +13,7 @@ import org.jspecify.annotations.Nullable;
public abstract class MusicInstrument implements Keyed, net.kyori.adventure.translation.Translatable {
// Start generate - MusicInstrument
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
public static final MusicInstrument ADMIRE_GOAT_HORN = getInstrument("admire_goat_horn");
public static final MusicInstrument CALL_GOAT_HORN = getInstrument("call_goat_horn");
paper-api/src/main/java/org/bukkit/Sound.java
+3 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
public interface Sound extends OldEnum<Sound>, Keyed, net.kyori.adventure.sound.Sound.Type { // Paper - implement Sound.Type
// Start generate - Sound
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
Sound AMBIENT_BASALT_DELTAS_ADDITIONS = getSound("ambient.basalt_deltas.additions");
Sound AMBIENT_BASALT_DELTAS_LOOP = getSound("ambient.basalt_deltas.loop");
@@ -3431,6 +3431,8 @@ public interface Sound extends OldEnum<Sound>, Keyed, net.kyori.adventure.sound.
Sound MUSIC_DISC_FAR = getSound("music_disc.far");
Sound MUSIC_DISC_LAVA_CHICKEN = getSound("music_disc.lava_chicken");
Sound MUSIC_DISC_MALL = getSound("music_disc.mall");
Sound MUSIC_DISC_MELLOHI = getSound("music_disc.mellohi");
paper-api/src/main/java/org/bukkit/SoundCategory.java
+1 -1
View File
@@ -10,7 +10,7 @@ import org.jspecify.annotations.NullMarked;
public enum SoundCategory implements Sound.Source.Provider {
// Start generate - SoundCategory
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
MASTER,
MUSIC,
RECORDS,
paper-api/src/main/java/org/bukkit/Statistic.java
+2 -2
View File
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
*/
public enum Statistic implements Keyed {
// Start generate - StatisticCustom
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
ANIMALS_BRED,
AVIATE_ONE_CM,
BELL_RING,
@@ -87,7 +87,7 @@ public enum Statistic implements Keyed {
WALK_UNDER_WATER_ONE_CM,
// End generate - StatisticCustom
// Start generate - StatisticType
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
BREAK_ITEM(Type.ITEM),
CRAFT_ITEM(Type.ITEM),
DROP(Type.ITEM),
paper-api/src/main/java/org/bukkit/Tag.java
+1 -1
View File
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
public interface Tag<T extends Keyed> extends Keyed {
// Start generate - Tag
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
String REGISTRY_BLOCKS = "blocks";
Tag<Material> ACACIA_LOGS = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("acacia_logs"), Material.class);
paper-api/src/main/java/org/bukkit/block/Biome.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.translation.Translatable { // Paper - Adventure translations
// Start generate - Biome
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
Biome BADLANDS = getBiome("badlands");
Biome BAMBOO_JUNGLE = getBiome("bamboo_jungle");
paper-api/src/main/java/org/bukkit/block/BlockType.java
+1 -1
View File
@@ -190,7 +190,7 @@ public interface BlockType extends Keyed, Translatable, net.kyori.adventure.tran
//<editor-fold desc="BlockTypes" defaultstate="collapsed">
// Start generate - BlockType
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
BlockType.Typed<Switch> ACACIA_BUTTON = getBlockType("acacia_button");
BlockType.Typed<Door> ACACIA_DOOR = getBlockType("acacia_door");
paper-api/src/main/java/org/bukkit/block/banner/PatternType.java
+1 -1
View File
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable;
public interface PatternType extends OldEnum<PatternType>, Keyed {
// Start generate - PatternType
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
PatternType BASE = getType("base");
PatternType BORDER = getType("border");
paper-api/src/main/java/org/bukkit/damage/DamageType.java
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
public interface DamageType extends Keyed, Translatable {
// Start generate - DamageType
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
DamageType ARROW = getDamageType("arrow");
DamageType BAD_RESPAWN_POINT = getDamageType("bad_respawn_point");
paper-api/src/main/java/org/bukkit/entity/Armadillo.java
+1 -1
View File
@@ -30,7 +30,7 @@ public interface Armadillo extends Animals {
*/
enum State {
// Start generate - ArmadilloState
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
IDLE,
ROLLING,
SCARED,
paper-api/src/main/java/org/bukkit/entity/Boat.java
+1 -1
View File
@@ -177,7 +177,7 @@ public interface Boat extends Vehicle, io.papermc.paper.entity.Leashable { // Pa
NOT_IN_WORLD,
// Start generate - BoatStatus
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
IN_WATER,
UNDER_WATER,
UNDER_FLOWING_WATER,
paper-api/src/main/java/org/bukkit/entity/Cat.java
+1 -1
View File
@@ -55,7 +55,7 @@ public interface Cat extends Tameable, Sittable, io.papermc.paper.entity.CollarC
interface Type extends OldEnum<Type>, Keyed {
// Start generate - CatType
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
Type ALL_BLACK = getType("all_black");
Type BLACK = getType("black");
paper-api/src/main/java/org/bukkit/entity/Chicken.java
+1 -1
View File
@@ -60,7 +60,7 @@ public interface Chicken extends Animals {
interface Variant extends Keyed {
// Start generate - ChickenVariant
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
Variant COLD = getVariant("cold");
Variant TEMPERATE = getVariant("temperate");
paper-api/src/main/java/org/bukkit/entity/Cow.java
+1 -1
View File
@@ -32,7 +32,7 @@ public interface Cow extends AbstractCow {
interface Variant extends Keyed {
// Start generate - CowVariant
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
Variant COLD = getVariant("cold");
Variant TEMPERATE = getVariant("temperate");
paper-api/src/main/java/org/bukkit/entity/EntityType.java
+1 -1
View File
@@ -46,7 +46,7 @@ import org.jetbrains.annotations.Nullable;
public enum EntityType implements Keyed, Translatable, net.kyori.adventure.translation.Translatable, io.papermc.paper.world.flag.FeatureDependant { // Paper - translatable
// Start generate - EntityType
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
ACACIA_BOAT("acacia_boat", AcaciaBoat.class, -1),
ACACIA_CHEST_BOAT("acacia_chest_boat", AcaciaChestBoat.class, -1),
ALLAY("allay", Allay.class, -1),
paper-api/src/main/java/org/bukkit/entity/Fox.java
+1 -1
View File
@@ -90,7 +90,7 @@ public interface Fox extends Animals, Sittable {
*/
public enum Type {
// Start generate - FoxType
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
RED,
SNOW;
// End generate - FoxType
paper-api/src/main/java/org/bukkit/entity/Frog.java
+1 -1
View File
@@ -53,7 +53,7 @@ public interface Frog extends Animals {
interface Variant extends OldEnum<Variant>, Keyed {
// Start generate - FrogVariant
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
Variant COLD = getVariant("cold");
Variant TEMPERATE = getVariant("temperate");
paper-api/src/main/java/org/bukkit/entity/Panda.java
+1 -1
View File
@@ -186,7 +186,7 @@ public interface Panda extends Animals, Sittable {
public enum Gene {
// Start generate - PandaGene
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
NORMAL(false),
LAZY(false),
WORRIED(false),
paper-api/src/main/java/org/bukkit/entity/Pig.java
+1 -1
View File
@@ -32,7 +32,7 @@ public interface Pig extends Steerable, Vehicle {
interface Variant extends Keyed {
// Start generate - PigVariant
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
Variant COLD = getVariant("cold");
Variant TEMPERATE = getVariant("temperate");
paper-api/src/main/java/org/bukkit/entity/Salmon.java
+1 -1
View File
@@ -28,7 +28,7 @@ public interface Salmon extends io.papermc.paper.entity.SchoolableFish { // Pape
public enum Variant {
// Start generate - SalmonVariant
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
SMALL,
MEDIUM,
LARGE;
paper-api/src/main/java/org/bukkit/entity/Sniffer.java
+1 -1
View File
@@ -75,7 +75,7 @@ public interface Sniffer extends Animals {
*/
public enum State {
// Start generate - SnifferState
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
IDLING,
FEELING_HAPPY,
SCENTING,
paper-api/src/main/java/org/bukkit/entity/TropicalFish.java
+1 -1
View File
@@ -61,7 +61,7 @@ public interface TropicalFish extends io.papermc.paper.entity.SchoolableFish { /
public static enum Pattern {
// Start generate - TropicalFishPattern
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
KOB,
SUNSTREAK,
SNOOPER,
paper-api/src/main/java/org/bukkit/entity/Villager.java
+2 -2
View File
@@ -172,7 +172,7 @@ public interface Villager extends AbstractVillager {
interface Type extends OldEnum<Type>, Keyed {
// Start generate - VillagerType
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
Type DESERT = getType("desert");
Type JUNGLE = getType("jungle");
@@ -224,7 +224,7 @@ public interface Villager extends AbstractVillager {
interface Profession extends OldEnum<Profession>, Keyed, net.kyori.adventure.translation.Translatable {
// Start generate - VillagerProfession
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
/**
* Armorer profession. Wears a black apron. Armorers primarily trade for
* iron armor, chainmail armor, and sometimes diamond armor.
paper-api/src/main/java/org/bukkit/entity/Wolf.java
+1 -1
View File
@@ -142,7 +142,7 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
interface SoundVariant extends Keyed {
// Start generate - WolfSoundVariant
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
SoundVariant ANGRY = getSoundVariant("angry");
SoundVariant BIG = getSoundVariant("big");
paper-api/src/main/java/org/bukkit/entity/memory/MemoryKey.java
+1 -1
View File
@@ -47,7 +47,7 @@ public final class MemoryKey<T> implements Keyed {
private static final Map<NamespacedKey, MemoryKey<?>> MEMORY_KEYS = new HashMap<>();
// Start generate - MemoryKey
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
public static final MemoryKey<Boolean> ADMIRING_DISABLED = new MemoryKey<>(NamespacedKey.minecraft("admiring_disabled"), Boolean.class);
public static final MemoryKey<Boolean> ADMIRING_ITEM = new MemoryKey<>(NamespacedKey.minecraft("admiring_item"), Boolean.class);
paper-api/src/main/java/org/bukkit/generator/structure/Structure.java
+1 -1
View File
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull;
public abstract class Structure implements Keyed {
// Start generate - Structure
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
public static final Structure ANCIENT_CITY = getStructure("ancient_city");
public static final Structure BASTION_REMNANT = getStructure("bastion_remnant");
paper-api/src/main/java/org/bukkit/generator/structure/StructureType.java
+1 -1
View File
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.NotNull;
public abstract class StructureType implements Keyed {
// Start generate - StructureType
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
public static final StructureType BURIED_TREASURE = getStructureType("buried_treasure");
public static final StructureType DESERT_PYRAMID = getStructureType("desert_pyramid");
paper-api/src/main/java/org/bukkit/inventory/ItemRarity.java
+1 -1
View File
@@ -10,7 +10,7 @@ import net.kyori.adventure.text.format.TextColor;
public enum ItemRarity {
// Start generate - ItemRarity
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
COMMON(NamedTextColor.WHITE),
UNCOMMON(NamedTextColor.YELLOW),
RARE(NamedTextColor.AQUA),
paper-api/src/main/java/org/bukkit/inventory/ItemType.java
+93 -91
View File
@@ -94,7 +94,7 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
//<editor-fold desc="ItemTypes" defaultstate="collapsed">
// Start generate - ItemType
// @GeneratedFrom 1.21.6-pre3
// @GeneratedFrom 1.21.7-rc1
ItemType.Typed<ItemMeta> ACACIA_BOAT = getItemType("acacia_boat");
ItemType.Typed<ItemMeta> ACACIA_BUTTON = getItemType("acacia_button");
@@ -937,96 +937,6 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> DIRT_PATH = getItemType("dirt_path");
ItemType.Typed<ItemMeta> DRAGON_BREATH = getItemType("dragon_breath");
ItemType.Typed<SkullMeta> DRAGON_HEAD = getItemType("dragon_head");
ItemType.Typed<EnchantmentStorageMeta> ENCHANTED_BOOK = getItemType("enchanted_book");
ItemType.Typed<ItemMeta> END_CRYSTAL = getItemType("end_crystal");
ItemType.Typed<SpawnEggMeta> ENDER_DRAGON_SPAWN_EGG = getItemType("ender_dragon_spawn_egg");
ItemType.Typed<SpawnEggMeta> ENDERMAN_SPAWN_EGG = getItemType("enderman_spawn_egg");
ItemType.Typed<SpawnEggMeta> ENDERMITE_SPAWN_EGG = getItemType("endermite_spawn_egg");
ItemType.Typed<SpawnEggMeta> EVOKER_SPAWN_EGG = getItemType("evoker_spawn_egg");
ItemType.Typed<ItemMeta> EXPERIENCE_BOTTLE = getItemType("experience_bottle");
ItemType.Typed<ItemMeta> FIRE_CHARGE = getItemType("fire_charge");
ItemType.Typed<FireworkMeta> FIREWORK_ROCKET = getItemType("firework_rocket");
ItemType.Typed<FireworkEffectMeta> FIREWORK_STAR = getItemType("firework_star");
ItemType.Typed<ItemMeta> FLOW_BANNER_PATTERN = getItemType("flow_banner_pattern");
ItemType.Typed<ItemMeta> FLOWER_POT = getItemType("flower_pot");
ItemType.Typed<SpawnEggMeta> FOX_SPAWN_EGG = getItemType("fox_spawn_egg");
ItemType.Typed<SpawnEggMeta> FROG_SPAWN_EGG = getItemType("frog_spawn_egg");
ItemType.Typed<SpawnEggMeta> GHAST_SPAWN_EGG = getItemType("ghast_spawn_egg");
ItemType.Typed<ItemMeta> GLOW_ITEM_FRAME = getItemType("glow_item_frame");
ItemType.Typed<SpawnEggMeta> GLOW_SQUID_SPAWN_EGG = getItemType("glow_squid_spawn_egg");
ItemType.Typed<SpawnEggMeta> GOAT_SPAWN_EGG = getItemType("goat_spawn_egg");
ItemType.Typed<ItemMeta> GOLDEN_CARROT = getItemType("golden_carrot");
ItemType.Typed<ItemMeta> GOLDEN_HORSE_ARMOR = getItemType("golden_horse_armor");
ItemType.Typed<BannerMeta> GRAY_BANNER = getItemType("gray_banner");
ItemType.Typed<BannerMeta> GREEN_BANNER = getItemType("green_banner");
ItemType.Typed<SpawnEggMeta> GUARDIAN_SPAWN_EGG = getItemType("guardian_spawn_egg");
ItemType.Typed<SpawnEggMeta> HAPPY_GHAST_SPAWN_EGG = getItemType("happy_ghast_spawn_egg");
ItemType.Typed<SpawnEggMeta> HOGLIN_SPAWN_EGG = getItemType("hoglin_spawn_egg");
ItemType.Typed<SpawnEggMeta> HORSE_SPAWN_EGG = getItemType("horse_spawn_egg");
ItemType.Typed<SpawnEggMeta> HUSK_SPAWN_EGG = getItemType("husk_spawn_egg");
ItemType.Typed<SpawnEggMeta> IRON_GOLEM_SPAWN_EGG = getItemType("iron_golem_spawn_egg");
ItemType.Typed<ItemMeta> IRON_HORSE_ARMOR = getItemType("iron_horse_armor");
ItemType.Typed<ItemMeta> ITEM_FRAME = getItemType("item_frame");
ItemType.Typed<ItemMeta> LEAD = getItemType("lead");
ItemType.Typed<LeatherArmorMeta> LEATHER_HORSE_ARMOR = getItemType("leather_horse_armor");
ItemType.Typed<BannerMeta> LIGHT_BLUE_BANNER = getItemType("light_blue_banner");
ItemType.Typed<BannerMeta> LIGHT_GRAY_BANNER = getItemType("light_gray_banner");
ItemType.Typed<BannerMeta> LIME_BANNER = getItemType("lime_banner");
ItemType.Typed<SpawnEggMeta> LLAMA_SPAWN_EGG = getItemType("llama_spawn_egg");
ItemType.Typed<ItemMeta> MACE = getItemType("mace");
ItemType.Typed<BannerMeta> MAGENTA_BANNER = getItemType("magenta_banner");
ItemType.Typed<SpawnEggMeta> MAGMA_CUBE_SPAWN_EGG = getItemType("magma_cube_spawn_egg");
ItemType.Typed<ItemMeta> MAP = getItemType("map");
ItemType.Typed<SpawnEggMeta> MOOSHROOM_SPAWN_EGG = getItemType("mooshroom_spawn_egg");
ItemType.Typed<SpawnEggMeta> MULE_SPAWN_EGG = getItemType("mule_spawn_egg");
ItemType.Typed<ItemMeta> MUSIC_DISC_5 = getItemType("music_disc_5");
ItemType.Typed<ItemMeta> DISC_FRAGMENT_5 = getItemType("disc_fragment_5");
ItemType.Typed<BlockStateMeta> DISPENSER = getItemType("dispenser");
@@ -1035,8 +945,12 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<SpawnEggMeta> DONKEY_SPAWN_EGG = getItemType("donkey_spawn_egg");
ItemType.Typed<ItemMeta> DRAGON_BREATH = getItemType("dragon_breath");
ItemType.Typed<ItemMeta> DRAGON_EGG = getItemType("dragon_egg");
ItemType.Typed<SkullMeta> DRAGON_HEAD = getItemType("dragon_head");
ItemType.Typed<ItemMeta> DRIED_GHAST = getItemType("dried_ghast");
ItemType.Typed<ItemMeta> DRIED_KELP = getItemType("dried_kelp");
@@ -1065,10 +979,14 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> EMERALD_ORE = getItemType("emerald_ore");
ItemType.Typed<EnchantmentStorageMeta> ENCHANTED_BOOK = getItemType("enchanted_book");
ItemType.Typed<ItemMeta> ENCHANTED_GOLDEN_APPLE = getItemType("enchanted_golden_apple");
ItemType.Typed<BlockStateMeta> ENCHANTING_TABLE = getItemType("enchanting_table");
ItemType.Typed<ItemMeta> END_CRYSTAL = getItemType("end_crystal");
ItemType.Typed<ItemMeta> END_PORTAL_FRAME = getItemType("end_portal_frame");
ItemType.Typed<ItemMeta> END_ROD = getItemType("end_rod");
@@ -1085,10 +1003,20 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<BlockStateMeta> ENDER_CHEST = getItemType("ender_chest");
ItemType.Typed<SpawnEggMeta> ENDER_DRAGON_SPAWN_EGG = getItemType("ender_dragon_spawn_egg");
ItemType.Typed<ItemMeta> ENDER_EYE = getItemType("ender_eye");
ItemType.Typed<ItemMeta> ENDER_PEARL = getItemType("ender_pearl");
ItemType.Typed<SpawnEggMeta> ENDERMAN_SPAWN_EGG = getItemType("enderman_spawn_egg");
ItemType.Typed<SpawnEggMeta> ENDERMITE_SPAWN_EGG = getItemType("endermite_spawn_egg");
ItemType.Typed<SpawnEggMeta> EVOKER_SPAWN_EGG = getItemType("evoker_spawn_egg");
ItemType.Typed<ItemMeta> EXPERIENCE_BOTTLE = getItemType("experience_bottle");
ItemType.Typed<ItemMeta> EXPLORER_POTTERY_SHERD = getItemType("explorer_pottery_sherd");
ItemType.Typed<ItemMeta> EXPOSED_CHISELED_COPPER = getItemType("exposed_chiseled_copper");
@@ -1123,6 +1051,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<MapMeta> FILLED_MAP = getItemType("filled_map");
ItemType.Typed<ItemMeta> FIRE_CHARGE = getItemType("fire_charge");
ItemType.Typed<ItemMeta> FIRE_CORAL = getItemType("fire_coral");
ItemType.Typed<ItemMeta> FIRE_CORAL_BLOCK = getItemType("fire_coral_block");
@@ -1131,6 +1061,10 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> FIREFLY_BUSH = getItemType("firefly_bush");
ItemType.Typed<FireworkMeta> FIREWORK_ROCKET = getItemType("firework_rocket");
ItemType.Typed<FireworkEffectMeta> FIREWORK_STAR = getItemType("firework_star");
ItemType.Typed<ItemMeta> FISHING_ROD = getItemType("fishing_rod");
ItemType.Typed<ItemMeta> FLETCHING_TABLE = getItemType("fletching_table");
@@ -1141,22 +1075,32 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> FLOW_ARMOR_TRIM_SMITHING_TEMPLATE = getItemType("flow_armor_trim_smithing_template");
ItemType.Typed<ItemMeta> FLOW_BANNER_PATTERN = getItemType("flow_banner_pattern");
ItemType.Typed<ItemMeta> FLOW_POTTERY_SHERD = getItemType("flow_pottery_sherd");
ItemType.Typed<ItemMeta> FLOWER_BANNER_PATTERN = getItemType("flower_banner_pattern");
ItemType.Typed<ItemMeta> FLOWER_POT = getItemType("flower_pot");
ItemType.Typed<ItemMeta> FLOWERING_AZALEA = getItemType("flowering_azalea");
ItemType.Typed<ItemMeta> FLOWERING_AZALEA_LEAVES = getItemType("flowering_azalea_leaves");
ItemType.Typed<SpawnEggMeta> FOX_SPAWN_EGG = getItemType("fox_spawn_egg");
ItemType.Typed<ItemMeta> FRIEND_POTTERY_SHERD = getItemType("friend_pottery_sherd");
ItemType.Typed<SpawnEggMeta> FROG_SPAWN_EGG = getItemType("frog_spawn_egg");
ItemType.Typed<ItemMeta> FROGSPAWN = getItemType("frogspawn");
ItemType.Typed<BlockStateMeta> FURNACE = getItemType("furnace");
ItemType.Typed<ItemMeta> FURNACE_MINECART = getItemType("furnace_minecart");
ItemType.Typed<SpawnEggMeta> GHAST_SPAWN_EGG = getItemType("ghast_spawn_egg");
ItemType.Typed<ItemMeta> GHAST_TEAR = getItemType("ghast_tear");
ItemType.Typed<ItemMeta> GILDED_BLACKSTONE = getItemType("gilded_blackstone");
@@ -1175,14 +1119,20 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> GLOW_INK_SAC = getItemType("glow_ink_sac");
ItemType.Typed<ItemMeta> GLOW_ITEM_FRAME = getItemType("glow_item_frame");
ItemType.Typed<ItemMeta> GLOW_LICHEN = getItemType("glow_lichen");
ItemType.Typed<SpawnEggMeta> GLOW_SQUID_SPAWN_EGG = getItemType("glow_squid_spawn_egg");
ItemType.Typed<ItemMeta> GLOWSTONE = getItemType("glowstone");
ItemType.Typed<ItemMeta> GLOWSTONE_DUST = getItemType("glowstone_dust");
ItemType.Typed<MusicInstrumentMeta> GOAT_HORN = getItemType("goat_horn");
ItemType.Typed<SpawnEggMeta> GOAT_SPAWN_EGG = getItemType("goat_spawn_egg");
ItemType.Typed<ItemMeta> GOLD_BLOCK = getItemType("gold_block");
ItemType.Typed<ItemMeta> GOLD_INGOT = getItemType("gold_ingot");
@@ -1197,12 +1147,16 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ArmorMeta> GOLDEN_BOOTS = getItemType("golden_boots");
ItemType.Typed<ItemMeta> GOLDEN_CARROT = getItemType("golden_carrot");
ItemType.Typed<ArmorMeta> GOLDEN_CHESTPLATE = getItemType("golden_chestplate");
ItemType.Typed<ArmorMeta> GOLDEN_HELMET = getItemType("golden_helmet");
ItemType.Typed<ItemMeta> GOLDEN_HOE = getItemType("golden_hoe");
ItemType.Typed<ItemMeta> GOLDEN_HORSE_ARMOR = getItemType("golden_horse_armor");
ItemType.Typed<ArmorMeta> GOLDEN_LEGGINGS = getItemType("golden_leggings");
ItemType.Typed<ItemMeta> GOLDEN_PICKAXE = getItemType("golden_pickaxe");
@@ -1223,6 +1177,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> GRAVEL = getItemType("gravel");
ItemType.Typed<BannerMeta> GRAY_BANNER = getItemType("gray_banner");
ItemType.Typed<BlockStateMeta> GRAY_BED = getItemType("gray_bed");
ItemType.Typed<BundleMeta> GRAY_BUNDLE = getItemType("gray_bundle");
@@ -1251,6 +1207,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> GRAY_WOOL = getItemType("gray_wool");
ItemType.Typed<BannerMeta> GREEN_BANNER = getItemType("green_banner");
ItemType.Typed<BlockStateMeta> GREEN_BED = getItemType("green_bed");
ItemType.Typed<BundleMeta> GREEN_BUNDLE = getItemType("green_bundle");
@@ -1281,6 +1239,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> GRINDSTONE = getItemType("grindstone");
ItemType.Typed<SpawnEggMeta> GUARDIAN_SPAWN_EGG = getItemType("guardian_spawn_egg");
ItemType.Typed<ItemMeta> GUNPOWDER = getItemType("gunpowder");
ItemType.Typed<ItemMeta> GUSTER_BANNER_PATTERN = getItemType("guster_banner_pattern");
@@ -1289,6 +1249,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> HANGING_ROOTS = getItemType("hanging_roots");
ItemType.Typed<SpawnEggMeta> HAPPY_GHAST_SPAWN_EGG = getItemType("happy_ghast_spawn_egg");
ItemType.Typed<ItemMeta> HAY_BLOCK = getItemType("hay_block");
ItemType.Typed<ItemMeta> HEART_OF_THE_SEA = getItemType("heart_of_the_sea");
@@ -1301,6 +1263,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> HEAVY_WEIGHTED_PRESSURE_PLATE = getItemType("heavy_weighted_pressure_plate");
ItemType.Typed<SpawnEggMeta> HOGLIN_SPAWN_EGG = getItemType("hoglin_spawn_egg");
ItemType.Typed<ItemMeta> HONEY_BLOCK = getItemType("honey_block");
ItemType.Typed<ItemMeta> HONEY_BOTTLE = getItemType("honey_bottle");
@@ -1319,10 +1283,14 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> HORN_CORAL_FAN = getItemType("horn_coral_fan");
ItemType.Typed<SpawnEggMeta> HORSE_SPAWN_EGG = getItemType("horse_spawn_egg");
ItemType.Typed<ItemMeta> HOST_ARMOR_TRIM_SMITHING_TEMPLATE = getItemType("host_armor_trim_smithing_template");
ItemType.Typed<ItemMeta> HOWL_POTTERY_SHERD = getItemType("howl_pottery_sherd");
ItemType.Typed<SpawnEggMeta> HUSK_SPAWN_EGG = getItemType("husk_spawn_egg");
ItemType.Typed<ItemMeta> ICE = getItemType("ice");
ItemType.Typed<ItemMeta> INFESTED_CHISELED_STONE_BRICKS = getItemType("infested_chiseled_stone_bricks");
@@ -1353,10 +1321,14 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> IRON_DOOR = getItemType("iron_door");
ItemType.Typed<SpawnEggMeta> IRON_GOLEM_SPAWN_EGG = getItemType("iron_golem_spawn_egg");
ItemType.Typed<ArmorMeta> IRON_HELMET = getItemType("iron_helmet");
ItemType.Typed<ItemMeta> IRON_HOE = getItemType("iron_hoe");
ItemType.Typed<ItemMeta> IRON_HORSE_ARMOR = getItemType("iron_horse_armor");
ItemType.Typed<ItemMeta> IRON_INGOT = getItemType("iron_ingot");
ItemType.Typed<ArmorMeta> IRON_LEGGINGS = getItemType("iron_leggings");
@@ -1373,6 +1345,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> IRON_TRAPDOOR = getItemType("iron_trapdoor");
ItemType.Typed<ItemMeta> ITEM_FRAME = getItemType("item_frame");
ItemType.Typed<ItemMeta> JACK_O_LANTERN = getItemType("jack_o_lantern");
ItemType.Typed<BlockStateMeta> JIGSAW = getItemType("jigsaw");
@@ -1433,6 +1407,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> LAVA_BUCKET = getItemType("lava_bucket");
ItemType.Typed<ItemMeta> LEAD = getItemType("lead");
ItemType.Typed<ItemMeta> LEAF_LITTER = getItemType("leaf_litter");
ItemType.Typed<ItemMeta> LEATHER = getItemType("leather");
@@ -1443,6 +1419,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ColorableArmorMeta> LEATHER_HELMET = getItemType("leather_helmet");
ItemType.Typed<LeatherArmorMeta> LEATHER_HORSE_ARMOR = getItemType("leather_horse_armor");
ItemType.Typed<ColorableArmorMeta> LEATHER_LEGGINGS = getItemType("leather_leggings");
ItemType.Typed<BlockStateMeta> LECTERN = getItemType("lectern");
@@ -1451,6 +1429,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> LIGHT = getItemType("light");
ItemType.Typed<BannerMeta> LIGHT_BLUE_BANNER = getItemType("light_blue_banner");
ItemType.Typed<BlockStateMeta> LIGHT_BLUE_BED = getItemType("light_blue_bed");
ItemType.Typed<BundleMeta> LIGHT_BLUE_BUNDLE = getItemType("light_blue_bundle");
@@ -1479,6 +1459,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> LIGHT_BLUE_WOOL = getItemType("light_blue_wool");
ItemType.Typed<BannerMeta> LIGHT_GRAY_BANNER = getItemType("light_gray_banner");
ItemType.Typed<BlockStateMeta> LIGHT_GRAY_BED = getItemType("light_gray_bed");
ItemType.Typed<BundleMeta> LIGHT_GRAY_BUNDLE = getItemType("light_gray_bundle");
@@ -1517,6 +1499,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> LILY_PAD = getItemType("lily_pad");
ItemType.Typed<BannerMeta> LIME_BANNER = getItemType("lime_banner");
ItemType.Typed<BlockStateMeta> LIME_BED = getItemType("lime_bed");
ItemType.Typed<BundleMeta> LIME_BUNDLE = getItemType("lime_bundle");
@@ -1547,10 +1531,16 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<PotionMeta> LINGERING_POTION = getItemType("lingering_potion");
ItemType.Typed<SpawnEggMeta> LLAMA_SPAWN_EGG = getItemType("llama_spawn_egg");
ItemType.Typed<ItemMeta> LODESTONE = getItemType("lodestone");
ItemType.Typed<ItemMeta> LOOM = getItemType("loom");
ItemType.Typed<ItemMeta> MACE = getItemType("mace");
ItemType.Typed<BannerMeta> MAGENTA_BANNER = getItemType("magenta_banner");
ItemType.Typed<BlockStateMeta> MAGENTA_BED = getItemType("magenta_bed");
ItemType.Typed<BundleMeta> MAGENTA_BUNDLE = getItemType("magenta_bundle");
@@ -1583,6 +1573,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> MAGMA_CREAM = getItemType("magma_cream");
ItemType.Typed<SpawnEggMeta> MAGMA_CUBE_SPAWN_EGG = getItemType("magma_cube_spawn_egg");
ItemType.Typed<ItemMeta> MANGROVE_BOAT = getItemType("mangrove_boat");
ItemType.Typed<ItemMeta> MANGROVE_BUTTON = getItemType("mangrove_button");
@@ -1619,6 +1611,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> MANGROVE_WOOD = getItemType("mangrove_wood");
ItemType.Typed<ItemMeta> MAP = getItemType("map");
ItemType.Typed<ItemMeta> MEDIUM_AMETHYST_BUD = getItemType("medium_amethyst_bud");
ItemType.Typed<ItemMeta> MELON = getItemType("melon");
@@ -1635,6 +1629,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> MOJANG_BANNER_PATTERN = getItemType("mojang_banner_pattern");
ItemType.Typed<SpawnEggMeta> MOOSHROOM_SPAWN_EGG = getItemType("mooshroom_spawn_egg");
ItemType.Typed<ItemMeta> MOSS_BLOCK = getItemType("moss_block");
ItemType.Typed<ItemMeta> MOSS_CARPET = getItemType("moss_carpet");
@@ -1669,10 +1665,14 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> MUDDY_MANGROVE_ROOTS = getItemType("muddy_mangrove_roots");
ItemType.Typed<SpawnEggMeta> MULE_SPAWN_EGG = getItemType("mule_spawn_egg");
ItemType.Typed<ItemMeta> MUSHROOM_STEM = getItemType("mushroom_stem");
ItemType.Typed<ItemMeta> MUSHROOM_STEW = getItemType("mushroom_stew");
ItemType.Typed<ItemMeta> MUSIC_DISC_5 = getItemType("music_disc_5");
ItemType.Typed<ItemMeta> MUSIC_DISC_11 = getItemType("music_disc_11");
ItemType.Typed<ItemMeta> MUSIC_DISC_13 = getItemType("music_disc_13");
@@ -1689,6 +1689,8 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> MUSIC_DISC_FAR = getItemType("music_disc_far");
ItemType.Typed<ItemMeta> MUSIC_DISC_LAVA_CHICKEN = getItemType("music_disc_lava_chicken");
ItemType.Typed<ItemMeta> MUSIC_DISC_MALL = getItemType("music_disc_mall");
ItemType.Typed<ItemMeta> MUSIC_DISC_MELLOHI = getItemType("music_disc_mellohi");
paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
+1 -1
View File
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
public interface TrimMaterial extends Keyed, Translatable {
// Start generate - TrimMaterial
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
TrimMaterial AMETHYST = getTrimMaterial("amethyst");
TrimMaterial COPPER = getTrimMaterial("copper");
paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
+1 -1
View File
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
public interface TrimPattern extends Keyed, Translatable {
// Start generate - TrimPattern
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
TrimPattern BOLT = getTrimPattern("bolt");
TrimPattern COAST = getTrimPattern("coast");
paper-api/src/main/java/org/bukkit/inventory/recipe/CookingBookCategory.java
+1 -1
View File
@@ -6,7 +6,7 @@ package org.bukkit.inventory.recipe;
public enum CookingBookCategory {
// Start generate - CookingBookCategory
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
FOOD,
BLOCKS,
MISC;
paper-api/src/main/java/org/bukkit/inventory/recipe/CraftingBookCategory.java
+1 -1
View File
@@ -6,7 +6,7 @@ package org.bukkit.inventory.recipe;
public enum CraftingBookCategory {
// Start generate - CraftingBookCategory
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
BUILDING,
REDSTONE,
EQUIPMENT,
paper-api/src/main/java/org/bukkit/map/MapCursor.java
+1 -1
View File
@@ -289,7 +289,7 @@ public final class MapCursor {
public interface Type extends OldEnum<Type>, Keyed {
// Start generate - MapCursorType
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
Type BANNER_BLACK = getType("banner_black");
Type BANNER_BLUE = getType("banner_blue");
paper-api/src/main/java/org/bukkit/map/MapPalette.java
+1 -1
View File
@@ -37,7 +37,7 @@ public final class MapPalette {
@NotNull
static final Color[] colors = {
// Start generate - MapPalette#colors
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
new Color(0x00000000, true),
new Color(0x00000000, true),
new Color(0x00000000, true),
paper-api/src/main/java/org/bukkit/potion/PotionType.java
+1 -1
View File
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable;
*/
public enum PotionType implements Keyed, io.papermc.paper.world.flag.FeatureDependant { // Paper - feature flag API
// Start generate - PotionType
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
AWKWARD("awkward"),
FIRE_RESISTANCE("fire_resistance"),
HARMING("harming"),
paper-api/src/main/java/org/bukkit/scoreboard/DisplaySlot.java
+1 -1
View File
@@ -8,7 +8,7 @@ import org.jspecify.annotations.NullMarked;
@NullMarked
public enum DisplaySlot {
// Start generate - DisplaySlot
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
PLAYER_LIST("list"),
SIDEBAR("sidebar"),
BELOW_NAME("below_name"),
paper-api/src/main/java/org/bukkit/tag/DamageTypeTags.java
+1 -1
View File
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.Nullable;
public final class DamageTypeTags {
// Start generate - DamageTypeTags
// @GeneratedFrom 1.21.6
// @GeneratedFrom 1.21.7-rc2
public static final Tag<DamageType> ALWAYS_HURTS_ENDER_DRAGONS = getTag("always_hurts_ender_dragons");
public static final Tag<DamageType> ALWAYS_KILLS_ARMOR_STANDS = getTag("always_kills_armor_stands");
paper-server/build.gradle.kts
+3 -3
View File
@@ -17,7 +17,7 @@ plugins {
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
dependencies {
mache("io.papermc:mache:1.21.6+build.1")
mache("io.papermc:mache:1.21.7-rc2+build.1")
paperclip("io.papermc:paperclip:3.0.3")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
@@ -27,7 +27,7 @@ paperweight {
gitFilePatches = false
spigot {
enabled = true
enabled = false
buildDataRef = "281ac0de7a76d808753ede97d11b034bc801b63d"
packageVersion = "v1_21_R5" // also needs to be updated in MappingEnvironment
}
@@ -381,7 +381,7 @@ fill {
version(paperweight.minecraftVersion)
build {
channel = BuildChannel.STABLE
channel = BuildChannel.ALPHA
downloads {
register("server:default") {
paper-server/patches/features/0003-Entity-Activation-Range-2.0.patch
+4 -4
View File
@@ -695,10 +695,10 @@ index fca31bbab8e7830933ceffcf992ff56ccc84414c..51804b611f469f2ab53e455e8c633b86
public void tick() {
if (this.getItem().isEmpty()) {
diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
index ef8347329b440833b45a54be2b6e4204ac0a425e..43f16df230f87a43e249a58fc10ef2da517f22ee 100644
index 1a6cfe566d84048c4e70e835f57d18b70f8783f0..e1e2bdb35866a8f32a41f6efd24ad77cf916b2e9 100644
--- a/net/minecraft/world/entity/npc/Villager.java
+++ b/net/minecraft/world/entity/npc/Villager.java
@@ -269,11 +269,35 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -268,11 +268,35 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
return this.assignProfessionWhenSpawned;
}
@@ -735,7 +735,7 @@ index ef8347329b440833b45a54be2b6e4204ac0a425e..43f16df230f87a43e249a58fc10ef2da
profilerFiller.pop();
if (this.assignProfessionWhenSpawned) {
this.assignProfessionWhenSpawned = false;
@@ -297,7 +321,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -296,7 +320,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
this.lastTradedPlayer = null;
}
@@ -744,7 +744,7 @@ index ef8347329b440833b45a54be2b6e4204ac0a425e..43f16df230f87a43e249a58fc10ef2da
Raid raidAt = level.getRaidAt(this.blockPosition());
if (raidAt != null && raidAt.isActive() && !raidAt.isOver()) {
level.broadcastEntityEvent(this, (byte)42);
@@ -308,6 +332,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -307,6 +331,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
this.stopTrading();
}
paper-server/patches/features/0015-Rewrite-dataconverter-system.patch
+6 -10
View File
@@ -32585,10 +32585,10 @@ index 8c1417c659ea0e079e99b9bfa79e1cf6ba9b712b..a8a32edea080f32fd25c9e009d4efa41
if (stopBelowZero) {
chunkData.putString("Status", net.minecraft.core.registries.BuiltInRegistries.CHUNK_STATUS.getKey(net.minecraft.world.level.chunk.status.ChunkStatus.SPAWN).toString());
diff --git a/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java b/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java
index 6be673172548c1382c7402ec4e1ec6ef51f702d3..49be43ac896d60587511a97445c53c10c587a341 100644
index 914af3dbbc875f7f672618e1a7a0bf8f10945eba..5b40a63955b61fa53bd9096b34de3adb036d0f35 100644
--- a/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java
+++ b/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java
@@ -32,13 +32,32 @@ public class SimpleRegionStorage implements AutoCloseable {
@@ -32,14 +32,29 @@ public class SimpleRegionStorage implements AutoCloseable {
return this.worker.store(chunkPos, data);
}
@@ -32605,14 +32605,10 @@ index 6be673172548c1382c7402ec4e1ec6ef51f702d3..49be43ac896d60587511a97445c53c10
+ // Paper end - rewrite data conversion system
+
public CompoundTag upgradeChunkTag(CompoundTag tag, int version) {
- int dataVersion = NbtUtils.getDataVersion(tag, version);
- return this.dataFixType.updateToCurrentVersion(this.fixerUpper, tag, dataVersion);
+ // Paper start - rewrite data conversion system
+ final int dataVer = NbtUtils.getDataVersion(tag, version);
+ final CompoundTag ret = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(this.getDataConverterType(), tag, dataVer, ca.spottedleaf.dataconverter.minecraft.util.Version.getCurrentVersion());
+ NbtUtils.addCurrentDataVersion(ret); // Fix MC-299110
+ return ret;
+ // Paper end - rewrite data conversion system
int dataVersion = NbtUtils.getDataVersion(tag, version);
- CompoundTag compoundTag = this.dataFixType.updateToCurrentVersion(this.fixerUpper, tag, dataVersion);
+ CompoundTag compoundTag = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(this.getDataConverterType(), tag, dataVersion, ca.spottedleaf.dataconverter.minecraft.util.Version.getCurrentVersion());; // Paper start - rewrite data conversion system
return NbtUtils.addCurrentDataVersion(compoundTag);
}
public Dynamic<Tag> upgradeChunkTag(Dynamic<Tag> tag, int version) {
paper-server/patches/features/0016-Moonrise-optimisation-patches.patch
+1 -1
View File
@@ -34317,7 +34317,7 @@ index 15417fab103feec3c1f7d5bd5b332e89d3ace3f5..2e6263d8b466e0f61bc72eb818044734
}
}
diff --git a/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java b/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java
index 49be43ac896d60587511a97445c53c10c587a341..1b070cf7e3612dbcb170cf5d954eba5f5b3c777c 100644
index 5b40a63955b61fa53bd9096b34de3adb036d0f35..88807eab6cdacf2785fa9c6d98b10d4986cb4cb4 100644
--- a/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java
+++ b/net/minecraft/world/level/chunk/storage/SimpleRegionStorage.java
@@ -14,7 +14,7 @@ import net.minecraft.util.datafix.DataFixTypes;
paper-server/patches/sources/net/minecraft/Util.java.patch
+1 -1
View File
@@ -113,7 +113,7 @@
public static void throwAsRuntime(Throwable throwable) {
throw throwable instanceof RuntimeException ? (RuntimeException)throwable : new RuntimeException(throwable);
}
@@ -1088,16 +_,7 @@
@@ -1093,16 +_,7 @@
}
public void openUri(URI uri) {
paper-server/patches/sources/net/minecraft/world/entity/animal/HappyGhast.java.patch
+2 -2
View File
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/animal/HappyGhast.java
+++ b/net/minecraft/world/entity/animal/HappyGhast.java
@@ -296,8 +_,12 @@
@@ -302,8 +_,12 @@
}
@Override
@@ -15,7 +15,7 @@
if (!this.level().isClientSide) {
this.setServerStillTimeout(10);
}
@@ -306,6 +_,7 @@
@@ -312,6 +_,7 @@
this.clearHome();
this.level().playSound(null, this.getX(), this.getY(), this.getZ(), SoundEvents.HARNESS_GOGGLES_UP, this.getSoundSource(), 1.0F, 1.0F);
}
paper-server/patches/sources/net/minecraft/world/entity/monster/Vindicator.java.patch
+1 -1
View File
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/monster/Vindicator.java
+++ b/net/minecraft/world/entity/monster/Vindicator.java
@@ -184,7 +_,7 @@
@@ -183,7 +_,7 @@
static class VindicatorBreakDoorGoal extends BreakDoorGoal {
public VindicatorBreakDoorGoal(Mob mob) {
paper-server/patches/sources/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java.patch
+1 -1
View File
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java
+++ b/net/minecraft/world/entity/monster/piglin/AbstractPiglin.java
@@ -101,9 +_,14 @@
@@ -100,9 +_,14 @@
}
protected void finishConversion(ServerLevel serverLevel) {
paper-server/patches/sources/net/minecraft/world/entity/npc/Villager.java.patch
+12 -12
View File
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/npc/Villager.java
+++ b/net/minecraft/world/entity/npc/Villager.java
@@ -287,7 +_,7 @@
@@ -286,7 +_,7 @@
this.increaseProfessionLevelOnUpdate = false;
}
@@ -9,7 +9,7 @@
}
}
@@ -396,7 +_,12 @@
@@ -395,7 +_,12 @@
this.updateDemand();
for (MerchantOffer merchantOffer : this.getOffers()) {
@@ -23,7 +23,7 @@
}
this.resendOffersToTradingPlayer();
@@ -457,7 +_,12 @@
@@ -456,7 +_,12 @@
int i = 2 - this.numberOfRestocksToday;
if (i > 0) {
for (MerchantOffer merchantOffer : this.getOffers()) {
@@ -37,7 +37,7 @@
}
}
@@ -478,6 +_,7 @@
@@ -477,6 +_,7 @@
int playerReputation = this.getPlayerReputation(player);
if (playerReputation != 0) {
for (MerchantOffer merchantOffer : this.getOffers()) {
@@ -45,7 +45,7 @@
merchantOffer.addToSpecialPriceDiff(-Mth.floor(playerReputation * merchantOffer.getPriceMultiplier()));
}
}
@@ -487,6 +_,7 @@
@@ -486,6 +_,7 @@
int amplifier = effect.getAmplifier();
for (MerchantOffer merchantOffer1 : this.getOffers()) {
@@ -53,7 +53,7 @@
double d = 0.3 + 0.0625 * amplifier;
int i = (int)Math.floor(d * merchantOffer1.getBaseCostA().getCount());
merchantOffer1.addToSpecialPriceDiff(-Math.max(i, 1));
@@ -595,7 +_,7 @@
@@ -594,7 +_,7 @@
}
if (offer.shouldRewardExp()) {
@@ -62,7 +62,7 @@
}
}
@@ -613,7 +_,7 @@
@@ -612,7 +_,7 @@
@Override
public void die(DamageSource cause) {
@@ -71,7 +71,7 @@
Entity entity = cause.getEntity();
if (entity != null) {
this.tellWitnessesThatIWasMurdered(entity);
@@ -781,12 +_,19 @@
@@ -780,12 +_,19 @@
@Override
public void thunderHit(ServerLevel level, LightningBolt lightning) {
if (level.getDifficulty() != Difficulty.PEACEFUL) {
@@ -93,7 +93,7 @@
if (witch == null) {
super.thunderHit(level, lightning);
}
@@ -826,6 +_,12 @@
@@ -825,6 +_,12 @@
@Override
protected void updateTrades() {
@@ -106,7 +106,7 @@
VillagerData villagerData = this.getVillagerData();
ResourceKey<VillagerProfession> resourceKey = villagerData.profession().unwrapKey().orElse(null);
if (resourceKey != null) {
@@ -841,10 +_,12 @@
@@ -840,10 +_,12 @@
VillagerTrades.ItemListing[] itemListings = map1.get(villagerData.level());
if (itemListings != null) {
MerchantOffers offers = this.getOffers();
@@ -120,7 +120,7 @@
}
public void gossip(ServerLevel serverLevel, Villager target, long gameTime) {
@@ -873,7 +_,7 @@
@@ -872,7 +_,7 @@
List<Villager> entitiesOfClass = serverLevel.getEntitiesOfClass(Villager.class, aabb);
List<Villager> list = entitiesOfClass.stream().filter(villager -> villager.wantsToSpawnGolem(gameTime)).limit(5L).toList();
if (list.size() >= minVillagerAmount) {
@@ -129,7 +129,7 @@
EntityType.IRON_GOLEM,
EntitySpawnReason.MOB_SUMMONED,
serverLevel,
@@ -882,9 +_,11 @@
@@ -881,9 +_,11 @@
8,
6,
SpawnUtil.Strategy.LEGACY_IRON_GOLEM,

Some files were not shown because too many files have changed in this diff Show More