Skip to content

Commit a78cbf3

Browse files
committed
Manual remapping fixes
1 parent c76e56e commit a78cbf3

File tree

66 files changed

+86
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+86
-110
lines changed

src/main/java/com/github/quiltservertools/ledger/mixin/AnvilMenuMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private static void ledgerLogAnvilBreak(Player player, Level world, BlockPos pos
3333

3434
@ModifyArgs(method = "method_24922",
3535
at = @At(value = "INVOKE",
36-
target = "Lnet/minecraft/world/level/Level;setBlockState(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Z"))
36+
target = "Lnet/minecraft/world/level/Level;setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Z"))
3737
private static void ledgerLogAnvilChange(Args args, Player player, Level world, BlockPos pos) {
3838
BlockState newBlockState = args.get(1);
3939
BlockChangeCallback.EVENT.invoker().changeBlock(

src/main/java/com/github/quiltservertools/ledger/mixin/AxeItemMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
@Mixin(AxeItem.class)
1717
public abstract class AxeItemMixin {
18-
@ModifyArgs(method = "useOn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;setBlockState(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Z"))
18+
@ModifyArgs(method = "useOn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Z"))
1919
public void logAxeUsage(Args args, UseOnContext context) {
2020
Level world = context.getLevel();
2121
BlockPos pos = context.getClickedPos();

src/main/java/com/github/quiltservertools/ledger/mixin/BaseContainerBlockEntityMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
@Mixin(BaseContainerBlockEntity.class)
1313
public abstract class BaseContainerBlockEntityMixin extends BlockEntity implements LocationalInventory {
14-
public LockableContainerBlockEntityMixin(BlockEntityType<?> type, BlockPos pos, BlockState state) {
14+
public BaseContainerBlockEntityMixin(BlockEntityType<?> type, BlockPos pos, BlockState state) {
1515
super(type, pos, state);
1616
}
1717

src/main/java/com/github/quiltservertools/ledger/mixin/BlockBehaviourMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public abstract class BlockBehaviourMixin {
2424
@Inject(
2525
method = "onExplosionHit",
2626
at = @At(
27-
value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;setBlockState(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Z"
27+
value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Z"
2828
)
2929
)
3030
private void ledgerBlockExplodeCallback(BlockState state, ServerLevel world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> stackMerger, CallbackInfo ci) {

src/main/java/com/github/quiltservertools/ledger/mixin/BlockMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
public abstract class BlockMixin {
1818
@Inject(
1919
method = "updateOrDestroy(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;II)V",
20-
at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/LevelAccessor;breakBlock(Lnet/minecraft/core/BlockPos;ZLnet/minecraft/world/entity/Entity;I)Z"))
20+
at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/LevelAccessor;destroyBlock(Lnet/minecraft/core/BlockPos;ZLnet/minecraft/world/entity/Entity;I)Z"))
2121
private static void ledgerTryLogSupportedBlockBreak(BlockState state, BlockState newState, LevelAccessor worldAccess, BlockPos pos, int flags, int maxUpdateDepth, CallbackInfo ci) {
2222
if (worldAccess instanceof Level world) {
2323
BlockBreakCallback.EVENT.invoker().breakBlock(world, pos.immutable(), state, state.hasBlockEntity() ? world.getBlockEntity(pos) : null, Sources.GRAVITY);

src/main/java/com/github/quiltservertools/ledger/mixin/BucketDispenserBehaviorMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
public abstract class BucketDispenserBehaviorMixin extends DefaultDispenseItemBehavior {
2020

2121
@Inject(
22-
method = "dispenseSilently",
22+
method = "execute",
2323
at = @At(
2424
value = "INVOKE",
2525
target = "Lnet/minecraft/world/level/block/BucketPickup;pickupBlock(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/item/ItemStack;",

src/main/java/com/github/quiltservertools/ledger/mixin/BucketItemMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public abstract class BucketItemMixin {
2929
@Final
3030
private Fluid content;
3131

32-
@Inject(method = "emptyContents", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;breakBlock(Lnet/minecraft/core/BlockPos;Z)Z"))
32+
@Inject(method = "emptyContents", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;destroyBlock(Lnet/minecraft/core/BlockPos;Z)Z"))
3333
private void logFluidBreak(LivingEntity user, Level world, BlockPos pos, BlockHitResult hitResult, CallbackInfoReturnable<Boolean> cir) {
3434
var blockstate = world.getBlockState(pos);
3535
if (!blockstate.isAir() && user instanceof Player player) {

src/main/java/com/github/quiltservertools/ledger/mixin/ChestBlockMixin.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ public abstract class ChestBlockMixin {
1616
@Shadow
1717
ChestBlockEntity val$first;
1818

19-
// TODO(Ravel): target method createMenu with the signature not found
2019
@Inject(
21-
method = "createMenu(ILnet/minecraft/entity/player/PlayerInventory;Lnet/minecraft/entity/player/PlayerEntity;)Lnet/minecraft/screen/ScreenHandler;",
20+
method = "createMenu(ILnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/inventory/AbstractContainerMenu;",
2221
at = @At("RETURN")
2322
)
2423
private void addPositionContext(int i, Inventory playerInventory, Player playerEntity, CallbackInfoReturnable<AbstractContainerMenu> cir) {

src/main/java/com/github/quiltservertools/ledger/mixin/CopperGolemGiveMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@Mixin(BehaviorUtils.class)
1717
public class CopperGolemGiveMixin {
1818

19-
@Inject(method = "throwItem(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;spawnEntity(Lnet/minecraft/world/entity/Entity;)Z"))
19+
@Inject(method = "throwItem(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;addFreshEntity(Lnet/minecraft/world/entity/Entity;)Z"))
2020
private static void onItemGiven(LivingEntity entity, ItemStack stack, Vec3 targetLocation, Vec3 velocityFactor, float yOffset, CallbackInfo ci, @Local ItemEntity itemEntity) {
2121
if (entity instanceof CopperGolem) {
2222
ItemDropCallback.EVENT.invoker().drop(itemEntity, entity);

src/main/java/com/github/quiltservertools/ledger/mixin/FlintAndSteelItemMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@Mixin(FlintAndSteelItem.class)
1616
public abstract class FlintAndSteelItemMixin {
17-
@ModifyArgs(method = "useOn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;setBlockState(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Z"))
17+
@ModifyArgs(method = "useOn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Z"))
1818
public void log(Args args, UseOnContext context) {
1919
BlockState state = args.get(1);
2020
BlockPos pos = args.get(0);

0 commit comments

Comments
 (0)