Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.18.2 port #287

Open
wants to merge 10 commits into
base: 1.16.5
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
41 changes: 41 additions & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Java CI with Gradle

on:
push:
branches: [ "1.18.2", "1.19.2" ]
pull_request:
branches: [ "1.18.2", "1.19.2" ]

jobs:
build:
runs-on: ubuntu-latest
permissions:
id-token: write
contents: read
attestations: write
steps:
- uses: actions/checkout@v4
- uses: gradle/actions/wrapper-validation@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
- name: Build with Gradle wrapper
run: ./gradlew build

- name: Rename jar
run: mv $(find build/libs/ | grep -P "\d\.jar") constructarmory.jar

- uses: actions/upload-artifact@v4
with:
name: Construct Armory
path: ./constructarmory.jar

- name: Generate artifact attestation
uses: actions/attest-build-provenance@v1
with:
subject-path: ./constructarmory.jar
18 changes: 11 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,29 @@ buildscript {
repositories {
maven { url 'https://files.minecraftforge.net/maven' }
maven { url 'https://plugins.gradle.org/m2/' }
maven { url = 'https://maven.parchmentmc.org' }
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.7', changing: true
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
classpath 'org.parchmentmc:librarian:1.+'
classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0'
classpath 'io.freefair.gradle:lombok-plugin:4.+'
classpath 'io.freefair.gradle:lombok-plugin:6.+'
}
}
apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.parchmentmc.librarian.forgegradle'
apply plugin: 'com.matthewprenger.cursegradle'
apply plugin: 'io.freefair.lombok'

version = "${mod_version}"
group = "${mod_group}"
archivesBaseName = "${mod_id}-forge"

java.toolchain.languageVersion = JavaLanguageVersion.of(8)
java.toolchain.languageVersion = JavaLanguageVersion.of(17)

minecraft {
mappings channel: 'snapshot', version: "${version_mcp}".toString()
mappings channel: 'parchment', version: "2022.11.06-1.18.2"

accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')

Expand Down Expand Up @@ -72,15 +75,15 @@ minecraft {
repositories {
maven {
name 'DVS1 Maven FS'
url 'http://dvs1.progwml6.com/files/maven'
url 'https://dvs1.progwml6.com/files/maven'
}
}

dependencies {
minecraft "net.minecraftforge:forge:${version_forge}"

compile fg.deobf("slimeknights.mantle:Mantle:${version_mantle}")
compile fg.deobf("slimeknights.tconstruct:TConstruct:${version_tic}")
implementation fg.deobf("slimeknights.mantle:Mantle:${version_mantle}")
implementation fg.deobf("slimeknights.tconstruct:TConstruct:${version_tic}")

runtimeOnly fg.deobf("mezz.jei:jei-${version_minecraft}:${version_jei}")
}
Expand Down Expand Up @@ -124,6 +127,7 @@ processResources {
include 'META-INF/mods.toml'
expand 'version': project.version, 'mod_id': mod_id, 'mod_name': mod_name, 'mod_url': mod_url, 'mod_author': mod_author, 'mod_description': mod_description, 'mod_icon': mod_icon
}
duplicatesStrategy = DuplicatesStrategy.WARN

from(sourceSets.main.resources.srcDirs) {
exclude 'META-INF/mods.toml'
Expand Down
17 changes: 8 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,23 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

# Mod
mod_version=2.0.0-alpha.2+1.16.5
mod_version=2.0.0-alpha.4+1.18.2
mod_group=top.theillusivec4.constructsarmory
mod_id=constructsarmory
mod_name=Construct's Armory
mod_url=https://www.curseforge.com/minecraft/mc-mods/constructs-armory
mod_author=C4
mod_author=C4, minemobs
mod_description=A Tinkers' Construct add-on to make armor out of materials and modifiers.
mod_icon=constructsarmory_icon.png

# Dependencies
version_minecraft=1.16.5
version_forge=1.16.5-36.2.34
version_mcp=20210309-1.16.5
version_mantle=1.16.5-1.6.157
version_tic=1.16.5-3.3.4.335
version_jei=7.7.1.152
version_minecraft=1.18.2
version_forge=1.18.2-40.2.0
version_mantle=1.18.2-1.9.50
version_tic=1.18.2-3.7.1.155
version_jei=9.7.1.255

# Curse
cf_id=287683
cf_release=alpha
cf_versions=1.16.5
cf_versions=1.18.2
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-6.8.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Empty file modified gradlew
100644 → 100755
Empty file.
Loading