Skip to content

Commit

Permalink
Update to 1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
UnRealDinnerbone committed Jun 13, 2024
1 parent 4e54e4b commit 64d768a
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 99 deletions.
1 change: 1 addition & 0 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ jobs:
secrets:
nanite-token: ${{ secrets.NANITE_DEPLOY }}
with:
java-version: 21
use-snapshots: true
gradle-tasks: build publish
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
### 5.0.0
### 6.0.0

- Update to Minecraft 1.20.5
- Update to Minecraft 1.21
24 changes: 11 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("dev.nanite.mlp") version("0.1.8")
id("dev.nanite.mlp") version("0.1.10")
id("java-library")
id("maven-publish")
id("me.modmuss50.mod-publish-plugin") version "0.3.0"
Expand Down Expand Up @@ -41,8 +41,12 @@ subprojects {
}
repositories {
maven {
name = "Creeperhost"
url = uri("https://maven.creeperhost.net/")
name = "NeoForge"
url = "https://maven.neoforged.net/"
}
maven {
name = "Fabric"
url = "https://maven.fabricmc.net/"
}
maven {
name = "Nanite"
Expand All @@ -53,6 +57,10 @@ subprojects {
outputs.upToDateWhen { false }
}

test {
enabled = false
}

publishing {
repositories {
if (providers.environmentVariable("NANITE_TOKEN").isPresent()) {
Expand Down Expand Up @@ -90,12 +98,6 @@ publishMods {
modLoaders.add("fabric")
}

// def forgeOptions = publishOptions {
// file = project.provider { project(":forge").tasks.jar }.flatMap { it.archiveFile }
// displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}"
// modLoaders.add("forge")
// }

def neoOptions = publishOptions {
file = project.provider { project(":neo").tasks.jar }.flatMap { it.archiveFile }
displayName = "${project.name} Neo ${mod_version}+mc${minecraft_version}"
Expand All @@ -119,10 +121,6 @@ publishMods {
}
}

// curseforge("curseforgeForge") {
// from(curseForgeOptions, forgeOptions)
// }

curseforge("curseforgeNeoForge") {
from(curseForgeOptions, neoOptions)
}
Expand Down
2 changes: 1 addition & 1 deletion fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"depends": {
"fabricloader": ">=0.14",
"minecraft": "${minecraft_version}",
"java": ">=17",
"java": ">=21",
"trenzalore": "${trenzalore_version}"
}
}
Expand Down
33 changes: 0 additions & 33 deletions forge/build.gradle

This file was deleted.

This file was deleted.

31 changes: 0 additions & 31 deletions forge/src/main/resources/META-INF/mods.toml

This file was deleted.

12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Project
mod_version=5.0.0
mod_version=6.0.0
maven_group=com.unrealdinnerbone
curse_id=517002
mod_name=IBICF
Expand All @@ -8,18 +8,18 @@ mod_id=ibicf


# Common
minecraft_version=1.20.5
minecraft_version=1.21

# Forge
#forge_version=49.0.13

neo_version=20.5.0-beta
neo_version=21.0.0-beta

fabric_version=0.97.6+1.20.5
fabric_loader_version=0.15.10
fabric_version=0.100.1+1.21
fabric_loader_version=0.15.11

# Other
trenzalore_version=5.0.1
trenzalore_version=6.0.0

# Gradle
org.gradle.jvmargs=-Xmx3G
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 64d768a

Please sign in to comment.