Fix Compat with newer version of Slice and Dice #188 #184

Signed-off-by: iglée42 <igleev2@gmail.com>

Author: iglee42

build.gradle

@@ -139,6 +139,9 @@ repositories {
             includeGroup "com.github.rtyley"
         }
     }
+    maven {
+        url 'https://registry.somethingcatchy.net/repository/maven-public'
+    }
 }
 
 dependencies {
@@ -166,7 +169,8 @@ dependencies {
     runtimeOnly "curse.maven:sodium-394468:6382651"
 
     runtimeOnly "curse.maven:kotlin-for-forge-351264:7471280"
-    implementation "curse.maven:slice-and-dice-659674:7738176"
+    implementation("com.possible-triangle:sliceanddice-neoforge:${sd_version}") { transitive = false }
+    runtimeOnly "com.possible-triangle:atmosphere-1.21.1-neoforge:1.0.13"
     implementation "curse.maven:farmers-delight-398521:8083481"
 
     api("dev.latvian.mods:kubejs-neoforge:2101.+")

gradle.properties

@@ -11,7 +11,7 @@ loader_version_range=[2,)
 mod_id=createcasing
 mod_name=Create Encased
 mod_license=MIT
-mod_version=1.8.1-ht1
+mod_version=1.8.1-ht2
 mod_group_id=fr.iglee42
 mod_authors=iglee42
 mod_description=Encase Your World !
@@ -25,4 +25,5 @@ create_version = 6.0.10-280
 create_version_range = [6.0.10,)
 ponder_version = 1.0.82
 flywheel_version = 1.0.6
-registrate_version = MC1.21-1.3.0+67
+registrate_version = MC1.21-1.3.0+67
+sd_version=4.3.2

src/main/java/fr/iglee42/createcasing/CreateCasingMixinPlugin.java

@@ -19,7 +19,6 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        if (mixinClassName.contains("FarmersDelight")) return LoadingModList.get().getModFileById("jei") != null && LoadingModList.get().getModFileById("sliceanddice") != null && LoadingModList.get().getModFileById("farmersdelight") != null;
         if (mixinClassName.contains("sliceanddice")) return LoadingModList.get().getModFileById("sliceanddice") != null;
         return true;
     }

src/main/java/fr/iglee42/createcasing/compat/jei/JEIPlugin.java

@@ -1,14 +1,16 @@
 package fr.iglee42.createcasing.compat.jei;
 
 import fr.iglee42.createcasing.CreateCasing;
+import fr.iglee42.createcasing.compat.sliceanddice.EncasedFarmersDelightCompat;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
 import mezz.jei.api.constants.VanillaTypes;
-import mezz.jei.api.registration.IModIngredientRegistration;
+import mezz.jei.api.registration.IRecipeCatalystRegistration;
 import mezz.jei.api.registration.IRecipeRegistration;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.neoforged.fml.ModList;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,4 +32,11 @@ public void registerRecipes(IRecipeRegistration registration) {
         });
         registration.getIngredientManager().removeIngredientsAtRuntime(VanillaTypes.ITEM_STACK,stacks);
     }
+
+    @Override
+    public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) {
+        if (ModList.get().isLoaded("sliceanddice") && ModList.get().isLoaded("farmersdelight")) {
+            EncasedFarmersDelightCompat.registerCatalysts(registration);
+        }
+    }
 }

src/main/java/fr/iglee42/createcasing/compat/sliceanddice/EncasedFarmersDelightCompat.java

@@ -0,0 +1,17 @@
+package fr.iglee42.createcasing.compat.sliceanddice;
+
+import fr.iglee42.createcasing.casings.CasingSet;
+import fr.iglee42.createcasing.casings.CasingSets;
+import mezz.jei.api.registration.IRecipeCatalystRegistration;
+import vectorwing.farmersdelight.integration.jei.FDRecipeTypes;
+
+import java.util.Objects;
+
+public class EncasedFarmersDelightCompat
+{
+
+    public static void registerCatalysts(IRecipeCatalystRegistration registration) {
+        CasingSets.getSets().stream().filter(set-> Objects.nonNull(set.getSlicer())).filter(CasingSet::doesGenerateSlicer)
+                .forEach(set->registration.addRecipeCatalyst(set.getSlicer(), FDRecipeTypes.CUTTING));
+    }
+}

src/main/java/fr/iglee42/createcasing/compat/sliceanddice/EncasedSliceAndDiceCompat.java

@@ -1,11 +1,12 @@
 package fr.iglee42.createcasing.compat.sliceanddice;
 
-import com.possible_triangle.sliceanddice.Content;
 import com.possible_triangle.sliceanddice.block.slicer.SlicerBlock;
 import com.possible_triangle.sliceanddice.block.slicer.SlicerBlockEntity;
 import com.possible_triangle.sliceanddice.block.slicer.SlicerRenderer;
 import com.possible_triangle.sliceanddice.block.slicer.SlicerVisual;
 import com.possible_triangle.sliceanddice.compat.ModCompat;
+import com.possible_triangle.sliceanddice.index.SDBlockEntities;
+import com.possible_triangle.sliceanddice.index.SDBlocks;
 import com.simibubi.create.content.kinetics.press.PressingBehaviour;
 import com.simibubi.create.content.processing.AssemblyOperatorBlockItem;
 import com.simibubi.create.foundation.data.SharedProperties;
@@ -24,6 +25,7 @@
 import fr.iglee42.createcasing.registries.EncasedBlockEntities;
 import fr.iglee42.createcasing.registries.EncasedBlockStateGens;
 import fr.iglee42.createcasing.registries.EncasedCreativeModeTabs;
+import mezz.jei.api.registration.IRecipeCatalystRegistration;
 import net.createmod.catnip.math.Pointing;
 import net.createmod.catnip.math.VecHelper;
 import net.createmod.ponder.api.registration.PonderSceneRegistrationHelper;
@@ -53,7 +55,7 @@ public static void register(IEventBus bus){
                 set.setSlicer(createSlicer(set.getName()));
         }
         bus.addListener(EncasedSliceAndDiceCompat::modifyBeTypes);
-        CasingSets.ANDESITE.setSlicer(()->Content.INSTANCE.getSLICER_BLOCK().get());
+        CasingSets.ANDESITE.setSlicer(()-> SDBlocks.SLICER.get());
         REGISTRATE.addDataGenerator(ProviderType.BLOCK_TAGS,EncasedSliceAndDiceCompat::blockTag);
     }
 
@@ -68,7 +70,7 @@ private static void blockTag(RegistrateTagsProvider<Block> provIn){
     }
 
     private static void modifyBeTypes(BlockEntityTypeAddBlocksEvent event){
-        EncasedBlockEntities.register(event, Content.INSTANCE.getSLICER_BLOCK_ENTITY().get(), CasingSet::getSlicer,CasingSet::doesGenerateSlicer);
+        EncasedBlockEntities.register(event, SDBlockEntities.SLICER.get(), CasingSet::getSlicer,CasingSet::doesGenerateSlicer);
     }
 
 

src/main/java/fr/iglee42/createcasing/mixins/sliceanddice/FarmersDelightCompatMixin.java

@@ -25,7 +25,6 @@
     "create.arm_interactions.SawMixin",
     "create.catnip.StitchedSpriteMixin",
     "minecraft.IItemExtensionMixin",
-    "sliceanddice.FarmersDelightCompatMixin",
     "sliceanddice.SlicerMixin"
   ],
   "client": [