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.

Sign up for GitHub

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.20.5 #127

Merged
merged 16 commits into from
Apr 23, 2024
Merged

1.20.5 #127

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ad14036
23w51b
mat-1 Jan 18, 2024
737af37
make recalculate_near_end_of_path public
mat-1 Feb 26, 2024
8bd1e93
update to 24w03a i think
mat-1 Mar 6, 2024
ff1a5eb
try to implement packets
mat-1 Mar 29, 2024
c1b9e18
start implementing 24w13a
mat-1 Mar 30, 2024
42bc86a
registries work (but a lot of packets are still broken)
mat-1 Apr 11, 2024
e05c842
fix recipes and commands packets
mat-1 Apr 11, 2024
2ead339
i love codecs :D i am not going insane :D mojang's java is very reada…
mat-1 Apr 15, 2024
561f226
item components are "implemented" meowmeowmeowmeowmeowmeowmeowmeowmeo…
mat-1 Apr 17, 2024
dfba6e3
update to 1.20.5-pre3
mat-1 Apr 17, 2024
8bf0c0c
fix all the broken packets and clippy (mojang please don't do an upda…
mat-1 Apr 17, 2024
fb06830
1.20.5-rc1
mat-1 Apr 18, 2024
23e9506
Merge branch 'main' into 1.20.5
mat-1 Apr 19, 2024
81c14d4
fix failing tests
mat-1 Apr 19, 2024
0dcaba8
merge main
mat-1 Apr 20, 2024
b55b869
1.20.5
mat-1 Apr 23, 2024
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 to 1.20.5-pre3
  • Loading branch information
@mat-1
mat-1 committed Apr 17, 2024
commit dfba6e369a52647d71bc10c4610b200c449ee86d
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ A collection of Rust crates for making Minecraft bots, clients, and tools.

<!-- The line below is automatically read and updated by the migrate script, so don't change it manually. -->

_Currently supported Minecraft version: `24w13a`._
_Currently supported Minecraft version: `1.20.5-pre3`._

> [!WARNING]
> Azalea is still very unfinished, though most crates are in a somewhat useable state
Expand Down
66 changes: 56 additions & 10 deletions azalea-language/src/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"advancements.adventure.avoid_vibration.title": "Sneak 100",
"advancements.adventure.blowback.description": "Kill a Breeze with a deflected Breeze-shot Wind Charge",
"advancements.adventure.blowback.title": "Blowback",
"advancements.adventure.brush_armadillo.description": "Get Armadillo Scutes from an Armadillo using a Brush",
"advancements.adventure.brush_armadillo.title": "Isn't It Scute?",
"advancements.adventure.bullseye.description": "Hit the bullseye of a Target block from at least 30 meters away",
"advancements.adventure.bullseye.title": "Bullseye",
"advancements.adventure.craft_decorated_pot_using_only_sherds.description": "Make a Decorated Pot out of 4 Pottery Sherds",
Expand Down Expand Up @@ -52,6 +54,8 @@
"advancements.adventure.play_jukebox_in_meadows.title": "Sound of Music",
"advancements.adventure.read_power_from_chiseled_bookshelf.description": "Read the power signal of a Chiseled Bookshelf using a Comparator",
"advancements.adventure.read_power_from_chiseled_bookshelf.title": "The Power of Books",
"advancements.adventure.revaulting.description": "Unlock an Ominous Vault with an Ominous Trial Key",
"advancements.adventure.revaulting.title": "Revaulting",
"advancements.adventure.root.description": "Adventure, exploration and combat",
"advancements.adventure.root.title": "Adventure",
"advancements.adventure.salvage_sherd.description": "Brush a Suspicious block to obtain a Pottery Sherd",
Expand Down Expand Up @@ -149,6 +153,10 @@
"advancements.husbandry.plant_any_sniffer_seed.title": "Planting the Past",
"advancements.husbandry.plant_seed.description": "Plant a seed and watch it grow",
"advancements.husbandry.plant_seed.title": "A Seedy Place",
"advancements.husbandry.remove_wolf_armor.description": "Remove Wolf Armor from a Wolf using Shears",
"advancements.husbandry.remove_wolf_armor.title": "Shear Brilliance",
"advancements.husbandry.repair_wolf_armor.description": "Repair a damaged Wolf Armor using Armadillo Scutes",
"advancements.husbandry.repair_wolf_armor.title": "Good as New",
"advancements.husbandry.ride_a_boat_with_a_goat.description": "Get in a Boat and float with a Goat",
"advancements.husbandry.ride_a_boat_with_a_goat.title": "Whatever Floats Your Goat!",
"advancements.husbandry.root.description": "The world is full of friends and food",
Expand All @@ -167,6 +175,8 @@
"advancements.husbandry.wax_off.title": "Wax Off",
"advancements.husbandry.wax_on.description": "Apply Honeycomb to a Copper block!",
"advancements.husbandry.wax_on.title": "Wax On",
"advancements.husbandry.whole_pack.description": "Tame one of each Wolf variant",
"advancements.husbandry.whole_pack.title": "The Whole Pack",
"advancements.nether.all_effects.description": "Have every effect applied at the same time",
"advancements.nether.all_effects.title": "How Did We Get Here?",
"advancements.nether.all_potions.description": "Have every potion effect applied at the same time",
Expand Down Expand Up @@ -346,6 +356,7 @@
"argument.literal.incorrect": "Expected literal %s",
"argument.long.big": "Long must not be more than %s, found %s",
"argument.long.low": "Long must not be less than %s, found %s",
"argument.message.too_long": "Chat message was too long (%s > maximum %s characters)",
"argument.nbt.array.invalid": "Invalid array type '%s'",
"argument.nbt.array.mixed": "Can't insert %s into %s",
"argument.nbt.expected.key": "Expected key",
Expand Down Expand Up @@ -387,9 +398,10 @@
"arguments.item.component.malformed": "Malformed '%s' component: '%s'",
"arguments.item.component.repeated": "Item component '%s' was repeated, but only one value can be specified",
"arguments.item.component.unknown": "Unknown item component '%s'",
"arguments.item.malformed": "Malformed item: '%s'",
"arguments.item.overstacked": "%s can only stack up to %s",
"arguments.item.predicate.malformed": "Malformed '%s' predicate: '%s'",
"arguments.item.predicate.unknown": "Unknown item predicate '%s''",
"arguments.item.predicate.unknown": "Unknown item predicate '%s'",
"arguments.item.tag.unknown": "Unknown item tag '%s'",
"arguments.nbtpath.node.invalid": "Invalid NBT path element",
"arguments.nbtpath.nothing_found": "Found no elements matching %s",
Expand Down Expand Up @@ -726,6 +738,22 @@
"block.minecraft.banner.diagonal_up_right.red": "Red Per Bend Sinister Inverted",
"block.minecraft.banner.diagonal_up_right.white": "White Per Bend Sinister Inverted",
"block.minecraft.banner.diagonal_up_right.yellow": "Yellow Per Bend Sinister Inverted",
"block.minecraft.banner.flow.black": "Black Flow",
"block.minecraft.banner.flow.blue": "Blue Flow",
"block.minecraft.banner.flow.brown": "Brown Flow",
"block.minecraft.banner.flow.cyan": "Cyan Flow",
"block.minecraft.banner.flow.gray": "Gray Flow",
"block.minecraft.banner.flow.green": "Green Flow",
"block.minecraft.banner.flow.light_blue": "Light Blue Flow",
"block.minecraft.banner.flow.light_gray": "Light Gray Flow",
"block.minecraft.banner.flow.lime": "Lime Flow",
"block.minecraft.banner.flow.magenta": "Magenta Flow",
"block.minecraft.banner.flow.orange": "Orange Flow",
"block.minecraft.banner.flow.pink": "Pink Flow",
"block.minecraft.banner.flow.purple": "Purple Flow",
"block.minecraft.banner.flow.red": "Red Flow",
"block.minecraft.banner.flow.white": "White Flow",
"block.minecraft.banner.flow.yellow": "Yellow Flow",
"block.minecraft.banner.flower.black": "Black Flower Charge",
"block.minecraft.banner.flower.blue": "Blue Flower Charge",
"block.minecraft.banner.flower.brown": "Brown Flower Charge",
Expand Down Expand Up @@ -790,6 +818,22 @@
"block.minecraft.banner.gradient.red": "Red Gradient",
"block.minecraft.banner.gradient.white": "White Gradient",
"block.minecraft.banner.gradient.yellow": "Yellow Gradient",
"block.minecraft.banner.guster.black": "Black Guster",
"block.minecraft.banner.guster.blue": "Blue Guster",
"block.minecraft.banner.guster.brown": "Brown Guster",
"block.minecraft.banner.guster.cyan": "Cyan Guster",
"block.minecraft.banner.guster.gray": "Gray Guster",
"block.minecraft.banner.guster.green": "Green Guster",
"block.minecraft.banner.guster.light_blue": "Light Blue Guster",
"block.minecraft.banner.guster.light_gray": "Light Gray Guster",
"block.minecraft.banner.guster.lime": "Lime Guster",
"block.minecraft.banner.guster.magenta": "Magenta Guster",
"block.minecraft.banner.guster.orange": "Orange Guster",
"block.minecraft.banner.guster.pink": "Pink Guster",
"block.minecraft.banner.guster.purple": "Purple Guster",
"block.minecraft.banner.guster.red": "Red Guster",
"block.minecraft.banner.guster.white": "White Guster",
"block.minecraft.banner.guster.yellow": "Yellow Guster",
"block.minecraft.banner.half_horizontal_bottom.black": "Black Per Fess Inverted",
"block.minecraft.banner.half_horizontal_bottom.blue": "Blue Per Fess Inverted",
"block.minecraft.banner.half_horizontal_bottom.brown": "Brown Per Fess Inverted",
Expand Down Expand Up @@ -3144,6 +3188,7 @@
"disconnect.loginFailedInfo.userBanned": "You are banned from playing online",
"disconnect.lost": "Connection Lost",
"disconnect.overflow": "Buffer overflow",
"disconnect.packetError": "Network Protocol Error",
"disconnect.quitting": "Quitting",
"disconnect.spam": "Kicked for spamming",
"disconnect.timeout": "Timed out",
Expand Down Expand Up @@ -4666,7 +4711,7 @@
"mco.configure.world.buttons.resetworld": "Reset World",
"mco.configure.world.buttons.settings": "Settings",
"mco.configure.world.buttons.subscription": "Subscription",
"mco.configure.world.buttons.switchminigame": "Switch minigame",
"mco.configure.world.buttons.switchminigame": "Switch Minigame",
"mco.configure.world.close.question.line1": "Your realm will become unavailable.",
"mco.configure.world.close.question.line2": "Are you sure you want to continue?",
"mco.configure.world.closing": "Closing the realm...",
Expand Down Expand Up @@ -4795,21 +4840,21 @@
"mco.invites.nopending": "No pending invites!",
"mco.invites.pending": "New invite(s)!",
"mco.invites.title": "Pending Invites",
"mco.minigame.world.changeButton": "Select another minigame",
"mco.minigame.world.changeButton": "Select Another Minigame",
"mco.minigame.world.info.line1": "This will temporarily replace your world with a minigame!",
"mco.minigame.world.info.line2": "You can later return to your original world without losing anything.",
"mco.minigame.world.noSelection": "Please make a selection",
"mco.minigame.world.restore": "Ending minigame...",
"mco.minigame.world.restore": "Ending Minigame...",
"mco.minigame.world.restore.question.line1": "The minigame will end and your realm will be restored.",
"mco.minigame.world.restore.question.line2": "Are you sure you want to continue?",
"mco.minigame.world.selected": "Selected minigame:",
"mco.minigame.world.slot.screen.title": "Switching world...",
"mco.minigame.world.selected": "Selected Minigame:",
"mco.minigame.world.slot.screen.title": "Switching World...",
"mco.minigame.world.startButton": "Switch",
"mco.minigame.world.starting.screen.title": "Starting minigame...",
"mco.minigame.world.stopButton": "End minigame",
"mco.minigame.world.starting.screen.title": "Starting Minigame...",
"mco.minigame.world.stopButton": "End Minigame",
"mco.minigame.world.switch.new": "Select another minigame?",
"mco.minigame.world.switch.title": "Switch minigame",
"mco.minigame.world.title": "Switch realm to minigame",
"mco.minigame.world.switch.title": "Switch Minigame",
"mco.minigame.world.title": "Switch Realm to Minigame",
"mco.news": "Realms news",
"mco.notification.dismiss": "Dismiss",
"mco.notification.transferSubscription.buttonText": "Transfer Now",
Expand Down Expand Up @@ -5426,6 +5471,7 @@
"parsing.quote.escape": "Invalid escape sequence '\\%s' in quoted string",
"parsing.quote.expected.end": "Unclosed quoted string",
"parsing.quote.expected.start": "Expected quote to start a string",
"particle.invalidOptions": "Can't parse particle options: %s",
"particle.notFound": "Unknown particle: %s",
"permissions.requires.entity": "An entity is required to run this command here",
"permissions.requires.player": "A player is required to run this command here",
Expand Down
1 change: 0 additions & 1 deletion azalea-protocol/azalea-protocol-macros/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ fn as_packet_derive(input: TokenStream, state: proc_macro2::TokenStream) -> Toke
panic!("#[derive(*Packet)] can only be used on structs")
};


