diff --git a/gradle.properties b/gradle.properties index 0cc36c5e..7c005e67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -91,7 +91,7 @@ usesMixins = true separateMixinSourceSet = # Adds some debug arguments like verbose output and class export. -usesMixinDebug = false +usesMixinDebug = true # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = diff --git a/src/main/java/chylex/hee/HEECore.java b/src/main/java/chylex/hee/HEECore.java index 196131e0..06db7afe 100644 --- a/src/main/java/chylex/hee/HEECore.java +++ b/src/main/java/chylex/hee/HEECore.java @@ -1,13 +1,12 @@ package chylex.hee; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import com.gtnewhorizon.gtnhlib.mixin.IMixins; import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader; -import chylex.hee.mixins.Mixins; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; public class HEECore implements IFMLLoadingPlugin, IEarlyMixinLoader { @@ -19,7 +18,7 @@ public class HEECore implements IFMLLoadingPlugin, IEarlyMixinLoader { @Override public List getMixins(Set loadedCoreMods) { - return IMixins.getEarlyMixins(Mixins.class, loadedCoreMods); + return Collections.singletonList("minecraft.MixinBlock_ReplaceDragonEgg"); } @Override diff --git a/src/main/java/chylex/hee/mixins/Mixins.java b/src/main/java/chylex/hee/mixins/Mixins.java deleted file mode 100644 index 6e14e96d..00000000 --- a/src/main/java/chylex/hee/mixins/Mixins.java +++ /dev/null @@ -1,70 +0,0 @@ -package chylex.hee.mixins; - -import static com.gtnewhorizon.gtnhlib.mixin.TargetedMod.VANILLA; - -import java.util.List; -import java.util.function.Supplier; - -import com.gtnewhorizon.gtnhlib.mixin.IMixins; -import com.gtnewhorizon.gtnhlib.mixin.ITargetedMod; -import com.gtnewhorizon.gtnhlib.mixin.MixinBuilder; -import com.gtnewhorizon.gtnhlib.mixin.Phase; -import com.gtnewhorizon.gtnhlib.mixin.Side; - -public enum Mixins implements IMixins { - - REPLACE_DRAGON_EGG(new MixinBuilder("Replaces the dragon egg").setApplyIf(() -> true) - .addMixinClasses("minecraft.MixinBlock").addTargetedMod(VANILLA).setSide(Side.BOTH).setPhase(Phase.EARLY)); - - private final List mixinClasses; - private final List targetedMods; - private final List excludedMods; - private final Supplier applyIf; - private final Phase phase; - private final Side side; - - Mixins(MixinBuilder builder) { - mixinClasses = builder.mixinClasses; - targetedMods = builder.targetedMods; - excludedMods = builder.excludedMods; - applyIf = builder.applyIf; - phase = builder.phase; - side = builder.side; - - if (mixinClasses.isEmpty()) throw new RuntimeException("No mixin class specified for Mixin : " + name()); - if (targetedMods.isEmpty()) throw new RuntimeException("No targeted mods specified for Mixin : " + name()); - if (applyIf == null) throw new RuntimeException("No ApplyIf function specified for Mixin : " + name()); - if (phase == null) throw new RuntimeException("No Phase specified for Mixin : " + name()); - if (side == null) throw new RuntimeException("No Side function specified for Mixin : " + name()); - } - - @Override - public List getMixinClasses() { - return mixinClasses; - } - - @Override - public Supplier getApplyIf() { - return applyIf; - } - - @Override - public Phase getPhase() { - return phase; - } - - @Override - public Side getSide() { - return side; - } - - @Override - public List getTargetedMods() { - return targetedMods; - } - - @Override - public List getExcludedMods() { - return excludedMods; - } -} diff --git a/src/main/java/chylex/hee/mixins/early/minecraft/MixinBlock.java b/src/main/java/chylex/hee/mixins/early/minecraft/MixinBlock_ReplaceDragonEgg.java similarity index 95% rename from src/main/java/chylex/hee/mixins/early/minecraft/MixinBlock.java rename to src/main/java/chylex/hee/mixins/early/minecraft/MixinBlock_ReplaceDragonEgg.java index 2b770ca1..3e7d4e63 100644 --- a/src/main/java/chylex/hee/mixins/early/minecraft/MixinBlock.java +++ b/src/main/java/chylex/hee/mixins/early/minecraft/MixinBlock_ReplaceDragonEgg.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Slice; import chylex.hee.block.BlockDragonEggCustom; @Mixin(Block.class) -public class MixinBlock { +public class MixinBlock_ReplaceDragonEgg { @ModifyArg( method = "registerBlocks",