fix applied flux recipes (#13)

* fix applied flux recipes

* add release permission to upload files to gitHub

* bump version to 1.4.1

* spotless

.github/workflows/release.yml

@@ -7,6 +7,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions: write-all
     steps:
       - name: checkout
         uses: actions/checkout@v4

gradle.properties

@@ -12,6 +12,6 @@ mod_authors= DancingSnow
 mod_description = A mod added more ae cells and so on.
 mod_license = MIT
 mod_url = https://github.com/GregTech-Exploring-Pioneer/BiggerAE2
-mod_version = 1.4.0
+mod_version = 1.4.1
 
 maven_group = cn.dancingsnow.bigger_ae2

gradle/scripts/dependencies.gradle

@@ -47,11 +47,13 @@ dependencies {
     topCompileOnlyApi(forge.theoneprobe) { transitive = false }
 
     // AE2
-    ae2Implementation(forge.ae2) { transitive = false }
+    // maven haven't uploaded.
+    // ae2Implementation(forge.ae2) { transitive = false }
+    ae2Implementation("curse.maven:ae2-223794:5490518")
 
     // applied flux
-    compileOnly("curse.maven:glodium-957920:5337083")
-    compileOnly("curse.maven:applied-flux-965012:5415184")
+    implementation("curse.maven:glodium-957920:5491696")
+    implementation("curse.maven:applied-flux-965012:5504017")
 
     // lombok
     compileOnly 'org.projectlombok:lombok:1.18.30'

settings.gradle

@@ -24,7 +24,7 @@ dependencyResolutionManagement {
         def jeiVersion = "19.0.0.7"
         def reiVersion = "16.0.729"
         def emiVersion = "1.1.7"
-        def ae2Version = "19.0.4-alpha"
+        def ae2Version = "19.0.8-alpha"
 
         // NeoForge
         def neoForgeVersion = "21.0.16-beta"

src/generated/resources/data/bigger_ae2/advancement/recipes/misc/advanced_flux_cell_housing.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "appflux:harden_insulating_resin"
-            ]
+            "items": "appflux:harden_insulating_resin"
           }
         ]
       },
@@ -22,14 +20,13 @@
   },
   "requirements": [
     [
-      "has_item",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_item"
     ]
   ],
   "rewards": {
     "recipes": [
       "bigger_ae2:advanced_flux_cell_housing"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }

src/generated/resources/data/bigger_ae2/advancement/recipes/misc/digital_singularity_flux_storage_cell.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "bigger_ae2:quantum_cell_component"
-            ]
+            "items": "bigger_ae2:quantum_cell_component"
           }
         ]
       },
@@ -22,14 +20,13 @@
   },
   "requirements": [
     [
-      "has_item",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_item"
     ]
   ],
   "rewards": {
     "recipes": [
       "bigger_ae2:digital_singularity_flux_storage_cell"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }

src/generated/resources/data/bigger_ae2/advancement/recipes/misc/quantum_flux_storage_cell.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "bigger_ae2:quantum_cell_component"
-            ]
+            "items": "bigger_ae2:quantum_cell_component"
           }
         ]
       },
@@ -22,14 +20,13 @@
   },
   "requirements": [
     [
-      "has_item",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_item"
     ]
   ],
   "rewards": {
     "recipes": [
       "bigger_ae2:quantum_flux_storage_cell"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }

src/generated/resources/data/bigger_ae2/recipe/advanced_flux_cell_housing.json

@@ -18,7 +18,7 @@
     "CCC"
   ],
   "result": {
-    "item": "bigger_ae2:advanced_flux_cell_housing"
-  },
-  "show_notification": true
+    "count": 1,
+    "id": "bigger_ae2:advanced_flux_cell_housing"
+  }
 }

src/generated/resources/data/bigger_ae2/recipe/digital_singularity_flux_storage_cell.json

@@ -10,6 +10,7 @@
     }
   ],
   "result": {
-    "item": "bigger_ae2:digital_singularity_flux_storage_cell"
+    "count": 1,
+    "id": "bigger_ae2:digital_singularity_flux_storage_cell"
   }
 }

src/generated/resources/data/bigger_ae2/recipe/quantum_flux_storage_cell.json

@@ -10,6 +10,7 @@
     }
   ],
   "result": {
-    "item": "bigger_ae2:quantum_flux_storage_cell"
+    "count": 1,
+    "id": "bigger_ae2:quantum_flux_storage_cell"
   }
 }

src/main/java/cn/dancingsnow/bigger_ae2/integration/appliedflux/AppliedFluxItems.java

@@ -12,7 +12,7 @@
 import net.minecraft.data.recipes.ShapedRecipeBuilder;
 import net.minecraft.data.recipes.ShapelessRecipeBuilder;
 
-import com.glodblock.github.appflux.common.AFItemAndBlock;
+import com.glodblock.github.appflux.common.AFSingletons;
 import com.glodblock.github.appflux.common.me.key.type.FluxKeyType;
 import com.tterrag.registrate.providers.RegistrateRecipeProvider;
 import com.tterrag.registrate.util.entry.ItemEntry;
@@ -29,9 +29,9 @@ public class AppliedFluxItems {
                     .pattern("CCC")
                     .define('A', AEBlocks.QUARTZ_GLASS)
                     .define('B', AEItems.SKY_DUST)
-                    .define('C', AFItemAndBlock.HARDEN_INSULATING_RESIN)
+                    .define('C', AFSingletons.HARDEN_INSULATING_RESIN)
                     .unlockedBy(
-                            "has_item", RegistrateRecipeProvider.has(AFItemAndBlock.HARDEN_INSULATING_RESIN))
+                            "has_item", RegistrateRecipeProvider.has(AFSingletons.HARDEN_INSULATING_RESIN))
                     .save(provider))
             .register();
 

src/main/java/cn/dancingsnow/bigger_ae2/integration/appliedflux/item/AdvancedItemFECell.java

@@ -20,6 +20,9 @@
 import com.glodblock.github.appflux.common.items.ItemFECell;
 import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
 public class AdvancedItemFECell extends ItemFECell {
     private final ItemLike coreItem;
 
@@ -32,7 +35,7 @@ public AdvancedItemFECell(ItemLike coreItem, int kilobytes, double idleDrain) {
     public @NotNull InteractionResultHolder<ItemStack> use(
             Level level, Player player, InteractionHand hand) {
         this.disassembleDrive(player.getItemInHand(hand), level, player);
-        return new InteractionResultHolder(
+        return new InteractionResultHolder<>(
                 InteractionResult.sidedSuccess(level.isClientSide()), player.getItemInHand(hand));
     }