Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
9d83812
most non-command methods have been updated to 7.3
Oct 26, 2024
5f3255d
couple methods updated
Oct 26, 2024
22b7a46
couple methods updated
Oct 26, 2024
016cf02
nightly 10-27
Oct 28, 2024
6319338
serverlibe implementation 1
Oct 28, 2024
23016b0
serverlibe implementation 2
Oct 28, 2024
8874e9b
boomba
Nov 3, 2024
9499286
fixes bugs, and registers commands properly
Nov 3, 2024
123fd9c
Warp Command
Nov 6, 2024
733588b
Re-implemented previous commands from 7.2_01, all have not been updat…
Nov 6, 2024
50eaa5c
Renamed previous commands to Old.djava
Nov 6, 2024
a9ff261
Renamed previous commands to Old.djava 2
Nov 6, 2024
9a1949a
Unrenamed RulesCommand.java to start working on it
Nov 6, 2024
8cd1fdb
reverted last commit
Nov 6, 2024
618f666
Created RoleID Argument Type and started work on RoleCommand
Nov 7, 2024
0ef3090
Updated /role create and /role delete. Fixed data removal method. Add…
Nov 7, 2024
a0daad1
Updated to nightly-2024-11-06
Nov 7, 2024
3ce78b2
Forgot a couple of methods
Nov 7, 2024
f9b7e71
couple more
Nov 7, 2024
9f3537c
couple more
Nov 7, 2024
9959115
couple more
Nov 7, 2024
cc31997
one more, finished now
Nov 7, 2024
70cc292
added role grant, revoke, reload, and list
Nov 8, 2024
5b381b6
removed one space
Nov 8, 2024
6c53925
moved all .executes into the ExecuteMethods class
Nov 9, 2024
0cbac3f
started work on /role edit. Layed groundwork for the command syntax. …
Nov 9, 2024
d630447
fixed couple of errors
Nov 9, 2024
d77bae2
actually registered roleSet and roleEdit
Nov 9, 2024
96668a6
Upgraded the FeedbackHandler with FeedbackTypes and a variable parser…
Nov 9, 2024
f940fd3
bit more refactoring of utility classes
Nov 9, 2024
dda7bcb
Upgraded/Fixed FeedbackHandler a bit, made new breakDownHex method, f…
Nov 10, 2024
9900f63
Role Command Finished!
Nov 10, 2024
8c8fe04
Fixed couple of errors.
Nov 10, 2024
65b4c14
New Data System with Json Adapters! Only converted Role so far, need …
Nov 10, 2024
90f4a7a
New Data System Complete! Started work on /lock
Nov 11, 2024
37768ad
Fixed issue with username -> uuid fetching. Created LegacyConversion …
Nov 11, 2024
40e220c
Finished /lock, maybe couple issues who knows
Nov 12, 2024
5f4fe95
don't really know what this is
Nov 18, 2024
29c0f62
updated to nightly 2024 11 12
Nov 18, 2024
06cd941
removed firetick gamerule and fixed login mixin
Nov 18, 2024
ece719d
hehe
Nov 18, 2024
7ee4900
updated rollback command, although something is off about rollback_area
Nov 18, 2024
4be652e
fixed rollback area and refactored some code relating to rollback
Nov 19, 2024
7e1f1c2
updated to nightly-2024-11-19
Nov 19, 2024
2744c6f
changed json minecraft dependency to Nightly.2024-11-18 because ident…
Nov 19, 2024
327bc61
idk
Nov 19, 2024
463bf4e
Finished Rollback
Nov 19, 2024
370f8e5
Started Work on Role Gui
Nov 20, 2024
27c44b2
stuff
Nov 20, 2024
d496798
Changed some lang and syntax
Nov 21, 2024
e590f03
Refactored all commands to allow for arbitrary running outside of com…
Nov 22, 2024
bd6df4c
cleaned up imports
Nov 22, 2024
f57c4f4
fixed color section map
Nov 22, 2024
ceec955
fixed naming convention for RollbackLogic
Nov 22, 2024
8adc1b9
changed a couple commands to toggles instead of boolean setters
Nov 22, 2024
06c85e9
merged and updated BTA Elevators.
Nov 24, 2024
8e925ed
got rid of mixin erroneous
Nov 24, 2024
f218ccd
couple fixes and changes
Nov 24, 2024
a29a3d9
fixed ArgumentTypeRole listSuggestions
Nov 24, 2024
f97b782
Finished CommandElevator, fixed/finished Steel Block Elevators
Nov 24, 2024
eb51026
forgot to add elevatorCooldown method to command builder
Nov 24, 2024
7f08b2e
upped the integer limit for elevator cooldownvalue from 99 to 256 (ti…
Nov 24, 2024
88496c0
First Basic SQLite implementation, not integrated with logging yet
Nov 26, 2024
2a88219
couple things
Nov 26, 2024
8bd709c
QuickCOnnection and started testing
Nov 26, 2024
5473084
added activator locking and mixins
Nov 26, 2024
a13c042
added activator lock syntax to CommandLogicLock
Nov 26, 2024
89ae3a5
F Doesn't log shit... too tired will figure it out tomorrow
Nov 26, 2024
c6fd55a
F Doesn't log shit... too tired will figure it out tomorrow
Nov 26, 2024
fb3f903
Updated to 7.3-pre2
Dec 17, 2024
de2b52f
Updated FeedbackHandler to get rid of constructor overload, now relyi…
Dec 18, 2024
eecfe8d
fixed bug with FeedbackHandler where all other arguments inside of a …
Jan 15, 2025
dab3b81
[/lock info] and preventative pickup logic
MelonMojito Jan 15, 2025
1ae79f2
Locked Containers can no longer be pushed
MelonMojito Jan 15, 2025
596c888
Renamed all iContainer to lockable
MelonMojito Jan 16, 2025
98a2c7b
Lockable Sneak Syntax Fix
MelonMojito Jan 16, 2025
a433109
Little Things
MelonMojito Jan 25, 2025
5397dca
/tpa, tpahere, tpaccept, tpdeny
MelonMojito Jan 25, 2025
fe201f2
Got rid of example commands
MelonMojito Jan 25, 2025
19834ea
Authorization for locked containers is much easier/better
MelonMojito Jan 25, 2025
caecc52
Removed All SyntaxBuilders and Deprecated the class, also removed stu…
MelonMojito Jan 25, 2025
607213c
commandlogics -> commandlogic
MelonMojito Jan 25, 2025
f0585b2
Fixing errors, code now runs
MelonMojito Jan 25, 2025
87cc7ae
Fixed Bug with picking up locked containers
MelonMojito Jan 25, 2025
38671e9
removed debug code
MelonMojito Jan 25, 2025
bf64375
Completely removed deprecated SyntaxBuilder and SyntaxLine
MelonMojito Jan 25, 2025
5974673
Added toggleable config options for all commands
MelonMojito Jan 25, 2025
6be39a7
Random Changes
MelonMojito Jan 26, 2025
1087841
7.3 Homes, Warps, Many Config Options, Locking Fix, Discord Integrati…
MelonMojito Jan 27, 2025
faecef1
Discord Relay looks less shit
MelonMojito Jan 27, 2025
94d7372
1.0.0pre2-7.3
MelonMojito Jan 27, 2025
eee9624
tiny
MelonMojito Jan 27, 2025
6d8f2ad
ignored vulnerability, once new version comes out will update.
MelonMojito Jan 27, 2025
7ef0c63
removed broken fatJar task
MelonMojito Jan 27, 2025
260a2ff
Fixed discord integration dependencies
MelonMojito Jan 27, 2025
0918414
Merge branch 'main' into next
MelonMojito Jan 27, 2025
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
105 changes: 71 additions & 34 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,40 @@ plugins {
id 'java'
}


import org.gradle.internal.os.OperatingSystem

project.ext.lwjglVersion = "3.3.4"

switch (OperatingSystem.current()) {
case OperatingSystem.LINUX:
project.ext.lwjglNatives = "natives-linux"
break
case OperatingSystem.WINDOWS:
project.ext.lwjglNatives = "natives-windows"
break
case OperatingSystem.MAC_OS:
project.ext.lwjglNatives = "natives-macos"
}

configurations.configureEach {
// Removes LWJGL2 dependencies
exclude group: "org.lwjgl.lwjgl"
}

configurations {
includeInJar
}

group = project.mod_group
archivesBaseName = project.mod_name
version = project.mod_version

loom {
gluedMinecraftJar()
noIntermediateMappings()
customMinecraftManifest.set("https://github.com/Turnip-Labs/bta-manifest-repo/releases/download/v${project.bta_version}/${project.bta_version}.json")

customMinecraftMetadata.set("https://downloads.betterthanadventure.net/bta-client/${project.bta_channel}/v${project.bta_version}/manifest.json")
}

repositories {
Expand All @@ -24,6 +50,14 @@ repositories {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
maven {
name = 'SignalumMavenInfrastructure'
url = 'https://maven.thesignalumproject.net/infrastructure'
}
maven {
name = 'SignalumMavenReleases'
url = 'https://maven.thesignalumproject.net/releases'
}
ivy {
url = "https://github.com/Better-than-Adventure"
patternLayout {
Expand All @@ -33,25 +67,18 @@ repositories {
metadataSources { artifact() }
}
ivy {
url = "https://github.com/Turnip-Labs"
patternLayout {
artifact "[organisation]/releases/download/v[revision]/[module]-[revision].jar"
m2compatible = true
}
metadataSources { artifact() }
}
ivy {
url = "https://github.com/Turnip-Labs"
url = "https://downloads.betterthanadventure.net/bta-client/${project.bta_channel}/"
patternLayout {
artifact "[organisation]/releases/download/[revision]/[module]-[revision].jar"
artifact "/v[revision]/client.jar"
m2compatible = true
}
metadataSources { artifact() }
}
ivy {
url = "https://github.com/Turnip-Labs"

url = "https://downloads.betterthanadventure.net/bta-server/${project.bta_channel}/"
patternLayout {
artifact "[organisation]/releases/download/[revision]/[module]-bta-[revision].jar"
artifact "/v[revision]/server.jar"
m2compatible = true
}
metadataSources { artifact() }
Expand All @@ -64,38 +91,29 @@ repositories {
}
metadataSources { artifact() }
}
ivy {
url = "https://github.com/MartinSVK12"
patternLayout {
artifact "[organisation]/releases/download/[revision]/[module]-[revision].jar"
m2compatible = true
}
metadataSources { artifact() }
}
ivy {
url = "https://github.com/MelonModding"
patternLayout {
artifact "[organisation]/releases/download/[revision]/[module]-[revision].jar"
m2compatible = true
}
metadataSources { artifact() }
}

}

dependencies {
minecraft "bta-download-repo:bta:${project.bta_version}"
mappings loom.layered() {}

modRuntimeOnly "objects:client:43db9b498cb67058d2e12d394e6507722e71bb45" // https://piston-data.mojang.com/v1/objects/43db9b498cb67058d2e12d394e6507722e71bb45/client.jar
modImplementation "fabric-loader:fabric-loader:${project.loader_version}"

// Helper library
// If you do not need Halplibe you can comment this line out or delete this line
modImplementation "com.github.Turnip-Labs:bta-halplibe:${project.halplibe_version}"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

modImplementation "com.github.UselessSolutions:serverlibe:${project.serverlibe_version}"

implementation "org.slf4j:slf4j-api:1.8.0-beta4"
implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0"

implementation "com.github.electronstudio:sdl2gdx:1.0.3"
includeInJar "com.github.electronstudio:sdl2gdx:1.0.3"
implementation "net.dv8tion:JDA:5.2.2"
includeInJar "net.dv8tion:JDA:5.2.2"
implementation "club.minnced:discord-webhooks:0.8.4"
includeInJar "club.minnced:discord-webhooks:0.8.4"

implementation 'com.google.guava:guava:33.0.0-jre'
implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
var log4jVersion = "2.20.0"
Expand All @@ -104,7 +122,24 @@ dependencies {
implementation("org.apache.logging.log4j:log4j-1.2-api:${log4jVersion}")
implementation("io.github.llamalad7:mixinextras-common:0.5.0-beta.3")
include(implementation("org.apache.commons:commons-lang3:3.12.0"))
implementation "serverlibe:serverlibe:${project.serverlibe_version}"

modImplementation("com.github.zarzelcow:legacy-lwjgl3:1.0.4")
implementation platform("org.lwjgl:lwjgl-bom:$lwjglVersion")

runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
runtimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives"
runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
implementation "org.lwjgl:lwjgl:$lwjglVersion"
implementation "org.lwjgl:lwjgl-assimp:$lwjglVersion"
implementation "org.lwjgl:lwjgl-glfw:$lwjglVersion"
implementation "org.lwjgl:lwjgl-openal:$lwjglVersion"
implementation "org.lwjgl:lwjgl-opengl:$lwjglVersion"
implementation "org.lwjgl:lwjgl-stb:$lwjglVersion"
implementation 'org.xerial:sqlite-jdbc:3.47.0.0'

}

java {
Expand All @@ -121,6 +156,8 @@ jar {
from("LICENSE") {
rename { "${it}_${archivesBaseName}" }
}
from(configurations.named("includeInJar").get().collect { zipTree(it) })
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}

processResources {
Expand Down
13 changes: 6 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
org.gradle.jvmargs=-Xmx2G

# BTA
bta_version=7.2_01

# Loader & Mod Menu
loader_version=0.15.6-babric.6-bta
bta_version=7.3
bta_channel=release

# HalpLibe
halplibe_version=4.1.3
# Loader & Mod Menu
loader_version=0.15.6-bta.7

# ServerLibe
serverlibe_version=beta.2.2
serverlibe_version=beta.2.7-7.3

# Mod
mod_version=0.1.2-7.2_01
mod_version=1.0.0pre3-7.3
mod_group=MelonModding
mod_name=MelonUtilities
Binary file added lib/slf4j-api-1.7.36.jar
Binary file not shown.
Binary file added lib/sqlite-jdbc-3.46.0.1.jar
Binary file not shown.
Empty file added lib/sqlite-jdbc-3.47.0.0.jar
Empty file.
Binary file added lib/sqlite-jdbc-3.47.1.0.jar
Binary file not shown.
Binary file added lib/sqlite-jdbc-3.47.2.0.jar
Binary file not shown.
Binary file added lib/sqlite-jdbc-3.48.0.0.jar
Binary file not shown.
Loading
Loading