2.2.6

Author: MarbleGateKeeper

CHANGELOG.md

@@ -1,6 +1,6 @@
-## Create: Central Kitchen 2.2.5
+## Create: Central Kitchen 2.2.6
 
-Update for Create ***6.0.7***.
+Update for Create ***6.0.8***. Require Create: Dragon+ 1.8.4.
 
 ### Fix
-* Fix ExtraDelight automatic juicing has wrong byproduct probability
+* Fix some messy mixin issues that might cause crash in certain situation.

gradle.properties

@@ -17,18 +17,18 @@ mod_id = create_central_kitchen
 mod_artifact_id = create-central-kitchen
 mod_name = Create: Central Kitchen
 mod_license = LGPL-3.0-or-later
-mod_version = 2.2.5
+mod_version = 2.2.6
 mod_group_id = plus.dragons.createcentralkitchen
 mod_authors = DragonsPlus
 mod_description = Integrated cooking automation for Create
 mod_github = https://github.com/DragonsPlusMinecraft/CreateCentralKitchen
 mod_logo = icon.png
 # Mod Dependencies
 conditional_mixin_version = 0.6.4
-create_version_production = 6.0.7
-create_version_range = [6.0.7,)
-create_dragons_plus_version = 1.8.3
-create_dragons_plus_version_range = [1.8.3,)
+create_version_production = 6.0.8
+create_version_range = [6.0.8,)
+create_dragons_plus_version = 1.8.4
+create_dragons_plus_version_range = [1.8.4,)
 farmers_delight_version = 1.21.1-1.2.9
 my_nethers_delight_version = 1.9
 ends_delight_version = 2.5.1+neoforge.1.21.1

src/integration/brewinandchewin/java/plus/dragons/createcentralkitchen/mixin/brewinandchewin/BnCIntegrationMixinConfigPlugin.java

@@ -20,6 +20,8 @@
 
 import com.simibubi.create.content.fluids.transfer.EmptyingRecipe;
 import com.simibubi.create.content.fluids.transfer.FillingRecipe;
+import me.fallenbreath.conditionalmixin.api.annotation.Condition;
+import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
 import mezz.jei.api.recipe.RecipeType;
 import mezz.jei.api.registration.IRecipeRegistration;
 import net.minecraft.world.item.crafting.RecipeHolder;
@@ -31,9 +33,11 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import plus.dragons.createcentralkitchen.config.CCKConfig;
+import plus.dragons.createcentralkitchen.integration.ModIntegration;
 import plus.dragons.createcentralkitchen.integration.brewinandchewin.recipe.KegPouringRecipeConverters;
 import plus.dragons.createcentralkitchen.integration.jei.CCKJeiPlugin;
 
