Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.19 #697

Merged
merged 8 commits into from
May 25, 2022
Merged

1.19 #697

Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update enums
  • Loading branch information
basaigh committed May 19, 2022
commit 5cad78b15ef3cc7767cf95eeace98077a28589ab
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ public class MagicValues {
register(EntityEvent.GOAT_LOWERING_HEAD, 58);
register(EntityEvent.GOAT_STOP_LOWERING_HEAD, 59);
register(EntityEvent.MAKE_POOF_PARTICLES, 60);
register(EntityEvent.WARDEN_RECEIVE_SIGNAL, 61);

register(PositionElement.X, 0);
register(PositionElement.Y, 1);
Expand Down Expand Up @@ -289,6 +290,10 @@ public class MagicValues {
register(PaintingType.BURNING_SKULL, 23);
register(PaintingType.SKELETON, 24);
register(PaintingType.DONKEY_KONG, 25);
register(PaintingType.EARTH, 26);
register(PaintingType.WIND, 27);
register(PaintingType.WATER, 28);
register(PaintingType.FIRE, 29);

register(ScoreboardPosition.PLAYER_LIST, 0);
register(ScoreboardPosition.SIDEBAR, 1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@ public enum EntityEvent {
LIVING_FREEZE,
GOAT_LOWERING_HEAD,
GOAT_STOP_LOWERING_HEAD,
MAKE_POOF_PARTICLES
MAKE_POOF_PARTICLES,
WARDEN_RECEIVE_SIGNAL
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,9 @@ public enum PaintingType {
PIG_SCENE,
BURNING_SKULL,
SKELETON,
DONKEY_KONG;
DONKEY_KONG,
EARTH,
WIND,
WATER,
FIRE;
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
@Getter
@AllArgsConstructor
public enum BuiltinSound implements Sound {
ALLAY_AMBIENT_WITH_ITEM("entity.allay.ambient_with_item"),
ALLAY_AMBIENT_WITHOUT_ITEM("entity.allay_ambient_without_item"),
ALLAY_DEATH("entity.allay.death"),
ALLAY_HURT("entity.allay.hurt"),
ALLAY_ITEM_GIVEN("entity.allay.item_given"),
ALLAY_ITEM_TAKEN("entity.allay.item_taken"),
ALLAY_THROW("entity.allay.allay_throw"),
AMBIENT_CAVE("ambient.cave"),
AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"),
AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"),
Expand Down Expand Up @@ -164,11 +171,13 @@ public enum BuiltinSound implements Sound {
ITEM_BUCKET_EMPTY_FISH("item.bucket.empty_fish"),
ITEM_BUCKET_EMPTY_LAVA("item.bucket.empty_lava"),
ITEM_BUCKET_EMPTY_POWDER_SNOW("item.bucket.empty_powder_snow"),
ITEM_BUCKET_EMPTY_TADPOLE("item.bucket.empty_tadpole"),
ITEM_BUCKET_FILL("item.bucket.fill"),
ITEM_BUCKET_FILL_AXOLOTL("item.bucket.fill_axolotl"),
ITEM_BUCKET_FILL_FISH("item.bucket.fill_fish"),
ITEM_BUCKET_FILL_LAVA("item.bucket.fill_lava"),
ITEM_BUCKET_FILL_POWDER_SNOW("item.bucket.fill_powder_snow"),
ITEM_BUCKET_FILL_TADPOLE("item.bucket.fill_tadpole"),
ITEM_BUNDLE_DROP_CONTENTS("item.bundle.drop_contents"),
ITEM_BUNDLE_INSERT("item.bundle.insert"),
ITEM_BUNDLE_REMOVE_ONE("item.bundle.remove_one"),
Expand Down Expand Up @@ -401,6 +410,25 @@ public enum BuiltinSound implements Sound {
ENTITY_FOX_SNIFF("entity.fox.sniff"),
ENTITY_FOX_SPIT("entity.fox.spit"),
ENTITY_FOX_TELEPORT("entity.fox.teleport"),
BLOCK_FROGLIGHT_BREAK("block.froglight.break"),
BLOCK_FROGLIGHT_FALL("block.froglight.fall"),
BLOCK_FROGLIGHT_HIT("block.froglight.hit"),
BLOCK_FROGLIGHT_PLACE("block.froglight.place"),
BLOCK_FROGLIGHT_STEP("block.froglight.step"),
BLOCK_FROGSPAWN_STEP("block.frogspawn.step"),
BLOCK_FROGSPAWN_BREAK("block.frogspawn.break"),
BLOCK_FROGSPAWN_FALL("block.frogspawn.fall"),
BLOCK_FROGSPAWN_HATCH("block.frogspawn.hatch"),
BLOCK_FROGSPAWN_HIT("block.frogspawn.hit"),
BLOCK_FROGSPAWN_PLACE("block.frogspawn.place"),
ENTITY_FROG_AMBIENT("entity.frog.ambient"),
ENTITY_FROG_DEATH("entity.frog.death"),
ENTITY_FROG_EAT("entity.frog.eat"),
ENTITY_FROG_HURT("entity.frog.hurt"),
ENTITY_FROG_LAY_SPAWN("entity.frog.lay_spawn"),
ENTITY_FROG_LONG_JUMP("entity.frog.long_jump"),
ENTITY_FROG_STEP("entity.frog.step"),
ENTITY_FROG_TONGUE("entity.frog.tongue"),
BLOCK_ROOTS_BREAK("block.roots.break"),
BLOCK_ROOTS_STEP("block.roots.step"),
BLOCK_ROOTS_PLACE("block.roots.place"),
Expand Down Expand Up @@ -452,6 +480,8 @@ public enum BuiltinSound implements Sound {
ENTITY_GOAT_MILK("entity.goat.milk"),
ENTITY_GOAT_PREPARE_RAM("entity.goat.prepare_ram"),
ENTITY_GOAT_RAM_IMPACT("entity.goat.ram_impact"),
ENTITY_GOAT_HORN_BREAK("entity.goat.horn_break"),
ENTITY_GOAT_HORN_PLAY("item.goat_horn.play"),
ENTITY_GOAT_SCREAMING_AMBIENT("entity.goat.screaming.ambient"),
ENTITY_GOAT_SCREAMING_DEATH("entity.goat.screaming.death"),
ENTITY_GOAT_SCREAMING_EAT("entity.goat.screaming.eat"),
Expand All @@ -460,6 +490,7 @@ public enum BuiltinSound implements Sound {
ENTITY_GOAT_SCREAMING_MILK("entity.goat.screaming.milk"),
ENTITY_GOAT_SCREAMING_PREPARE_RAM("entity.goat.screaming.prepare_ram"),
ENTITY_GOAT_SCREAMING_RAM_IMPACT("entity.goat.screaming.ram_impact"),
ENTITY_GOAT_SCREAMING_HORN_BREAK("entity.goat.screaming.horn_break"),
ENTITY_GOAT_STEP("entity.goat.step"),
BLOCK_GRASS_BREAK("block.grass.break"),
BLOCK_GRASS_FALL("block.grass.fall"),
Expand Down Expand Up @@ -503,6 +534,14 @@ public enum BuiltinSound implements Sound {
BLOCK_HONEY_BLOCK_STEP("block.honey_block.step"),
ITEM_HONEYCOMB_WAX_ON("item.honeycomb.wax_on"),
ITEM_HONEY_BOTTLE_DRINK("item.honey_bottle.drink"),
ITEM_GOAT_HORN_SOUND_0("item.goat_horn.sound.0"),
ITEM_GOAT_HORN_SOUND_1("item.goat_horn.sound.1"),
ITEM_GOAT_HORN_SOUND_2("item.goat_horn.sound.2"),
ITEM_GOAT_HORN_SOUND_3("item.goat_horn.sound.3"),
ITEM_GOAT_HORN_SOUND_4("item.goat_horn.sound.4"),
ITEM_GOAT_HORN_SOUND_5("item.goat_horn.sound.5"),
ITEM_GOAT_HORN_SOUND_6("item.goat_horn.sound.6"),
ITEM_GOAT_HORN_SOUND_7("item.goat_horn.sound.7"),
ENTITY_HORSE_AMBIENT("entity.horse.ambient"),
ENTITY_HORSE_ANGRY("entity.horse.angry"),
ENTITY_HORSE_ARMOR("entity.horse.armor"),
Expand Down Expand Up @@ -595,6 +634,11 @@ public enum BuiltinSound implements Sound {
ENTITY_MAGMA_CUBE_JUMP("entity.magma_cube.jump"),
ENTITY_MAGMA_CUBE_SQUISH("entity.magma_cube.squish"),
ENTITY_MAGMA_CUBE_SQUISH_SMALL("entity.magma_cube.squish_small"),
BLOCK_MANGROVE_ROOTS_BREAK("block.mangrove_roots.break"),
BLOCK_MANGROVE_ROOTS_FALL("block.mangrove_roots.fall"),
BLOCK_MANGROVE_ROOTS_HIT("block.mangrove_roots.hit"),
BLOCK_MANGROVE_ROOTS_PLACE("block.mangrove_roots.place"),
BLOCK_MANGROVE_ROOTS_STEP("block.mangrove_roots.step"),
BLOCK_MEDIUM_AMETHYST_BUD_BREAK("block.medium_amethyst_bud.break"),
BLOCK_MEDIUM_AMETHYST_BUD_PLACE("block.medium_amethyst_bud.place"),
BLOCK_METAL_BREAK("block.metal.break"),
Expand Down Expand Up @@ -622,6 +666,21 @@ public enum BuiltinSound implements Sound {
BLOCK_MOSS_HIT("block.moss.hit"),
BLOCK_MOSS_PLACE("block.moss.place"),
BLOCK_MOSS_STEP("block.moss.step"),
BLOCK_MUD_BREAK("block.mud.break"),
BLOCK_MUD_FALL("block.mud.fall"),
BLOCK_MUD_HIT("block.mud.hit"),
BLOCK_MUD_PLACE("block.mud.place"),
BLOCK_MUD_STEP("block.mud.step"),
BLOCK_MUD_BRICKS_BREAK("block.mud_bricks.break"),
BLOCK_MUD_BRICKS_FALL("block.mud_bricks.fall"),
BLOCK_MUD_BRICKS_HIT("block.mud_bricks.hit"),
BLOCK_MUD_BRICKS_PLACE("block.mud_bricks.place"),
BLOCK_MUD_BRICKS_STEP("block.mud_bricks.step"),
BLOCK_MUDDY_MANGROVE_ROOTS_BREAK("block.muddy_mangrove_roots.break"),
BLOCK_MUDDY_MANGROVE_ROOTS_FALL("block.muddy_mangrove_roots.fall"),
BLOCK_MUDDY_MANGROVE_ROOTS_HIT("block.muddy_mangrove_roots.hit"),
BLOCK_MUDDY_MANGROVE_ROOTS_PLACE("block.muddy_mangrove_roots.place"),
BLOCK_MUDDY_MANGROVE_ROOTS_STEP("block.muddy_mangrove_roots.step"),
ENTITY_MULE_AMBIENT("entity.mule.ambient"),
ENTITY_MULE_ANGRY("entity.mule.angry"),
ENTITY_MULE_CHEST("entity.mule.chest"),
Expand All @@ -630,6 +689,7 @@ public enum BuiltinSound implements Sound {
ENTITY_MULE_HURT("entity.mule.hurt"),
MUSIC_CREATIVE("music.creative"),
MUSIC_CREDITS("music.credits"),
MUSIC_DISC_5("music_disc.5"),
MUSIC_DISC_11("music_disc.11"),
MUSIC_DISC_13("music_disc.13"),
MUSIC_DISC_BLOCKS("music_disc.blocks"),
Expand All @@ -650,10 +710,14 @@ public enum BuiltinSound implements Sound {
MUSIC_MENU("music.menu"),
MUSIC_NETHER_BASALT_DELTAS("music.nether.basalt_deltas"),
MUSIC_NETHER_CRIMSON_FOREST("music.nether.crimson_forest"),
MUSIC_OVERWORLD_DEEP_DARK("music.overworld.deep_dark"),
MUSIC_OVERWORLD_DRIPSTONE_CAVES("music.overworld.dripstone_caves"),
MUSIC_OVERWORLD_GROVE("music.overworld.grove"),
MUSIC_OVERWORLD_JAGGED_PEAKS("music.overworld.jagged_peaks"),
MUSIC_OVERWORLD_LUSH_CAVES("music.overworld.lush_caves"),
MUSIC_OVERWORLD_SWAMP("music.overworld.swamp"),
MUSIC_OVERWORLD_JUNGLE_AND_FOREST("music.overworld.jungle_and_forest"),
MUSIC_OVERWORLD_OLD_GROWTH_TAIGA("music.overworld.old_growth_taiga"),
MUSIC_OVERWORLD_MEADOW("music.overworld.meadow"),
MUSIC_NETHER_NETHER_WASTES("music.nether.nether_wastes"),
MUSIC_OVERWORLD_FROZEN_PEAKS("music.overworld.frozen_peaks"),
Expand All @@ -669,6 +733,11 @@ public enum BuiltinSound implements Sound {
BLOCK_NETHER_BRICKS_FALL("block.nether_bricks.fall"),
BLOCK_NETHER_WART_BREAK("block.nether_wart.break"),
ITEM_NETHER_WART_PLANT("item.nether_wart.plant"),
BLOCK_PACKED_MUD_BREAK("block.packed_mud.break"),
BLOCK_PACKED_MUD_FALL("block.packed_mud.fall"),
BLOCK_PACKED_MUD_HIT("block.packed_mud.hit"),
BLOCK_PACKED_MUD_PLACE("block.packed_mud.place"),
BLOCK_PACKED_MUD_STEP("block.packed_mud.step"),
BLOCK_STEM_BREAK("block.stem.break"),
BLOCK_STEM_STEP("block.stem.step"),
BLOCK_STEM_PLACE("block.stem.place"),
Expand Down Expand Up @@ -772,6 +841,7 @@ public enum BuiltinSound implements Sound {
ENTITY_PARROT_IMITATE_STRAY("entity.parrot.imitate.stray"),
ENTITY_PARROT_IMITATE_VEX("entity.parrot.imitate.vex"),
ENTITY_PARROT_IMITATE_VINDICATOR("entity.parrot.imitate.vindicator"),
ENTITY_PARROT_IMITATE_WARDEN("entity.parrot.imitate.warden"),
ENTITY_PARROT_IMITATE_WITCH("entity.parrot.imitate.witch"),
ENTITY_PARROT_IMITATE_WITHER("entity.parrot.imitate.wither"),
ENTITY_PARROT_IMITATE_WITHER_SKELETON("entity.parrot.imitate.wither_skeleton"),
Expand Down Expand Up @@ -907,13 +977,37 @@ public enum BuiltinSound implements Sound {
BLOCK_SCAFFOLDING_HIT("block.scaffolding.hit"),
BLOCK_SCAFFOLDING_PLACE("block.scaffolding.place"),
BLOCK_SCAFFOLDING_STEP("block.scaffolding.step"),
BLOCK_SCULK_SPREAD("block.sculk.spread"),
BLOCK_SCULK_CHARGE("block.sculk.charge"),
BLOCK_SCULK_BREAK("block.sculk.break"),
BLOCK_SCULK_FALL("block.sculk.fall"),
BLOCK_SCULK_HIT("block.sculk.hit"),
BLOCK_SCULK_PLACE("block.sculk.place"),
BLOCK_SCULK_STEP("block.sculk.step"),
BLOCK_SCULK_CATALYST_BLOOM("block.sculk_catalyst.bloom"),
BLOCK_SCULK_CATALYST_BREAK("block.sculk_catalyst.break"),
BLOCK_SCULK_CATALYST_FALL("block.sculk_catalyst.fall"),
BLOCK_SCULK_CATALYST_HIT("block.sculk_catalyst.hit"),
BLOCK_SCULK_CATALYST_PLACE("block.sculk_catalyst.place"),
BLOCK_SCULK_CATALYST_STEP("block.sculk_catalyst.step"),
BLOCK_SCULK_SENSOR_CLICKING("block.sculk_sensor.clicking"),
BLOCK_SCULK_SENSOR_CLICKING_STOP("block.sculk_sensor.clicking_stop"),
BLOCK_SCULK_SENSOR_BREAK("block.sculk_sensor.break"),
BLOCK_SCULK_SENSOR_FALL("block.sculk_sensor.fall"),
BLOCK_SCULK_SENSOR_HIT("block.sculk_sensor.hit"),
BLOCK_SCULK_SENSOR_PLACE("block.sculk_sensor.place"),
BLOCK_SCULK_SENSOR_STEP("block.sculk_sensor.step"),
BLOCK_SCULK_SHRIEKER_BREAK("block.sculk_shrieker.break"),
BLOCK_SCULK_SHRIEKER_FALL("block.sculk_shrieker.fall"),
BLOCK_SCULK_SHRIEKER_HIT("block.sculk_shrieker.hit"),
BLOCK_SCULK_SHRIEKER_PLACE("block.sculk_shrieker.place"),
BLOCK_SCULK_SHRIEKER_SHRIEK("block.sculk_shrieker.shriek"),
BLOCK_SCULK_SHRIEKER_STEP("block.sculk_shrieker.step"),
BLOCK_SCULK_VEIN_BREAK("block.sculk_vein.break"),
BLOCK_SCULK_VEIN_FALL("block.sculk_vein.fall"),
BLOCK_SCULK_VEIN_HIT("block.sculk_vein.hit"),
BLOCK_SCULK_VEIN_PLACE("block.sculk_vein.place"),
BLOCK_SCULK_VEIN_STEP("block.sculk_vein.step"),
ENTITY_SHEEP_AMBIENT("entity.sheep.ambient"),
ENTITY_SHEEP_DEATH("entity.sheep.death"),
ENTITY_SHEEP_HURT("entity.sheep.hurt"),
Expand Down Expand Up @@ -1044,6 +1138,10 @@ public enum BuiltinSound implements Sound {
BLOCK_SWEET_BERRY_BUSH_BREAK("block.sweet_berry_bush.break"),
BLOCK_SWEET_BERRY_BUSH_PLACE("block.sweet_berry_bush.place"),
BLOCK_SWEET_BERRY_BUSH_PICK_BERRIES("block.sweet_berry_bush.pick_berries"),
ENTITY_TADPOLE_DEATH("entity.tadpole.death"),
ENTITY_TADPOLE_FLOP("entity.tadpole.flop"),
ENTITY_TADPOLE_GROW_UP("entity.tadpole.grow_up"),
ENTITY_TADPOLE_HURT("entity.tadpole.hurt"),
ENCHANT_THORNS_HIT("enchant.thorns.hit"),
ENTITY_TNT_PRIMED("entity.tnt.primed"),
ITEM_TOTEM_USE("item.totem.use"),
Expand Down Expand Up @@ -1133,6 +1231,26 @@ public enum BuiltinSound implements Sound {
ENTITY_WANDERING_TRADER_REAPPEARED("entity.wandering_trader.reappeared"),
ENTITY_WANDERING_TRADER_TRADE("entity.wandering_trader.trade"),
ENTITY_WANDERING_TRADER_YES("entity.wandering_trader.yes"),
ENTITY_WARDEN_AGITATED("entity.warden.agitated"),
ENTITY_WARDEN_AMBIENT("entity.warden.ambient"),
ENTITY_WARDEN_ANGRY("entity.warden.angry"),
ENTITY_WARDEN_ATTACK_IMPACT("entity.warden.attack_impact"),
ENTITY_WARDEN_DEATH("entity.warden.death"),
ENTITY_WARDEN_DIG("entity.warden.dig"),
ENTITY_WARDEN_EMERGE("entity.warden.emerge"),
ENTITY_WARDEN_HEARTBEAT("entity.warden.heartbeat"),
ENTITY_WARDEN_HURT("entity.warden.hurt"),
ENTITY_WARDEN_LISTENING("entity.warden.listening"),
ENTITY_WARDEN_LISTENING_ANGRY("entity.warden.listening_angry"),
ENTITY_WARDEN_NEARBY_CLOSE("entity.warden.nearby_close"),
ENTITY_WARDEN_NEARBY_CLOSER("entity.warden.nearby_closer"),
ENTITY_WARDEN_NEARBY_CLOSEST("entity.warden.nearby_closest"),
ENTITY_WARDEN_ROAR("entity.warden.roar"),
ENTITY_WARDEN_SNIFF("entity.warden.sniff"),
ENTITY_WARDEN_SONIC_BOOM("entity.warden.sonic_boom"),
ENTITY_WARDEN_SONIC_CHARGE("entity.warden.sonic_charge"),
ENTITY_WARDEN_STEP("entity.warden.step"),
ENTITY_WARDEN_TENDRIL_CLICKS("entity.warden.tendril_clicks"),
BLOCK_WATER_AMBIENT("block.water.ambient"),
WEATHER_RAIN("weather.rain"),
WEATHER_RAIN_ABOVE("weather.rain.above"),
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.