26.1 port

.github/workflows/gradle.yml

@@ -23,28 +23,28 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
-      with:
-        java-version: '21'
-        distribution: 'temurin'
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Build with Gradle
-      run: ./gradlew build
-
-    - name: Publish Fabric artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: Fabric-Package
-        path: fabric/build/libs/*.jar
-
-    - name: Publish NeoForge artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: NeoForge-Package
-        path: neoforge/build/libs/*.jar
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 25
+        uses: actions/setup-java@v4
+        with:
+          java-version: '25'
+          distribution: 'temurin'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - name: Publish Fabric artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: Fabric-Package
+          path: fabric/build/libs/*.jar
+
+      - name: Publish NeoForge artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: NeoForge-Package
+          path: neoforge/build/libs/*.jar

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'dev.architectury.loom' version '1.13-SNAPSHOT' apply false
-    id 'architectury-plugin' version '3.4-SNAPSHOT'
+    id 'dev.architectury.loom-no-remap' version '1.17-SNAPSHOT' apply false
+    id 'architectury-plugin' version '3.5-SNAPSHOT'
     id 'com.gradleup.shadow' version '8.3.6' apply false
 }
 
@@ -14,7 +14,7 @@ allprojects {
 }
 
 subprojects {
-    apply plugin: 'dev.architectury.loom'
+    apply plugin: 'dev.architectury.loom-no-remap'
     apply plugin: 'architectury-plugin'
     apply plugin: 'maven-publish'
 
@@ -37,7 +37,6 @@ subprojects {
 
     dependencies {
         minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
-        mappings loom.officialMojangMappings()
     }
 
     java {
@@ -46,12 +45,12 @@ subprojects {
         // If you remove this line, sources will not be generated.
         withSourcesJar()
 
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_25
+        targetCompatibility = JavaVersion.VERSION_25
     }
 
     tasks.withType(JavaCompile).configureEach {
-        it.options.release = 21
+        it.options.release = 25
     }
 
     // Configure Maven publishing.

common/build.gradle

@@ -10,11 +10,11 @@ repositories {
 }
 
 dependencies {
-    modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
+    implementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
 
-    modCompileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_api_version}"
-    modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${rei_api_version}"
-    modCompileOnly "me.shedaniel:RoughlyEnoughItems-default-plugin:${rei_api_version}"
+    compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_api_version}"
+    compileOnly "me.shedaniel:RoughlyEnoughItems-api:${rei_api_version}"
+    compileOnly "me.shedaniel:RoughlyEnoughItems-default-plugin:${rei_api_version}"
 }
 
 loom {

common/src/main/java/one/dqu/additionaladditions/AdditionalAdditions.java

@@ -2,8 +2,8 @@
 
 import one.dqu.additionaladditions.config.Config;
 import one.dqu.additionaladditions.config.io.ConfigLoader;
+import one.dqu.additionaladditions.core.util.ModCompatibility;
 import one.dqu.additionaladditions.registry.*;
-import one.dqu.additionaladditions.util.ModCompatibility;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,6 +16,7 @@ public final class AdditionalAdditions {
     public static void init() {
         ConfigLoader.load();
 
+        AATags.registerAll();
         AAMisc.registerAll();
         AAEntities.registerAll();
         AAItems.registerAll();

common/src/main/java/one/dqu/additionaladditions/client/HasDiscProperty.java

@@ -9,7 +9,7 @@
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import one.dqu.additionaladditions.feature.album.AlbumContents;
-import one.dqu.additionaladditions.item.PocketJukeboxItem;
+import one.dqu.additionaladditions.feature.pocket_jukebox.PocketJukeboxItem;
 import one.dqu.additionaladditions.registry.AAMisc;
 import org.jetbrains.annotations.Nullable;
 

common/src/main/java/one/dqu/additionaladditions/config/io/ConfigLoader.java

@@ -16,7 +16,7 @@
 import one.dqu.additionaladditions.config.datafixer.ConfigFixerUpper;
 import one.dqu.additionaladditions.config.type.VersionConfig;
 import one.dqu.additionaladditions.config.type.unit.FoodUnitConfig;
-import one.dqu.additionaladditions.util.Registrar;
+import one.dqu.additionaladditions.core.util.Registrar;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -38,8 +38,8 @@ public static void onPostReload(Identifier id, Runnable observer) {
     /**
      * Handles config loading.
      * In order: init config -> create config directory -> load config version
-     *           -> run relocator -> read or create config files
-     *           -> datafix if version is outdated -> apply config values
+     * -> run relocator -> read or create config files
+     * -> datafix if version is outdated -> apply config values
      */
     public static void load() {
         AdditionalAdditions.LOGGER.info("[{}] Loading config files...", AdditionalAdditions.NAMESPACE);

common/src/main/java/one/dqu/additionaladditions/core/builder/AABlock.java

@@ -0,0 +1,66 @@
+package one.dqu.additionaladditions.core.builder;
+
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import one.dqu.additionaladditions.AdditionalAdditions;
+import one.dqu.additionaladditions.core.datagen.AABlockDatagen;
+import one.dqu.additionaladditions.registry.AARegistries;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public class AABlock<T extends Block> {
+    private final Function<BlockBehaviour.Properties, T> factory;
+    private Consumer<BlockBehaviour.Properties> props = p -> {
+    };
+    // datagen data
+    private final List<TagKey<Block>> tags = new ArrayList<>();
+    private Consumer<Block> model;
+
+    public AABlock(Function<BlockBehaviour.Properties, T> factory) {
+        this.factory = factory;
+    }
+
+    public AABlock<T> props(Consumer<BlockBehaviour.Properties> props) {
+        this.props = this.props.andThen(props);
+        return this;
+    }
+
+    @SafeVarargs
+    public final AABlock<T> tags(TagKey<Block>... tags) {
+        this.tags.addAll(Arrays.asList(tags));
+        return this;
+    }
+
+    /**
+     * optional datagen block template, e.g. Models::cube
+     */
+    public AABlock<T> model(Consumer<Block> model) {
+        this.model = model;
+        return this;
+    }
+
+    public Supplier<T> make(String id) {
+        Identifier location = Identifier.tryBuild(AdditionalAdditions.NAMESPACE, id);
+
+        BlockBehaviour.Properties properties = BlockBehaviour.Properties.of();
+        properties.setId(ResourceKey.create(Registries.BLOCK, location));
+        props.accept(properties);
+
+        Supplier<T> block = AARegistries.BLOCKS.register(location, () -> factory.apply(properties));
+
+        if (AdditionalAdditions.DATAGEN) {
+            AABlockDatagen.register(new AABlockDatagen.Entry(location, block, List.copyOf(tags), model));
+        }
+
+        return block;
+    }
+}

common/src/main/java/one/dqu/additionaladditions/gametest/AAGameTest.java → common/src/main/java/one/dqu/additionaladditions/core/builder/AAGameTest.java

@@ -1,13 +1,13 @@
-package one.dqu.additionaladditions.gametest;
+package one.dqu.additionaladditions.core.builder;
 
 import net.minecraft.core.registries.Registries;
+import net.minecraft.gametest.framework.GameTestEnvironments;
 import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.gametest.framework.TestEnvironmentDefinition;
 import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.gametest.framework.TestEnvironmentDefinition;
-import net.minecraft.gametest.framework.GameTestEnvironments;
 import one.dqu.additionaladditions.AdditionalAdditions;
-import one.dqu.additionaladditions.gametest.datagen.AAGameTestDatagen;
+import one.dqu.additionaladditions.core.datagen.AAGameTestDatagen;
 import one.dqu.additionaladditions.registry.AARegistries;
 
 import java.util.function.Consumer;
@@ -16,7 +16,7 @@ public class AAGameTest {
     private Consumer<GameTestHelper> function = null;
     private String structure = "empty";
     private int maxTicks = 100;
-    private ResourceKey<TestEnvironmentDefinition> environment = GameTestEnvironments.DEFAULT_KEY;
+    private ResourceKey<TestEnvironmentDefinition<?>> environment = GameTestEnvironments.DEFAULT_KEY;
 
     public void create(String name) {
         if (function == null) {
@@ -50,7 +50,7 @@ public AAGameTest maxTicks(int maxTicks) {
         return this;
     }
 
-    public AAGameTest environment(ResourceKey<TestEnvironmentDefinition> environment) {
+    public AAGameTest environment(ResourceKey<TestEnvironmentDefinition<?>> environment) {
         this.environment = environment;
         return this;
     }