update comments

This commit is contained in:
Lulu13022002 2025-01-10 16:15:16 +01:00
parent 7fbb07b807
commit ce9235f84b
No known key found for this signature in database
GPG Key ID: 491C8F0B8ACDEB01
51 changed files with 117 additions and 119 deletions

View File

@ -63,7 +63,7 @@ import static java.util.Objects.requireNonNull;
@ApiStatus.Experimental
public final class DataComponentTypes {
// Paper start - Generated/DataComponentTypes
// Start generate - DataComponentTypes
// @GeneratedFrom 1.21.4
/**
* Holds attribute modifiers applied to any item,
@ -372,7 +372,7 @@ public final class DataComponentTypes {
* Holds the contents and metadata of a Written Book.
*/
public static final DataComponentType.Valued<WrittenBookContent> WRITTEN_BOOK_CONTENT = valued("written_book_content");
// Paper end - Generated/DataComponentTypes
// End generate - DataComponentTypes
// /**
// * Causes an item to not be pickable in the creative menu, currently not very useful.
// */

View File

@ -4,7 +4,7 @@ package io.papermc.paper.datacomponent.item.consumable;
* Represents the hand animation that is used when a player is consuming this item.
*/
public enum ItemUseAnimation {
// Paper start - Generated/ItemUseAnimation
// Start generate - ItemUseAnimation
// @GeneratedFrom 1.21.4
NONE,
EAT,
@ -17,5 +17,5 @@ public enum ItemUseAnimation {
TOOT_HORN,
BRUSH,
BUNDLE;
// Paper end - Generated/ItemUseAnimation
// End generate - ItemUseAnimation
}

View File

@ -24,14 +24,14 @@ import static io.papermc.paper.registry.event.RegistryEventProviderImpl.create;
@NullMarked
public final class RegistryEvents {
// Paper start - Generated/RegistryEvents
// Start generate - RegistryEvents
// @GeneratedFrom 1.21.4
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<Enchantment, EnchantmentRegistryEntry.Builder> ENCHANTMENT = create(RegistryKey.ENCHANTMENT);
public static final RegistryEventProvider<PatternType, BannerPatternRegistryEntry.Builder> BANNER_PATTERN = create(RegistryKey.BANNER_PATTERN);
public static final RegistryEventProvider<Art, PaintingVariantRegistryEntry.Builder> PAINTING_VARIANT = create(RegistryKey.PAINTING_VARIANT);
// Paper end - Generated/RegistryEvents
// End generate - RegistryEvents
private RegistryEvents() {
}

View File

@ -34,7 +34,7 @@ public interface Art extends OldEnum<Art>, Keyed {
return InlinedRegistryBuilderProvider.instance().createPaintingVariant(value);
}
// Paper start - Generated/Art
// Start generate - Art
// @GeneratedFrom 1.21.4
Art ALBAN = getArt("alban");
@ -135,7 +135,7 @@ public interface Art extends OldEnum<Art>, Keyed {
Art WIND = getArt("wind");
Art WITHER = getArt("wither");
// Paper end - Generated/Art
// End generate - Art
@NotNull
private static Art getArt(@NotNull String key) {

View File

@ -14,7 +14,7 @@ import org.jetbrains.annotations.ApiStatus;
*/
public interface FeatureFlag extends Keyed {
// Paper start - Generated/FeatureFlag
// Start generate - FeatureFlag
// @GeneratedFrom 1.21.4
@ApiStatus.Experimental
FeatureFlag MINECART_IMPROVEMENTS = create("minecart_improvements");
@ -26,7 +26,7 @@ public interface FeatureFlag extends Keyed {
FeatureFlag TRADE_REBALANCE = create("trade_rebalance");
FeatureFlag VANILLA = create("vanilla");
// Paper end - Generated/FeatureFlag
// End generate - FeatureFlag
/**
* <strong>AVAILABLE BETWEEN VERSIONS:</strong> 1.19 - 1.19.4

View File

@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
*/
public interface Fluid extends OldEnum<Fluid>, Keyed {
// Paper start - Generated/Fluid
// Start generate - Fluid
// @GeneratedFrom 1.21.4
Fluid EMPTY = getFluid("empty");
@ -22,7 +22,7 @@ public interface Fluid extends OldEnum<Fluid>, Keyed {
Fluid LAVA = getFluid("lava");
Fluid WATER = getFluid("water");
// Paper end - Generated/Fluid
// End generate - Fluid
@NotNull
private static Fluid getFluid(@NotNull String key) {

View File

@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable;
*/
public abstract class GameEvent implements Keyed {
// Paper start - Generated/GameEvent
// Start generate - GameEvent
// @GeneratedFrom 1.21.4
public static final GameEvent BLOCK_ACTIVATE = getEvent("block_activate");
@ -132,7 +132,7 @@ public abstract class GameEvent implements Keyed {
public static final GameEvent TELEPORT = getEvent("teleport");
public static final GameEvent UNEQUIP = getEvent("unequip");
// Paper end - Generated/GameEvent
// End generate - GameEvent
/**
* @deprecated in favor of {@link #BLOCK_ACTIVATE}
*/

View File

@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
@ApiStatus.Experimental
public interface JukeboxSong extends Keyed, Translatable {
// Paper start - Generated/JukeboxSong
// Start generate - JukeboxSong
// @GeneratedFrom 1.21.4
JukeboxSong ELEVEN = get("11");
@ -48,7 +48,7 @@ public interface JukeboxSong extends Keyed, Translatable {
JukeboxSong WAIT = get("wait");
JukeboxSong WARD = get("ward");
// Paper end - Generated/JukeboxSong
// End generate - JukeboxSong
@NotNull
private static JukeboxSong get(@NotNull String key) {

View File

@ -138,7 +138,7 @@ import org.jetbrains.annotations.Nullable;
@SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
public enum Material implements Keyed, Translatable, net.kyori.adventure.translation.Translatable { // Paper
//<editor-fold desc="Materials" defaultstate="collapsed">
// Paper start - Generated/Items
// Start generate - Items
// @GeneratedFrom 1.21.4
ACACIA_BOAT(-1, 1),
ACACIA_CHEST_BOAT(-1, 1),
@ -583,8 +583,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
ZOMBIE_SPAWN_EGG(-1),
ZOMBIE_VILLAGER_SPAWN_EGG(-1),
ZOMBIFIED_PIGLIN_SPAWN_EGG(-1),
// Paper end - Generated/Items
// Paper start - Generated/Blocks
// End generate - Items
// Start generate - Blocks
// @GeneratedFrom 1.21.4
ACACIA_BUTTON(-1, Switch.class),
ACACIA_DOOR(-1, Door.class),
@ -1680,7 +1680,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
YELLOW_WOOL(-1),
ZOMBIE_HEAD(-1, Skull.class),
ZOMBIE_WALL_HEAD(-1, WallSkull.class),
// Paper end - Generated/Blocks
// End generate - Blocks
// ----- Legacy Separator -----
@Deprecated(since = "1.13")
LEGACY_AIR(0, 0),
@ -3041,7 +3041,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
}
switch (this) {
//<editor-fold defaultstate="collapsed" desc="isTransparent">
// Paper start - Generated/Material#isTransparent
// Start generate - Material#isTransparent
case ACACIA_BUTTON:
case ACACIA_SAPLING:
case ACTIVATOR_RAIL:
@ -3169,7 +3169,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
case YELLOW_CARPET:
case ZOMBIE_HEAD:
case ZOMBIE_WALL_HEAD:
// Paper end - Generated/Material#isTransparent
// End generate - Material#isTransparent
// ----- Legacy Separator -----
case LEGACY_AIR:
case LEGACY_SAPLING:
@ -3400,7 +3400,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
Preconditions.checkArgument(isItem(), "The Material is not an item!");
switch (this) {
// <editor-fold defaultstate="collapsed" desc="getEquipmentSlot">
// Paper start - Generated/Material#getEquipmentSlot
// Start generate - Material#getEquipmentSlot
// @GeneratedFrom 1.21.4
case BLACK_CARPET:
case BLUE_CARPET:
@ -3466,7 +3466,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
return EquipmentSlot.OFF_HAND;
default:
return EquipmentSlot.HAND;
// Paper end - Generated/Material#getEquipmentSlot
// End generate - Material#getEquipmentSlot
// </editor-fold>
}
}

View File

@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
public abstract class MusicInstrument implements Keyed, net.kyori.adventure.translation.Translatable { // Paper - translation keys
// Paper start - Generated/MusicInstrument
// Start generate - MusicInstrument
// @GeneratedFrom 1.21.4
public static final MusicInstrument ADMIRE_GOAT_HORN = getInstrument("admire_goat_horn");
@ -25,7 +25,7 @@ public abstract class MusicInstrument implements Keyed, net.kyori.adventure.tran
public static final MusicInstrument SING_GOAT_HORN = getInstrument("sing_goat_horn");
public static final MusicInstrument YEARN_GOAT_HORN = getInstrument("yearn_goat_horn");
// Paper end - Generated/MusicInstrument
// End generate - MusicInstrument
/**
* Returns a {@link MusicInstrument} by a {@link NamespacedKey}.

View File

@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
*/
public interface Sound extends OldEnum<Sound>, Keyed, net.kyori.adventure.sound.Sound.Type { // Paper - implement Sound.Type
// Paper start - Generated/Sound
// Start generate - Sound
// @GeneratedFrom 1.21.4
Sound AMBIENT_BASALT_DELTAS_ADDITIONS = getSound("ambient.basalt_deltas.additions");
@ -3325,7 +3325,7 @@ public interface Sound extends OldEnum<Sound>, Keyed, net.kyori.adventure.sound.
Sound WEATHER_RAIN = getSound("weather.rain");
Sound WEATHER_RAIN_ABOVE = getSound("weather.rain.above");
// Paper end - Generated/Sound
// End generate - Sound
@NotNull
private static Sound getSound(@NotNull String key) {

View File

@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
* Represents a countable statistic, which is tracked by the server.
*/
public enum Statistic implements Keyed {
// Paper start - Generated/StatisticCustom
// Start generate - StatisticCustom
// @GeneratedFrom 1.21.4
ANIMALS_BRED,
AVIATE_ONE_CM,
@ -84,8 +84,8 @@ public enum Statistic implements Keyed {
WALK_ON_WATER_ONE_CM,
WALK_ONE_CM,
WALK_UNDER_WATER_ONE_CM,
// Paper end - Generated/StatisticCustom
// Paper start - Generated/StatisticType
// End generate - StatisticCustom
// Start generate - StatisticType
// @GeneratedFrom 1.21.4
BREAK_ITEM(Type.ITEM),
CRAFT_ITEM(Type.ITEM),
@ -95,7 +95,7 @@ public enum Statistic implements Keyed {
MINE_BLOCK(Type.BLOCK),
PICKUP(Type.ITEM),
USE_ITEM(Type.ITEM);
// Paper end - Generated/StatisticType
// End generate - StatisticType
private final Type type;
private final NamespacedKey key;

View File

@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull;
*/
public interface Tag<T extends Keyed> extends Keyed {
// Paper start - Generated/Tag
// Start generate - Tag
// @GeneratedFrom 1.21.4
String REGISTRY_BLOCKS = "blocks";
@ -832,7 +832,7 @@ public interface Tag<T extends Keyed> extends Keyed {
Tag<GameEvent> GAME_EVENT_VIBRATIONS = Bukkit.getTag(REGISTRY_GAME_EVENTS, NamespacedKey.minecraft("vibrations"), GameEvent.class);
Tag<GameEvent> GAME_EVENT_WARDEN_CAN_LISTEN = Bukkit.getTag(REGISTRY_GAME_EVENTS, NamespacedKey.minecraft("warden_can_listen"), GameEvent.class);
// Paper end - Generated/Tag
// End generate - Tag
/**
* @deprecated {@link #WOOL_CARPETS}.

View File

@ -16,7 +16,7 @@ import org.jetbrains.annotations.NotNull;
*/
public interface Attribute extends OldEnum<Attribute>, Keyed, Translatable, net.kyori.adventure.translation.Translatable { // Paper - Adventure translations
// Paper start - Generated/Attribute
// Start generate - Attribute
// @GeneratedFrom 1.21.4
Attribute ARMOR = getAttribute("armor");
@ -81,7 +81,7 @@ public interface Attribute extends OldEnum<Attribute>, Keyed, Translatable, net.
Attribute TEMPT_RANGE = getAttribute("tempt_range");
Attribute WATER_MOVEMENT_EFFICIENCY = getAttribute("water_movement_efficiency");
// Paper end - Generated/Attribute
// End generate - Attribute
@NotNull
private static Attribute getAttribute(@NotNull String key) {

View File

@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
*/
public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.translation.Translatable { // Paper - Adventure translations
// Paper start - Generated/Biome
// Start generate - Biome
// @GeneratedFrom 1.21.4
Biome BADLANDS = getBiome("badlands");
@ -153,7 +153,7 @@ public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.transl
Biome WINDSWEPT_SAVANNA = getBiome("windswept_savanna");
Biome WOODED_BADLANDS = getBiome("wooded_badlands");
// Paper end - Generated/Biome
// End generate - Biome
/**
* Represents a custom Biome

View File

@ -183,7 +183,7 @@ public interface BlockType extends Keyed, Translatable, net.kyori.adventure.tran
}
//<editor-fold desc="BlockTypes" defaultstate="collapsed">
// Paper start - Generated/BlockType
// Start generate - BlockType
// @GeneratedFrom 1.21.4
BlockType.Typed<Switch> ACACIA_BUTTON = getBlockType("acacia_button");
@ -2374,7 +2374,7 @@ public interface BlockType extends Keyed, Translatable, net.kyori.adventure.tran
BlockType.Typed<Skull> ZOMBIE_HEAD = getBlockType("zombie_head");
BlockType.Typed<WallSkull> ZOMBIE_WALL_HEAD = getBlockType("zombie_wall_head");
// Paper end - Generated/BlockType
// End generate - BlockType
//</editor-fold>
@NotNull

View File

@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable;
public interface PatternType extends OldEnum<PatternType>, Keyed {
// Paper start - Generated/PatternType
// Start generate - PatternType
// @GeneratedFrom 1.21.4
PatternType BASE = getType("base");
@ -100,7 +100,7 @@ public interface PatternType extends OldEnum<PatternType>, Keyed {
PatternType TRIANGLES_BOTTOM = getType("triangles_bottom");
PatternType TRIANGLES_TOP = getType("triangles_top");
// Paper end - Generated/PatternType
// End generate - PatternType
// Paper start - deprecate getKey
/**

View File

@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull;
@ApiStatus.Experimental
public interface DamageType extends Keyed, Translatable {
// Paper start - Generated/DamageType
// Start generate - DamageType
// @GeneratedFrom 1.21.4
DamageType ARROW = getDamageType("arrow");
@ -118,7 +118,7 @@ public interface DamageType extends Keyed, Translatable {
DamageType WITHER = getDamageType("wither");
DamageType WITHER_SKULL = getDamageType("wither_skull");
// Paper end - Generated/DamageType
// End generate - DamageType
@NotNull
private static DamageType getDamageType(@NotNull String key) {

View File

@ -176,14 +176,14 @@ public interface Boat extends Vehicle, io.papermc.paper.entity.Leashable { // Pa
public enum Status {
NOT_IN_WORLD,
// Paper start - Generated/BoatStatus
// Start generate - BoatStatus
// @GeneratedFrom 1.21.4
IN_WATER,
UNDER_WATER,
UNDER_FLOWING_WATER,
ON_LAND,
IN_AIR;
// Paper end - Generated/BoatStatus
// End generate - BoatStatus
}
// Paper start

View File

@ -52,7 +52,7 @@ public interface Cat extends Tameable, Sittable, io.papermc.paper.entity.CollarC
*/
interface Type extends OldEnum<Type>, Keyed {
// Paper start - Generated/CatType
// Start generate - CatType
// @GeneratedFrom 1.21.4
Type ALL_BLACK = getType("all_black");
@ -75,7 +75,7 @@ public interface Cat extends Tameable, Sittable, io.papermc.paper.entity.CollarC
Type TABBY = getType("tabby");
Type WHITE = getType("white");
// Paper end - Generated/CatType
// End generate - CatType
@NotNull
private static Type getType(@NotNull String key) {

View File

@ -45,7 +45,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
// Paper start - Generated/EntityType
// Start generate - EntityType
// @GeneratedFrom 1.21.4
ACACIA_BOAT("acacia_boat", AcaciaBoat.class, -1),
ACACIA_CHEST_BOAT("acacia_chest_boat", AcaciaChestBoat.class, -1),
@ -196,7 +196,7 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
ZOMBIE_HORSE("zombie_horse", ZombieHorse.class, 29),
ZOMBIE_VILLAGER("zombie_villager", ZombieVillager.class, 27),
ZOMBIFIED_PIGLIN("zombified_piglin", PigZombie.class, 57),
// Paper end - Generated/EntityType
// End generate - EntityType
/**
* An unknown entity without an Entity Class
*/

View File

@ -89,11 +89,11 @@ public interface Fox extends Animals, Sittable {
* Represents the various different fox types there are.
*/
public enum Type {
// Paper start - Generated/FoxType
// Start generate - FoxType
// @GeneratedFrom 1.21.4
RED,
SNOW;
// Paper end - Generated/FoxType
// End generate - FoxType
}
// Paper start - Add more fox behavior API

View File

@ -50,14 +50,14 @@ public interface Frog extends Animals {
*/
interface Variant extends OldEnum<Variant>, Keyed {
// Paper start - Generated/FrogVariant
// Start generate - FrogVariant
// @GeneratedFrom 1.21.4
Variant COLD = getVariant("cold");
Variant TEMPERATE = getVariant("temperate");
Variant WARM = getVariant("warm");
// Paper end - Generated/FrogVariant
// End generate - FrogVariant
@NotNull
private static Variant getVariant(@NotNull String key) {

View File

@ -201,7 +201,7 @@ public interface Panda extends Animals, Sittable {
public enum Gene {
// Paper start - Generated/PandaGene
// Start generate - PandaGene
// @GeneratedFrom 1.21.4
NORMAL(false),
LAZY(false),
@ -210,7 +210,7 @@ public interface Panda extends Animals, Sittable {
BROWN(true),
WEAK(true),
AGGRESSIVE(false);
// Paper end - Generated/PandaGene
// End generate - PandaGene
private final boolean recessive;

View File

@ -27,11 +27,11 @@ public interface Salmon extends io.papermc.paper.entity.SchoolableFish { // Pape
*/
public enum Variant {
// Paper start - Generated/SalmonVariant
// Start generate - SalmonVariant
// @GeneratedFrom 1.21.4
SMALL,
MEDIUM,
LARGE;
// Paper end - Generated/SalmonVariant
// End generate - SalmonVariant
}
}

View File

@ -74,7 +74,7 @@ public interface Sniffer extends Animals {
* Represents the current state of the Sniffer.
*/
public enum State {
// Paper start - Generated/SnifferState
// Start generate - SnifferState
// @GeneratedFrom 1.21.4
IDLING,
FEELING_HAPPY,
@ -83,6 +83,6 @@ public interface Sniffer extends Animals {
SEARCHING,
DIGGING,
RISING;
// Paper end - Generated/SnifferState
// End generate - SnifferState
}
}

View File

@ -60,7 +60,7 @@ public interface TropicalFish extends io.papermc.paper.entity.SchoolableFish { /
*/
public static enum Pattern {
// Paper start - Generated/TropicalFishPattern
// Start generate - TropicalFishPattern
// @GeneratedFrom 1.21.4
KOB,
SUNSTREAK,
@ -74,6 +74,6 @@ public interface TropicalFish extends io.papermc.paper.entity.SchoolableFish { /
BLOCKFISH,
BETTY,
CLAYFISH;
// Paper end - Generated/TropicalFishPattern
// End generate - TropicalFishPattern
}
}

View File

@ -171,7 +171,7 @@ public interface Villager extends AbstractVillager {
*/
interface Type extends OldEnum<Type>, Keyed {
// Paper start - Generated/VillagerType
// Start generate - VillagerType
// @GeneratedFrom 1.21.4
Type DESERT = getType("desert");
@ -186,7 +186,7 @@ public interface Villager extends AbstractVillager {
Type SWAMP = getType("swamp");
Type TAIGA = getType("taiga");
// Paper end - Generated/VillagerType
// End generate - VillagerType
@NotNull
private static Type getType(@NotNull String key) {
@ -223,7 +223,7 @@ public interface Villager extends AbstractVillager {
*/
interface Profession extends OldEnum<Profession>, Keyed, net.kyori.adventure.translation.Translatable {
// Paper start - Generated/VillagerProfession
// Start generate - VillagerProfession
// @GeneratedFrom 1.21.4
/**
* Armorer profession. Wears a black apron. Armorers primarily trade for
@ -310,7 +310,7 @@ public interface Villager extends AbstractVillager {
* trade for iron and diamond weapons, sometimes enchanted.
*/
Profession WEAPONSMITH = getProfession("weaponsmith");
// Paper end - Generated/VillagerProfession
// End generate - VillagerProfession
@NotNull
private static Profession getProfession(@NotNull String key) {

View File

@ -93,7 +93,7 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
*/
interface Variant extends Keyed {
// Paper start - Generated/WolfVariant
// Start generate - WolfVariant
// @GeneratedFrom 1.21.4
Variant ASHEN = getVariant("ashen");
@ -112,7 +112,7 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
Variant STRIPED = getVariant("striped");
Variant WOODS = getVariant("woods");
// Paper end - Generated/WolfVariant
// End generate - WolfVariant
@NotNull
private static Variant getVariant(@NotNull String key) {

View File

@ -46,7 +46,7 @@ public final class MemoryKey<T> implements Keyed {
private static final Map<NamespacedKey, MemoryKey<?>> MEMORY_KEYS = new HashMap<>();
// Paper start - Generated/MemoryKey
// Start generate - MemoryKey
// @GeneratedFrom 1.21.4
public static final MemoryKey<Boolean> ADMIRING_DISABLED = new MemoryKey<>(NamespacedKey.minecraft("admiring_disabled"), Boolean.class);
@ -127,7 +127,7 @@ public final class MemoryKey<T> implements Keyed {
public static final MemoryKey<Integer> VISIBLE_ADULT_HOGLIN_COUNT = new MemoryKey<>(NamespacedKey.minecraft("visible_adult_hoglin_count"), Integer.class);
public static final MemoryKey<Integer> VISIBLE_ADULT_PIGLIN_COUNT = new MemoryKey<>(NamespacedKey.minecraft("visible_adult_piglin_count"), Integer.class);
// Paper end - Generated/MemoryKey
// End generate - MemoryKey
/**
* @deprecated this constant uses the wrong generic type, the sniffer now stores different positions
* from possibly different worlds. Use the relevant methods in {@link org.bukkit.entity.Sniffer} directly

View File

@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
*/
public abstract class Structure implements Keyed {
// Paper start - Generated/Structure
// Start generate - Structure
// @GeneratedFrom 1.21.4
public static final Structure ANCIENT_CITY = getStructure("ancient_city");
@ -83,7 +83,7 @@ public abstract class Structure implements Keyed {
public static final Structure VILLAGE_SNOWY = getStructure("village_snowy");
public static final Structure VILLAGE_TAIGA = getStructure("village_taiga");
// Paper end - Generated/Structure
// End generate - Structure
@NotNull
private static Structure getStructure(@NotNull String name) {

View File

@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
*/
public abstract class StructureType implements Keyed {
// Paper start - Generated/StructureType
// Start generate - StructureType
// @GeneratedFrom 1.21.4
public static final StructureType BURIED_TREASURE = getStructureType("buried_treasure");
@ -48,7 +48,7 @@ public abstract class StructureType implements Keyed {
public static final StructureType SWAMP_HUT = getStructureType("swamp_hut");
public static final StructureType WOODLAND_MANSION = getStructureType("woodland_mansion");
// Paper end - Generated/StructureType
// End generate - StructureType
@NotNull
private static StructureType getStructureType(@NotNull String name) {

View File

@ -9,13 +9,13 @@ import net.kyori.adventure.text.format.TextColor;
*/
public enum ItemRarity {
// Paper start - Generated/ItemRarity
// Start generate - ItemRarity
// @GeneratedFrom 1.21.4
COMMON(NamedTextColor.WHITE),
UNCOMMON(NamedTextColor.YELLOW),
RARE(NamedTextColor.AQUA),
EPIC(NamedTextColor.LIGHT_PURPLE);
// Paper end - Generated/ItemRarity
// End generate - ItemRarity
// Paper start - improve ItemRarity
private final NamedTextColor color;

View File

@ -89,7 +89,7 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
}
//<editor-fold desc="ItemTypes" defaultstate="collapsed">
// Paper start - Generated/ItemType
// Start generate - ItemType
// @GeneratedFrom 1.21.4
ItemType.Typed<ItemMeta> ACACIA_BOAT = getItemType("acacia_boat");
@ -2860,7 +2860,7 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans
ItemType.Typed<ItemMeta> ZOMBIE_VILLAGER_SPAWN_EGG = getItemType("zombie_villager_spawn_egg");
ItemType.Typed<ItemMeta> ZOMBIFIED_PIGLIN_SPAWN_EGG = getItemType("zombified_piglin_spawn_egg");
// Paper end - Generated/ItemType
// End generate - ItemType
//</editor-fold>
@NotNull

View File

@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
*/
public interface TrimMaterial extends Keyed, Translatable {
// Paper start - Generated/TrimMaterial
// Start generate - TrimMaterial
// @GeneratedFrom 1.21.4
TrimMaterial AMETHYST = getTrimMaterial("amethyst");
@ -35,7 +35,7 @@ public interface TrimMaterial extends Keyed, Translatable {
TrimMaterial REDSTONE = getTrimMaterial("redstone");
TrimMaterial RESIN = getTrimMaterial("resin");
// Paper end - Generated/TrimMaterial
// End generate - TrimMaterial
@NotNull
private static TrimMaterial getTrimMaterial(@NotNull String key) {

View File

@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
*/
public interface TrimPattern extends Keyed, Translatable {
// Paper start - Generated/TrimPattern
// Start generate - TrimPattern
// @GeneratedFrom 1.21.4
TrimPattern BOLT = getTrimPattern("bolt");
@ -49,7 +49,7 @@ public interface TrimPattern extends Keyed, Translatable {
TrimPattern WAYFINDER = getTrimPattern("wayfinder");
TrimPattern WILD = getTrimPattern("wild");
// Paper end - Generated/TrimPattern
// End generate - TrimPattern
@NotNull
private static TrimPattern getTrimPattern(@NotNull String key) {

View File

@ -5,10 +5,10 @@ package org.bukkit.inventory.recipe;
*/
public enum CookingBookCategory {
// Paper start - Generated/CookingBookCategory
// Start generate - CookingBookCategory
// @GeneratedFrom 1.21.4
FOOD,
BLOCKS,
MISC;
// Paper end - Generated/CookingBookCategory
// End generate - CookingBookCategory
}

View File

@ -5,11 +5,11 @@ package org.bukkit.inventory.recipe;
*/
public enum CraftingBookCategory {
// Paper start - Generated/CraftingBookCategory
// Start generate - CraftingBookCategory
// @GeneratedFrom 1.21.4
BUILDING,
REDSTONE,
EQUIPMENT,
MISC;
// Paper end - Generated/CraftingBookCategory
// End generate - CraftingBookCategory
}

View File

@ -288,7 +288,7 @@ public final class MapCursor {
*/
public interface Type extends OldEnum<Type>, Keyed {
// Paper start - Generated/MapCursorType
// Start generate - MapCursorType
// @GeneratedFrom 1.21.4
Type BANNER_BLACK = getType("banner_black");
@ -359,7 +359,7 @@ public final class MapCursor {
Type VILLAGE_SNOWY = getType("village_snowy");
Type VILLAGE_TAIGA = getType("village_taiga");
// Paper end - Generated/MapCursorType
// End generate - MapCursorType
@NotNull
private static Type getType(@NotNull String key) {

View File

@ -36,7 +36,7 @@ public final class MapPalette {
@NotNull
static final Color[] colors = {
// Paper start - Generated/MapPalette#colors
// Start generate - MapPalette#colors
// @GeneratedFrom 1.21.4
new Color(0x00000000, true),
new Color(0x00000000, true),
@ -286,7 +286,7 @@ public final class MapPalette {
new Color(0x6D9081),
new Color(0x7FA796),
new Color(0x43584F),
// Paper end - Generated/MapPalette#colors
// End generate - MapPalette#colors
};
// Interface

View File

@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable;
* the Creative mode inventory
*/
public enum PotionType implements Keyed, io.papermc.paper.world.flag.FeatureDependant { // Paper - feature flag API
// Paper start - Generated/PotionType
// Start generate - PotionType
// @GeneratedFrom 1.21.4
AWKWARD("awkward"),
FIRE_RESISTANCE("fire_resistance"),
@ -63,7 +63,7 @@ public enum PotionType implements Keyed, io.papermc.paper.world.flag.FeatureDepe
WEAKNESS("weakness"),
WEAVING("weaving"),
WIND_CHARGED("wind_charged");
// Paper end - Generated/PotionType
// End generate - PotionType
private final NamespacedKey key;
private final Supplier<InternalPotionData> internalPotionDataSupplier;

View File

@ -4,7 +4,7 @@ package org.bukkit.scoreboard;
* Locations for displaying objectives to the player
*/
public enum DisplaySlot {
// Paper start - Generated/DisplaySlot
// Start generate - DisplaySlot
// @GeneratedFrom 1.21.4
PLAYER_LIST("list"),
SIDEBAR("sidebar"),
@ -25,7 +25,7 @@ public enum DisplaySlot {
SIDEBAR_TEAM_LIGHT_PURPLE("sidebar.team.light_purple"),
SIDEBAR_TEAM_YELLOW("sidebar.team.yellow"),
SIDEBAR_TEAM_WHITE("sidebar.team.white");
// Paper end - Generated/DisplaySlot
// End generate - DisplaySlot
public static final net.kyori.adventure.util.Index<String, DisplaySlot> NAMES = net.kyori.adventure.util.Index.create(DisplaySlot.class, DisplaySlot::getId);

View File

@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable;
@ApiStatus.Experimental
public final class DamageTypeTags {
// Paper start - Generated/DamageTypeTags
// Start generate - DamageTypeTags
// @GeneratedFrom 1.21.4
public static final Tag<DamageType> ALWAYS_HURTS_ENDER_DRAGONS = getTag("always_hurts_ender_dragons");
@ -80,7 +80,7 @@ public final class DamageTypeTags {
public static final Tag<DamageType> WITCH_RESISTANT_TO = getTag("witch_resistant_to");
public static final Tag<DamageType> WITHER_IMMUNE_TO = getTag("wither_immune_to");
// Paper end - Generated/DamageTypeTags
// End generate - DamageTypeTags
/**
* Internal use only.
*/

View File

@ -27,9 +27,7 @@ import org.jspecify.annotations.Nullable;
@NullMarked
public class PaperPatternSourceSetRewriter extends SourceSetRewriterImpl<PatternSourceSetRewriter> implements PatternSourceSetRewriter {
private static final String PAPER_START_FORMAT = "Paper start"; // todo rename, "Paper" is not needed anymore here
private static final String PAPER_END_FORMAT = "Paper end";
private static final String COMMENT_MARKER_FORMAT = "%s - Generated/%s"; // {0} = PAPER_START_FORMAT|PAPER_END_FORMAT {1} = pattern
private static final String COMMENT_MARKER_FORMAT = "%s generate - %s"; // {0} = Start|End {1} = pattern
private static final IndentUnit INDENT_UNIT = IndentUnit.parse(SimpleGenerator.INDENT_UNIT);
public PaperPatternSourceSetRewriter() {
@ -51,8 +49,8 @@ public class PaperPatternSourceSetRewriter extends SourceSetRewriterImpl<Pattern
private static ReplaceOptionsLike getOptions(String pattern, @Nullable ClassNamed targetClass) {
return ReplaceOptions.between(
COMMENT_MARKER_FORMAT.formatted(PAPER_START_FORMAT, pattern),
COMMENT_MARKER_FORMAT.formatted(PAPER_END_FORMAT, pattern)
COMMENT_MARKER_FORMAT.formatted("Start", pattern),
COMMENT_MARKER_FORMAT.formatted("End", pattern)
)
.generatedComment(Annotations.annotationStyle(GeneratedFrom.class) + " " + SharedConstants.getCurrentVersion().getName())
.targetClass(targetClass);

View File

@ -35,7 +35,7 @@ public class MobGoalHelper {
ignored.add("wrapped");
//<editor-fold defaultstate="collapsed" desc="bukkitMap Entities">
// Paper start - Generated/MobGoalHelper#bukkitMap
// Start generate - MobGoalHelper#bukkitMap
// @GeneratedFrom 1.21.4
bukkitMap.put(net.minecraft.world.entity.Mob.class, Mob.class);
bukkitMap.put(net.minecraft.world.entity.AgeableMob.class, Ageable.class);
@ -143,7 +143,7 @@ public class MobGoalHelper {
bukkitMap.put(net.minecraft.world.entity.monster.Bogged.class, Bogged.class);
bukkitMap.put(net.minecraft.world.entity.monster.creaking.Creaking.class, Creaking.class);
bukkitMap.put(net.minecraft.world.entity.animal.AgeableWaterCreature.class, Squid.class);
// Paper end - Generated/MobGoalHelper#bukkitMap
// End generate - MobGoalHelper#bukkitMap
//</editor-fold>
}

View File

@ -83,7 +83,7 @@ public final class PaperRegistries {
private static final Map<ResourceKey<?>, RegistryEntry<?, ?>> BY_RESOURCE_KEY;
static {
REGISTRY_ENTRIES = List.of(
// Paper start - Generated/RegistryDefinitions
// Start generate - RegistryDefinitions
// @GeneratedFrom 1.21.4
// built-in
start(Registries.GAME_EVENT, RegistryKey.GAME_EVENT).craft(GameEvent.class, CraftGameEvent::new).writable(PaperGameEventRegistryEntry.PaperBuilder::new),
@ -120,7 +120,7 @@ public final class PaperRegistries {
start(Registries.PARTICLE_TYPE, RegistryKey.PARTICLE_TYPE).apiOnly(PaperSimpleRegistry::particleType),
start(Registries.POTION, RegistryKey.POTION).apiOnly(PaperSimpleRegistry::potion),
start(Registries.MEMORY_MODULE_TYPE, RegistryKey.MEMORY_MODULE_TYPE).apiOnly(() -> org.bukkit.Registry.MEMORY_MODULE_TYPE)
// Paper end - Generated/RegistryDefinitions
// End generate - RegistryDefinitions
);
final Map<RegistryKey<?>, RegistryEntry<?, ?>> byRegistryKey = new IdentityHashMap<>(REGISTRY_ENTRIES.size());
final Map<ResourceKey<?>, RegistryEntry<?, ?>> byResourceKey = new IdentityHashMap<>(REGISTRY_ENTRIES.size());

View File

@ -19,13 +19,13 @@ import org.bukkit.potion.PotionType;
public class PaperFeatureFlagProviderImpl implements FeatureFlagProvider {
public static final BiMap<FeatureFlag, net.minecraft.world.flag.FeatureFlag> FLAGS = ImmutableBiMap.of(
// Paper start - Generated/PaperFeatureFlagProviderImpl#FLAGS
// Start generate - PaperFeatureFlagProviderImpl#FLAGS
// @GeneratedFrom 1.21.4
FeatureFlag.MINECART_IMPROVEMENTS, FeatureFlags.MINECART_IMPROVEMENTS,
FeatureFlag.REDSTONE_EXPERIMENTS, FeatureFlags.REDSTONE_EXPERIMENTS,
FeatureFlag.TRADE_REBALANCE, FeatureFlags.TRADE_REBALANCE,
FeatureFlag.VANILLA, FeatureFlags.VANILLA
// Paper end - Generated/PaperFeatureFlagProviderImpl#FLAGS
// End generate - PaperFeatureFlagProviderImpl#FLAGS
);
@Override

View File

@ -20,7 +20,7 @@ import org.bukkit.craftbukkit.inventory.CraftItemType;
import org.bukkit.entity.EntityType;
public enum CraftStatistic {
// Paper start - Generated/CraftStatisticCustom
// Start generate - CraftStatisticCustom
// @GeneratedFrom 1.21.4
ANIMALS_BRED(Stats.ANIMALS_BRED),
AVIATE_ONE_CM(Stats.AVIATE_ONE_CM),
@ -97,8 +97,8 @@ public enum CraftStatistic {
WALK_ON_WATER_ONE_CM(Stats.WALK_ON_WATER_ONE_CM),
WALK_ONE_CM(Stats.WALK_ONE_CM),
WALK_UNDER_WATER_ONE_CM(Stats.WALK_UNDER_WATER_ONE_CM),
// Paper end - Generated/CraftStatisticCustom
// Paper start - Generated/CraftStatisticType
// End generate - CraftStatisticCustom
// Start generate - CraftStatisticType
// @GeneratedFrom 1.21.4
BREAK_ITEM(ResourceLocation.withDefaultNamespace("broken")),
CRAFT_ITEM(ResourceLocation.withDefaultNamespace("crafted")),
@ -108,7 +108,7 @@ public enum CraftStatistic {
MINE_BLOCK(ResourceLocation.withDefaultNamespace("mined")),
PICKUP(ResourceLocation.withDefaultNamespace("picked_up")),
USE_ITEM(ResourceLocation.withDefaultNamespace("used"));
// Paper end - Generated/CraftStatisticType
// End generate - CraftStatisticType
private final ResourceLocation minecraftKey;
private final org.bukkit.Statistic bukkit;
private static final BiMap<ResourceLocation, org.bukkit.Statistic> statistics;

View File

@ -133,7 +133,7 @@ public final class CraftBlockStates {
// Paper end
static {
// Paper start - Generated/CraftBlockEntityStates
// Start generate - CraftBlockEntityStates
// @GeneratedFrom 1.21.4
register(BlockEntityType.BANNER, CraftBanner.class, CraftBanner::new);
register(BlockEntityType.BARREL, CraftBarrel.class, CraftBarrel::new);
@ -180,7 +180,7 @@ public final class CraftBlockStates {
register(BlockEntityType.TRAPPED_CHEST, CraftChest.class, CraftChest::new);
register(BlockEntityType.TRIAL_SPAWNER, CraftTrialSpawner.class, CraftTrialSpawner::new);
register(BlockEntityType.VAULT, CraftVault.class, CraftVault::new);
// Paper end - Generated/CraftBlockEntityStates
// End generate - CraftBlockEntityStates
}
private static void register(Material blockType, BlockStateFactory<?> factory) {

View File

@ -351,7 +351,7 @@ public class CraftBlockData implements BlockData {
static {
//<editor-fold desc="CraftBlockData Registration" defaultstate="collapsed">
// Paper start - Generated/CraftBlockData#MAP
// Start generate - CraftBlockData#MAP
// @GeneratedFrom 1.21.4
register(net.minecraft.world.level.block.AmethystClusterBlock.class, org.bukkit.craftbukkit.block.impl.CraftAmethystCluster::new);
register(net.minecraft.world.level.block.AnvilBlock.class, org.bukkit.craftbukkit.block.impl.CraftAnvil::new);
@ -529,7 +529,7 @@ public class CraftBlockData implements BlockData {
register(net.minecraft.world.level.block.piston.MovingPistonBlock.class, org.bukkit.craftbukkit.block.impl.CraftMovingPiston::new);
register(net.minecraft.world.level.block.piston.PistonBaseBlock.class, org.bukkit.craftbukkit.block.impl.CraftPistonBase::new);
register(net.minecraft.world.level.block.piston.PistonHeadBlock.class, org.bukkit.craftbukkit.block.impl.CraftPistonHead::new);
// Paper end - Generated/CraftBlockData#MAP
// End generate - CraftBlockData#MAP
//</editor-fold>
}

View File

@ -14,7 +14,7 @@ import org.bukkit.potion.PotionType;
public class CraftPotionUtil {
private static final BiMap<PotionType, PotionType> upgradeable = ImmutableBiMap.<PotionType, PotionType>builder()
// Paper start - Generated/CraftPotionUtil#upgradeable
// Start generate - CraftPotionUtil#upgradeable
// @GeneratedFrom 1.21.4
.put(PotionType.HARMING, PotionType.STRONG_HARMING)
.put(PotionType.HEALING, PotionType.STRONG_HEALING)
@ -25,10 +25,10 @@ public class CraftPotionUtil {
.put(PotionType.STRENGTH, PotionType.STRONG_STRENGTH)
.put(PotionType.SWIFTNESS, PotionType.STRONG_SWIFTNESS)
.put(PotionType.TURTLE_MASTER, PotionType.STRONG_TURTLE_MASTER)
// Paper end - Generated/CraftPotionUtil#upgradeable
// End generate - CraftPotionUtil#upgradeable
.build();
private static final BiMap<PotionType, PotionType> extendable = ImmutableBiMap.<PotionType, PotionType>builder()
// Paper start - Generated/CraftPotionUtil#extendable
// Start generate - CraftPotionUtil#extendable
// @GeneratedFrom 1.21.4
.put(PotionType.FIRE_RESISTANCE, PotionType.LONG_FIRE_RESISTANCE)
.put(PotionType.INVISIBILITY, PotionType.LONG_INVISIBILITY)
@ -43,7 +43,7 @@ public class CraftPotionUtil {
.put(PotionType.TURTLE_MASTER, PotionType.LONG_TURTLE_MASTER)
.put(PotionType.WATER_BREATHING, PotionType.LONG_WATER_BREATHING)
.put(PotionType.WEAKNESS, PotionType.LONG_WEAKNESS)
// Paper end - Generated/CraftPotionUtil#extendable
// End generate - CraftPotionUtil#extendable
.build();
public static PotionType fromBukkit(PotionData data) {