feat: simple datagen for machines

texture providers are no longer dynamic
multiple models and blockstate variants should be used instead

Author: marcus8448

.github/workflows/codeql.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   codeql:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Checkout repository

.github/workflows/commit.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/pr_check.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -28,9 +28,9 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
             .gradle
-          key: ${{ runner.os }}-gradle-PR${{github.event.number}}-${{ hashFiles('gradle/gradle-wrapper.properties', 'settings.gradle.kts', '**/build.gradle.kts', '**/gradle.properties') }}
+          key: ${{ runner.os }}-gradle-PR${{github.event.number}}-${{ hashFiles('gradle/gradle-wrapper.properties', 'settings.gradle.kts', 'build.gradle.kts', 'gradle.properties') }}
           restore-keys: |
-            ${{ runner.os }}-gradle-${{ hashFiles('gradle/gradle-wrapper.properties', 'settings.gradle.kts', '**/build.gradle.kts', '**/gradle.properties') }}
+            ${{ runner.os }}-gradle-${{ hashFiles('gradle/gradle-wrapper.properties', 'settings.gradle.kts', 'build.gradle.kts', 'gradle.properties') }}
             ${{ runner.os }}-gradle-PR${{github.event.number}}-
             ${{ runner.os }}-gradle-
 

.gitignore

@@ -235,3 +235,5 @@ gradle-app.setting
 # FabricMC
 run/
 remappedSrc/
+
+src/testmod/generated/.cache

build.gradle.kts

@@ -44,10 +44,10 @@ val wthit = project.property("wthit.version").toString()
 plugins {
     java
     `maven-publish`
-    id("fabric-loom") version("1.8-SNAPSHOT")
+    id("fabric-loom") version("1.9-SNAPSHOT")
     id("org.cadixdev.licenser") version("0.6.1")
     id("org.ajoberstar.grgit") version("5.2.2")
-    id("dev.galacticraft.mojarn") version("0.5.1+14")
+    id("dev.galacticraft.mojarn") version("0.5.2+15")
 }
 
 group = "dev.galacticraft"
@@ -86,6 +86,8 @@ java {
 
 sourceSets {
     register("testmod") {
+        resources.srcDir("src/testmod/generated")
+
         runtimeClasspath += sourceSets.main.get().runtimeClasspath
         compileClasspath += sourceSets.main.get().compileClasspath
     }
@@ -126,6 +128,16 @@ loom {
             property("fabric-api.gametest")
             property("fabric-api.gametest.report-file", "${project.layout.buildDirectory.get()}/junit.xml")
         }
+        register("data") {
+            name("Data Generation")
+            client()
+            source(testmod)
+            runDir("build/datagen")
+            property("fabric-api.datagen")
+            property("fabric-api.datagen.modid", "machinelib_testmod")
+            property("fabric-api.datagen.output-dir", project.file("src/testmod/generated").toString())
+            property("fabric-api.datagen.strict-validation", "false")
+        }
     }
 }
 

gradle.properties

@@ -7,13 +7,13 @@ mod.version=0.7.0
 
 # Minecraft and Fabric Loader
 minecraft.version=1.21.1
-loader.version=0.16.7
+loader.version=0.16.9
 yarn.build=3
 
 # Mod Dependencies
 badpackets.version=0.8.1
 energy.version=4.1.0
-fabric.version=0.107.0+1.21.1
+fabric.version=0.110.0+1.21.1
 
 # Optional Mod Dependencies
 cloth.config.version=15.0.140

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/dev/galacticraft/machinelib/api/data/model/MachineModelGenerator.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2021-2024 Team Galacticraft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package dev.galacticraft.machinelib.api.data.model;
+
+import dev.galacticraft.machinelib.client.api.model.MachineTextureBase;
+import dev.galacticraft.machinelib.client.api.model.TextureProvider;
+import dev.galacticraft.machinelib.client.impl.data.model.MachineModelData;
+import dev.galacticraft.machinelib.client.impl.data.model.MachineTextureBaseData;
+import dev.galacticraft.machinelib.client.impl.model.MachineModelLoadingPlugin;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.data.models.BlockModelGenerators;
+import net.minecraft.data.models.blockstates.MultiVariantGenerator;
+import net.minecraft.data.models.blockstates.Variant;
+import net.minecraft.data.models.blockstates.VariantProperties;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Block;
+import org.jetbrains.annotations.Nullable;
+
+public class MachineModelGenerator {
+    public static ResourceLocation getMachineModelLocation(Block block) {
+        ResourceLocation resourceLocation = BuiltInRegistries.BLOCK.getKey(block);
+        return resourceLocation.withPrefix("machine/");
+    }
+
+    public static ResourceLocation getMachineModelLocation(Block block, String suffix) {
+        return getMachineModelLocation(block).withSuffix(suffix);
+    }
+
+    public static void setupMachineBaseTextures(BlockModelGenerators gen, String namespace, MachineTextureBase base) {
+        setupMachineBaseTextures(gen, ResourceLocation.fromNamespaceAndPath(namespace, MachineModelLoadingPlugin.DEFAULT_MACHINE_BASE), base);
+    }
+
+    public static void setupMachineBaseTextures(BlockModelGenerators gen, ResourceLocation id, MachineTextureBase base) {
+        gen.modelOutput.accept(id, new MachineTextureBaseData(base));
+    }
+
+    public static ResourceLocation generateMachineModel(BlockModelGenerators gen, Block block, TextureProvider textureProvider) {
+        return generateMachineModel(gen, block, null, textureProvider);
+    }
+
+    public static ResourceLocation generateMachineModel(BlockModelGenerators gen, Block block, @Nullable ResourceLocation base, TextureProvider textureProvider) {
+        return generateMachineModel(gen, getMachineModelLocation(block), base, textureProvider);
+    }
+
+    public static ResourceLocation generateMachineModel(BlockModelGenerators gen, ResourceLocation id, TextureProvider textureProvider) {
+        return generateMachineModel(gen, id, null, textureProvider);
+    }
+
+    public static ResourceLocation generateMachineModel(BlockModelGenerators gen, ResourceLocation id, @Nullable ResourceLocation base, TextureProvider textureProvider) {
+        gen.modelOutput.accept(id, new MachineModelData(base, textureProvider));
+        return id;
+    }
+
+    public static void createTrivialMachine(BlockModelGenerators gen, Block block, TextureProvider textureProvider) {
+        createTrivialMachine(gen, block, null, textureProvider);
+    }
+
+    public static void createTrivialMachine(BlockModelGenerators gen, Block block, @Nullable ResourceLocation base, TextureProvider textureProvider) {
+        gen.blockStateOutput.accept(MultiVariantGenerator.multiVariant(block, Variant.variant().with(VariantProperties.MODEL, generateMachineModel(gen, block, base, textureProvider))));
+        gen.skipAutoItemBlock(block);
+    }
+}

