From a09981e807701551699dbd3b03e6b19bc9cf6804 Mon Sep 17 00:00:00 2001 From: altrisi Date: Wed, 26 Jan 2022 12:16:35 +0100 Subject: [PATCH] Revert missed `@Desc` annotation Those are not yet remapped on dev environment dependencies, making mods that depend on Carpet not be able to load in dev with different mappings --- .../mixins/StructureBlockBlockEntity_fillUpdatesMixin.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java b/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java index c8e46c05..0bc156ae 100644 --- a/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java +++ b/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java @@ -3,12 +3,10 @@ package carpet.mixins; import carpet.CarpetSettings; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Desc; import org.spongepowered.asm.mixin.injection.Redirect; import java.util.Random; import net.minecraft.core.BlockPos; -import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.block.entity.StructureBlockEntity; import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings; @@ -17,9 +15,9 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemp @Mixin(StructureBlockEntity.class) public abstract class StructureBlockBlockEntity_fillUpdatesMixin { - @Redirect(target = @Desc(args = {ServerLevel.class, boolean.class, StructureTemplate.class}, value = "loadStructure", ret = boolean.class, owner = StructureBlockEntity.class), at = @At( + @Redirect(method = "Lnet/minecraft/world/level/block/entity/StructureBlockEntity;loadStructure(Lnet/minecraft/server/level/ServerLevel;ZLnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate;)Z", at = @At( value = "INVOKE", - desc = @Desc(owner = StructureTemplate.class, value = "placeInWorld", args = {ServerLevelAccessor.class, BlockPos.class, BlockPos.class, StructurePlaceSettings.class, Random.class, int.class}, ret = boolean.class) + target = "Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate;placeInWorld(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructurePlaceSettings;Ljava/util/Random;I)Z" )) private boolean onStructurePlacen(StructureTemplate structure, ServerLevelAccessor serverWorldAccess, BlockPos pos, BlockPos blockPos, StructurePlaceSettings placementData, Random random, int i) {