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

Instance handling refactor #39

Merged
merged 30 commits into from
Apr 18, 2024
Merged

Instance handling refactor #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
9487b95
WHOOPS
Apr 11, 2024
02b360a
Merge remote-tracking branch 'origin/QuestCraft' into QuestCraft
Apr 12, 2024
c2dd986
Finish Instance Refactor
Apr 12, 2024
7b5ae4d
Add deletion, fix mod dir and default mods
Apr 12, 2024
16090a8
Add javadocs (CAD get better at reading code)
Apr 12, 2024
83e2522
Testing fixes
Apr 12, 2024
9015fdb
Add supportedVersions.json
Apr 13, 2024
760f207
Fix Minecraft Version API
CADIndie Apr 13, 2024
c22a0b5
Fixes
Apr 13, 2024
9ff174e
oops
Apr 13, 2024
9f1767b
Damn you GSON
Apr 13, 2024
c3c9f2d
I get a bit silly when I am tired
Apr 13, 2024
fd9602f
Bye bye
Apr 13, 2024
62b289a
So long gay bowser
Apr 13, 2024
77e1345
Arrays are fun, said no one ever
Apr 13, 2024
c4c16a6
Move Mod Update Call
CADIndie Apr 13, 2024
f2d94fa
Finish instance refactor
Apr 13, 2024
2cafb9d
Fix sodium
Apr 14, 2024
29e8c41
Merge remote-tracking branch 'origin/QuestCraft' into instance-refactor
Apr 14, 2024
afed4e7
Fixes
Apr 14, 2024
beb2717
Handle xr errors
Apr 15, 2024
82bb770
Fix race condition
thejudge156 Apr 15, 2024
a44b46f
Don't need to save the json yet
thejudge156 Apr 15, 2024
92618f7
Fix default mods toggle
Apr 16, 2024
e03b974
Add imageURL
Apr 16, 2024
1e3cfc5
Fix javadocs
Apr 16, 2024
49a9357
Fix actions?
Apr 16, 2024
e6f3436
Slightly More Logging
CADIndie Apr 17, 2024
d81200e
Prep for merge
thejudge156 Apr 18, 2024
cdbf105
Merge remote-tracking branch 'origin/instance-refactor' into instance…
thejudge156 Apr 18, 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
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
java-version: '17'
distribution: 'temurin'
- name: Make Gradle wrapper executable
run: chmod +x ./gradlew
run: git lfs pull | chmod +x ./gradlew
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
with:
Expand Down
94 changes: 0 additions & 94 deletions coremods.json
View file
Open in desktop

This file was deleted.

