Commit Graph

818 Commits

Author SHA1 Message Date
Bjarne Koll
5933bd5bf3 TrialSpawner compile fixes 2025-06-01 14:39:40 +02:00
Owen1212055
df96454561 Fixup whatever happened here 2025-05-31 13:28:35 -04:00
Owen1212055
e49b5e88fa Fix compile issues:
- Changes:
Turtle now included in the experience orb dropped
- Todo: See what spigot does for CraftEquippableComponent serialization
2025-05-31 13:21:48 -04:00
Bjarne Koll
19a36413c7 Last per file patches 2025-05-31 14:44:19 +02:00
Bjarne Koll
4fe0ac240b Some more comments 2025-05-31 14:28:59 +02:00
Bjarne Koll
4a903d8124 Readd dropped diff
Additionally, add some identifying messages to paper comments added by
our more junior developer during the update process.
2025-05-31 14:23:06 +02:00
Owen1212055
92ece7b625 Fix dropped diff 2025-05-29 23:42:18 -04:00
Owen1212055
2f152e015d Fix some compile errors 2025-05-29 21:52:43 -04:00
Owen1212055
f44197c4da net/minecraft/world/entity/item
random other server classes

Note: Scoreboards may need handling for the waypoints.

/net/minecraft/world/entity/animal/wolf

Also properly mark the item dropped when shearing as force drops
2025-05-29 21:32:46 -04:00
Owen1212055
6d71abd25f Other random classes
net/minecraft/core/dispenser/
2025-05-29 21:32:46 -04:00
Owen1212055
4a82168542 ServerPlayer, ServerLevel, ServerEntity
net/minecraft/world/entity/vehicle/

Nothing much to note, reworked the loot table inventory serialization a bit

net/minecraft/world/level/

net/minecraft/world/entity/player
2025-05-29 21:32:46 -04:00
Owen1212055
62c4dda5f4 /net/minecraft/world/entity/monster
Some blocks

LayeredCauldronBlock.java.patch has strange diff-- the comment seems to be a red herring.

net/minecraft/network/protocol/login/
2025-05-29 17:15:45 -04:00
Owen1212055
d251511d35 net\minecraft\world\entity\projectile\ 2025-05-29 16:33:59 -04:00
Owen1212055
e0437448dd /net/minecraft/world/entity/decoration/
Note that a method was removed on Armorstand for a bug fix that makes literally zero sense, probably very old.
Also added and fixed the logic for leashes, as any entity can hold leashes but anything can be leashed.

Also very sad hack used to detect if the value was set.

/net/minecraft/world/level/block/entity/trialspawner/

