diff --git a/src/main/java/com/teammoeg/frostedheart/mixin/noremap/NonvanillaBonemealableBlockMixin_CheckTemp.java b/src/main/java/com/teammoeg/frostedheart/mixin/caupona/CauponaBonemealableBlockMixin_CheckTemp.java similarity index 74% rename from src/main/java/com/teammoeg/frostedheart/mixin/noremap/NonvanillaBonemealableBlockMixin_CheckTemp.java rename to src/main/java/com/teammoeg/frostedheart/mixin/caupona/CauponaBonemealableBlockMixin_CheckTemp.java index e74d5647a..69e788127 100644 --- a/src/main/java/com/teammoeg/frostedheart/mixin/noremap/NonvanillaBonemealableBlockMixin_CheckTemp.java +++ b/src/main/java/com/teammoeg/frostedheart/mixin/caupona/CauponaBonemealableBlockMixin_CheckTemp.java @@ -1,31 +1,29 @@ -package com.teammoeg.frostedheart.mixin.noremap; +package com.teammoeg.frostedheart.mixin.caupona; -import blusunrize.immersiveengineering.common.blocks.plant.HempBlock; import com.teammoeg.caupona.blocks.plants.FruitsLeavesBlock; import com.teammoeg.caupona.blocks.plants.SilphiumBlock; import com.teammoeg.frostedheart.base.event.PerformBonemealEvent; -import com.teammoeg.frostedheart.content.climate.WorldTemperature; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; -import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.MinecraftForge; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(value = { SilphiumBlock.class, FruitsLeavesBlock.class }) -public class NonvanillaBonemealableBlockMixin_CheckTemp { +public class CauponaBonemealableBlockMixin_CheckTemp { /** * @reason Check if the block can be bonemealed * @author yuesha-yc + * + * Note: Must set remap to be true as this performBonemeal is from minecraft interface. */ - @Inject(method = "performBonemeal", at = @At("HEAD"), cancellable = true, remap = false) + @Inject(method = "performBonemeal", at = @At("HEAD"), cancellable = true) private void fh$checkTempForBonemeal(ServerLevel pLevel, RandomSource pRandom, BlockPos pPos, BlockState pState, CallbackInfo ci) { if (MinecraftForge.EVENT_BUS.post(new PerformBonemealEvent(pLevel, pPos, pState, pRandom))) { ci.cancel(); diff --git a/src/main/resources/frostedheart.mixins.json b/src/main/resources/frostedheart.mixins.json index 3ae5f7c77..32462c960 100644 --- a/src/main/resources/frostedheart.mixins.json +++ b/src/main/resources/frostedheart.mixins.json @@ -62,7 +62,7 @@ "minecraft.temperature.SnowLayerBlockMixin_Melt", "minecraft.research.BlockEntityMixin_Research", "minecraft.temperature.VillagerMixin", - "noremap.NonvanillaBonemealableBlockMixin_CheckTemp" + "caupona.CauponaBonemealableBlockMixin_CheckTemp" ], "client": [ "client.BossHealthOverlayAccess",