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.

Sign up for GitHub

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

Jump to bottom

Rfb support and new JUL logging #159

Open
wants to merge 11 commits into
base: staging
Choose a base branch
from
Open

Rfb support and new JUL logging #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
effd0d3
Use RFB
gravit0 Jun 9, 2024
3cdb52f
Compile fix, update rfb
gravit0 Jul 26, 2024
cb6c4b0
Fix JUL
gravit0 Jul 26, 2024
592af09
Fix PluginLogger (but logger name might be a plugin name) and custom-…
gravit0 Jul 26, 2024
51173ee
Fix WorldGuard and support rfb transformers for plugins
gravit0 Jul 28, 2024
0396422
Support lw transformers for plugins
gravit0 Jul 28, 2024
b3cbfe9
Fix Logger.setParent (Essentials)
gravit0 Jul 28, 2024
74aa214
Improve debug NMS search
gravit0 Jul 28, 2024
8219966
Remove prompt, fix command display
gravit0 Aug 13, 2024
bb526e8
Merge branch 'staging' into rfb-support
gravit0 Oct 21, 2024
c32b5a9
Upgrade gradle and asm
gravit0 Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ repositories {
name 'minecraft'
url 'https://libraries.minecraft.net/'
}
maven {
name 'gtnh'
url 'https://nexus.gtnewhorizons.com/repository/public/'
}
}

minecraft {
Expand All @@ -57,6 +61,7 @@ minecraft {
'https://github.com/juanmuscaria/maven/raw/master',
'https://maven.minecraftforge.net/',
'https://oss.sonatype.org/content/repositories/snapshots/',
'https://nexus.gtnewhorizons.com/repository/public/',
'https://libraries.minecraft.net/'
]
}
Expand All @@ -81,13 +86,16 @@ configurations {

dependencies {
// New java stuff
libraries('com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.0.7') {
exclude group: 'org.apache.logging.log4j'
}
libraries 'org.apache.commons:commons-lang3:3.12.0'
libraries 'org.apache.commons:commons-compress:1.21'
libraries 'org.ow2.asm:asm:9.5'
libraries 'org.ow2.asm:asm-commons:9.5'
libraries 'org.ow2.asm:asm-tree:9.5'
libraries 'org.ow2.asm:asm-analysis:9.5'
libraries 'org.ow2.asm:asm-util:9.5'
libraries 'org.ow2.asm:asm:9.7.1'
libraries 'org.ow2.asm:asm-commons:9.7.1'
libraries 'org.ow2.asm:asm-tree:9.7.1'
libraries 'org.ow2.asm:asm-analysis:9.7.1'
libraries 'org.ow2.asm:asm-util:9.7.1'
libraries 'org.ow2.asm:asm-deprecated:7.1'
libraries 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
libraries "javax.servlet:javax.servlet-api:4.0.1"
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ repositories {

dependencies {
// TODO? figure a way to use the runtime dependencies of FG?
implementation("org.ow2.asm:asm:9.6")
implementation("org.ow2.asm:asm-tree:9.6")
implementation("org.ow2.asm:asm:9.7.1")
implementation("org.ow2.asm:asm-tree:9.7.1")
implementation("com.google.guava:guava:31.1-jre")
implementation("com.opencsv:opencsv:5.7.0")
implementation("com.cloudbees:diff4j:1.3")
Expand All @@ -33,7 +33,7 @@ dependencies {
implementation("de.oceanlabs.mcp:mcinjector:3.2-SNAPSHOT")
implementation("net.minecraftforge:Srg2Source:4.2.7")

api("com.anatawa12.forge:ForgeGradle:1.2-1.1.0")
api("com.anatawa12.forge:ForgeGradle:1.2-1.1.1")
testImplementation(platform("org.junit:junit-bom:5.9.1"))
testImplementation("org.junit.jupiter:junit-jupiter")

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading