[1.21.1] Implement ignitable fluids

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'net.neoforged.moddev' version '2.0.99'
+    id 'net.neoforged.moddev' version '2.0.141'
     id 'idea'
 }
 
@@ -191,7 +191,6 @@ dependencies {
     // For more info:
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
-    annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.
@@ -237,6 +236,9 @@ tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
     options.warnings = false
 }
+tasks.named("processResources", ProcessResources) {
+    duplicatesStrategy = DuplicatesStrategy.WARN
+}
 
 // IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
 idea {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/generated/resources/data/c/tags/fluid/ignites.json

@@ -0,0 +1,36 @@
+{
+  "values": [
+    {
+      "id": "#c:biofuel",
+      "required": false
+    },
+    {
+      "id": "#c:creosote",
+      "required": false
+    },
+    {
+      "id": "#c:crude_oil",
+      "required": false
+    },
+    {
+      "id": "#c:plantoil",
+      "required": false
+    },
+    {
+      "id": "#c:ethanol",
+      "required": false
+    },
+    {
+      "id": "#c:gasoline",
+      "required": false
+    },
+    {
+      "id": "#c:diesel",
+      "required": false
+    },
+    {
+      "id": "#c:biodiesel",
+      "required": false
+    }
+  ]
+}

src/generated/resources/data/createaddition/recipe/filling/cake.json

@@ -5,9 +5,9 @@
       "item": "createaddition:cake_base_baked"
     },
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 1000,
-      "fluid_tag": "c:milk"
+      "tag": "c:milk"
     }
   ],
   "results": [

src/generated/resources/data/createaddition/recipe/filling/chocolate_cake.json

@@ -5,7 +5,7 @@
       "item": "createaddition:cake_base_baked"
     },
     {
-      "type": "fluid_stack",
+      "type": "neoforge:single",
       "amount": 500,
       "fluid": "create:chocolate"
     }

src/generated/resources/data/createaddition/recipe/filling/honey_cake.json

@@ -5,9 +5,9 @@
       "item": "createaddition:cake_base_baked"
     },
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 500,
-      "fluid_tag": "c:honey"
+      "tag": "c:honey"
     }
   ],
   "results": [

src/generated/resources/data/createaddition/recipe/liquid_burning/biodiesel.json

@@ -9,9 +9,9 @@
   "burn_time": 24000,
   "ingredients": [
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 1000,
-      "fluid_tag": "c:biodiesel"
+      "tag": "c:biodiesel"
     }
   ],
   "results": []

src/generated/resources/data/createaddition/recipe/liquid_burning/biofuel.json

@@ -1,13 +1,13 @@
 {
   "type": "createaddition:liquid_burning",
-  "burn_time": 24000,
+  "burn_time": 2400,
   "ingredients": [
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 1000,
-      "fluid_tag": "c:biofuel"
+      "tag": "c:biofuel"
     }
   ],
   "results": [],
   "superheated": true
-}
+}

src/generated/resources/data/createaddition/recipe/liquid_burning/creosote.json

@@ -9,9 +9,9 @@
   "burn_time": 4800,
   "ingredients": [
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 1000,
-      "fluid_tag": "c:creosote"
+      "tag": "c:creosote"
     }
   ],
   "results": []

src/generated/resources/data/createaddition/recipe/liquid_burning/crude_oil.json

@@ -9,9 +9,9 @@
   "burn_time": 9600,
   "ingredients": [
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 1000,
-      "fluid_tag": "c:crude_oil"
+      "tag": "c:crude_oil"
     }
   ],
   "results": []

src/generated/resources/data/createaddition/recipe/liquid_burning/diesel.json

@@ -9,9 +9,9 @@
   "burn_time": 24000,
   "ingredients": [
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 1000,
-      "fluid_tag": "c:diesel"
+      "tag": "c:diesel"
     }
   ],
   "results": []

src/generated/resources/data/createaddition/recipe/liquid_burning/ethanol.json

@@ -9,9 +9,9 @@
   "burn_time": 8000,
   "ingredients": [
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 1000,
-      "fluid_tag": "c:ethanol"
+      "tag": "c:ethanol"
     }
   ],
   "results": []

src/generated/resources/data/createaddition/recipe/liquid_burning/gasoline.json

@@ -9,9 +9,9 @@
   "burn_time": 24000,
   "ingredients": [
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 1000,
-      "fluid_tag": "c:gasoline"
+      "tag": "c:gasoline"
     }
   ],
   "results": []

src/generated/resources/data/createaddition/recipe/liquid_burning/lava.json

@@ -3,9 +3,9 @@
   "burn_time": 20000,
   "ingredients": [
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 1000,
-      "fluid_tag": "minecraft:lava"
+      "tag": "minecraft:lava"
     }
   ],
   "results": []

src/generated/resources/data/createaddition/recipe/liquid_burning/plantoil.json