/net/minecraft/server/network
2025-05-29 15:56:14 -04:00
Bjarne Koll
ca8da0e3ca Commands
ExperienceOrb award methods were consolidated to avoid this large of a
conflict in future versions for what is a single override.
Callers are expected to now pass null to the 3rd overload param as well.
2025-05-29 17:46:55 +02:00
Bjarne Koll
0795cbed25 Entity 2025-05-28 22:36:46 +02:00
Noah van der Aa
912e35ba5e work 2025-05-28 15:32:29 +02:00
Noah van der Aa
8fee18401c patch batch 2025-05-28 15:08:46 +02:00
Bjarne Koll
40c8d4f900 Couple of block entities 2025-05-28 13:57:49 +02:00
Bjarne Koll
b745ab65e6 Begin 1.21.6-pre1
Initial move of patches to rejected and non rejected source patches to
publish to patch-roulette.
2025-05-28 13:23:32 +02:00
Newwind
84ee4249c9 Add Map filled event (#12574) 2025-05-24 22:45:32 +02:00
Pedro
220b57add4 Fixs and Improvements for EndermanEscapeEvent (#12570) 2025-05-24 21:53:02 +02:00
Pedro
87349c317f Fix CombatTracker stale on death (#12562) 2025-05-21 18:19:08 +02:00
brickmonster
fa360aa836 Add some missing annotations and an incorrect one (#12204) 2025-05-18 18:31:49 -04:00
Pedro
cc38032bee Deprecate TeleportCause CHORUS_FRUIT for CONSUMABLE_EFFECT (#12546) 2025-05-18 16:33:21 +02:00
Pedro
841d634230 Fix ItemStack#addUnsafeEnchantment ignored for missing enchantment component (#12549) 2025-05-17 16:13:08 +02:00
Namiu/うにたろう
d683970d40 Add FishHookStateChangeEvent (#12165) 2025-05-15 20:17:32 +02:00
Nassim Jahnke
358e72ec0d Remove simplify remote item matching stuff for now
Twas broken for some time and I haven't had time to address it, this may be revisited later in a different way
2025-05-09 14:47:24 +02:00
David
cbcf75a57c Update visual fire handling with TriState support (#12303)
Replaced the Boolean-based visual fire system with TriState for improved clarity and flexibility, enabling three distinct states: TRUE, FALSE, and NOT_SET. Deprecated older methods in favor of new ones and updated internal handling to reflect these changes. Adjusted serialization and deserialization logic to accommodate the new TriState implementation.
2025-05-07 23:33:41 +02:00
Mart
88a3a87015 Configurable xp orb merge group count (#12503) 2025-05-03 20:51:19 +02:00
Pedro
6f1f5b67e0 Fix ArmorStand items for canceled EntityDeathEvent (#12288)
Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com>
2025-05-02 23:19:15 +02:00
TonytheMacaroni
1074237311 Pass correct draw strength for EntityShootBowEvent (#12308) 2025-05-02 16:05:50 -04:00
Pedro
d637ae85dd Fix NoSuchElementException in EntityTransformEvent for slimes (#12510) 2025-05-02 21:15:58 +02:00
Shane Freeder
cb3ffd0b4a Don't store empty PDCs on raids 2025-05-02 20:02:34 +01:00
Shane Freeder
93246a0730 Fix errors when loading raid files without a PDC 2025-05-02 19:43:06 +01:00
Miles
2754d7c3b9 Add Throw EntityChangeBlockEvent for BrushableBlockEntity#brush (#12133) 2025-04-30 14:03:40 -04:00
Pedro
5acfdd6af4 Fix save/load NaN Entity Motion (#12269) 2025-04-30 19:53:32 +02:00
Illia Bondar
e663f99982 Add combat tracker API (#11853) 2025-04-30 19:24:33 +02:00
Dqu1J
646b80ca53 Fix unnecessary map data saves (#12296) 2025-04-30 11:51:13 -04:00
Bjarne Koll
b9d3147d3b Use correct placed block position for sound (#12410)
Previously the server attempted to compute the block placed by using the
BlockPlaceContext. This approach however fails on replacable blocks, as
the BlockPlaceContext computes this during its construction, which
happened after the actual world modification.

The commit reworks this approach and now stores metadata in the
InteractionResult which can later be read.
The diff is structured to allow for easy future expansion of the tracked
metadata.
2025-04-27 14:19:42 +02:00
Warrior
f86b435228 Add vault change state event (#12069) 2025-04-26 16:34:12 +02:00
gecko10000
9cddf136d7 Fix portal create event block list (#12373) 2025-04-24 18:10:13 +02:00
Bjarne Koll
ed322043d0 Clone blockpos in InsideBlockEffectApplier record 2025-04-14 18:31:39 +02:00
David
33e8928f53 Add support for bonus chest configuration in WorldCreator (#12344) 2025-04-14 17:24:19 +02:00
Bjarne Koll
de410d13ef Fix reobf mappings regression in GameRules.Type (#12437)
The recent commit 121a7bf4eb added
the interface FeatureElement to the GameRules.Type class to expose the
stored feature flags of gamerules.
This however messed with the reobf mappings spigot uses, as the now
overridden method requiredFeatures needs to be mapped to the same
obfuscated name as FeatureElement#requiredFeatures.

To avoid having this in the mappings patch, the commit removes the
inheritance again and instead exposes a wrapper method.
2025-04-14 17:05:01 +02:00
DerEchtePilz
121a7bf4eb Make GameRule a FeatureDependant (#12429) 2025-04-14 13:21:14 +02:00
KioProject
91bfb6fb7e Fix freeze locked (#12434) 2025-04-14 11:47:27 +02:00
Bjarne Koll
8f62e0fb31 Correctly order getArmorContents
Mojangs EQUIPMENT_SLOT_MAPPING uses an Int2ObjectArrayMap and hence
technically does provide iteration stability, however it is filled from
a MapN, which destroys the well order of the entries.
To iterate from smallest to largest inventory index correctly, this
commit introduces a sorted array based on the EQUIPMENT_SLOT_MAPPING.
2025-04-13 11:41:59 +02:00
Nassim Jahnke
f00727c57e 1.21.5
Co-authored-by: Bjarne Koll <git@lynxplay.dev>
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Co-authored-by: MiniDigger | Martin <admin@minidigger.dev>
Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
Co-authored-by: Noah van der Aa <ndvdaa@gmail.com>
Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Co-authored-by: Shane Freeder <theboyetronic@gmail.com>
Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com>
Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
2025-04-12 17:27:00 +02:00
Nassim Jahnke
9b1798d643 Simplify custom payload handling (#12347) 2025-03-27 14:22:38 +01:00