0.1.5

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.1-SNAPSHOT'
+	id 'fabric-loom' version '1.2-SNAPSHOT'
 	id "io.github.juuxel.loom-quiltflower" version "1.+"
 	id 'maven-publish'
 }

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.parallel=true
 	loader_version=0.14.17
 
 # Mod Properties
-	mod_version=0.1.4-mc1.19.x
+	mod_version=0.1.5-create0.5.1-mc1.19.x
 	maven_group=ho.artisan.createreibugfix
 	archives_base_name=CreateFabricREIBugFix
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/ho/artisan/createreibugfix/ModMixinConfigPlugin.java → src/main/java/ho/artisan/createreibugfix/CREIBFModMixinConfigPlugin.java

@@ -5,7 +5,7 @@
 import java.util.List;
 import java.util.Set;
 
-public class ModMixinConfigPlugin extends RestrictiveMixinConfigPlugin {
+public class CREIBFModMixinConfigPlugin extends RestrictiveMixinConfigPlugin {
     @Override
     public String getRefMapperConfig() {
         return null;

src/main/java/ho/artisan/createreibugfix/CreateFabricREIBugFixMod.java

@@ -24,8 +24,10 @@
 package ho.artisan.createreibugfix;
 
 import ho.artisan.createreibugfix.utils.StringUtils;
+
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/ho/artisan/createreibugfix/inject/CreateDisplayInject.java

@@ -28,11 +28,15 @@
 import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
 import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
 import com.simibubi.create.content.processing.sequenced.SequencedRecipe;
+
 import ho.artisan.createreibugfix.utils.REICreateUtils;
+
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.entry.EntryIngredient;
 import me.shedaniel.rei.api.common.util.EntryIngredients;
+
 import net.minecraft.recipe.Recipe;
+
 import org.jetbrains.annotations.ApiStatus;
 import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
 

src/main/java/ho/artisan/createreibugfix/inject/CrushingCategoryInject.java

@@ -27,12 +27,16 @@
 import com.simibubi.create.compat.rei.category.CrushingCategory;
 import com.simibubi.create.compat.rei.display.CreateDisplay;
 import com.simibubi.create.content.kinetics.crusher.AbstractCrushingRecipe;
+
 import ho.artisan.createreibugfix.utils.REICreateUtils;
+
 import io.github.fabricators_of_create.porting_lib.util.FluidStack;
+
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.gui.widgets.Widget;
 import me.shedaniel.rei.api.common.util.EntryStacks;
+
 import net.minecraft.util.collection.DefaultedList;
 
 import java.util.List;

src/main/java/ho/artisan/createreibugfix/inject/MillingCategoryInject.java

@@ -26,14 +26,19 @@
 import com.simibubi.create.compat.rei.category.CreateRecipeCategory;
 import com.simibubi.create.compat.rei.display.CreateDisplay;
 import com.simibubi.create.content.kinetics.crusher.AbstractCrushingRecipe;
+
 import io.github.fabricators_of_create.porting_lib.util.FluidStack;
+
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.gui.widgets.Widget;
 import me.shedaniel.rei.api.common.util.EntryStacks;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+
 import net.minecraft.util.collection.DefaultedList;
+
 import ho.artisan.createreibugfix.utils.REICreateUtils;
 
 import java.util.List;

src/main/java/ho/artisan/createreibugfix/inject/SequencedAssemblyRecipeInject.java

@@ -25,6 +25,7 @@
 
 import com.simibubi.create.content.processing.recipe.ProcessingOutput;
 import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
+
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.List;

src/main/java/ho/artisan/createreibugfix/mixin/AssemblySpoutingMixin.java

@@ -25,14 +25,19 @@
 
 import com.simibubi.create.compat.rei.category.sequencedAssembly.ReiSequencedAssemblySubCategory;
 import com.simibubi.create.content.processing.sequenced.SequencedRecipe;
+
 import ho.artisan.createreibugfix.utils.REICreateUtils;
 import ho.artisan.createreibugfix.utils.StringUtils;
-import me.fallenbreath.conditionalmixin.api.annotation.Condition;
-import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
+
 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;

src/main/java/ho/artisan/createreibugfix/mixin/BasinCategoryMixin.java

@@ -28,32 +28,42 @@
 import com.simibubi.create.content.processing.basin.BasinRecipe;
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 import com.simibubi.create.foundation.utility.Pair;
+
 import ho.artisan.createreibugfix.utils.StringUtils;
-import me.fallenbreath.conditionalmixin.api.annotation.Condition;
-import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
+import ho.artisan.createreibugfix.utils.REICreateUtils;
+
 import me.shedaniel.math.Point;
 import me.shedaniel.rei.api.client.gui.widgets.Widget;
 import me.shedaniel.rei.api.common.entry.EntryIngredient;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.util.collection.DefaultedList;
+
 import org.apache.commons.lang3.mutable.MutableInt;
+
+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;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
-import ho.artisan.createreibugfix.utils.REICreateUtils;
+
 
 import java.util.List;
 
 @Restriction(conflict = @Condition(StringUtils.createsdelight_modid))
 @Mixin(BasinCategory.class)
 @Environment(EnvType.CLIENT)
 public class BasinCategoryMixin {
+    @Unique
     private final ThreadLocal<FluidIngredient> fluidIngredient = new ThreadLocal<>();
 
     @Inject(method = "addWidgets", at = @At(value = "INVOKE", target = "Lme/shedaniel/rei/api/common/util/EntryIngredients;of(Ldev/architectury/fluid/FluidStack;)Lme/shedaniel/rei/api/common/entry/EntryIngredient;", ordinal = 0, remap = false), locals = LocalCapture.CAPTURE_FAILHARD, remap = false)

src/main/java/ho/artisan/createreibugfix/mixin/CreateDisplayMixin.java

@@ -24,12 +24,17 @@
 package ho.artisan.createreibugfix.mixin;
 
 import com.simibubi.create.compat.rei.display.CreateDisplay;
+
 import ho.artisan.createreibugfix.inject.CreateDisplayInject;
 import ho.artisan.createreibugfix.utils.StringUtils;
-import me.fallenbreath.conditionalmixin.api.annotation.Condition;
-import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
+
 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;

src/main/java/ho/artisan/createreibugfix/mixin/CrushingCategoryMixin.java

@@ -27,16 +27,22 @@
 import com.simibubi.create.compat.rei.display.CreateDisplay;
 import com.simibubi.create.content.kinetics.crusher.AbstractCrushingRecipe;
 import com.simibubi.create.content.processing.recipe.ProcessingOutput;
+
 import ho.artisan.createreibugfix.inject.CrushingCategoryInject;
 import ho.artisan.createreibugfix.utils.StringUtils;
-import me.fallenbreath.conditionalmixin.api.annotation.Condition;
-import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
+
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.gui.widgets.Widget;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+
 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;

src/main/java/ho/artisan/createreibugfix/mixin/MillingCategoryMixin.java

@@ -27,15 +27,20 @@
 import com.simibubi.create.compat.rei.display.CreateDisplay;
 import com.simibubi.create.content.kinetics.crusher.AbstractCrushingRecipe;
 import com.simibubi.create.content.processing.recipe.ProcessingOutput;
+
 import ho.artisan.createreibugfix.inject.MillingCategoryInject;
 import ho.artisan.createreibugfix.utils.StringUtils;
-import me.fallenbreath.conditionalmixin.api.annotation.Condition;
-import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
+
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 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.Inject;

src/main/java/ho/artisan/createreibugfix/mixin/SequencedAssemblyRecipeMixin.java

@@ -25,13 +25,16 @@
 
 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 ho.artisan.createreibugfix.inject.SequencedAssemblyRecipeInject;
 
 import java.util.List;
 

src/main/java/ho/artisan/createreibugfix/utils/REICreateUtils.java

@@ -30,26 +30,31 @@
 import com.simibubi.create.foundation.fluid.FluidIngredient;
 import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.utility.Pair;
+
 import dev.architectury.fluid.FluidStack;
+
 import me.shedaniel.math.Point;
 import me.shedaniel.rei.api.client.gui.widgets.Slot;
 import me.shedaniel.rei.api.client.gui.widgets.Widgets;
 import me.shedaniel.rei.api.common.entry.EntryIngredient;
 import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes;
 import me.shedaniel.rei.api.common.util.EntryIngredients;
+
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemStack;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.recipe.Recipe;
 import net.minecraft.util.collection.DefaultedList;
+
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
+
 /**
  The REI tool method related to Create.
  @since 1.0.0

src/main/resources/createreibugfix.mixins.json

@@ -3,7 +3,7 @@
   "minVersion": "0.8",
   "package": "ho.artisan.createreibugfix.mixin",
   "compatibilityLevel": "JAVA_17",
-  "plugin": "ho.artisan.createreibugfix.ModMixinConfigPlugin",
+  "plugin": "ho.artisan.createreibugfix.CREIBFModMixinConfigPlugin",
   "mixins": [
     "SequencedAssemblyRecipeMixin"
   ],

src/main/resources/fabric.mod.json

@@ -28,6 +28,6 @@
     "minecraft": "1.19.x",
     "java": ">=17",
     "roughlyenoughitems": "*",
-    "create": "0.5.1"
+    "create": "*"
   }
 }