Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MineInAbyss/HiddenOre
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Gensokyo-Reimagined/HiddenOre
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 5 commits
  • 18 files changed
  • 1 contributor

Commits on Dec 23, 2024

  1. unblocky

    @kidofcubes
    kidofcubes committed Dec 23, 2024
    Copy the full SHA
    761405e View commit details

Commits on Dec 25, 2024

  1. nexo block integration

    @kidofcubes
    kidofcubes committed Dec 25, 2024
    Copy the full SHA
    ae87d71 View commit details

  2. bump paper api, gensokyoize

    @kidofcubes
    kidofcubes committed Dec 25, 2024
    Copy the full SHA
    99ce38d View commit details

  3. jithubaction

    @kidofcubes
    kidofcubes committed Dec 25, 2024
    Copy the full SHA
    529d35d View commit details

  4. forgottofixgradle

    @kidofcubes
    kidofcubes committed Dec 25, 2024
    Copy the full SHA
    8c48132 View commit details
43 changes: 43 additions & 0 deletions .github/workflows/build-and-publish.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Build plugin and blow up

on: [push, workflow_dispatch]

jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- uses: actions/checkout@v4
- name: JDK 21 setup
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
server-id: github
settings-path: ${{ github.workspace }}

- name: Gradle plz build
uses: gradle/actions/setup-gradle@v3
env:
GENSOKYOUSER: ${{ secrets.ORG_GRADLE_PROJECT_GENSOREPOUSERNAME }}
GENSOKYOTOKEN: ${{ secrets.ORG_GRADLE_PROJECT_GENSOREPOPASSWORD }}
with:
arguments: build

- name: GitHub save this jar for me kthx
uses: actions/upload-artifact@v3
with:
name: kosuzu-plugin
path: build/libs/*.jar

- name: Reposilite hates my posterior
uses: gradle/actions/setup-gradle@v3
with:
arguments: publish
env:
GENSOKYOUSER: ${{ secrets.ORG_GRADLE_PROJECT_GENSOREPOUSERNAME }}
GENSOKYOTOKEN: ${{ secrets.ORG_GRADLE_PROJECT_GENSOREPOPASSWORD }}
24 changes: 0 additions & 24 deletions .github/workflows/build.yml
View file

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/publish.yml
View file

This file was deleted.

47 changes: 35 additions & 12 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,45 @@
@Suppress("DSL_SCOPE_VIOLATION")
plugins {
alias(libs.plugins.mia.kotlin.jvm)
alias(libs.plugins.kotlinx.serialization)
alias(libs.plugins.mia.papermc)
alias(libs.plugins.mia.copyjar)
alias(libs.plugins.mia.publication)
alias(libs.plugins.mia.autoversion)
id("java")
id("maven-publish")
id("com.gradleup.shadow") version "8.3.5"
}


repositories {
maven("https://repo.mineinabyss.com/releases")
maven("https://repo.mineinabyss.com/snapshots")
maven("https://repo.papermc.io/repository/maven-public/")
maven("https://maven.enginehub.org/repo")
maven("https://repo.nexomc.com/releases")
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}

dependencies {
compileOnly(hiddenlibs.minecraft.plugin.worldguard)
compileOnly(hiddenlibs.minecraft.plugin.geary.papermc)
compileOnly(hiddenlibs.minecraft.plugin.blocky)
compileOnly(hiddenlibs.paperapi)
compileOnly(hiddenlibs.minecraft.plugin.nexo)
}

publishing {
publications {
create<MavenPublication>("mavenJava") {
groupId = "plugins"
artifact(tasks.shadowJar) {
artifactId = "HiddenOre"
}
}
}

repositories {
maven {
name = "gensokyoReimagined"
url = uri("https://repo.gensokyoreimagined.net")
credentials {
username = project.findProperty("gensokyoUser")?.toString() ?: System.getenv("GENSOKYOUSER")
password = project.findProperty("gensokyoToken")?.toString() ?: System.getenv("GENSOKYOTOKEN")
}
}
}
}
4 changes: 1 addition & 3 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
group=com.github.devotedmc
version=2.1
idofrontVersion=0.18.9

version=2.2
4 changes: 2 additions & 2 deletions gradle/hiddenlibs.versions.toml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[libraries]
minecraft-plugin-worldguard = "com.sk89q.worldguard:worldguard-bukkit:7.0.7"
minecraft-plugin-geary-papermc = "com.mineinabyss:geary-papermc:0.24-SNAPSHOT"
minecraft-plugin-blocky = "com.mineinabyss:blocky:0.6-SNAPSHOT"
paperapi = "io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT"
minecraft-plugin-nexo = "com.nexomc:nexo:0.4.0"
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading