Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

Commit

Permalink
0.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
TexBlock committed Jul 8, 2023
1 parent d7dad1c commit d515088
Show file tree
Hide file tree
Showing 17 changed files with 72 additions and 22 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ org.gradle.parallel=true
loader_version=0.14.17

# Mod Properties
mod_version=0.1.4-mc1.18.x
mod_version=0.1.5-create0.5.1-mc1.18.x
maven_group=ho.artisan.createreibugfix
archives_base_name=CreateFabricREIBugFix

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.List;
import java.util.Set;

public class ModMixinConfiPlugin extends RestrictiveMixinConfigPlugin {
public class CREIBFModMixinConfigPlugin extends RestrictiveMixinConfigPlugin {
@Override
public String getRefMapperConfig() {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,16 @@
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 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;

import ho.artisan.createreibugfix.utils.REICreateUtils;

import java.util.LinkedList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,15 @@
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 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 ho.artisan.createreibugfix.utils.REICreateUtils;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,24 @@
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.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 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;
Expand All @@ -49,6 +54,7 @@
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

import org.apache.commons.lang3.mutable.MutableInt;
import java.util.List;

@Restriction(conflict = @Condition(StringUtils.createsdelight_modid))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,28 @@
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.utils.StringUtils;
import me.fallenbreath.conditionalmixin.api.annotation.Condition;
import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
import ho.artisan.createreibugfix.inject.CrushingCategoryInject;

import me.shedaniel.math.Point;
import me.shedaniel.math.Rectangle;
import me.shedaniel.rei.api.client.gui.widgets.Widget;

import org.objectweb.asm.Opcodes;

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;
import org.spongepowered.asm.mixin.injection.ModifyVariable;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import ho.artisan.createreibugfix.inject.CrushingCategoryInject;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,25 @@
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.utils.StringUtils;
import me.fallenbreath.conditionalmixin.api.annotation.Condition;
import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
import ho.artisan.createreibugfix.inject.MillingCategoryInject;

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;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import ho.artisan.createreibugfix.inject.MillingCategoryInject;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,17 @@

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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,23 @@
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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/createreibugfix.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"minVersion": "0.8",
"package": "ho.artisan.createreibugfix.mixin",
"compatibilityLevel": "JAVA_17",
"plugin": "ho.artisan.createreibugfix.ModMixinConfiPlugin",
"plugin": "ho.artisan.createreibugfix.CREIBFModMixinConfigPlugin",
"mixins": [
"SequencedAssemblyRecipeMixin"
],
Expand Down

0 comments on commit d515088

Please sign in to comment.