@@ -3,9 +3,9 @@
   "burn_time": 4800,
   "ingredients": [
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 1000,
-      "fluid_tag": "c:plantoil"
+      "tag": "c:plantoil"
     }
   ],
   "results": []

src/generated/resources/data/createaddition/recipe/mixing/biomass_from_crops.json

@@ -9,9 +9,9 @@
       "tag": "c:crops"
     },
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 100,
-      "fluid_tag": "c:plantoil"
+      "tag": "c:plantoil"
     }
   ],
   "results": [

src/generated/resources/data/createaddition/recipe/mixing/biomass_from_flowers.json

@@ -9,9 +9,9 @@
       "tag": "minecraft:flowers"
     },
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 100,
-      "fluid_tag": "c:plantoil"
+      "tag": "c:plantoil"
     }
   ],
   "results": [

src/generated/resources/data/createaddition/recipe/mixing/biomass_from_honeycomb.json

@@ -6,9 +6,9 @@
       "item": "minecraft:honeycomb"
     },
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 100,
-      "fluid_tag": "c:plantoil"
+      "tag": "c:plantoil"
     }
   ],
   "results": [

src/generated/resources/data/createaddition/recipe/mixing/biomass_from_leaves.json

@@ -12,9 +12,9 @@
       "tag": "minecraft:leaves"
     },
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 100,
-      "fluid_tag": "c:plantoil"
+      "tag": "c:plantoil"
     }
   ],
   "results": [

src/generated/resources/data/createaddition/recipe/mixing/biomass_from_plant_foods.json

@@ -9,9 +9,9 @@
       "tag": "createaddition:plant_foods"
     },
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 100,
-      "fluid_tag": "c:plantoil"
+      "tag": "c:plantoil"
     }
   ],
   "results": [

src/generated/resources/data/createaddition/recipe/mixing/biomass_from_plants.json

@@ -12,9 +12,9 @@
       "tag": "createaddition:plants"
     },
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 100,
-      "fluid_tag": "c:plantoil"
+      "tag": "c:plantoil"
     }
   ],
   "results": [

src/generated/resources/data/createaddition/recipe/mixing/biomass_from_saplings.json

@@ -12,9 +12,9 @@
       "tag": "minecraft:saplings"
     },
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 100,
-      "fluid_tag": "c:plantoil"
+      "tag": "c:plantoil"
     }
   ],
   "results": [

src/generated/resources/data/createaddition/recipe/mixing/biomass_from_stricks.json

@@ -27,9 +27,9 @@
       "item": "minecraft:stick"
     },
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 100,
-      "fluid_tag": "c:plantoil"
+      "tag": "c:plantoil"
     }
   ],
   "results": [

src/generated/resources/data/createaddition/recipe/mixing/netherrack.json

@@ -8,9 +8,9 @@
       "item": "create:cinder_flour"
     },
     {
-      "type": "fluid_tag",
+      "type": "neoforge:tag",
       "amount": 25,
-      "fluid_tag": "minecraft:lava"
+      "tag": "minecraft:lava"
     }
   ],
   "results": [

src/main/java/com/mrh0/createaddition/datagen/TagProvider/CAFluidTagProvider.java

@@ -5,11 +5,10 @@
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.tags.FluidTagsProvider;
-import net.minecraft.tags.FluidTags;
-import net.minecraft.world.level.material.Fluid;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 public class CAFluidTagProvider extends FluidTagsProvider {
@@ -28,6 +27,18 @@ protected void addTags(HolderLookup.Provider provider) {
                 CAFluids.SEED_OIL.getSource()
         );
 
+        var ignites = tag(CATagRegister.Fluids.IGNITES);
+        List.of(
+                CATagRegister.Fluids.BIOFUEL,
+                CATagRegister.Fluids.CREOSOTE,
+                CATagRegister.Fluids.CRUDE_OIL,
+                CATagRegister.Fluids.PLANTOIL,
+                CATagRegister.Fluids.ETHANOL,
+                CATagRegister.Fluids.GASOLINE,
+                CATagRegister.Fluids.DIESEL,
+                CATagRegister.Fluids.BIODIESEL
+        ).forEach(ignites::addOptionalTag);
+
         /*
         tag(FluidTags.WATER).add(
                 CAFluids.SEED_OIL.get(),

src/main/java/com/mrh0/createaddition/datagen/TagProvider/CATagRegister.java

@@ -115,6 +115,7 @@ public static class Fluids {
         public static final TagKey<Fluid> GASOLINE = commonTags("gasoline");
         public static final TagKey<Fluid> DIESEL = commonTags("diesel");
         public static final TagKey<Fluid> BIODIESEL = commonTags("biodiesel");
+        public static final TagKey<Fluid> IGNITES = commonTags("ignites");
 
         public static TagKey<Fluid> commonTags(String folder, String name) {
             return FluidTags.create(ResourceLocation.fromNamespaceAndPath("c", String.format("%s/%s", folder, name)));