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

Dispenser stuff #666

Merged
merged 16 commits into from
Jan 23, 2025
Merged

Dispenser stuff #666

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
28622b1
rename n/m/util/math/BlockPointer -> n/m/block/dispenser/DispenserCon…
supersaiyansubtlety Nov 22, 2024
72bddfe
complete and clarify BlockHitResult
supersaiyansubtlety Nov 22, 2024
4d7df7f
map MinecartDispenserBehavior
supersaiyansubtlety Nov 22, 2024
d783f48
add simple type for Hand
supersaiyansubtlety Nov 22, 2024
b9a2ddd
map EquipmentDispenserBehavior
supersaiyansubtlety Nov 22, 2024
e723c40
complete n/m/block/dispenser
supersaiyansubtlety Nov 22, 2024
b4c8a8e
rename ItemDispenserBehavior -> DefaultDispenserBehavior
supersaiyansubtlety Nov 22, 2024
f8cdca0
restore old name Bootstrapper -> Bootstrap
supersaiyansubtlety Nov 25, 2024
1aaf5a0
Merge branch '1.21.4-pre2' into dispenser-stuff
supersaiyansubtlety Nov 27, 2024
07faeb8
Merge branch '1.21.4-rc3' into dispenser-stuff
github-actions[bot] Dec 2, 2024
2d4e8bf
Drop invalid mappings
actions-user Dec 2, 2024
f95f53f
re-complete DispenserBehavior
supersaiyansubtlety Dec 3, 2024
ada639e
Merge branch '1.21.4' into dispenser-stuff
github-actions[bot] Dec 4, 2024
809f8dc
Drop invalid mappings
actions-user Dec 4, 2024
fbf0f83
Merge branch '25w02a' into dispenser-stuff
github-actions[bot] Jan 15, 2025
bbbb968
update javadoc references in WorldEvents
supersaiyansubtlety Jan 18, 2025
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
Next Next commit
rename n/m/util/math/BlockPointer -> n/m/block/dispenser/DispenserCon… 
…text:

it holds a DispenserBlockEntity and is used by DispenserBehaviors, context is more conventional than pointer
  • Loading branch information
@supersaiyansubtlety
supersaiyansubtlety committed Nov 22, 2024
commit 28622b1ae176dfcd7a34941eac426fb76744076a
4 changes: 3 additions & 1 deletion mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
CLASS net/minecraft/unmapped/C_ooeeaffg net/minecraft/block/dispenser/DispenserBehavior
FIELD f_qafvtfzb LOGGER Lorg/slf4j/Logger;
FIELD f_szadkszc NOOP Lnet/minecraft/unmapped/C_ooeeaffg;
METHOD dispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 context
METHOD m_ujgviwhs doDispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 0 pointer
ARG 0 context
ARG 1 stack
METHOD m_ummkrstn registerDefaults ()V
2 changes: 1 addition & 1 deletion .../minecraft/util/math/BlockPointer.mapping → .../block/dispenser/DispenserContext.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_wzdnszcs net/minecraft/util/math/BlockPointer
CLASS net/minecraft/unmapped/C_wzdnszcs net/minecraft/block/dispenser/DispenserContext
FIELD f_iumwlodc world Lnet/minecraft/unmapped/C_bdwnwhiu;
METHOD m_eildmjnz world ()Lnet/minecraft/unmapped/C_bdwnwhiu;
METHOD m_jqrqggsy center ()Lnet/minecraft/unmapped/C_vgpupfxx;
8 changes: 4 additions & 4 deletions mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
CLASS net/minecraft/unmapped/C_dnfsxzwl net/minecraft/block/dispenser/ItemDispenserBehavior
FIELD f_vkzertet DEFAULT_SPAWN_VELOCITY_DEVIATION I
METHOD m_bzvzsacf spawnParticles (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)V
ARG 1 pointer
ARG 1 context
ARG 2 side
METHOD m_clhynwvb dispenseSilently (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 pointer
ARG 1 context
ARG 2 stack
METHOD m_fhxczazc insertAndSpawnExcess (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)V
ARG 1 block
@@ -14,9 +14,9 @@ CLASS net/minecraft/unmapped/C_dnfsxzwl net/minecraft/block/dispenser/ItemDispen
ARG 2 dispensedStack
ARG 3 remainder
METHOD m_nvxshqvu playSound (Lnet/minecraft/unmapped/C_wzdnszcs;)V
ARG 1 pointer
ARG 1 context
METHOD m_umjaspru playDefaultSound (Lnet/minecraft/unmapped/C_wzdnszcs;)V
ARG 0 pointer
ARG 0 context
METHOD m_yfabkxkw spawnDefaultParticles (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)V
ARG 0 block
ARG 1 direction