delete conditional mixin dep

HO-Artisan · Oct 6, 2023 · d40b51d · d40b51d
1 parent 1431e54
commit d40b51d
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 60 deletions.
diff --git a/build.gradle b/build.gradle
@@ -38,7 +38,6 @@ dependencies {
 	modImplementation "io.github.fabricators_of_create.Porting-Lib:Porting-Lib:${project.portinglib_version}"
 	modLocalRuntime "maven.modrinth:forge-config-api-port:${project.forgeconfigapiport_version}"
 
-	include(modImplementation("com.github.Fallen-Breath:conditional-mixin:${project.conditionalmixin_version}"))
 	modImplementation "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -21,4 +21,3 @@ org.gradle.parallel=true
 	forgeconfigapiport_version=v8.0.0-1.20.1-Fabric
 	create_version=0.5.1-d-build.1161+mc1.20.1
 	portinglib_version=2.1.1127+1.20
-	conditionalmixin_version=v0.3.2
diff --git a/src/main/java/ho/artisan/createreibugfix/CREIBFModMixinConfigPlugin.java b/src/main/java/ho/artisan/createreibugfix/CREIBFModMixinConfigPlugin.java
diff --git a/src/main/java/ho/artisan/createreibugfix/CreateFabricREIBugFixMod.java b/src/main/java/ho/artisan/createreibugfix/CreateFabricREIBugFixMod.java
@@ -37,8 +37,5 @@ public class CreateFabricREIBugFixMod implements ModInitializer {
 	@Override
 	public void onInitialize() {
 		LOGGER.info(StringUtils.MODNAME + " (" + StringUtils.MODID + ") " + " is loaded!");
-		if (FabricLoader.getInstance().isModLoaded(StringUtils.createsdelight_modid)) {
-			LOGGER.warn(StringUtils.MODNAME + "incompatibility with Creates Delight!");
-		}
 	}
 }
diff --git a/src/main/java/ho/artisan/createreibugfix/mixin/AssemblySpoutingMixin.java b/src/main/java/ho/artisan/createreibugfix/mixin/AssemblySpoutingMixin.java
@@ -27,25 +27,21 @@
 import com.simibubi.create.content.processing.sequenced.SequencedRecipe;
 
 import ho.artisan.createreibugfix.utils.REICreateUtils;
-import ho.artisan.createreibugfix.utils.StringUtils;
 
 import me.shedaniel.math.Point;
 import me.shedaniel.rei.api.client.gui.widgets.Widget;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 
-import me.fallenbreath.conditionalmixin.api.annotation.Condition;
-import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
-
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.ModifyArgs;
 import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
 
 import java.util.List;
-@Restriction(conflict = @Condition(StringUtils.createsdelight_modid))
+
 @Mixin(ReiSequencedAssemblySubCategory.AssemblySpouting.class)
 @Environment(EnvType.CLIENT)
 public class AssemblySpoutingMixin {

diff --git a/src/main/java/ho/artisan/createreibugfix/mixin/BasinCategoryMixin.java b/src/main/java/ho/artisan/createreibugfix/mixin/BasinCategoryMixin.java
@@ -29,7 +29,6 @@
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 import com.simibubi.create.foundation.utility.Pair;
 
-import ho.artisan.createreibugfix.utils.StringUtils;
 import ho.artisan.createreibugfix.utils.REICreateUtils;
 
 import me.shedaniel.math.Point;
@@ -45,9 +44,6 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 
-import me.fallenbreath.conditionalmixin.api.annotation.Condition;
-import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
-
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -59,7 +55,6 @@
 
 import java.util.List;
 
-@Restriction(conflict = @Condition(StringUtils.createsdelight_modid))
 @Mixin(BasinCategory.class)
 @Environment(EnvType.CLIENT)
 public class BasinCategoryMixin {

diff --git a/src/main/java/ho/artisan/createreibugfix/mixin/CreateDisplayMixin.java b/src/main/java/ho/artisan/createreibugfix/mixin/CreateDisplayMixin.java
@@ -26,21 +26,16 @@
 import com.simibubi.create.compat.rei.display.CreateDisplay;
 
 import ho.artisan.createreibugfix.inject.CreateDisplayInject;
-import ho.artisan.createreibugfix.utils.StringUtils;
 
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 
 import net.minecraft.recipe.Recipe;
 
-import me.fallenbreath.conditionalmixin.api.annotation.Condition;
-import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
-
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyArgs;
 import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
 
-@Restriction(conflict = @Condition(StringUtils.createsdelight_modid))
 @Mixin(CreateDisplay.class)
 public abstract class CreateDisplayMixin {
     @ModifyArgs(method = "<init>(Lnet/minecraft/recipe/Recipe;Lme/shedaniel/rei/api/common/category/CategoryIdentifier;)V", at = @At(value = "INVOKE", target = "Lcom/simibubi/create/compat/rei/display/CreateDisplay;<init>(Lnet/minecraft/recipe/Recipe;Lme/shedaniel/rei/api/common/category/CategoryIdentifier;Ljava/util/List;Ljava/util/List;)V"))

diff --git a/src/main/java/ho/artisan/createreibugfix/mixin/CrushingCategoryMixin.java b/src/main/java/ho/artisan/createreibugfix/mixin/CrushingCategoryMixin.java
@@ -29,7 +29,6 @@
 import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 
 import ho.artisan.createreibugfix.inject.CrushingCategoryInject;
-import ho.artisan.createreibugfix.utils.StringUtils;
 
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
@@ -40,9 +39,6 @@
 
 import org.objectweb.asm.Opcodes;
 
-import me.fallenbreath.conditionalmixin.api.annotation.Condition;
-import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
-
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -52,7 +48,6 @@
 
 import java.util.List;
 
-@Restriction(conflict = @Condition(StringUtils.createsdelight_modid))
 @Mixin(CrushingCategory.class)
 @Environment(EnvType.CLIENT)
 public class CrushingCategoryMixin {

diff --git a/src/main/java/ho/artisan/createreibugfix/mixin/MillingCategoryMixin.java b/src/main/java/ho/artisan/createreibugfix/mixin/MillingCategoryMixin.java
@@ -29,7 +29,6 @@
 import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 
 import ho.artisan.createreibugfix.inject.MillingCategoryInject;
-import ho.artisan.createreibugfix.utils.StringUtils;
 
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
@@ -38,9 +37,6 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 
-import me.fallenbreath.conditionalmixin.api.annotation.Condition;
-import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
-
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -49,7 +45,6 @@
 
 import java.util.List;
 
-@Restriction(conflict = @Condition(StringUtils.createsdelight_modid))
 @Mixin(MillingCategory.class)
 @Environment(EnvType.CLIENT)
 public abstract class MillingCategoryMixin {

diff --git a/src/main/java/ho/artisan/createreibugfix/mixin/SequencedAssemblyRecipeMixin.java b/src/main/java/ho/artisan/createreibugfix/mixin/SequencedAssemblyRecipeMixin.java
@@ -26,19 +26,14 @@
 import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
 
-import ho.artisan.createreibugfix.utils.StringUtils;
 import ho.artisan.createreibugfix.inject.SequencedAssemblyRecipeInject;
 
-import me.fallenbreath.conditionalmixin.api.annotation.Condition;
-import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
-
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 import java.util.List;
 
-@Restriction(conflict = @Condition(StringUtils.createsdelight_modid))
 @Mixin(SequencedAssemblyRecipe.class)
 public abstract class SequencedAssemblyRecipeMixin implements SequencedAssemblyRecipeInject.Interface {
     @Final

diff --git a/src/main/java/ho/artisan/createreibugfix/utils/StringUtils.java b/src/main/java/ho/artisan/createreibugfix/utils/StringUtils.java
@@ -26,5 +26,4 @@
 public class StringUtils {
     public static final String MODID = "createreibugfix";
     public static final String MODNAME = "CreateFabric&REIBugFix";
-    public static final String createsdelight_modid = "createsdelight";
 }
diff --git a/src/main/resources/createreibugfix.mixins.json b/src/main/resources/createreibugfix.mixins.json
@@ -3,7 +3,6 @@
   "minVersion": "0.8",
   "package": "ho.artisan.createreibugfix.mixin",
   "compatibilityLevel": "JAVA_17",
-  "plugin": "ho.artisan.createreibugfix.CREIBFModMixinConfigPlugin",
   "mixins": [
     "SequencedAssemblyRecipeMixin"
   ],