Fix compatibility

Author: remakefactory

…tags/fluids/quantum_infusion_source.json …ced_ae/tags/fluids/quantum_infusion.jsonsrc/generated/resources/data/advanced_ae/tags/fluids/quantum_infusion_source.json renamed to src/generated/resources/data/advanced_ae/tags/fluids/quantum_infusion.json src/generated/resources/data/advanced_ae/tags/fluids/quantum_infusion_source.json renamed to src/generated/resources/data/advanced_ae/tags/fluids/quantum_infusion.json

@@ -1,11 +1,11 @@
 {
   "values": [
     {
-      "id": "advanced_ae:quantum_infusion_source",
+      "id": "advanced_ae:quantum_infusion_flowing",
       "required": false
     },
     {
-      "id": "advanced_ae:quantum_infusion_flowing",
+      "id": "advanced_ae:quantum_infusion_source",
       "required": false
     }
   ]

src/generated/resources/data/aea/recipes/mirror_adv_pattern_provider.json

@@ -12,7 +12,7 @@
         "type": "ae2:transform",
         "circumstance": {
           "type": "fluid",
-          "tag": "advanced_ae:quantum_infusion_source"
+          "tag": "advanced_ae:quantum_infusion"
         },
         "ingredients": [
           {

src/generated/resources/data/aea/recipes/mirror_ex_adv_pattern_provider.json

@@ -12,7 +12,7 @@
         "type": "ae2:transform",
         "circumstance": {
           "type": "fluid",
-          "tag": "advanced_ae:quantum_infusion_source"
+          "tag": "advanced_ae:quantum_infusion"
         },
         "ingredients": [
           {

src/main/java/com/ref/aea/core/modifier/PatternEncodingModifierService.java

@@ -3,6 +3,9 @@
 import appeng.api.stacks.AEItemKey;
 import appeng.api.stacks.AEKey;
 import appeng.api.stacks.GenericStack;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.InventoryActionPacket;
+import appeng.helpers.InventoryAction;
 import appeng.integration.modules.jei.GenericEntryStackHelper;
 import appeng.integration.modules.jeirei.EncodingHelper;
 import appeng.menu.me.common.GridInventoryEntry;
@@ -129,7 +132,8 @@ private static void encodeBestMatchingStacksIntoSlots(
           i < encodedInputs.size()
               ? GenericStack.wrapInItemStack(encodedInputs.get(i))
               : ItemStack.EMPTY;
-      slot.setFilterTo(stack);
+      NetworkHandler.instance()
+          .sendToServer(new InventoryActionPacket(InventoryAction.SET_FILTER, slot.index, stack));
     }
   }
 

src/main/java/com/ref/aea/data/AEARecipeProvider.java

@@ -19,6 +19,7 @@
 import net.minecraft.world.level.ItemLike;
 import net.minecraftforge.common.crafting.ConditionalRecipe;
 import net.minecraftforge.common.crafting.conditions.ModLoadedCondition;
+import net.minecraftforge.registries.ForgeRegistries;
 import org.jetbrains.annotations.NotNull;
 
 public class AEARecipeProvider extends RecipeProvider {
@@ -110,4 +111,8 @@ public static Supplier<Ingredient> i(Supplier<? extends ItemLike> item) {
   public static Supplier<Ingredient> t(TagKey<Item> tag) {
     return () -> Ingredient.of(tag);
   }
+
+  public static Supplier<Ingredient> i(String itemId) {
+    return () -> Ingredient.of(ForgeRegistries.ITEMS.getValue(ResourceLocation.parse(itemId)));
+  }
 }

src/main/java/com/ref/aea/integration/aae/AAEIntegration.java

@@ -13,6 +13,7 @@
 import com.ref.aea.integration.aae.mirror.*;
 import java.util.List;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
@@ -21,12 +22,13 @@
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.registries.RegistryObject;
-import net.pedroksl.advanced_ae.common.definitions.AAEBlocks;
-import net.pedroksl.advanced_ae.common.definitions.AAEFluids;
+import net.pedroksl.advanced_ae.AdvancedAE;
 
 public class AAEIntegration {
   public static final TagKey<Fluid> QUANTUM_INFUSION =
-      TagKey.create(Registries.FLUID, AAEFluids.QUANTUM_INFUSION.id());
+      TagKey.create(
+          Registries.FLUID,
+          ResourceLocation.fromNamespaceAndPath(AdvancedAE.MOD_ID, "quantum_infusion"));
 
   public static RegistryObject<MirrorAdvPatternProviderBlock<MirrorAdvPatternProviderEntity>>
       MIRROR_ADV_PATTERN_PROVIDER_BLOCK;
@@ -101,23 +103,23 @@ public static void init() {
     AEAFluidTagsProvider.FLUID_OPTIONAL_MAP.putAll(
         QUANTUM_INFUSION,
         List.of(
-            AAEFluids.QUANTUM_INFUSION.sourceRegistry().getKey().location(),
-            AAEFluids.QUANTUM_INFUSION.flowingRegistry().getKey().location()));
+            ResourceLocation.fromNamespaceAndPath(AdvancedAE.MOD_ID, "quantum_infusion_flowing"),
+            ResourceLocation.fromNamespaceAndPath(AdvancedAE.MOD_ID, "quantum_infusion_source")));
 
     AEARecipeProvider.addMutualConversionRecipes(
         MIRROR_ADV_PATTERN_PROVIDER_BLOCK,
         MIRROR_ADV_PATTERN_PROVIDER_PART,
         "advanced_ae",
         TransformCircumstance.fluid(QUANTUM_INFUSION),
-        AEARecipeProvider.i(AAEBlocks.SMALL_ADV_PATTERN_PROVIDER),
+        AEARecipeProvider.i("advanced_ae:small_adv_pattern_provider"),
         AEARecipeProvider.i(AEItems.SINGULARITY));
 
     AEARecipeProvider.addMutualConversionRecipes(
         MIRROR_EX_ADV_PATTERN_PROVIDER_BLOCK,
         MIRROR_EX_ADV_PATTERN_PROVIDER_PART,
         "advanced_ae",
         TransformCircumstance.fluid(QUANTUM_INFUSION),
-        AEARecipeProvider.i(AAEBlocks.ADV_PATTERN_PROVIDER),
+        AEARecipeProvider.i("advanced_ae:adv_pattern_provider"),
         AEARecipeProvider.i(AEItems.SINGULARITY));
 
     DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> AAEIntegrationClient::init);

src/main/java/com/ref/aea/mixin/ae/mirror/CableBusColorMixin.java

@@ -13,7 +13,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @OnlyIn(Dist.CLIENT)
-@Mixin(value = CableBusColor.class, remap = false)
+@Mixin(value = CableBusColor.class)
 public class CableBusColorMixin {
   @Inject(method = "getColor", at = @At("HEAD"), cancellable = true)
   private void onGetColor(