1.4.0

(cherry picked from commit 70a46d9)
matthewperiut · Mar 5, 2025 · 101c479 · 101c479
1 parent 20ab8a2
commit 101c479
Show file tree

Hide file tree

Showing 22 changed files with 141 additions and 203 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
         run: ./gradlew build
 
       - name: Upload built JAR (Fabric)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: chisel-artifacts
           path: build/libs
diff --git a/build.gradle b/build.gradle
@@ -1,31 +1,12 @@
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+    id 'dev.architectury.loom' version '1.7-SNAPSHOT' apply false
+    id 'architectury-plugin' version '3.4-SNAPSHOT'
+    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
 
 architectury {
-    minecraft = rootProject.minecraft_version
+    minecraft = project.minecraft_version
 }
-
-subprojects {
-    apply plugin: "dev.architectury.loom"
-
-    loom {
-        silentMojangMappingsLicense()
-    }
-
-    dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        mappings loom.layered {
-            it.mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
-            it.mappings("dev.architectury:yarn-mappings-patch-neoforge:1.21+build.4")
-        }
-        //modRuntimeOnly group: "earth.terrarium.athena", name: "athena-$project.name-$minecraft_version", version: athena_version
-
-        modCompileOnly files("../lib/chisel-1.6.jar")
-    }
-}
-
 def createVersionString() {
     def builder = new StringBuilder()
 
@@ -37,36 +18,63 @@ def createVersionString() {
 }
 
 allprojects {
-    apply plugin: "java"
-    apply plugin: "architectury-plugin"
-    apply plugin: "maven-publish"
+    version = createVersionString()
+    group = rootProject.maven_group
+}
+
+subprojects {
+    apply plugin: 'dev.architectury.loom'
+    apply plugin: 'architectury-plugin'
+    apply plugin: 'maven-publish'
 
     base {
-        archivesName = rootProject.archives_base_name
+        // Set up a suffixed format for the mod jar names, e.g. `example-fabric`.
+        archivesName = "$rootProject.archives_name-$project.name"
     }
 
-    version = createVersionString()
-    group = rootProject.maven_group
-
     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.
-        maven {
-            url "https://maven.teamresourceful.com/repository/maven-public/"
-        }
-        maven { url "https://maven.neoforged.net/" }
-
+        maven { url = "https://maven.terraformersmc.com/" }
+        maven { url "https://maven.periut.com/" }
     }
 
-    tasks.withType(JavaCompile) {
-        options.encoding = "UTF-8"
-        options.release = 21
+    dependencies {
+        minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
+        mappings loom.layered {
+            it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
+            it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version")
+        }
+        modImplementation "com.periut.chisel:chisel-${project.name}:2.0.0+mc${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()
+
+        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.
+        }
     }
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -3,7 +3,6 @@ architectury {
 }
 
 loom {
-    accessWidenerPath = file("src/main/resources/examplemod.accesswidener")
 }
 
 dependencies {
@@ -12,14 +11,12 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     // Remove the next line if you don't want to depend on the API
     modApi "dev.architectury:architectury:${rootProject.architectury_version}"
-
-
 }
 
 publishing {
     publications {
         mavenCommon(MavenPublication) {
-            artifactId = rootProject.archives_base_name
+            artifactId = rootProject.archives_name
             from components.java
         }
     }

diff --git a/...incow/factoryblocks/FactoryBlocksMod.java → ...eriut/factoryblocks/FactoryBlocksMod.java b/...incow/factoryblocks/FactoryBlocksMod.java → ...eriut/factoryblocks/FactoryBlocksMod.java
@@ -1,15 +1,12 @@
-package com.slaincow.factoryblocks;
+package com.periut.factoryblocks;
 
-import com.google.common.base.Supplier;
-import com.slaincow.factoryblocks.block.RegisterBlocks;
-import com.slaincow.factoryblocks.optional.ChiselSupport;
+import com.periut.factoryblocks.block.RegisterBlocks;
+import com.periut.factoryblocks.optional.ChiselSupport;
 import dev.architectury.registry.registries.RegistrySupplier;
 import net.minecraft.item.Item;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.slaincow.factoryblocks.block.RegisterBlocks.itemSuppliers;
-
 public class FactoryBlocksMod
 {
 	public static final String MODID = "factory_blocks";

diff --git a/.../slaincow/factoryblocks/FactorySound.java → ...om/periut/factoryblocks/FactorySound.java b/.../slaincow/factoryblocks/FactorySound.java → ...om/periut/factoryblocks/FactorySound.java
@@ -1,4 +1,4 @@
-package com.slaincow.factoryblocks;
+package com.periut.factoryblocks;
 
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.sound.SoundEvent;

diff --git a/...incow/factoryblocks/TooltipBlockItem.java → ...eriut/factoryblocks/TooltipBlockItem.java b/...incow/factoryblocks/TooltipBlockItem.java → ...eriut/factoryblocks/TooltipBlockItem.java
@@ -1,4 +1,4 @@
-package com.slaincow.factoryblocks;
+package com.periut.factoryblocks;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.BlockItem;

diff --git a/...factoryblocks/block/BaseFactoryBlock.java → ...factoryblocks/block/BaseFactoryBlock.java b/...factoryblocks/block/BaseFactoryBlock.java → ...factoryblocks/block/BaseFactoryBlock.java
@@ -1,9 +1,9 @@
-package com.slaincow.factoryblocks.block;
+package com.periut.factoryblocks.block;
 
 import net.minecraft.block.Block;
 import net.minecraft.state.property.BooleanProperty;
 
-import static com.slaincow.factoryblocks.FactorySound.FACTORY_BLOCKS;
+import static com.periut.factoryblocks.FactorySound.FACTORY_BLOCKS;
 
 public class BaseFactoryBlock extends Block
 {

diff --git a/...w/factoryblocks/block/RegisterBlocks.java → ...t/factoryblocks/block/RegisterBlocks.java b/...w/factoryblocks/block/RegisterBlocks.java → ...t/factoryblocks/block/RegisterBlocks.java
@@ -1,11 +1,11 @@
-package com.slaincow.factoryblocks.block;
+package com.periut.factoryblocks.block;
 
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
-import com.slaincow.factoryblocks.TooltipBlockItem;
-import com.slaincow.factoryblocks.block.fan.BaseFanBlock;
-import com.slaincow.factoryblocks.block.fan.MediumFanBlock;
-import com.slaincow.factoryblocks.block.fan.RedstoneFanBlock;
+import com.periut.factoryblocks.TooltipBlockItem;
+import com.periut.factoryblocks.block.fan.BaseFanBlock;
+import com.periut.factoryblocks.block.fan.MediumFanBlock;
+import com.periut.factoryblocks.block.fan.RedstoneFanBlock;
 import dev.architectury.registry.registries.Registrar;
 import dev.architectury.registry.registries.RegistrarManager;
 import dev.architectury.registry.registries.RegistrySupplier;
@@ -19,7 +19,7 @@
 
 import java.util.ArrayList;
 
-import static com.slaincow.factoryblocks.FactoryBlocksMod.MODID;
+import static com.periut.factoryblocks.FactoryBlocksMod.MODID;
 
 public class RegisterBlocks
 {

diff --git a/...factoryblocks/block/fan/BaseFanBlock.java → ...factoryblocks/block/fan/BaseFanBlock.java b/...factoryblocks/block/fan/BaseFanBlock.java → ...factoryblocks/block/fan/BaseFanBlock.java
@@ -1,6 +1,6 @@
-package com.slaincow.factoryblocks.block.fan;
+package com.periut.factoryblocks.block.fan;
 
-import com.slaincow.factoryblocks.block.BaseFactoryBlock;
+import com.periut.factoryblocks.block.BaseFactoryBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemPlacementContext;

diff --git a/...ctoryblocks/block/fan/MediumFanBlock.java → ...ctoryblocks/block/fan/MediumFanBlock.java b/...ctoryblocks/block/fan/MediumFanBlock.java → ...ctoryblocks/block/fan/MediumFanBlock.java
@@ -1,4 +1,4 @@
-package com.slaincow.factoryblocks.block.fan;
+package com.periut.factoryblocks.block.fan;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;

diff --git a/...oryblocks/block/fan/RedstoneFanBlock.java → ...oryblocks/block/fan/RedstoneFanBlock.java b/...oryblocks/block/fan/RedstoneFanBlock.java → ...oryblocks/block/fan/RedstoneFanBlock.java
@@ -1,4 +1,4 @@
-package com.slaincow.factoryblocks.block.fan;
+package com.periut.factoryblocks.block.fan;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;

diff --git a/...factoryblocks/optional/ChiselSupport.java → ...factoryblocks/optional/ChiselSupport.java b/...factoryblocks/optional/ChiselSupport.java → ...factoryblocks/optional/ChiselSupport.java
@@ -1,8 +1,6 @@
-package com.slaincow.factoryblocks.optional;
+package com.periut.factoryblocks.optional;
 
-import com.matthewperiut.chisel.block.ChiselGroupLookup;
-import com.slaincow.factoryblocks.TooltipBlockItem;
-import net.minecraft.block.Block;
+import com.periut.chisel.block.ChiselGroupLookup;
 import net.minecraft.util.Identifier;
 
 public class ChiselSupport {

diff --git a/common/src/main/resources/architectury.common.json b/common/src/main/resources/architectury.common.json
diff --git a/common/src/main/resources/examplemod.accesswidener b/common/src/main/resources/examplemod.accesswidener
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -1,81 +1,53 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
-}
-
-base {
-    archivesName = "factory_blocks-fabric"
+    id 'com.github.johnrengelman.shadow'
 }
 
 architectury {
     platformSetupLoomIde()
     fabric()
 }
 
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-}
-
 configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common
+
+    // Files in this configuration will be bundled into your mod using the Shadow plugin.
+    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
 }
 
 dependencies {
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
-    // Remove the next line if you don't want to depend on the API
+    modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
+
+    // Fabric API. This is technically optional, but you probably want it anyway.
+    modImplementation "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version"
     modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
 
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
+    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: ':common', configuration: 'transformProductionFabric')
 }
 
 processResources {
-    inputs.property "version", project.version
+    inputs.property 'version', project.version
 
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
+    filesMatching('fabric.mod.json') {
+        expand version: project.version
     }
 }
 
 shadowJar {
-    exclude "architectury.common.json"
-
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier = "dev-shadow"
+    configurations = [project.configurations.shadowBundle]
+    archiveClassifier = 'dev-shadow'
 }
 
 remapJar {
-    injectAccessWidener = true
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            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.
-    }
+    inputFile.set shadowJar.archiveFile
 }
diff --git a/...oryblocks/fabric/FactoryBlocksFabric.java → ...oryblocks/fabric/FactoryBlocksFabric.java b/...oryblocks/fabric/FactoryBlocksFabric.java → ...oryblocks/fabric/FactoryBlocksFabric.java
@@ -1,6 +1,6 @@
-package com.slaincow.factoryblocks.fabric;
+package com.periut.factoryblocks.fabric;
 
-import com.slaincow.factoryblocks.FactoryBlocksMod;
+import com.periut.factoryblocks.FactoryBlocksMod;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -20,12 +20,12 @@
 	"environment": "*",
 	"entrypoints": {
 		"main": [
-			"com.slaincow.factoryblocks.fabric.FactoryBlocksFabric"
+			"com.periut.factoryblocks.fabric.FactoryBlocksFabric"
 		]
 	},
 	"depends": {
 		"fabricloader": ">=0.15.10",
-		"minecraft": ["1.21", "1.21.1"],
+		"minecraft": ["1.21", "1.21.1", "1.21.2"],
 		"fabric-api": "*"
 	},
 	"suggests": {