Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@MixinConfig(name = FermiumMixins.MODID)
public class SpawnerControlConfig {

@Config.Comment("Makes curing Zombie Villagers and Pig lightning conversions count as a kill for spawners")
@Config.Comment("Makes curing Zombie Villagers, Silverfish, and Pig lightning conversions count as a kill for spawners")
@Config.Name("Curing/Conversion Ticks Spawners (MobSpawnerControl)")
@Config.RequiresMcRestart
@MixinConfig.MixinToggle(earlyMixin = "mixins.fermiummixins.early.spawnercontrol.curing.json", defaultValue = false)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package fermiummixins.mixin.spawnercontrol.vanilla;

import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
import fermiummixins.wrapper.SpawnerControlWrapper;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;

@Mixin(targets = "net.minecraft.entity.monster.EntitySilverfish$AIHideInStone")
public abstract class EntitySilverFish_BlockInfestMixin extends EntityAIWander {


public EntitySilverFish_BlockInfestMixin(EntityCreature creatureIn, double speedIn) {
super(creatureIn, speedIn);
}

@WrapWithCondition(
method = "startExecuting",
at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;I)Z")
)
public boolean fermiummixins_vanillaEntitySilverfish$AIHideInStone_startExecuting(World world, BlockPos pos, IBlockState newState, int flags){
SpawnerControlWrapper.increaseSpawnerCount(this.entity);
return !SpawnerControlWrapper.shouldCancelDrops(this.entity); // Don't set infested block
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"minVersion": "0.8",
"mixins": [
"spawnercontrol.vanilla.EntityZombieVillager_CuringMixin",
"spawnercontrol.vanilla.EntitySilverFish_BlockInfestMixin",
"spawnercontrol.vanilla.EntityPig_CuringMixin"
]
}