Fix a lot of random registry issues
This commit is contained in:
14 files changed
+2906
-29
No files matched your search
@@ -148,8 +148,8 @@ public final class Parsers {
|
||||
public static final Parser STYLE = define("style", null, null);
|
||||
public static final Parser MESSAGE = define("message", null, null);
|
||||
public static final Parser NBT_COMPOUND_TAG = define("nbt_compound_tag", null, null);
|
||||
@Deprecated
|
||||
public static final Parser NBT = NBT_COMPOUND_TAG;
|
||||
@ApiStatus.Obsolete
|
||||
public static final Parser NBT = define("nbt", null, null);
|
||||
public static final Parser NBT_TAG = define("nbt_tag", null, null);
|
||||
public static final Parser NBT_PATH = define("nbt_path", null, null);
|
||||
public static final Parser OBJECTIVE = define("objective", null, null);
|
||||
|
||||
+3
-3
@@ -55,7 +55,7 @@ import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemAdv
|
||||
import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemAttributeModifiers;
|
||||
import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemBees;
|
||||
import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemBlockStateProperties;
|
||||
import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemBlocksAttack;
|
||||
import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemBlocksAttacks;
|
||||
import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemBreakSound;
|
||||
import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemConsumable;
|
||||
import com.github.retrooper.packetevents.protocol.component.builtin.item.ItemContainerContents;
|
||||
@@ -329,8 +329,8 @@ public final class ComponentTypes {
|
||||
/**
|
||||
* Added with 1.21.5
|
||||
*/
|
||||
public static final ComponentType<ItemBlocksAttack> BLOCKS_ATTACK = define("blocks_attack",
|
||||
ItemBlocksAttack::read, ItemBlocksAttack::write);
|
||||
public static final ComponentType<ItemBlocksAttacks> BLOCKS_ATTACKS = define("blocks_attacks",
|
||||
ItemBlocksAttacks::read, ItemBlocksAttacks::write);
|
||||
/**
|
||||
* Added with 1.21.5
|
||||
*/
|
||||
|
||||
+7
-7
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
public class ItemBlocksAttack {
|
||||
public class ItemBlocksAttacks {
|
||||
|
||||
private float blockDelaySeconds;
|
||||
private float disableCooldownScale;
|
||||
@@ -39,7 +39,7 @@ public class ItemBlocksAttack {
|
||||
private @Nullable Sound blockSound;
|
||||
private @Nullable Sound disableSound;
|
||||
|
||||
public ItemBlocksAttack(
|
||||
public ItemBlocksAttacks(
|
||||
float blockDelaySeconds, float disableCooldownScale, List<DamageReduction> damageReductions,
|
||||
ItemDamageFunction itemDamage, @Nullable ResourceLocation bypassedBy,
|
||||
@Nullable Sound blockSound, @Nullable Sound disableSound
|
||||
@@ -53,7 +53,7 @@ public class ItemBlocksAttack {
|
||||
this.disableSound = disableSound;
|
||||
}
|
||||
|
||||
public static ItemBlocksAttack read(PacketWrapper<?> wrapper) {
|
||||
public static ItemBlocksAttacks read(PacketWrapper<?> wrapper) {
|
||||
float blockDelaySeconds = wrapper.readFloat();
|
||||
float disableCooldownScale = wrapper.readFloat();
|
||||
List<DamageReduction> damageReductions = wrapper.readList(DamageReduction::read);
|
||||
@@ -61,12 +61,12 @@ public class ItemBlocksAttack {
|
||||
ResourceLocation bypassedBy = wrapper.readOptional(PacketWrapper::readIdentifier);
|
||||
Sound blockSound = wrapper.readOptional(Sound::read);
|
||||
Sound disableSound = wrapper.readOptional(Sound::read);
|
||||
return new ItemBlocksAttack(
|
||||
return new ItemBlocksAttacks(
|
||||
blockDelaySeconds, disableCooldownScale, damageReductions,
|
||||
itemDamage, bypassedBy, blockSound, disableSound);
|
||||
}
|
||||
|
||||
public static void write(PacketWrapper<?> wrapper, ItemBlocksAttack attack) {
|
||||
public static void write(PacketWrapper<?> wrapper, ItemBlocksAttacks attack) {
|
||||
wrapper.writeFloat(attack.blockDelaySeconds);
|
||||
wrapper.writeFloat(attack.disableCooldownScale);
|
||||
wrapper.writeList(attack.damageReductions, DamageReduction::write);
|
||||
@@ -134,8 +134,8 @@ public class ItemBlocksAttack {
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (!(obj instanceof ItemBlocksAttack)) return false;
|
||||
ItemBlocksAttack that = (ItemBlocksAttack) obj;
|
||||
if (!(obj instanceof ItemBlocksAttacks)) return false;
|
||||
ItemBlocksAttacks that = (ItemBlocksAttacks) obj;
|
||||
if (Float.compare(that.blockDelaySeconds, this.blockDelaySeconds) != 0) return false;
|
||||
if (Float.compare(that.disableCooldownScale, this.disableCooldownScale) != 0) return false;
|
||||
if (!this.damageReductions.equals(that.damageReductions)) return false;
|
||||
+1
-1
@@ -42,7 +42,7 @@ public final class AxolotlVariants {
|
||||
public static final AxolotlVariant WILD = define("wild");
|
||||
public static final AxolotlVariant GOLD = define("gold");
|
||||
public static final AxolotlVariant CYAN = define("cyan");
|
||||
public static final AxolotlVariant BROWN = define("brown");
|
||||
public static final AxolotlVariant BLUE = define("blue");
|
||||
|
||||
static {
|
||||
REGISTRY.unloadMappings();
|
||||
|
||||
@@ -536,6 +536,8 @@ public final class ItemTypes {
|
||||
public static final ItemType QUARTZ_STAIRS = builder("quartz_stairs").setMaxAmount(64).setPlacedType(StateTypes.QUARTZ_STAIRS).build();
|
||||
public static final ItemType RAIL = builder("rail").setMaxAmount(64).setPlacedType(StateTypes.RAIL).build();
|
||||
public static final ItemType WHITE_BANNER = builder("white_banner").setMaxAmount(16).setPlacedType(StateTypes.WHITE_BANNER).setAttributes(ItemAttribute.FUEL).build();
|
||||
@ApiStatus.Obsolete
|
||||
public static final ItemType WHITE_WALL_BANNER = builder("white_wall_banner").setMaxAmount(16).setPlacedType(StateTypes.WHITE_WALL_BANNER).setAttributes(ItemAttribute.FUEL).build();
|
||||
public static final ItemType MOSS_BLOCK = builder("moss_block").setMaxAmount(64).setPlacedType(StateTypes.MOSS_BLOCK).build();
|
||||
public static final ItemType BLUE_STAINED_GLASS = builder("blue_stained_glass").setMaxAmount(64).setPlacedType(StateTypes.BLUE_STAINED_GLASS).build();
|
||||
public static final ItemType GREEN_TERRACOTTA = builder("green_terracotta").setMaxAmount(64).setPlacedType(StateTypes.GREEN_TERRACOTTA).build();
|
||||
|
||||
+13
@@ -82,6 +82,19 @@ public final class ParticleTypes {
|
||||
public static final ParticleType<ParticleBlockStateData> BLOCK = define("block",
|
||||
ParticleBlockStateData::read, ParticleBlockStateData::write,
|
||||
ParticleBlockStateData::decode, ParticleBlockStateData::encode);
|
||||
/**
|
||||
* Removed with 1.18
|
||||
*/
|
||||
@ApiStatus.Obsolete
|
||||
public static final ParticleType<ParticleData> BARRIER = define("barrier");
|
||||
/**
|
||||
* Removed with 1.18
|
||||
*/
|
||||
@ApiStatus.Obsolete
|
||||
public static final ParticleType<ParticleData> LIGHT = define("light");
|
||||
/**
|
||||
* Added with 1.18
|
||||
*/
|
||||
public static final ParticleType<ParticleBlockStateData> BLOCK_MARKER = define("block_marker",
|
||||
ParticleBlockStateData::read, ParticleBlockStateData::write,
|
||||
ParticleBlockStateData::decode, ParticleBlockStateData::encode);
|
||||
|
||||
@@ -63,6 +63,275 @@ public final class Sounds {
|
||||
return REGISTRY.getById(version, id);
|
||||
}
|
||||
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ZOMBIE_PIGMAN_HURT = define("entity.zombie_pigman.hurt");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_PARROT_IMITATE_POLAR_BEAR = define("entity.parrot.imitate.polar_bear");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_PARROT_IMITATE_PANDA = define("entity.parrot.imitate.panda");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound MUSIC_NETHER = define("music.nether");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_SWEET_BERRY_BUSH_PICK_FROM_BUSH = define("block.sweet_berry_bush.pick_from_bush");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_PARROT_IMITATE_ZOMBIE_PIGMAN = define("entity.parrot.imitate.zombie_pigman");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ZOMBIE_PIGMAN_AMBIENT = define("entity.zombie_pigman.ambient");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ZOMBIE_PIGMAN_DEATH = define("entity.zombie_pigman.death");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_PARROT_IMITATE_WOLF = define("entity.parrot.imitate.wolf");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_PARROT_IMITATE_ENDERMAN = define("entity.parrot.imitate.enderman");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ZOMBIE_PIGMAN_ANGRY = define("entity.zombie_pigman.angry");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_TRIAL_SPAWNER_AMBIENT_CHARGED = define("block.trial_spawner.ambient_charged");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_TRIAL_SPAWNER_CHARGE_ACTIVATE = define("block.trial_spawner.charge_activate");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERDRAGON_FIREBALL_EXPLODE = define("entity.enderdragon_fireball.explode");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_ENDERCHEST_OPEN = define("block.enderchest.open");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERDRAGON_AMBIENT = define("entity.enderdragon.ambient");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_FIREWORK_LARGE_BLAST_FAR = define("entity.firework.large_blast_far");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERPEARL_THROW = define("entity.enderpearl.throw");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound RECORD_FAR = define("record.far");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDEREYE_LAUNCH = define("entity.endereye.launch");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_CLOTH_HIT = define("block.cloth.hit");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_SNOWMAN_DEATH = define("entity.snowman.death");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ARMORSTAND_BREAK = define("entity.armorstand.break");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound RECORD_STRAD = define("record.strad");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_CLOTH_BREAK = define("block.cloth.break");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_NOTE_SNARE = define("block.note.snare");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_WOOD_BUTTON_CLICK_OFF = define("block.wood_button.click_off");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_LEASHKNOT_BREAK = define("entity.leashknot.break");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_MAGMACUBE_HURT = define("entity.magmacube.hurt");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_SNOWMAN_AMBIENT = define("entity.snowman.ambient");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ARMORSTAND_HIT = define("entity.armorstand.hit");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_MAGMACUBE_JUMP = define("entity.magmacube.jump");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ZOMBIE_PIG_DEATH = define("entity.zombie_pig.death");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ZOMBIE_ATTACK_DOOR_WOOD = define("entity.zombie.attack_door_wood");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_NOTE_HARP = define("block.note.harp");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound RECORD_BLOCKS = define("record.blocks");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_CLOTH_STEP = define("block.cloth.step");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_FIREWORK_SHOOT = define("entity.firework.shoot");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERDRAGON_FLAP = define("entity.enderdragon.flap");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_FIREWORK_TWINKLE_FAR = define("entity.firework.twinkle_far");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound RECORD_MELLOHI = define("record.mellohi");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERMEN_SCREAM = define("entity.endermen.scream");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_SMALL_MAGMACUBE_SQUISH = define("entity.small_magmacube.squish");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_IRONGOLEM_HURT = define("entity.irongolem.hurt");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_MAGMACUBE_DEATH = define("entity.magmacube.death");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERMEN_DEATH = define("entity.endermen.death");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_FIREWORK_BLAST_FAR = define("entity.firework.blast_far");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_WOOD_BUTTON_CLICK_ON = define("block.wood_button.click_on");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERDRAGON_HURT = define("entity.enderdragon.hurt");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_LEASHKNOT_PLACE = define("entity.leashknot.place");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_SLIME_BREAK = define("block.slime.break");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_WATERLILY_PLACE = define("block.waterlily.place");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ARMORSTAND_PLACE = define("entity.armorstand.place");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERDRAGON_SHOOT = define("entity.enderdragon.shoot");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_LIGHTNING_THUNDER = define("entity.lightning.thunder");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_SMALL_MAGMACUBE_HURT = define("entity.small_magmacube.hurt");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_CLOTH_FALL = define("block.cloth.fall");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ZOMBIE_PIG_AMBIENT = define("entity.zombie_pig.ambient");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_IRONGOLEM_ATTACK = define("entity.irongolem.attack");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ZOMBIE_PIG_ANGRY = define("entity.zombie_pig.angry");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_FIREWORK_BLAST = define("entity.firework.blast");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_SNOWMAN_SHOOT = define("entity.snowman.shoot");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_CLOTH_PLACE = define("block.cloth.place");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_SLIME_PLACE = define("block.slime.place");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_SLIME_FALL = define("block.slime.fall");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ITEMFRAME_REMOVE_ITEM = define("entity.itemframe.remove_item");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_SNOWMAN_HURT = define("entity.snowman.hurt");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound RECORD_STAL = define("record.stal");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_SMALL_SLIME_DEATH = define("entity.small_slime.death");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound RECORD_WARD = define("record.ward");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_IRONGOLEM_STEP = define("entity.irongolem.step");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ZOMBIE_PIG_HURT = define("entity.zombie_pig.hurt");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_FIREWORK_LAUNCH = define("entity.firework.launch");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound RECORD_MALL = define("record.mall");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERMEN_HURT = define("entity.endermen.hurt");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERMEN_STARE = define("entity.endermen.stare");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_SMALL_SLIME_SQUISH = define("entity.small_slime.squish");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_FIREWORK_TWINKLE = define("entity.firework.twinkle");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_LIGHTNING_IMPACT = define("entity.lightning.impact");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_IRONGOLEM_DEATH = define("entity.irongolem.death");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_STONE_PRESSUREPLATE_CLICK_ON = define("block.stone_pressureplate.click_on");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_EXPERIENCE_ORB_TOUCH = define("entity.experience_orb.touch");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_BOBBER_THROW = define("entity.bobber.throw");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERDRAGON_DEATH = define("entity.enderdragon.death");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_BOBBER_SPLASH = define("entity.bobber.splash");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERMEN_AMBIENT = define("entity.endermen.ambient");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_SLIME_STEP = define("block.slime.step");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_NOTE_PLING = define("block.note.pling");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ITEMFRAME_ROTATE_ITEM = define("entity.itemframe.rotate_item");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ITEMFRAME_BREAK = define("entity.itemframe.break");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_WOOD_PRESSUREPLATE_CLICK_OFF = define("block.wood_pressureplate.click_off");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound RECORD_CAT = define("record.cat");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound RECORD_WAIT = define("record.wait");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ITEMFRAME_ADD_ITEM = define("entity.itemframe.add_item");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_NOTE_HAT = define("block.note.hat");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_LINGERINGPOTION_THROW = define("entity.lingeringpotion.throw");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_VILLAGER_TRADING = define("entity.villager.trading");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_ENDERCHEST_CLOSE = define("block.enderchest.close");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ITEMFRAME_PLACE = define("entity.itemframe.place");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_FIREWORK_LARGE_BLAST = define("entity.firework.large_blast");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_MAGMACUBE_SQUISH = define("entity.magmacube.squish");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_STONE_PRESSUREPLATE_CLICK_OFF = define("block.stone_pressureplate.click_off");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_NOTE_BASS = define("block.note.bass");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_SMALL_MAGMACUBE_DEATH = define("entity.small_magmacube.death");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ARMORSTAND_FALL = define("entity.armorstand.fall");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERDRAGON_GROWL = define("entity.enderdragon.growl");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_METAL_PRESSUREPLATE_CLICK_OFF = define("block.metal_pressureplate.click_off");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_SMALL_SLIME_HURT = define("entity.small_slime.hurt");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_SMALL_SLIME_JUMP = define("entity.small_slime.jump");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ZOMBIE_BREAK_DOOR_WOOD = define("entity.zombie.break_door_wood");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound RECORD_CHIRP = define("record.chirp");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_NOTE_BASEDRUM = define("block.note.basedrum");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_SLIME_HIT = define("block.slime.hit");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound RECORD_13 = define("record.13");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound RECORD_11 = define("record.11");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_METAL_PRESSUREPLATE_CLICK_ON = define("block.metal_pressureplate.click_on");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound BLOCK_WOOD_PRESSUREPLATE_CLICK_ON = define("block.wood_pressureplate.click_on");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_ENDERMEN_TELEPORT = define("entity.endermen.teleport");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound MUSIC_OVERWORLD_JUNGLE_AND_FOREST = define("music.overworld.jungle_and_forest");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ITEM_BRUSH_BRUSHING = define("item.brush.brushing");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ITEM_BRUSH_BRUSH_SAND_COMPLETED = define("item.brush.brush_sand_completed");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_GENERIC_WIND_BURST = define("entity.generic.wind_burst");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_POLAR_BEAR_BABY_AMBIENT = define("entity.polar_bear.baby_ambient");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_VINDICATION_ILLAGER_DEATH = define("entity.vindication_illager.death");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_VINDICATION_ILLAGER_AMBIENT = define("entity.vindication_illager.ambient");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_EVOCATION_ILLAGER_HURT = define("entity.evocation_illager.hurt");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_EVOCATION_ILLAGER_PREPARE_ATTACK = define("entity.evocation_illager.prepare_attack");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_EVOCATION_FANGS_ATTACK = define("entity.evocation_fangs.attack");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_EVOCATION_ILLAGER_CAST_SPELL = define("entity.evocation_illager.cast_spell");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_EVOCATION_ILLAGER_PREPARE_SUMMON = define("entity.evocation_illager.prepare_summon");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_EVOCATION_ILLAGER_AMBIENT = define("entity.evocation_illager.ambient");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_EVOCATION_ILLAGER_PREPARE_WOLOLO = define("entity.evocation_illager.prepare_wololo");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_VINDICATION_ILLAGER_HURT = define("entity.vindication_illager.hurt");
|
||||
@ApiStatus.Obsolete
|
||||
public static final Sound ENTITY_EVOCATION_ILLAGER_DEATH = define("entity.evocation_illager.death");
|
||||
|
||||
public static final Sound ENTITY_ALLAY_AMBIENT_WITH_ITEM = define("entity.allay.ambient_with_item");
|
||||
public static final Sound ENTITY_ALLAY_AMBIENT_WITHOUT_ITEM = define("entity.allay.ambient_without_item");
|
||||
public static final Sound ENTITY_ALLAY_DEATH = define("entity.allay.death");
|
||||
@@ -755,18 +1024,8 @@ public final class Sounds {
|
||||
public static final Sound BLOCK_TRIAL_SPAWNER_SPAWN_ITEM_BEGIN = define("block.trial_spawner.spawn_item_begin");
|
||||
public static final Sound BLOCK_TRIAL_SPAWNER_DETECT_PLAYER = define("block.trial_spawner.detect_player");
|
||||
public static final Sound BLOCK_TRIAL_SPAWNER_OMINOUS_ACTIVATE = define("block.trial_spawner.ominous_activate");
|
||||
/**
|
||||
* Removed in 1.21
|
||||
*/
|
||||
@Deprecated
|
||||
public static final Sound BLOCK_TRIAL_SPAWNER_CHARGE_ACTIVATE = BLOCK_TRIAL_SPAWNER_OMINOUS_ACTIVATE;
|
||||
public static final Sound BLOCK_TRIAL_SPAWNER_AMBIENT = define("block.trial_spawner.ambient");
|
||||
public static final Sound BLOCK_TRIAL_SPAWNER_AMBIENT_OMINOUS = define("block.trial_spawner.ambient_ominous");
|
||||
/**
|
||||
* Removed in 1.21
|
||||
*/
|
||||
@Deprecated
|
||||
public static final Sound BLOCK_TRIAL_SPAWNER_AMBIENT_CHARGED = BLOCK_TRIAL_SPAWNER_AMBIENT_OMINOUS;
|
||||
public static final Sound BLOCK_TRIAL_SPAWNER_OPEN_SHUTTER = define("block.trial_spawner.open_shutter");
|
||||
public static final Sound BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER = define("block.trial_spawner.close_shutter");
|
||||
public static final Sound BLOCK_TRIAL_SPAWNER_EJECT_ITEM = define("block.trial_spawner.eject_item");
|
||||
|
||||
+95
-3
@@ -30,6 +30,8 @@ import org.jetbrains.annotations.ApiStatus;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.OptionalInt;
|
||||
|
||||
public final class Biomes {
|
||||
|
||||
@@ -56,12 +58,25 @@ public final class Biomes {
|
||||
|
||||
@ApiStatus.Internal
|
||||
public static Biome define(String key) {
|
||||
return define(key, false);
|
||||
}
|
||||
|
||||
@ApiStatus.Internal
|
||||
public static Biome define(String key, boolean allowNoData) {
|
||||
return REGISTRY.define(key, data -> {
|
||||
NBTCompound dataTag = BIOME_DATA.get(data.getName());
|
||||
if (dataTag == null) {
|
||||
throw new IllegalArgumentException("Can't define biome " + data.getName() + ", no data found");
|
||||
if (dataTag != null) {
|
||||
return Biome.decode(dataTag, ClientVersion.getLatest(), data);
|
||||
} else if (allowNoData) {
|
||||
BiomeEffects effects = new BiomeEffects(0xC0D8FF, 0x3F76E4, 0x050533,
|
||||
0x78A7FF, OptionalInt.empty(), OptionalInt.empty(),
|
||||
BiomeEffects.GrassColorModifier.NONE, Optional.empty(),
|
||||
Optional.empty(), Optional.empty(),
|
||||
Optional.empty(), Optional.empty());
|
||||
return new StaticBiome(data, true, 0.8f,
|
||||
Biome.TemperatureModifier.NONE, 0.4f, effects);
|
||||
}
|
||||
return Biome.decode(dataTag, ClientVersion.getLatest(), data);
|
||||
throw new IllegalArgumentException("Can't define biome " + data.getName() + ", no data found");
|
||||
});
|
||||
}
|
||||
|
||||
@@ -69,6 +84,83 @@ public final class Biomes {
|
||||
return REGISTRY;
|
||||
}
|
||||
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome SNOWY_MOUNTAINS = define("snowy_mountains", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome GIANT_SPRUCE_TAIGA = define("giant_spruce_taiga", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome BADLANDS_PLATEAU = define("badlands_plateau", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome DESERT_HILLS = define("desert_hills", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome SNOWY_TAIGA_HILLS = define("snowy_taiga_hills", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome DARK_FOREST_HILLS = define("dark_forest_hills", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome MUSHROOM_FIELD_SHORE = define("mushroom_field_shore", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome TALL_BIRCH_FOREST = define("tall_birch_forest", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome SNOWY_TAIGA_MOUNTAINS = define("snowy_taiga_mountains", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome TAIGA_MOUNTAINS = define("taiga_mountains", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome BAMBOO_JUNGLE_HILLS = define("bamboo_jungle_hills", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome WOODED_MOUNTAINS = define("wooded_mountains", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome TAIGA_HILLS = define("taiga_hills", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome MODIFIED_GRAVELLY_MOUNTAINS = define("modified_gravelly_mountains", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome MODIFIED_WOODED_BADLANDS_PLATEAU = define("modified_wooded_badlands_plateau", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome DEEP_WARM_OCEAN = define("deep_warm_ocean", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome GIANT_TREE_TAIGA = define("giant_tree_taiga", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome MODIFIED_JUNGLE = define("modified_jungle", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome TALL_BIRCH_HILLS = define("tall_birch_hills", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome WOODED_BADLANDS_PLATEAU = define("wooded_badlands_plateau", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome SNOWY_TUNDRA = define("snowy_tundra", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome MOUNTAINS = define("mountains", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome WOODED_HILLS = define("wooded_hills", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome GRAVELLY_MOUNTAINS = define("gravelly_mountains", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome GIANT_SPRUCE_TAIGA_HILLS = define("giant_spruce_taiga_hills", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome MODIFIED_BADLANDS_PLATEAU = define("modified_badlands_plateau", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome JUNGLE_HILLS = define("jungle_hills", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome JUNGLE_EDGE = define("jungle_edge", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome MODIFIED_JUNGLE_EDGE = define("modified_jungle_edge", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome SWAMP_HILLS = define("swamp_hills", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome GIANT_TREE_TAIGA_HILLS = define("giant_tree_taiga_hills", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome SHATTERED_SAVANNA = define("shattered_savanna", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome MOUNTAIN_EDGE = define("mountain_edge", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome DESERT_LAKES = define("desert_lakes", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome BIRCH_FOREST_HILLS = define("birch_forest_hills", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome SHATTERED_SAVANNA_PLATEAU = define("shattered_savanna_plateau", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome STONE_SHORE = define("stone_shore", true);
|
||||
@ApiStatus.Obsolete
|
||||
public static final Biome NETHER = define("nether", true);
|
||||
|
||||
public static final Biome BADLANDS = define("badlands");
|
||||
public static final Biome BAMBOO_JUNGLE = define("bamboo_jungle");
|
||||
public static final Biome BASALT_DELTAS = define("basalt_deltas");
|
||||
|
||||
+3
@@ -20,6 +20,7 @@ package com.github.retrooper.packetevents.protocol.world.blockentity;
|
||||
|
||||
import com.github.retrooper.packetevents.protocol.player.ClientVersion;
|
||||
import com.github.retrooper.packetevents.util.mappings.VersionedRegistry;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
@@ -85,6 +86,8 @@ public final class BlockEntityTypes {
|
||||
public static final BlockEntityType SCULK_CATALYST = define("sculk_catalyst");
|
||||
public static final BlockEntityType SCULK_SHRIEKER = define("sculk_shrieker");
|
||||
public static final BlockEntityType CHISELED_BOOKSHELF = define("chiseled_bookshelf");
|
||||
@ApiStatus.Obsolete
|
||||
public static final BlockEntityType SUSPICIOUS_SAND = define("suspicious_sand");
|
||||
public static final BlockEntityType BRUSHABLE_BLOCK = define("brushable_block");
|
||||
public static final BlockEntityType DECORATED_POT = define("decorated_pot");
|
||||
public static final BlockEntityType CRAFTER = define("crafter");
|
||||
|
||||
+3
@@ -22,6 +22,7 @@ import com.github.retrooper.packetevents.protocol.player.ClientVersion;
|
||||
import com.github.retrooper.packetevents.protocol.world.MaterialType;
|
||||
import com.github.retrooper.packetevents.resources.ResourceLocation;
|
||||
import com.github.retrooper.packetevents.util.mappings.VersionedRegistry;
|
||||
import org.jetbrains.annotations.ApiStatus;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -524,6 +525,8 @@ public final class StateTypes {
|
||||
public static StateType BLACK_CARPET = StateTypes.builder().name("BLACK_CARPET").blastResistance(0.1f).hardness(0.1f).isBlocking(false).requiresCorrectTool(false).isSolid(true).setMaterial(MaterialType.CLOTH_DECORATION).build();
|
||||
public static StateType TERRACOTTA = StateTypes.builder().name("TERRACOTTA").blastResistance(4.2f).hardness(1.25f).isBlocking(true).requiresCorrectTool(true).isSolid(true).setMaterial(MaterialType.STONE).build();
|
||||
public static StateType PACKED_ICE = StateTypes.builder().name("PACKED_ICE").blastResistance(0.5f).hardness(0.5f).isBlocking(true).requiresCorrectTool(false).isSolid(true).setMaterial(MaterialType.ICE_SOLID).build();
|
||||
@ApiStatus.Obsolete
|
||||
public static StateType GRASS_PATH = StateTypes.builder().name("GRASS_PATH").blastResistance(0.65f).hardness(0.65f).isBlocking(true).requiresCorrectTool(false).isSolid(true).setMaterial(MaterialType.DIRT).build();
|
||||
public static StateType DIRT_PATH = StateTypes.builder().name("DIRT_PATH").blastResistance(0.65f).hardness(0.65f).isBlocking(true).requiresCorrectTool(false).isSolid(true).setMaterial(MaterialType.DIRT).build();
|
||||
public static StateType SUNFLOWER = StateTypes.builder().name("SUNFLOWER").blastResistance(0.0f).hardness(0.0f).isBlocking(false).requiresCorrectTool(false).isSolid(false).setMaterial(MaterialType.REPLACEABLE_PLANT).build();
|
||||
public static StateType LILAC = StateTypes.builder().name("LILAC").blastResistance(0.0f).hardness(0.0f).isBlocking(false).requiresCorrectTool(false).isSolid(false).setMaterial(MaterialType.REPLACEABLE_PLANT).build();
|
||||
|
||||
@@ -189,6 +189,7 @@ public class ClassStructureTest extends BaseDummyAPITest {
|
||||
assert entries != null; // ensured above
|
||||
String invalidEntries = entries.values().stream()
|
||||
.flatMap(map -> map.keySet().stream())
|
||||
.filter(name -> !name.startsWith("__missing_"))
|
||||
.map(ResourceLocation::normString)
|
||||
.distinct()
|
||||
.filter(name -> registry.getByName(name) == null)
|
||||
|
||||
+1108
-2
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -1452,6 +1452,6 @@
|
||||
"sweep_attack",
|
||||
"falling_dust",
|
||||
"totem_of_undying",
|
||||
"split"
|
||||
"spit"
|
||||
]
|
||||
}
|
||||
Reference in new issue
Block a user