icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #668 from magneticflux-/fix-villager-mixin-signature

Browse Source 
Modify mixin signature to match 1.16 signature
This commit is contained in:
gnembon authored and GitHub committed 2021-01-13 01:53:40 -04:00
2 parents 5e7bab6b9e 0f90328e53
commit 3bf3c31160
1 file changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/mixins/VillagerEntity_aiMixin.java
+4 -3
View File
@@ -19,6 +19,7 @@ import net.minecraft.item.Items;
import net.minecraft.particle.ParticleTypes; import net.minecraft.particle.ParticleTypes;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.ActionResult;
import net.minecraft.util.dynamic.GlobalPos; import net.minecraft.util.dynamic.GlobalPos;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@@ -113,7 +114,7 @@ public abstract class VillagerEntity_aiMixin extends MerchantEntity
} }
@Inject(method = "interactMob", at = @At("HEAD"), cancellable = true) @Inject(method = "interactMob", at = @At("HEAD"), cancellable = true)
private void onInteract(PlayerEntity playerEntity_1, Hand hand_1, CallbackInfoReturnable<Boolean> cir) private void onInteract(PlayerEntity playerEntity_1, Hand hand_1, CallbackInfoReturnable<ActionResult> cir)
{ {
if (MobAI.isTracking(this, MobAI.TrackingType.VILLAGER_BREEDING)) if (MobAI.isTracking(this, MobAI.TrackingType.VILLAGER_BREEDING))
{ {
@@ -121,7 +122,7 @@ public abstract class VillagerEntity_aiMixin extends MerchantEntity
if (itemStack_1.getItem() == Items.EMERALD) if (itemStack_1.getItem() == Items.EMERALD)
{ {
GlobalPos bedPos = this.brain.getOptionalMemory(MemoryModuleType.HOME).orElse(null); GlobalPos bedPos = this.brain.getOptionalMemory(MemoryModuleType.HOME).orElse(null);
if (bedPos == null || bedPos.getDimension() != world.getRegistryKey()) // get DImension if (bedPos == null || bedPos.getDimension() != world.getRegistryKey()) // get Dimension
{ {
sayNo(); sayNo();
((ServerWorld) getEntityWorld()).spawnParticles(ParticleTypes.BARRIER, getX(), getY() + getStandingEyeHeight() + 1, getZ(), 1, 0.1, 0.1, 0.1, 0.0); ((ServerWorld) getEntityWorld()).spawnParticles(ParticleTypes.BARRIER, getX(), getY() + getStandingEyeHeight() + 1, getZ(), 1, 0.1, 0.1, 0.1, 0.0);
@@ -162,7 +163,7 @@ public abstract class VillagerEntity_aiMixin extends MerchantEntity
1, 0.1, 0.1, 0.1, 0.0); 1, 0.1, 0.1, 0.1, 0.0);
} }
} }
cir.setReturnValue(false); cir.setReturnValue(ActionResult.FAIL);
cir.cancel(); cir.cancel();
} }
} }