Skip to content

Commit ec59721

Browse files
committed
Ported stuff over...
1 parent 429284b commit ec59721

93 files changed

Lines changed: 550 additions & 1717 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Auto Assign
2+
on:
3+
pull_request_target:
4+
5+
jobs:
6+
run:
7+
runs-on: ubuntu-latest
8+
permissions:
9+
contents: read
10+
issues: write
11+
pull-requests: write
12+
discussions: write
13+
steps:
14+
- uses: wow-actions/auto-assign@v3
15+
with:
16+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17+
reviewers: RealMangoRage, PaintNinja
18+
assignees: PaintNinja, RealMangoRage
19+
skipKeywords: wip, draft
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Build MangoBot
2+
on:
3+
push:
4+
branches: [ "master" ]
5+
paths:
6+
- 'src/**' # Only trigger when files inside /src change
7+
- 'build.gradle' # Include Gradle build script changes
8+
- 'settings.gradle' # Include Gradle settings changes
9+
- 'gradle/**' # Include Gradle wrapper changes
10+
11+
permissions:
12+
contents: write
13+
14+
jobs:
15+
build:
16+
uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@v0
17+
with:
18+
java: 21
19+
gradle_tasks: :bot:runDatagen :bot:publish
20+
artifact_name: "mangobot"
21+
artifact_group: "org.mangorage"
22+
author_icon_url: "https://avatars.githubusercontent.com/u/147930550"
23+
secrets:
24+
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
25+
PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
26+
PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
27+
PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
28+
MAVEN_USER: ${{ secrets.USERNAME }} # Reference the secret
29+
MAVEN_PASSWORD: ${{ secrets.PASSWORD }} # Reference the secret

bot/build.gradle

Lines changed: 59 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.mangorage.mangobotgradle.util.GitVersion
2+
13
buildscript {
24
repositories {
35
gradlePluginPortal()
@@ -8,7 +10,6 @@ buildscript {
810
}
911

1012
dependencies {
11-
1213
classpath 'org.mangorage:MangoBotGradle:5.0.14'
1314
}
1415
}
@@ -19,6 +20,12 @@ plugins {
1920

2021
apply plugin: 'java'
2122
apply plugin: 'MangoBotGradle'
23+
apply plugin: 'maven-publish'
24+
25+
group = 'org.mangorage'
26+
version = "12.0.0" //GitVersion.getGitVersion().getVersionAsString()
27+
28+
println("Version: " + version)
2229

2330
extraJavaModuleInfo {
2431
setDeriveAutomaticModuleNamesFromFileNames(true)
@@ -47,17 +54,13 @@ repositories {
4754

4855

4956
dependencies {
50-
installer('org.mangorage:installer:+')
57+
installer('org.mangorage:installer:4.0.9')
5158
botInternal(sourceSets.main.output)
5259

53-
library('org.mangorage:scanner:+')
60+
library('org.mangorage:scanner:1.1.3')
5461
library('net.dv8tion:JDA:5.3.2')
5562
library('com.google.code.gson:gson:2.10.1')
56-
library('org.luaj:luaj-jse:3.0.1')
5763
library('net.minecraftforge:eventbus:7.0-beta.1')
58-
59-
embedLibrary(project(":modules:core"))
60-
embedLibrary(project(":modules:common-utils"))
6164
}
6265

6366
jar {
@@ -76,3 +79,52 @@ jar {
7679
attributes 'Main-Class': 'org.mangorage.mangobot.Test'
7780
}
7881
}
82+
83+
task sourcesJar(type: Jar) {
84+
archiveClassifier.set("sources")
85+
from sourceSets.main.allSource
86+
}
87+
88+
publishing {
89+
publications.register("mangobotaddon", MavenPublication) {
90+
artifactId = 'mangobot'
91+
artifact jar
92+
artifact sourcesJar
93+
94+
pom {
95+
name = 'MangoBotCore'
96+
description = 'The Main Plugin For MangoBot'
97+
url = 'https://github.com/MangoRageBot/MangoBot'
98+
issueManagement {
99+
system = 'github'
100+
url = 'https://github.com/MangoRageBot/MangoBot/issues'
101+
}
102+
developers {
103+
developer {
104+
id = 'mangorage'
105+
name = 'MangoRage'
106+
}
107+
}
108+
withXml {
109+
def dependencies = asNode().appendNode('dependencies')
110+
configurations.library.getDependencies().each {
111+
def dependency = dependencies.appendNode('dependency')
112+
dependency.appendNode('groupId', it.group)
113+
dependency.appendNode('artifactId', it.name)
114+
dependency.appendNode('version', it.version)
115+
}
116+
}
117+
}
118+
}
119+
120+
repositories {
121+
maven {
122+
url = "https://maven.minecraftforge.net/"
123+
124+
credentials {
125+
username = System.getenv("MAVEN_USER")
126+
password = System.getenv("MAVEN_PASSWORD")
127+
}
128+
}
129+
}
130+
}

bot/src/main/java/module-info.java

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
1-
module org.mangorage.mangobot {
2-
requires org.mangorage.mangobot.core;
3-
requires net.dv8tion.jda;
4-
requires org.mangorage.commonutils;
1+
module org.mangorage.mangobotcore {
52
requires com.google.gson;
6-
requires luaj.jse;
3+
requires net.dv8tion.jda;
4+
requires annotations;
5+
requires org.slf4j;
76
requires net.minecraftforge.eventbus;
7+
requires org.mangorage.scanner;
8+
9+
10+
// Common Utils
11+
exports org.mangorage.commonutils.misc;
12+
exports org.mangorage.commonutils.data;
13+
exports org.mangorage.commonutils.config;
14+
exports org.mangorage.commonutils.jda;
15+
exports org.mangorage.commonutils.jda.slash.command;
16+
exports org.mangorage.commonutils.jda.slash.command.watcher;
17+
exports org.mangorage.commonutils.log;
18+
19+
// Mangobot Core
20+
exports org.mangorage.mangobotcore.plugin.api;
21+
exports org.mangorage.mangobotcore.jda.command.api;
22+
exports org.mangorage.mangobotcore.jda.event;
823

9-
opens org.mangorage.mangobot to org.mangorage.mangobot.core;
24+
opens org.mangorage.entrypoint to org.mangorage.installer;
1025
}

modules/common-utils/src/main/java/org/mangorage/commonutils/config/Config.java renamed to bot/src/main/java/org/mangorage/commonutils/config/Config.java

File renamed without changes.

modules/common-utils/src/main/java/org/mangorage/commonutils/config/ConfigSetting.java renamed to bot/src/main/java/org/mangorage/commonutils/config/ConfigSetting.java

File renamed without changes.

modules/common-utils/src/main/java/org/mangorage/commonutils/config/ISetting.java renamed to bot/src/main/java/org/mangorage/commonutils/config/ISetting.java

File renamed without changes.

modules/common-utils/src/main/java/org/mangorage/commonutils/config/ITransformer.java renamed to bot/src/main/java/org/mangorage/commonutils/config/ITransformer.java

File renamed without changes.

modules/common-utils/src/main/java/org/mangorage/commonutils/config/Transformer.java renamed to bot/src/main/java/org/mangorage/commonutils/config/Transformer.java

File renamed without changes.

modules/common-utils/src/main/java/org/mangorage/commonutils/config/Transformers.java renamed to bot/src/main/java/org/mangorage/commonutils/config/Transformers.java

File renamed without changes.

0 commit comments

Comments
 (0)