+@Restriction(require = @Condition(ModIntegration.Mods.BREWINANDCHEWIN))
 @Mixin(CCKJeiPlugin.class)
 public abstract class CCKJeiPluginMixin {
     @Shadow

src/integration/brewinandchewin/java/plus/dragons/createcentralkitchen/mixin/brewinandchewin/CCKJeiPluginMixin.java

@@ -22,14 +22,18 @@
 import com.simibubi.create.content.fluids.transfer.EmptyingRecipe;
 import com.simibubi.create.content.fluids.transfer.GenericItemEmptying;
 import java.util.Optional;
+import me.fallenbreath.conditionalmixin.api.annotation.Condition;
+import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import plus.dragons.createcentralkitchen.config.CCKConfig;
+import plus.dragons.createcentralkitchen.integration.ModIntegration;
 import plus.dragons.createcentralkitchen.integration.brewinandchewin.recipe.KegPouringRecipeConverters;
 
+@Restriction(require = @Condition(ModIntegration.Mods.BREWINANDCHEWIN))
 @Mixin(GenericItemEmptying.class)
 public class GenericItemEmptyingMixin {
     @ModifyExpressionValue(method = "canItemBeEmptied", at = @At(value = "INVOKE", target = "Lcom/simibubi/create/AllRecipeTypes;find(Lnet/minecraft/world/item/crafting/RecipeInput;Lnet/minecraft/world/level/Level;)Ljava/util/Optional;"))

src/integration/brewinandchewin/java/plus/dragons/createcentralkitchen/mixin/brewinandchewin/GenericItemEmptyingMixin.java

@@ -20,6 +20,8 @@
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.simibubi.create.content.fluids.transfer.GenericItemFilling;
+import me.fallenbreath.conditionalmixin.api.annotation.Condition;
+import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.level.Level;
@@ -29,8 +31,10 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import plus.dragons.createcentralkitchen.config.CCKConfig;
+import plus.dragons.createcentralkitchen.integration.ModIntegration;
 import plus.dragons.createcentralkitchen.integration.brewinandchewin.recipe.KegPouringRecipeConverters;
 
+@Restriction(require = @Condition(ModIntegration.Mods.BREWINANDCHEWIN))
 @Mixin(GenericItemFilling.class)
 public class GenericItemFillingMixin {
     @Inject(method = "canItemBeFilled", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;getCapability(Lnet/neoforged/neoforge/capabilities/ItemCapability;)Ljava/lang/Object;"), cancellable = true)

src/integration/brewinandchewin/java/plus/dragons/createcentralkitchen/mixin/brewinandchewin/GenericItemFillingMixin.java

@@ -27,16 +27,20 @@
 import com.simibubi.create.api.boiler.BoilerHeater;
 import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
 import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
+import me.fallenbreath.conditionalmixin.api.annotation.Condition;
+import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import plus.dragons.createcentralkitchen.integration.ModIntegration;
 import plus.dragons.createdragonsplus.common.processing.freeze.BlockFreezer;
 import umpaz.brewinandchewin.common.block.entity.KegBlockEntity;
 import umpaz.brewinandchewin.common.tag.BnCTags;
 import vectorwing.farmersdelight.common.tag.ModTags;
 
+@Restriction(require = @Condition(ModIntegration.Mods.BREWINANDCHEWIN))
 @Mixin(KegBlockEntity.class)
 public class KegBlockEntityMixin {
     @WrapOperation(method = "updateTemperature", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;"))

src/integration/brewinandchewin/java/plus/dragons/createcentralkitchen/mixin/brewinandchewin/KegBlockEntityMixin.java

@@ -2,7 +2,7 @@
   "required": true,
   "priority": 1000,
   "package": "plus.dragons.createcentralkitchen.mixin.brewinandchewin",
-  "plugin": "plus.dragons.createcentralkitchen.mixin.brewinandchewin.BnCIntegrationMixinConfigPlugin",
+  "plugin": "plus.dragons.createcentralkitchen.mixin.UniversalConditionalMixinPlugin",
   "compatibilityLevel": "JAVA_21",
   "mixins": [
     "CCKJeiPluginMixin",

src/integration/brewinandchewin/resources/create_central_kitchen.brewinandchewin.mixins.json

@@ -3,7 +3,6 @@
 @ParametersAreNonnullByDefault
 package plus.dragons.createcentralkitchen.integration.dungeonsdelight.data;
 
+import javax.annotation.ParametersAreNonnullByDefault;
 import net.minecraft.FieldsAreNonnullByDefault;
 import net.minecraft.MethodsReturnNonnullByDefault;
-
-import javax.annotation.ParametersAreNonnullByDefault;

src/integration/dungeonsdelight/java/plus/dragons/createcentralkitchen/integration/dungeonsdelight/data/package-info.java

@@ -3,7 +3,6 @@
 @ParametersAreNonnullByDefault
 package plus.dragons.createcentralkitchen.integration.dungeonsdelight.handler;
 
+import javax.annotation.ParametersAreNonnullByDefault;
 import net.minecraft.FieldsAreNonnullByDefault;
 import net.minecraft.MethodsReturnNonnullByDefault;
-
-import javax.annotation.ParametersAreNonnullByDefault;