Add compat for Coal Coke Dust

Author: Amronos

.gitignore

@@ -25,7 +25,6 @@ run-data
 *.vscode
 *.zip
 *.mrpack
-*.jar
 *.exe
 
 # Files from Forge MDK

README.md

@@ -24,14 +24,21 @@ Pneumaticcraft takes priority, recipes have been unified, TFMG's plastic sheet i
 Mods: [Create: Connected](https://modrinth.com/mod/create-connected), [Create Utilities](https://modrinth.com/mod/create-utilities)<br>
 Create: Connected takes priority, recipes have been unified, Create Utilities's Gearcube is hid in JEI/REI/EMI. <br>
 </details>
+
+<details>
+<summary>Coal Coke Dust</summary>
+
+Mods: [Immersive Engineering](https://modrinth.com/mod/immersiveengineering), [TFMG](https://modrinth.com/mod/create-tfmg)<br>
+Coal Coke Dust from both mods works in both mods' processes and recipes.
+</details>
 <br>
 
 ### Fluids
 
 <details>
 <summary>Crude Oil</summary>
 
-Mods: [Ad Astra](https://modrinth.com/mod/ad-astra), [CDG](https://modrinth.com/mod/create-diesel-generators), [Destroy](https://modrinth.com/mod/destroy), [Pneumaticcraft](https://modrinth.com/mod/pneumaticcraft-repressurized), [TFMG](https://modrinth.com/mod/create-tfmg) <br>
+Mods: [Ad Astra](https://modrinth.com/mod/ad-astra), [CDG](https://modrinth.com/mod/create-diesel-generators), [C:L&W](https://modrinth.com/mod/create-love-war), [Destroy](https://modrinth.com/mod/destroy), [Pneumaticcraft](https://modrinth.com/mod/pneumaticcraft-repressurized), [TFMG](https://modrinth.com/mod/create-tfmg) <br>
 Crude Oil from all these mods works in all distillation processes requiring it present in these mods.<br>
 </details>
 
@@ -57,7 +64,7 @@ Kerosene, Molten/Liquid Plastic, Lubricant/Lubrication Oil from both mods works
 <br><br>
 
 ## Installation
-The mod is currently only available for 1.20.1 (neo)forge. Fabric/Quilt versions and 1.19.2 versions may come later.<br>
+The mod is currently only available for 1.20.1 (neo)forge. Fabric/Quilt versions and >=1.21.1 versions will come soon. A port to 1.19.2 is not planned.<br>
 [Almost Unified](https://modrinth.com/mod/almost-unified) is required to be installed.<br>
 <br><br>
 
@@ -69,7 +76,6 @@ They can be enabled during world creation or by using the ``/datapack enable`` c
 <br><br>
 
 ## Suggestions / More Compatibility Features
-If you want to change something like which mod takes priority please have a look at the [Wiki](https://github.com/Amronos/createaddoncompatibility/wiki/Unification-Config-Changes#changes-to-the-config-by-create-addon-compatibility). <br>
 I do have more compatibility features planned, but if you have any ideas feel free to create an issue on GitHub or tell me in the Discord server.
 
 <br><br>

build.gradle

@@ -89,6 +89,10 @@ repositories {
         name = "ModMaven"
         url = "https://modmaven.dev"
     }
+    maven {
+        name = "Modrinth Maven"
+        url = "https://api.modrinth.com/maven"
+    }
 }
 
 dependencies {
@@ -108,6 +112,7 @@ dependencies {
 
     implementation fg.deobf("com.almostreliable.mods:almostunified-forge:${almostunified_version}")
 
+    implementation fg.deobf("maven.modrinth:create-tfmg:0.9.3-1.20.1")
 }
 
 

gradle/wrapper/gradle-wrapper.jar

@@ -22,6 +22,7 @@ private static TagKey<Fluid> tag(String name) {
 
     public static class Items {
         public static final TagKey<Item> PLASTIC = tag("ingots/plastic");
+        public static final TagKey<Item> COKE_DUST = tag("dusts/coal_coke");
 
         private static TagKey<Item> tag(String name) {
             return ItemTags.create(new ResourceLocation("forge", name));

src/main/java/com/amronos/createaddoncompatibility/data/tags/ForgeTags.java

@@ -0,0 +1,77 @@
+package com.amronos.createaddoncompatibility.mixin;
+
+import com.amronos.createaddoncompatibility.data.tags.ForgeTags;
+import com.drmangotea.tfmg.blocks.machines.metal_processing.blast_furnace.BlastFurnaceOutputBlockEntity;
+import com.drmangotea.tfmg.registry.TFMGItems;
+import com.simibubi.create.foundation.item.SmartInventory;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.Shadow;
+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.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+import java.util.List;
+
+@Pseudo
+@Mixin(BlastFurnaceOutputBlockEntity.class)
+public class MixinBlastFurnaceOutputBlockEntity {
+    @Shadow
+    public SmartInventory fuelInventory;
+    @Shadow
+    public SmartInventory inputInventory;
+
+    @Unique
+    public SmartInventory createaddoncompatibility$previousFuelInventory;
+    @Unique
+    public SmartInventory createaddoncompatibility$previousInputInventory;
+
+    @Inject(remap = false, method = "acceptInsertedItems", at = @At(value = "HEAD"))
+    private void savePreviousInventory(CallbackInfo info){
+        createaddoncompatibility$previousFuelInventory = fuelInventory;
+        createaddoncompatibility$previousInputInventory = inputInventory;
+    }
+
+    @Inject(remap = false, method = "acceptInsertedItems", at = @At(value = "TAIL"), locals = LocalCapture.CAPTURE_FAILSOFT)
+    private void acceptInsertedItems(CallbackInfo info, List<ItemEntity> itemsToPick) {
+        fuelInventory = createaddoncompatibility$previousFuelInventory;
+        inputInventory = createaddoncompatibility$previousInputInventory;
+        for (ItemEntity itemEntity : itemsToPick) {
+            ItemStack itemStack = itemEntity.getItem();
+            int count;
+            int freeSpace2;
+            if (itemStack.is(ForgeTags.Items.COKE_DUST)) {
+                freeSpace2 = this.fuelInventory.getStackInSlot(0).getMaxStackSize() - this.fuelInventory.getStackInSlot(0).getCount();
+                count = itemStack.getCount();
+                if (count > freeSpace2) {
+                    itemStack.setCount(itemStack.getCount() - freeSpace2);
+                    this.fuelInventory.setItem(0, new ItemStack(TFMGItems.COAL_COKE_DUST.get(), this.fuelInventory.getStackInSlot(0).getCount() + freeSpace2));
+                } else {
+                    this.fuelInventory.setItem(0, new ItemStack(TFMGItems.COAL_COKE_DUST.get(), this.fuelInventory.getStackInSlot(0).getCount() + itemStack.getCount()));
+                    itemEntity.discard();
+                }
+            } else {
+                if (itemStack.getCount() == 1) {
+                    itemStack.setCount(2);
+                    itemEntity.setItem(itemStack);
+                }
+
+                freeSpace2 = this.inputInventory.getStackInSlot(0).getMaxStackSize() - this.inputInventory.getStackInSlot(0).getCount();
+                count = itemStack.getCount();
+                if (this.inputInventory.isEmpty() || this.inputInventory.getItem(0).is(itemStack.getItem())) {
+                    if (count > freeSpace2) {
+                        itemStack.setCount(itemStack.getCount() - freeSpace2);
+                        this.inputInventory.setItem(0, new ItemStack(itemStack.getItem(), this.inputInventory.getStackInSlot(0).getCount() + freeSpace2));
+                    } else {
+                        this.inputInventory.setItem(0, new ItemStack(itemStack.getItem(), this.inputInventory.getStackInSlot(0).getCount() + itemStack.getCount()));
+                        itemEntity.discard();
+                    }
+                }
+            }
+        }
+    }
+}

src/main/java/com/amronos/createaddoncompatibility/mixin/MixinBlastFurnaceOutputBlockEntity.java

@@ -4,6 +4,7 @@
   "refmap": "createaddoncompatibility.refmap.json",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
+    "MixinBlastFurnaceOutputBlockEntity",
     "MixinUnifyConfig"
   ],
   "client": [