Skip to content

Commit 7e4d9c9

Browse files
committed
the
1 parent 28503b8 commit 7e4d9c9

File tree

10 files changed

+61
-144
lines changed

10 files changed

+61
-144
lines changed

build.gradle

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
plugins {
2-
id "maven-publish"
3-
alias(libs.plugins.quilt.loom)
4-
alias(libs.plugins.minotaur)
2+
id 'fabric-loom' version '1.2-SNAPSHOT'
3+
id 'org.ajoberstar.grgit' version '4.1.0'
4+
id "com.modrinth.minotaur" version "2.+"
5+
id 'maven-publish'
56
}
67

7-
archivesBaseName = project.archives_base_name + "-" + libs.versions.minecraft.get()
8+
version = "${project.mod_version}${getVersionMetadata()}"
89
version = project.version
910
group = project.maven_group
1011

@@ -30,21 +31,16 @@ repositories {
3031
}
3132

3233
dependencies {
33-
minecraft libs.minecraft
34-
mappings loom.layered {
35-
addLayer quiltMappings.mappings("org.quiltmc:quilt-mappings:${libs.versions.quilt.mappings.get()}:v2")
36-
}
37-
38-
modImplementation libs.quilt.loader
39-
modImplementation libs.quilted.fabric.api
34+
minecraft "com.mojang:minecraft:${project.minecraft_version}"
35+
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
36+
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
4037

4138
implementation "com.github.bbottema:jetbrains-runtime-annotations:1.0.1"
4239

43-
// probably a bad idea to jij this lol
44-
modApi include("fi.dy.masa.malilib:malilib-fabric-1.19.1:${libs.versions.malilib.get()}")
45-
modCompileOnly("com.terraformersmc:modmenu:${libs.versions.mod.menu.get()}")
40+
implementation files("libs/malilib-fabric-1.20-pre5-0.16.0.jar")
4641

47-
modApi include("com.adryd:cauldron:${libs.versions.cauldron.get()}")
42+
modCompileOnly("com.terraformersmc:modmenu:${project.modmenu_version}")
43+
modApi include("com.adryd:cauldron:${project.cauldron_version}")
4844
}
4945

5046
loom {
@@ -77,20 +73,12 @@ jar {
7773
}
7874
}
7975

80-
// configure the maven publication
8176
publishing {
8277
publications {
8378
mavenJava(MavenPublication) {
8479
from components.java
8580
}
8681
}
87-
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
88-
repositories {
89-
// Add repositories to publish to here.
90-
// Notice: This block does NOT have the same function as the block in the top level.
91-
// The repositories here will be used for publishing your artifact, not for
92-
// retrieving dependencies.
93-
}
9482
}
9583

9684
modrinth {
@@ -100,11 +88,35 @@ modrinth {
10088
versionNumber = version
10189
versionType = (System.getenv("MODRINTH_RELEASE") == "true") ? "release" : "beta"
10290
uploadFile = remapJar
103-
gameVersions = ["1.19.1"]
91+
gameVersions = ["1.20"]
10492
loaders = ["quilt"]
10593
dependencies {
10694
required.project "qsl"
10795
}
10896
}
10997

11098
tasks.modrinth.dependsOn(tasks.modrinthSyncBody)
99+
100+
def getVersionMetadata() {
101+
def release = System.getenv("BUILD_RELEASE") == "true"
102+
def build_ci_branch = System.getenv("CI_COMMIT_BRANCH")
103+
104+
if (release) {
105+
return ""
106+
}
107+
108+
if (grgit != null && grgit.status().clean) {
109+
// 8 chars long to match GitLab's commit IDs
110+
def id = grgit.head().id[[0..7]]
111+
def branch = grgit.branch.current().name
112+
113+
if (branch == "main" || build_ci_branch == "main") {
114+
return "+" + id
115+
}
116+
117+
return "+" + branch + "." + id
118+
}
119+
120+
return "+SNAPSHOT"
121+
}
122+

gradle.properties

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
org.gradle.jvmargs=-Xmx1G
22
org.gradle.parallel = true
33

4-
mod_version = 0.5.0
4+
# Fabric Properties
5+
minecraft_version=1.20
6+
yarn_mappings=1.20+build.1
7+
loader_version=0.14.19
8+
9+
mod_version = 0.6.0
510
maven_group = pm.n2
611
archives_base_name = parachute
12+
13+
# Dependencies
14+
fabric_version=0.83.0+1.20
15+
cauldron_version=0.1.2-alpha2
16+
modmenu_version=7.0.1
17+
#malilib_version

gradle/libs.versions.toml

Lines changed: 0 additions & 27 deletions
This file was deleted.

gradle/wrapper/gradle-wrapper.jar

1.29 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
545 KB
Binary file not shown.

settings.gradle

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
pluginManagement {
22
repositories {
3-
maven {
4-
name = "Quilt"
5-
url = "https://maven.quiltmc.org/repository/release"
6-
}
73
maven {
84
name = "Fabric"
95
url = "https://maven.fabricmc.net/"
106
}
11-
maven {
12-
name = "Cotton"
13-
url = "https://server.bbkr.space/artifactory/libs-release/"
14-
}
7+
mavenCentral()
158
gradlePluginPortal()
169
}
1710
}

src/main/java/pm/n2/parachute/ParachuteClient.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import com.adryd.cauldron.api.render.helper.OverlayRenderManager;
44
import fi.dy.masa.malilib.event.InitializationHandler;
5+
import net.fabricmc.api.ClientModInitializer;
6+
import net.fabricmc.loader.api.FabricLoader;
57
import net.minecraft.util.Formatting;
68
import com.adryd.cauldron.api.command.ClientCommandManager;
79
import org.quiltmc.loader.api.ModContainer;
@@ -35,17 +37,19 @@ public static String getModVersion() {
3537
return MOD_VERSION;
3638
}
3739

38-
public void onInitializeClient(ModContainer mod) {
39-
MOD_VERSION = mod.metadata()
40-
.version()
41-
.raw();
40+
public void onInitializeClient() {
41+
MOD_VERSION = FabricLoader
42+
.getInstance()
43+
.getModContainer("parachute")
44+
.get()
45+
.getMetadata()
46+
.getVersion()
47+
.toString();
4248

4349
InitializationHandler.getInstance().registerInitializationHandler(new InitHandler());
4450
Parachute.LOGGER.info("Hello from parachute <3!");
4551

4652
PanoramaCommand.register(ClientCommandManager.DISPATCHER);
4753
ModsCommand.register(ClientCommandManager.DISPATCHER);
48-
49-
OverlayRenderManager.addRenderer(new OverlayRendererWorldEditCUI());
5054
}
5155
}

src/main/java/pm/n2/parachute/render/OverlayRendererWorldEditCUI.java

Lines changed: 0 additions & 66 deletions
This file was deleted.

src/main/java/pm/n2/parachute/render/RenderColors.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)