Skip to content

Commit

Permalink
Backup
Browse files Browse the repository at this point in the history
  • Loading branch information
justmangoou committed Jun 29, 2024
1 parent 41b242c commit 02544d7
Show file tree
Hide file tree
Showing 218 changed files with 3,692 additions and 416 deletions.
50 changes: 25 additions & 25 deletions .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
name: Build and Release
on:
push:
branches:
- main

permissions:
contents: write

jobs:
build:
runs-on: ubuntu-20.04
container:
image: eclipse-temurin:18-jdk
options: --user root
steps:
- run: apt update && apt install git -y && git --version
- run: git config --global --add safe.directory /__w/smp/smp
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: gradle/wrapper-validation-action@v1
- run: ./gradlew build github --stacktrace -Porg.gradle.parallel.threads=4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
#name: Build and Release
#on:
# push:
# branches:
# - main
#
#permissions:
# contents: write
#
#jobs:
# build:
# runs-on: ubuntu-20.04
# container:
# image: eclipse-temurin:21-jdk
# options: --user root
# steps:
# - run: apt update && apt install git -y && git --version
# - run: git config --global --add safe.directory /__w/smp/smp
# - uses: actions/checkout@v2
# with:
# fetch-depth: 0
# - uses: gradle/wrapper-validation-action@v1
# - run: ./gradlew build github --stacktrace -Porg.gradle.parallel.threads=4
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
run
*.exe
*.mrpack

### Eclipse ###
.metadata
Expand Down
68 changes: 44 additions & 24 deletions INCLUDE_MODS.md

Large diffs are not rendered by default.

13 changes: 2 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,8 @@ tasks.withType<JavaCompile>().configureEach {
options.release.set(17)
}

sourceSets {
main {
resources {
srcDir("src/main/docker")
}
}
}

loom {
serverOnlyMinecraftJar()
splitMinecraftJar()

accessWidenerPath.set(file("src/main/resources/smp.accesswidener"))
}
Expand All @@ -54,7 +46,7 @@ tasks {

filteringCharset = "UTF-8"

filesMatching(listOf("fabric.mod.json", "docker-compose.yml")) {
filesMatching(listOf("fabric.mod.json")) {
expand(mapOf(
"version" to project.version,
"minecraftVersion" to project.version,
Expand Down Expand Up @@ -93,7 +85,6 @@ tasks {

val ghRelease = releaseBuilder.create()
ghRelease.uploadAsset(remapJar.get().archiveFile.get().asFile, "application/java-archive");
ghRelease.uploadAsset(buildDir.resolve("resources/main/docker-compose.yml"), "application/x-yaml");
}
}
}
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
org.gradle.jvmargs=-Xmx1G

version=1.19.3
version=1.21
group=xyz.mangostudio

yarnMappings=1.19.3+build.5
loaderVersion=0.14.13
fabricVersion=0.73.0+1.19.3
yarnMappings=1.21+build.2
loaderVersion=0.15.11
fabricVersion=0.100.4+1.21


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-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 02544d7

Please sign in to comment.