Skip to content

Commit fe65c22

Browse files
UnRealDinnerboneUnRealDinnerbone
committed
Tooling Updates
1 parent 6d73c90 commit fe65c22

File tree

12 files changed

+85
-91
lines changed

12 files changed

+85
-91
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
### 6.0.1
1+
### 6.0.2
22

3-
- Update NeoForge
3+
- Tooling Updates

‎build.gradle

Lines changed: 2 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("dev.nanite.mlp") version("0.2.0")
2+
id("dev.nanite.mlp") version("0.3.0")
33
id("java-library")
44
id("maven-publish")
55
id("me.modmuss50.mod-publish-plugin") version "0.3.0"
@@ -15,83 +15,7 @@ multiLoader.root() {
1515
splitSources.set(true)
1616
convertAccessWidener.set(true)
1717
accessWidenerFile.set(project(":common").file("src/main/resources/${mod_id}.accesswidener"))
18-
19-
def get = filesToExpand.get()
20-
def newList = new ArrayList<>(get)
21-
newList.add("META-INF/neoforge.mods.toml")
22-
filesToExpand.set(newList)
23-
}
24-
25-
allprojects {
26-
def isSnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false)
27-
version = "${mod_version}+mc${minecraft_version}${isSnapshot ? '-SNAPSHOT' : ''}"
28-
setArchivesBaseName("${mod_name}-${project.name}".toLowerCase())
29-
group = "com.unrealdinnerbone"
30-
31-
idea {
32-
module {
33-
downloadSources = true
34-
downloadJavadoc = true
35-
}
36-
}
37-
}
38-
39-
subprojects {
40-
41-
42-
apply plugin: 'java-library'
43-
apply plugin: 'maven-publish'
44-
apply plugin: 'dev.nanite.mlp'
45-
46-
47-
sourceSets.main.resources.srcDir project.file('src/generated/resources')
48-
49-
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
50-
51-
52-
base {
53-
archivesName = "${project.property("mod_name")}-${project.name}".toLowerCase()
54-
}
55-
repositories {
56-
maven {
57-
name = "NeoForge"
58-
url = "https://maven.neoforged.net/"
59-
}
60-
maven {
61-
name = "Fabric"
62-
url = "https://maven.fabricmc.net/"
63-
}
64-
}
65-
tasks.withType(ProcessResources).configureEach {
66-
outputs.upToDateWhen { false }
67-
}
68-
69-
test {
70-
enabled = false
71-
}
72-
73-
publishing {
74-
repositories {
75-
if (providers.environmentVariable("NANITE_TOKEN").isPresent()) {
76-
maven {
77-
def isSnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false)
78-
url "https://maven.nanite.dev/${isSnapshot ? 'snapshots' : 'releases'}"
79-
credentials {
80-
username = "nanite"
81-
password = providers.environmentVariable("NANITE_TOKEN").get()
82-
}
83-
}
84-
}
85-
}
86-
publications {
87-
register("mavenJava", MavenPublication) {
88-
groupId project.group
89-
artifactId project.getArchivesBaseName()
90-
}
91-
}
92-
}
93-
94-
18+
group.set(project.property("maven_group"))
9519
}
9620

9721

‎buildSrc/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
plugins {
2+
id 'groovy-gradle-plugin'
3+
}

‎buildSrc/src/main/groovy/multiloader.gradle

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
plugins {
2+
id 'java-library'
3+
id 'maven-publish'
4+
id 'dev.nanite.mlp'
5+
}
6+
7+
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
8+
9+
def isASnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false)
10+
version = "${mod_version}+mc${minecraft_version}${isASnapshot ? '-SNAPSHOT' : ''}"
11+
setArchivesBaseName("${mod_name}-${project.name}".toLowerCase())
12+
group = "${maven_group}"
13+
14+
idea {
15+
module {
16+
downloadSources = true
17+
downloadJavadoc = true
18+
}
19+
}
20+
21+
base {
22+
archivesName = "${project.property("mod_name")}-${project.name}".toLowerCase()
23+
}
24+
25+
repositories {
26+
maven {
27+
name = "NeoForge"
28+
url = "https://maven.neoforged.net/"
29+
}
30+
maven {
31+
name = "Fabric"
32+
url = "https://maven.fabricmc.net/"
33+
}
34+
}
35+
36+
tasks.withType(ProcessResources).configureEach {
37+
outputs.upToDateWhen { false }
38+
}
39+
40+
test {
41+
enabled = false
42+
}
43+
44+
publishing {
45+
repositories {
46+
if (providers.environmentVariable("NANITE_TOKEN").isPresent()) {
47+
maven {
48+
def isSnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false)
49+
url "https://maven.nanite.dev/${isSnapshot ? 'snapshots' : 'releases'}"
50+
credentials {
51+
username = "nanite"
52+
password = providers.environmentVariable("NANITE_TOKEN").get()
53+
}
54+
}
55+
}
56+
}
57+
publications {
58+
register("mavenJava", MavenPublication) {
59+
groupId project.group
60+
artifactId project.getArchivesBaseName()
61+
}
62+
}
63+
}

‎common/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
plugins {
2+
id 'multiloader'
3+
}
4+
15
multiLoader.common()
26

37
publishing.publications.mavenJava.from components.java
4-
5-

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
package com.unrealdinnerbone.trenzalore.api.registry;
22

33
import com.unrealdinnerbone.trenzalore.api.platform.Services;
4-
import net.minecraft.advancements.CriteriaTriggers;
5-
import net.minecraft.advancements.CriterionTrigger;
64
import net.minecraft.core.BlockPos;
75
import net.minecraft.core.Registry;
86
import net.minecraft.resources.ResourceKey;
9-
import net.minecraft.resources.ResourceLocation;
107
import net.minecraft.world.entity.player.Inventory;
118
import net.minecraft.world.flag.FeatureFlagSet;
129
import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -17,7 +14,6 @@
1714
import net.minecraft.world.level.block.entity.BlockEntity;
1815
import net.minecraft.world.level.block.entity.BlockEntityType;
1916
import net.minecraft.world.level.block.state.BlockState;
20-
import org.jetbrains.annotations.ApiStatus;
2117

2218
import java.util.List;
2319
import java.util.function.BiFunction;

‎common/src/main/resources/assets/trenzalore/logo.png

-29.3 KB
Loading

‎fabric/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
plugins {
2+
id 'multiloader'
3+
}
4+
15
multiLoader.fabric() {
26
fabricLoaderVersion.set("${fabric_loader_version}")
37
fabricApiVersion.set("${fabric_version}")

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Project
2-
mod_version=6.0.1
2+
mod_version=6.0.2
33
maven_group=com.unrealdinnerbone
44
mod_name=Trenzalore
55
mod_author=UnRealDinnerbone

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎neo/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
plugins {
2+
id 'multiloader'
3+
}
4+
15
multiLoader.neo() {
26
neoVersion.set("${neo_version}")
37
}
48

59
publishing.publications.mavenJava.from components.java
610

11+
sourceSets.main.resources { srcDir 'src/generated/resources' }

‎settings.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
pluginManagement {
22
repositories {
3-
mavenLocal()
43
gradlePluginPortal()
54
maven {
65
name = "NeoForge"
@@ -25,6 +24,4 @@ pluginManagement {
2524
}
2625

2726

28-
29-
3027
include("common", "neo", "fabric")

0 commit comments

Comments
 (0)