90 changes: 56 additions & 34 deletions devmods.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@
"versions": [
{
"name": "1.20.4",
"mods": [
"coreMods": [
{
"slug": "Vivecraft",
"version": "1.0",
"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.20.4/vivecraft.jar"
},
{
"slug": "Fabric-API",
"version": "0.96.11",
"download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/htRy7kbI/fabric-api-0.96.11%2B1.20.4.jar"
},
"version": "0.91.2",
"download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/yGY1P8Yr/fabric-api-0.91.2%2B1.20.4.jar"
}
],
"defaultMods": [
{
"slug": "Sodium",
"version": "0.5.8",
Expand Down Expand Up @@ -45,8 +47,8 @@
},
{
"slug": "Simple-Voice-Chat",
"version": "2.5.1",
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/lobOF2Co/voicechat-fabric-1.20.4-2.5.1.jar"
"version": "2.4.30",
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/kp8RtRlH/voicechat-fabric-1.20.4-2.4.30.jar"
},
{
"slug": "Modern-Fix",
Expand All @@ -57,7 +59,7 @@
},
{
"name": "1.20.2",
"mods": [
"coreMods": [
{
"slug": "Vivecraft",
"version": "1.1.1",
Expand All @@ -67,7 +69,9 @@
"slug": "Fabric-API",
"version": "0.91.1",
"download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/qg6wQgub/fabric-api-0.91.1%2B1.20.2.jar"
},
}
],
"defaultMods": [
{
"slug": "Lithium",
"version": "0.12.0",
Expand All @@ -85,7 +89,7 @@
},
{
"slug": "Sodium",
"version": "0.5.5.1",
"version": "0.5.5",
"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.20.2-0.5.5/sodium-fabric-mc1.20.2-0.5.5.jar"
},
{
Expand Down Expand Up @@ -126,23 +130,18 @@
{
"slug": "Simple-Voice-Chat",
"version": "2.4.28",
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/Pq4BryXi/voicechat-fabric-1.20.2-2.5.1.jar"
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/5XcFdUYz/voicechat-fabric-1.20.2-2.4.28.jar"
},
{
"slug": "Modern-Fix",
"version": "5.9.0",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/FDGaMHFj/modernfix-fabric-5.9.0%2Bmc1.20.1.jar"
},
{
"slug": "EBE",
"version": "0.9.1",
"download_link": "https://cdn.modrinth.com/data/OVuFYfre/versions/eIFo7wvq/enhancedblockentities-0.9.1%2B1.20.2.jar"
}
]
},
{
"name": "1.20.1",
"mods": [
"coreMods": [
{
"slug": "Vivecraft",
"version": "1.1.1",
Expand All @@ -152,7 +151,9 @@
"slug": "Fabric-API",
"version": "0.91.0",
"download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/YblXfKtI/fabric-api-0.91.0%2B1.20.1.jar"
},
}
],
"defaultMods": [
{
"slug": "Lithium",
"version": "0.11.2",
Expand Down Expand Up @@ -185,8 +186,8 @@
},
{
"slug": "Fabric-Language-Kotlin",
"version": "1.10.19+kotlin.1.9.23",
"download_link": "https://cdn.modrinth.com/data/Ha28R6CL/versions/ZMokinzs/fabric-language-kotlin-1.10.19%2Bkotlin.1.9.23.jar"
"version": "1.9.5+kotlin.1.8.22",
"download_link": "https://cdn.modrinth.com/data/Ha28R6CL/versions/ADg3gvlr/fabric-language-kotlin-1.9.5%2Bkotlin.1.8.22.jar"
},
{
"slug": "Krypton",
Expand Down Expand Up @@ -215,8 +216,8 @@
},
{
"slug": "Simple-Voice-Chat",
"version": "2.5.1",
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/ot113WbU/voicechat-fabric-1.20.1-2.5.1.jar"
"version": "2.4.12",
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/NkZguN8n/voicechat-fabric-1.20.1-2.4.12.jar"
},
{
"slug": "Modern-Fix",
Expand All @@ -227,7 +228,7 @@
},
{
"name": "1.19.4",
"mods": [
"coreMods": [
{
"slug": "Vivecraft",
"version": "1.1.1",
Expand All @@ -237,11 +238,13 @@
"slug": "Fabric-API",
"version": "0.87.2",
"download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/nyAmoHlr/fabric-api-0.87.2%2B1.19.4.jar"
},
}
],
"defaultMods": [
{
"slug": "Simple-Voice-Chat",
"version": "2.5.1",
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/u7rKquVn/voicechat-fabric-1.19.4-2.5.1.jar"
"version": "2.4.10",
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/cgPK1BnP/voicechat-fabric-1.19.4-2.4.10.jar"
},
{
"slug": "Lithium",
Expand All @@ -263,6 +266,11 @@
"version": "1.6.2",
"download_link": "https://cdn.modrinth.com/data/NNAgCjsB/versions/UvJN5Cy4/entityculling-fabric-1.6.2-mc1.19.4.jar"
},
{
"slug": "Sodium",
"version": "0.4.10",
"download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/b4hTi3mo/sodium-fabric-mc1.19.4-0.4.10%2Bbuild.24.jar"
},
{
"slug": "Cloth-Config",
"version": "9.0.94",
Expand Down Expand Up @@ -327,7 +335,7 @@
},
{
"name": "1.19.2",
"mods": [
"coreMods": [
{
"slug": "Vivecraft",
"version": "1.1.3",
Expand All @@ -337,16 +345,18 @@
"slug": "Fabric-API",
"version": "0.77.0",
"download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/6g95K303/fabric-api-0.77.0%2B1.19.2.jar"
},
}
],
"defaultMods": [
{
"slug": "LazyDFU",
"version": "1.3",
"download_link": "https://cdn.modrinth.com/data/hvFnDODi/versions/0.1.3/lazydfu-0.1.3.jar"
},
{
"slug": "Simple-Voice-Chat",
"version": "2.5.1",
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/KfPEtgDQ/voicechat-fabric-1.19.2-2.5.1.jar"
"version": "2.4.10",
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/onVH7UO9/voicechat-fabric-1.19.2-2.4.10.jar"
},
{
"slug": "Lithium",
Expand All @@ -368,6 +378,11 @@
"version": "1.6.1",
"download_link": "https://cdn.modrinth.com/data/NNAgCjsB/versions/twdGLDHv/entityculling-fabric-1.6.1-mc1.19.2.jar"
},
{
"slug": "Sodium",
"version": "0.4.4",
"download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/rAfhHfow/sodium-fabric-mc1.19.2-0.4.4%2Bbuild.18.jar"
},
{
"slug": "Cloth-Config",
"version": "8.2.88",
Expand Down Expand Up @@ -417,7 +432,7 @@
},
{
"name": "1.18.2",
"mods": [
"coreMods": [
{
"slug": "Vivecraft",
"version": "1.1.3",
Expand All @@ -427,16 +442,18 @@
"slug": "Fabric-API",
"version": "0.77.0",
"download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/qk28POfr/fabric-api-0.77.0%2B1.18.2.jar"
},
}
],
"defaultMods": [
{
"slug": "LazyDFU",
"version": "1.2",
"download_link": "https://cdn.modrinth.com/data/hvFnDODi/versions/0.1.2/lazydfu-0.1.2.jar"
},
{
"slug": "Simple-Voice-Chat",
"version": "2.5.1",
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/oz82VCKL/voicechat-fabric-1.18.2-2.5.1.jar"
"version": "2.4.10",
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/QKFGOJUD/voicechat-fabric-1.18.2-2.4.10.jar"
},
{
"slug": "Lithium",
Expand All @@ -458,6 +475,11 @@
"version": "1.5.1",
"download_link": "https://cdn.modrinth.com/data/NNAgCjsB/versions/1.5.1-fabric-1.18/entityculling-fabric-mc1.18-1.5.1.jar"
},
{
"slug": "Sodium",
"version": "0.4.1",
"download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/mc1.18.2-0.4.1/sodium-fabric-mc1.18.2-0.4.1%2Bbuild.15.jar"
},
{
"slug": "Better-Biome-Blend",
"version": "1.3.5",
Expand Down Expand Up @@ -511,4 +533,4 @@
]
}
]
}
}
Loading
Loading