diff --git a/src/main/java/com/mobiusflip/crimsonrevelations/CrimsonRevelations.java b/src/main/java/com/mobiusflip/crimsonrevelations/CrimsonRevelations.java index 0839276..53f9b46 100644 --- a/src/main/java/com/mobiusflip/crimsonrevelations/CrimsonRevelations.java +++ b/src/main/java/com/mobiusflip/crimsonrevelations/CrimsonRevelations.java @@ -17,7 +17,7 @@ public class CrimsonRevelations { public static final String MODID = "crimsonrevelations"; public static final String NAME = "New Crimson Revelations"; public static final String VERSION = "1.0"; - public static final String DEPENDENCIES = "required-after:thaumcraft@[1.12.2-6.1.BETA26,);after:thaumicaugmentation"; + public static final String DEPENDENCIES = "required-after:mixinbooter@[8.0,);required-after:thaumcraft@[1.12.2-6.1.BETA26,);after:thaumicaugmentation"; public static final CreativeTabs tabCR = new CRCreativeTabs(CreativeTabs.CREATIVE_TAB_ARRAY.length, "CrimsonRevelationsTab"); @Mod.Instance diff --git a/src/main/java/com/mobiusflip/crimsonrevelations/core/CRMixinLoader.java b/src/main/java/com/mobiusflip/crimsonrevelations/core/CRMixinLoader.java index 68bf08c..333a981 100644 --- a/src/main/java/com/mobiusflip/crimsonrevelations/core/CRMixinLoader.java +++ b/src/main/java/com/mobiusflip/crimsonrevelations/core/CRMixinLoader.java @@ -20,7 +20,7 @@ public class CRMixinLoader implements ILateMixinLoader { private static final Map> commonMixinConfigs = ImmutableMap.copyOf(new HashMap>() { { - + put("mixins.crimsonrevelations.json", () -> true); } }); diff --git a/src/main/java/com/mobiusflip/crimsonrevelations/mixin/TCEntityEventsMixin.java b/src/main/java/com/mobiusflip/crimsonrevelations/mixin/TCEntityEventsMixin.java new file mode 100644 index 0000000..25b2844 --- /dev/null +++ b/src/main/java/com/mobiusflip/crimsonrevelations/mixin/TCEntityEventsMixin.java @@ -0,0 +1,21 @@ +package com.mobiusflip.crimsonrevelations.mixin; + +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 com.mobiusflip.crimsonrevelations.entity.boss.EntityOvergrownTaintacle; + +import net.minecraftforge.event.entity.living.LivingDropsEvent; +import thaumcraft.common.lib.events.EntityEvents; + +@Mixin(value = EntityEvents.class, remap = false) +public class TCEntityEventsMixin { + @Inject(method = "livingDrops", at = @At(value = "HEAD"), cancellable = true) + public void crLivingDrops(LivingDropsEvent event, CallbackInfo ci) + { + // No hardcoded treasure bag drop + if (!event.getEntity().world.isRemote && event.isRecentlyHit() && event.getEntity() instanceof EntityOvergrownTaintacle) ci.cancel(); + } +} diff --git a/src/main/resources/mixins.crimsonrevelations.json b/src/main/resources/mixins.crimsonrevelations.json new file mode 100644 index 0000000..7905a5c --- /dev/null +++ b/src/main/resources/mixins.crimsonrevelations.json @@ -0,0 +1,11 @@ +{ + "package": "com.mobiusflip.crimsonrevelations.mixin", + "refmap": "crimsonrevelations.refmap.json", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "TCEntityEventsMixin" + ], + "client": [], + "server": [] +} \ No newline at end of file