Additional Additions 10.0.0

.github/workflows/gradle.yml

@@ -23,18 +23,28 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
+    - uses: actions/checkout@v4
+
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
-        java-version: '17'
-        distribution: 'adopt'
+        java-version: '21'
+        distribution: 'temurin'
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
+
     - name: Build with Gradle
       run: ./gradlew build
-    - name: Publish artifacts
-      uses: actions/upload-artifact@v2
+
+    - 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: Package
-        path: build/libs
+        name: NeoForge-Package
+        path: neoforge/build/libs/*.jar

build.gradle

@@ -1,102 +1,74 @@
 plugins {
-	id 'fabric-loom' version '1.5-SNAPSHOT'
-	id 'io.github.juuxel.loom-quiltflower' version '1.7.1'
-	id 'maven-publish'
+    id 'dev.architectury.loom' version '1.11-SNAPSHOT' apply false
+    id 'architectury-plugin' version '3.4-SNAPSHOT'
+    id 'com.gradleup.shadow' version '8.3.6' apply false
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
-archivesBaseName = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
-
-repositories {
-	maven {
-		url "https://maven.terraformersmc.com/releases"
-	}
-	maven {
-		name = "CottonMC"
-		url = "https://server.bbkr.space/artifactory/libs-release"
-	}
-	maven {
-		name = "Gegy"
-		url = "https://maven.gegy.dev"
-	}
-}
-
-dependencies {
-	// To change the versions see the gradle.properties file
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings loom.officialMojangMappings()
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-	// ModMenu API
-	modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
-
-	// LibGui
-	modImplementation include("io.github.cottonmc:LibGui:${project.libgui_version}")
-
-	// LambDynamicLights
-	modImplementation "dev.lambdaurora:lambdynamiclights:${project.lambdynamiclights_version}"
-
-	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-	// You may need to force-disable transitiveness on them.
-}
-
-processResources {
-	inputs.property "version", project.version
-
-	filesMatching("fabric.mod.json") {
-		expand "version": project.version
-	}
-}
-
-tasks.withType(JavaCompile).configureEach {
-	// ensure that the encoding is set to UTF-8, no matter what the system default is
-	// this fixes some edge cases with special characters not displaying correctly
-	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-	// If Javadoc is generated, this must be specified in that task too.
-	it.options.encoding = "UTF-8"
-
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+architectury {
+    minecraft = project.minecraft_version
 }
 
-java {
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
-	// If you remove this line, sources will not be generated.
-	withSourcesJar()
+allprojects {
+    group = rootProject.maven_group
+    version = rootProject.mod_version
 }
 
-loom {
-	accessWidenerPath = file("src/main/resources/additionaladditions.accesswidener")
-}
-
-jar {
-	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
-	}
-}
-
-// configure the maven publication
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			// add all the jars that should be included when publishing to maven
-			from components.java
-		}
-	}
-
-	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-	repositories {
-		// Add repositories to publish to here.
-		// Notice: This block does NOT have the same function as the block in the top level.
-		// The repositories here will be used for publishing your artifact, not for
-		// retrieving dependencies.
-	}
+subprojects {
+    apply plugin: 'dev.architectury.loom'
+    apply plugin: 'architectury-plugin'
+    apply plugin: 'maven-publish'
+
+    base {
+        // Set up a suffixed format for the mod jar names, e.g. `example-fabric`.
+        archivesName = "$rootProject.archives_name-$project.name"
+    }
+
+    repositories {
+        // Add repositories to retrieve artifacts from in here.
+        // You should only use this when depending on other mods because
+        // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+        // See https://docs.gradle.org/current/userguide/declaring_repositories.html
+        // for more information about repositories.
+    }
+
+    loom {
+        silentMojangMappingsLicense()
+    }
+
+    dependencies {
+        minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
+        mappings loom.officialMojangMappings()
+    }
+
+    java {
+        // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+        // if it is present.
+        // If you remove this line, sources will not be generated.
+        withSourcesJar()
+
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
+
+    tasks.withType(JavaCompile).configureEach {
+        it.options.release = 21
+    }
+
+    // Configure Maven publishing.
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                artifactId = base.archivesName.get()
+                from components.java
+            }
+        }
+
+        // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+        repositories {
+            // Add repositories to publish to here.
+            // Notice: This block does NOT have the same function as the block in the top level.
+            // The repositories here will be used for publishing your artifact, not for
+            // retrieving dependencies.
+        }
+    }
 }

common/build.gradle

@@ -0,0 +1,22 @@
+architectury {
+    common rootProject.enabled_platforms.split(',')
+}
+
+repositories {
+    maven {
+        name = "JEI"
+        url = "https://maven.blamejared.com/"
+    }
+}
+
+dependencies {
+    modImplementation "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}"
+}
+
+loom {
+    accessWidenerPath = file("../common/src/main/resources/additionaladditions.accesswidener" )
+}

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

@@ -0,0 +1,29 @@
+package one.dqu.additionaladditions;
+
+import one.dqu.additionaladditions.config.Config;
+import one.dqu.additionaladditions.config.io.ConfigLoader;
+import one.dqu.additionaladditions.registry.*;
+import one.dqu.additionaladditions.util.ModCompatibility;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class AdditionalAdditions {
+    public static final String NAMESPACE = "additionaladditions";
+    public static final Logger LOGGER = LoggerFactory.getLogger(NAMESPACE);
+
+    public static void init() {
+        ConfigLoader.load();
+
+        AAMisc.registerAll();
+        AAEntities.registerAll();
+        AAItems.registerAll();
+        AABlocks.registerAll();
+
+        ModCompatibility.add(
+                () -> Config.COPPER_PATINA.get().enabled(),
+                "Alternate Current mod is incompatible with the Copper Patina feature. Please disable Copper Patina in the config or uninstall Alternate Current.",
+                "alternate-current", "alternate_current"
+        );
+    }
+}
+

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

@@ -0,0 +1,72 @@
+package one.dqu.additionaladditions;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.renderer.item.ClampedItemPropertyFunction;
+import net.minecraft.client.renderer.item.ItemProperties;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.Level;
+import one.dqu.additionaladditions.item.PocketJukeboxItem;
+import one.dqu.additionaladditions.registry.AAItems;
+import one.dqu.additionaladditions.registry.AAMisc;
+
+@Environment(EnvType.CLIENT)
+public final class AdditionalAdditionsClient {
+    public static void init() {
+        itemProperties();
+    }
+
+    private static void itemProperties() {
+        ItemProperties.register(AAItems.POCKET_JUKEBOX_ITEM.get(), ResourceLocation.withDefaultNamespace("disc"), ((itemStack, clientWorld, livingEntity, worldSeed) -> {
+            return PocketJukeboxItem.hasDisc(itemStack) ? 1.0F : 0.0F;
+        }));
+
+        ClampedItemPropertyFunction albumFunction = (itemStack, clientWorld, livingEntity, worldSeed) -> {
+            if (!itemStack.has(AAMisc.ALBUM_CONTENTS_COMPONENT.get())) {
+                return 0.0F;
+            }
+            return itemStack.get(AAMisc.ALBUM_CONTENTS_COMPONENT.get()).items().isEmpty() ? 0.0F : 1.0F;
+        };
+        ResourceLocation albumLocation = ResourceLocation.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "disc");
+        ItemProperties.register(AAItems.ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.WHITE_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.LIGHT_GRAY_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.GRAY_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.BLACK_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.BROWN_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.RED_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.ORANGE_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.YELLOW_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.LIME_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.GREEN_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.CYAN_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.LIGHT_BLUE_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.BLUE_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.PURPLE_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.MAGENTA_ALBUM.get(), albumLocation, albumFunction);
+        ItemProperties.register(AAItems.PINK_ALBUM.get(), albumLocation, albumFunction);
+
+        ItemProperties.register(AAItems.BAROMETER.get(), ResourceLocation.withDefaultNamespace("angle"), (itemStack, clientWorld, livingEntity, worldSeed) -> {
+            Entity entity = livingEntity != null ? livingEntity : itemStack.getEntityRepresentation();
+            if (entity == null) return 0.3125F;
+            Level world = entity.level();
+
+            float sea = world.getSeaLevel();
+            float height = entity.getBlockY();
+            float top = world.getMaxBuildHeight();
+            float bottom = world.getMinBuildHeight();
+
+            if (height > top) return 0;
+            if (height < bottom) return 1;
+
+            if (height >= sea) {
+                double val = (height / (2 * (sea - top))) + 0.25 - ((sea + top) / (4 * (sea - top)));
+                return (float) val;
+            } else {
+                double val = (height / (2 * (bottom - sea))) + 0.75 - ((bottom + sea) / (4 * (bottom - sea)));
+                return (float) val;
+            }
+        });
+    }
+}

common/src/main/java/one/dqu/additionaladditions/block/CopperPatinaBlock.java

@@ -0,0 +1,9 @@
+package one.dqu.additionaladditions.block;
+
+import net.minecraft.world.level.block.RedStoneWireBlock;
+
+public class CopperPatinaBlock extends RedStoneWireBlock {
+    public CopperPatinaBlock(Properties properties) {
+        super(properties);
+    }
+}