let (syn::Fields::Named(_) | syn::Fields::Unit) = fields else {
panic!("#[derive(*Packet)] can only be used on structs with named fields")
};
Expand Down
12 changes: 12 additions & 0 deletions azalea-registry/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3219,6 +3219,7 @@ enum LootConditionKind {
registry! {
enum LootFunctionKind {
SetCount => "minecraft:set_count",
SetItem => "minecraft:set_item",
EnchantWithLevels => "minecraft:enchant_with_levels",
EnchantRandomly => "minecraft:enchant_randomly",
SetEnchantments => "minecraft:set_enchantments",
Expand All @@ -3233,6 +3234,8 @@ enum LootFunctionKind {
SetStewEffect => "minecraft:set_stew_effect",
CopyName => "minecraft:copy_name",
SetContents => "minecraft:set_contents",
ModifyContents => "minecraft:modify_contents",
Filtered => "minecraft:filtered",
LimitCount => "minecraft:limit_count",
ApplyBonus => "minecraft:apply_bonus",
SetLootTable => "minecraft:set_loot_table",
Expand All @@ -3254,6 +3257,7 @@ enum LootFunctionKind {
SetWritableBookPages => "minecraft:set_writable_book_pages",
ToggleTooltips => "minecraft:toggle_tooltips",
SetOminousBottleAmplifier => "minecraft:set_ominous_bottle_amplifier",
SetCustomModelData => "minecraft:set_custom_model_data",
}
}

Expand Down Expand Up @@ -6337,6 +6341,14 @@ enum ItemSubPredicateKind {
StoredEnchantments => "minecraft:stored_enchantments",
PotionContents => "minecraft:potion_contents",
CustomData => "minecraft:custom_data",
Container => "minecraft:container",
BundleContents => "minecraft:bundle_contents",
FireworkExplosion => "minecraft:firework_explosion",
Fireworks => "minecraft:fireworks",
WritableBookContent => "minecraft:writable_book_content",
WrittenBookContent => "minecraft:written_book_content",
AttributeModifiers => "minecraft:attribute_modifiers",
Trim => "minecraft:trim",
}
}

Expand Down
Loading
Loading