src/main/java/dev/galacticraft/machinelib/client/api/model/MachineModelRegistry.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package dev.galacticraft.machinelib.client.api.model.sprite;
+package dev.galacticraft.machinelib.client.api.model;
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
@@ -34,20 +34,23 @@
 import java.util.Collections;
 import java.util.function.Function;
 
-public record MachineTextureBase(Material machineEnergyIn, Material machineEnergyOut, Material machineEnergyBoth,
+public record MachineTextureBase(Material base,
+                                 Material machineEnergyIn, Material machineEnergyOut, Material machineEnergyBoth,
                                  Material machineItemIn, Material machineItemOut, Material machineItemBoth,
                                  Material machineFluidIn, Material machineFluidOut, Material machineFluidBoth,
                                  Material machineAnyIn, Material machineAnyOut, Material machineAnyBoth
 ) implements UnbakedModel {
     public static final Codec<MachineTextureBase> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+            TextureProvider.MATERIAL_CODEC.fieldOf("base").forGetter(MachineTextureBase::base),
             TypedResourceSprites.CODEC.fieldOf("energy").forGetter(b -> new TypedResourceSprites(b.machineEnergyIn, b.machineEnergyOut, b.machineEnergyBoth)),
             TypedResourceSprites.CODEC.fieldOf("item").forGetter(b -> new TypedResourceSprites(b.machineItemIn, b.machineItemOut, b.machineItemBoth)),
             TypedResourceSprites.CODEC.fieldOf("fluid").forGetter(b -> new TypedResourceSprites(b.machineFluidIn, b.machineFluidOut, b.machineFluidBoth)),
             TypedResourceSprites.CODEC.fieldOf("any").forGetter(b -> new TypedResourceSprites(b.machineAnyIn, b.machineAnyOut, b.machineAnyBoth))
-    ).apply(instance, (e, i, f ,a) -> new MachineTextureBase(e.input, e.output, e.both, i.input, i.output, i.both, f.input, f.output, f.both, a.input, a.output, a.both)));
+    ).apply(instance, (b, e, i, f ,a) -> new MachineTextureBase(b, e.input, e.output, e.both, i.input, i.output, i.both, f.input, f.output, f.both, a.input, a.output, a.both)));
 
     public static MachineTextureBase prefixed(String id, String prefix) {
         return new MachineTextureBase(
+                mat(id, prefix),
                 mat(id, prefix + "_energy_input"), mat(id, prefix + "_energy_output"), mat(id, prefix + "_energy_both"),
                 mat(id, prefix + "_item_input"), mat(id, prefix + "_item_output"), mat(id, prefix + "_item_both"),
                 mat(id, prefix + "_fluid_input"), mat(id, prefix + "_fluid_output"), mat(id, prefix + "_fluid_both"),
@@ -57,6 +60,7 @@ public static MachineTextureBase prefixed(String id, String prefix) {
 
     public Bound bind(Function<Material, TextureAtlasSprite> atlas) {
         return new Bound(
+                atlas.apply(this.base),
                 atlas.apply(this.machineEnergyIn), atlas.apply(this.machineEnergyOut), atlas.apply(this.machineEnergyBoth),
                 atlas.apply(this.machineItemIn), atlas.apply(this.machineItemOut), atlas.apply(this.machineItemBoth),
                 atlas.apply(this.machineFluidIn), atlas.apply(this.machineFluidOut), atlas.apply(this.machineFluidBoth),
@@ -78,7 +82,8 @@ public void resolveParents(Function<ResourceLocation, UnbakedModel> modelLoader)
         return null;
     }
 
-    public record Bound(TextureAtlasSprite machineEnergyIn, TextureAtlasSprite machineEnergyOut, TextureAtlasSprite machineEnergyBoth,
+    public record Bound(TextureAtlasSprite base,
+                        TextureAtlasSprite machineEnergyIn, TextureAtlasSprite machineEnergyOut, TextureAtlasSprite machineEnergyBoth,
                         TextureAtlasSprite machineItemIn, TextureAtlasSprite machineItemOut, TextureAtlasSprite machineItemBoth,
                         TextureAtlasSprite machineFluidIn, TextureAtlasSprite machineFluidOut, TextureAtlasSprite machineFluidBoth,
                         TextureAtlasSprite machineAnyIn, TextureAtlasSprite machineAnyOut, TextureAtlasSprite machineAnyBoth) {