Skip to content

Commit

Permalink
Ported to 1.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
LatvianModder committed Nov 20, 2023
1 parent e5d52f5 commit b237e76
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 20 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: Java CI (1.19.2 Forge)
name: Java CI (1.20.1 Forge)

on:
push:
branches:
- '1902/forge'
- '2001/forge'
workflow_dispatch:
branches:
- '1902/forge'
- '2001/forge'
inputs:
release_type:
description: 'Release Type'
Expand Down
2 changes: 1 addition & 1 deletion .kubejs/meta.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"minecraft": 1902,
"minecraft": 2001,
"type": "forge",
"version": {
"file": "gradle.properties",
Expand Down
34 changes: 28 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,24 @@ group = project.maven_group

loom {
silentMojangMappingsLicense()

runs {
client {
if (ENV.MC_CLIENT_ARGS) {
programArgs ENV.MC_CLIENT_ARGS.split(' ')
}

vmArgs("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AllowEnhancedClassRedefinition")
}
}
}

repositories {
maven {
url "https://maven.saps.dev/releases"
url "https://maven.latvian.dev/releases"
content {
includeGroup "dev.latvian.mods"
}
}

maven {
Expand All @@ -45,6 +58,14 @@ repositories {
includeGroup "curse.maven"
}
}

maven {
name 'JitPack'
url 'https://jitpack.io'
content {
includeGroupByRegex '(io|com)\\.github\\..*'
}
}
}

dependencies {
Expand All @@ -53,14 +74,15 @@ dependencies {

forge "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"

implementation(annotationProcessor("io.github.llamalad7:mixinextras-forge:0.2.0"))
modApi "dev.latvian.mods:kubejs-forge:${rootProject.kubejs_version}"
modApi("com.simibubi.create:create-${rootProject.minecraft_version}:${rootProject.create_version}:slim") {
transitive = false // transitive jei and cc tweaked dependencies leaking through 😍
}
modApi "com.jozufozu.flywheel:flywheel-forge-${rootProject.minecraft_version}:${rootProject.flywheel_version}"
modApi "com.tterrag.registrate:Registrate:${registrate_version}"

modLocalRuntime modCompileOnly("curse.maven:jei-238222:4494410")
modLocalRuntime modCompileOnly("curse.maven:jei-238222:4712868")
}

processResources {
Expand Down Expand Up @@ -141,10 +163,10 @@ unifiedPublishing {
relations {
depends {
curseforge = modrinth = "kubejs"
}
depends {
curseforge = modrinth = "create"
}
}
depends {
curseforge = modrinth = "create"
}
}

if (ENV.CURSEFORGE_KEY) {
Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ org.gradle.daemon=false
mod_id=kubejs_create
mod_name=KubeJS Create
archives_base_name=kubejs-create
mod_version=1902.2.4
mod_version=2001.2.5

maven_group=dev.latvian.mods
mod_author=LatvianModder
minecraft_version=1.19.2
minecraft_version=1.20.1

curseforge_id=429371
modrinth_id=T38eAZQC

create_version=0.5.1.c-35
flywheel_version=0.6.9-18
registrate_version=MC1.19-1.1.5
create_version=0.5.1.f-26
flywheel_version=0.6.10-7
registrate_version=MC1.20-1.3.11

kubejs_version=1902.6.1-build.327
kubejs_version=2001.6.4-build.95

forge_version=43.2.4
forge_version=47.2.0

loom.platform=forge
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ pluginManagement {
}
}

rootProject.name = 'KubeJS-Create-1.19.2-Forge'
rootProject.name = 'KubeJS-Create-1.20.1-Forge'
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
modLoader = "javafml"
loaderVersion = "[40,)"
issueTrackerURL = "https://kubejs.com/support?source=kubejs_create&mc=1902&loader=forge"
issueTrackerURL = "https://kubejs.com/support?source=kubejs_create&mc=2001&loader=forge"
license = "GNU LGPLv3"

[[mods]]
Expand All @@ -16,7 +16,7 @@ license = "GNU LGPLv3"
[[dependencies.kubejs_create]]
modId = "kubejs"
mandatory = true
versionRange = "[1902.6.1-build.300,)"
versionRange = "[2001.6.4-build.95,)"
ordering = "AFTER"
side = "BOTH"

Expand Down

0 comments on commit b237e76

Please sign in to comment.