Tooling Updates

CHANGELOG.md

@@ -1,3 +1,3 @@
-### 6.0.1
+### 6.0.2
 
-- Update NeoForge
+- Tooling Updates

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id("dev.nanite.mlp") version("0.2.0")
+    id("dev.nanite.mlp") version("0.3.0")
     id("java-library")
     id("maven-publish")
     id("me.modmuss50.mod-publish-plugin") version "0.3.0"
@@ -15,83 +15,7 @@ multiLoader.root() {
     splitSources.set(true)
     convertAccessWidener.set(true)
     accessWidenerFile.set(project(":common").file("src/main/resources/${mod_id}.accesswidener"))
-
-    def get = filesToExpand.get()
-    def newList = new ArrayList<>(get)
-    newList.add("META-INF/neoforge.mods.toml")
-    filesToExpand.set(newList)
-}
-
-allprojects {
-    def isSnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false)
-    version = "${mod_version}+mc${minecraft_version}${isSnapshot ? '-SNAPSHOT' : ''}"
-    setArchivesBaseName("${mod_name}-${project.name}".toLowerCase())
-    group = "com.unrealdinnerbone"
-
-    idea {
-        module {
-            downloadSources = true
-            downloadJavadoc = true
-        }
-    }
-}
-
-subprojects {
-
-
-    apply plugin: 'java-library'
-    apply plugin: 'maven-publish'
-    apply plugin: 'dev.nanite.mlp'
-
-
-    sourceSets.main.resources.srcDir project.file('src/generated/resources')
-
-    java.toolchain.languageVersion = JavaLanguageVersion.of(21)
-
-
-    base {
-        archivesName = "${project.property("mod_name")}-${project.name}".toLowerCase()
-    }
-    repositories {
-        maven {
-            name = "NeoForge"
-            url = "https://maven.neoforged.net/"
-        }
-        maven {
-            name = "Fabric"
-            url = "https://maven.fabricmc.net/"
-        }
-    }
-    tasks.withType(ProcessResources).configureEach {
-        outputs.upToDateWhen { false }
-    }
-
-    test {
-        enabled = false
-    }
-
-    publishing {
-        repositories {
-            if (providers.environmentVariable("NANITE_TOKEN").isPresent()) {
-                maven {
-                    def isSnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false)
-                    url "https://maven.nanite.dev/${isSnapshot ? 'snapshots' : 'releases'}"
-                    credentials {
-                        username = "nanite"
-                        password = providers.environmentVariable("NANITE_TOKEN").get()
-                    }
-                }
-            }
-        }
-        publications {
-            register("mavenJava", MavenPublication) {
-                groupId project.group
-                artifactId project.getArchivesBaseName()
-            }
-        }
-    }
-
-
+    group.set(project.property("maven_group"))
 }
 
 

buildSrc/build.gradle

@@ -0,0 +1,3 @@
+plugins {
+    id 'groovy-gradle-plugin'
+}

buildSrc/src/main/groovy/multiloader.gradle

@@ -0,0 +1,63 @@
+plugins {
+    id 'java-library'
+    id 'maven-publish'
+    id 'dev.nanite.mlp'
+}
+
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+
+def isASnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false)
+version = "${mod_version}+mc${minecraft_version}${isASnapshot ? '-SNAPSHOT' : ''}"
+setArchivesBaseName("${mod_name}-${project.name}".toLowerCase())
+group = "${maven_group}"
+
+idea {
+    module {
+        downloadSources = true
+        downloadJavadoc = true
+    }
+}
+
+base {
+    archivesName = "${project.property("mod_name")}-${project.name}".toLowerCase()
+}
+
+repositories {
+    maven {
+        name = "NeoForge"
+        url = "https://maven.neoforged.net/"
+    }
+    maven {
+        name = "Fabric"
+        url = "https://maven.fabricmc.net/"
+    }
+}
+
+tasks.withType(ProcessResources).configureEach {
+    outputs.upToDateWhen { false }
+}
+
+test {
+    enabled = false
+}
+
+publishing {
+    repositories {
+        if (providers.environmentVariable("NANITE_TOKEN").isPresent()) {
+            maven {
+                def isSnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false)
+                url "https://maven.nanite.dev/${isSnapshot ? 'snapshots' : 'releases'}"
+                credentials {
+                    username = "nanite"
+                    password = providers.environmentVariable("NANITE_TOKEN").get()
+                }
+            }
+        }
+    }
+    publications {
+        register("mavenJava", MavenPublication) {
+            groupId project.group
+            artifactId project.getArchivesBaseName()
+        }
+    }
+}

common/build.gradle

@@ -1,5 +1,7 @@
+plugins {
+    id 'multiloader'
+}
+
 multiLoader.common()
 
 publishing.publications.mavenJava.from components.java
-
-

common/src/main/java/com/unrealdinnerbone/trenzalore/api/registry/Regeneration.java

@@ -1,12 +1,9 @@
 package com.unrealdinnerbone.trenzalore.api.registry;
 
 import com.unrealdinnerbone.trenzalore.api.platform.Services;
-import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.advancements.CriterionTrigger;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.flag.FeatureFlagSet;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -17,7 +14,6 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
-import org.jetbrains.annotations.ApiStatus;
 
 import java.util.List;
 import java.util.function.BiFunction;

fabric/build.gradle

@@ -1,3 +1,7 @@
+plugins {
+    id 'multiloader'
+}
+
 multiLoader.fabric() {
     fabricLoaderVersion.set("${fabric_loader_version}")
     fabricApiVersion.set("${fabric_version}")

gradle.properties

@@ -1,5 +1,5 @@
 # Project
-mod_version=6.0.1
+mod_version=6.0.2
 maven_group=com.unrealdinnerbone
 mod_name=Trenzalore
 mod_author=UnRealDinnerbone

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

neo/build.gradle

@@ -1,6 +1,11 @@
+plugins {
+    id 'multiloader'
+}
+
 multiLoader.neo() {
     neoVersion.set("${neo_version}")
 }
 
 publishing.publications.mavenJava.from components.java
 
+sourceSets.main.resources { srcDir 'src/generated/resources' }

settings.gradle

@@ -1,6 +1,5 @@
 pluginManagement {
     repositories {
-        mavenLocal()
         gradlePluginPortal()
         maven {
             name = "NeoForge"
@@ -25,6 +24,4 @@ pluginManagement {
 }
 
 
-
-
 include("common", "neo", "fabric")