Skip to content

Commit

Permalink
Merge branch 'Testing' of https://github.com/thewiilover/Pojlib into …
Browse files Browse the repository at this point in the history 
…QuestCraft
  • Loading branch information
@thewiilover
thewiilover committed Sep 15, 2024
2 parents fe252a7 + f218378 commit 0dcb75f
Show file tree
Hide file tree
Showing 15 changed files with 177 additions and 48 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/gradle.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,17 @@ jobs:
local-cache: true
link-to-sdk: true
- name: Make Gradle wrapper executable and pull LFS
<<<<<<< HEAD
run: git lfs pull | chmod +x ./gradlew
=======
run: git lfs pull
>>>>>>> f218378a8cc7fcd40b18c0361aa9ad4926dc9ae4
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
with:
arguments: build

<<<<<<< HEAD
- name: Upload debug
uses: actions/upload-artifact@v3
with:
Expand All @@ -57,3 +62,15 @@ jobs:
name: app-debug
path: wrapper/launcher/build/outputs/apk/release/*

=======
- name: Upload Debug
uses: actions/upload-artifact@v3
with:
name: app-debug
path: wrapper/launcher/build/outputs/apk/debug/*
- name: Upload Release
uses: actions/upload-artifact@v3
with:
name: app-release
path: wrapper/launcher/build/outputs/apk/release/*
>>>>>>> f218378a8cc7fcd40b18c0361aa9ad4926dc9ae4
13 changes: 8 additions & 5 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
plugins {
id("com.android.library") version("7.1.0")
id("com.android.library") version('7.3.0')
}

android {
ndkVersion = "26.1.10909125"
compileSdkVersion = "android-32"
defaultConfig {
minSdkVersion(29)
ndk {
abiFilters 'arm64-v8a'
}
minSdk 32
multiDexEnabled true

ndk.stl = "c++_shared"
}

buildTypes {
release {
ndk.abiFilters.add("arm64-v8a")
bundle {
}
packagingOptions {
}
debug {
ndk.abiFilters.add("arm64-v8a")
Expand Down
90 changes: 72 additions & 18 deletions devmods.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,66 @@
{
"versions": [
{
"name": "1.21",
"coreMods": [
{
"slug": "Vivecraft",
"version": "1.0",
"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.21.0/Vivecraft.jar"
},
{
"slug": "Fabric-API",
"version": "0.102.0",
"download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/oGwyXeEI/fabric-api-0.102.0%2B1.21.jar"
}
],
"defaultMods": [
{
"slug": "Sodium",
"version": "0.6.0-beta.1",
"download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/oZOSEhyy/sodium-fabric-0.6.0-beta.1%2Bmc1.21.jar"
},
{
"slug": "ModernFix",
"version": "5.19.1+mc1.21",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/i8GSONFm/modernfix-fabric-5.19.1%2Bmc1.21.jar"
}
]
},
{
"name": "1.20.6",
"coreMods": [
{
"slug": "Vivecraft",
"version": "1.0",
"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.20.6/vivecraft.jar"
},
{
"slug": "Fabric-API",
"version": "0.100.4",
"download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/GT0R5Mz7/fabric-api-0.100.4%2B1.20.6.jar"
}
],
"defaultMods": [
{
"slug": "Sodium",
"version": "0.5.11",
"download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/OwLQelEI/sodium-fabric-0.5.11%2Bmc1.20.6.jar"
},
{
"slug": "ModernFix",
"version": "5.18.0+mc1.20.6",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/dUdr6D7I/modernfix-fabric-5.18.0%2Bmc1.20.6.jar"
}
]
},
{
"name": "1.20.4",
"coreMods": [
{
"slug": "Vivecraft",
"version": "1.0",
"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.20.4/vivecraft.jar"
"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.20.4/vivecraft.jar"
},
{
"slug": "Fabric-API",
Expand All @@ -18,7 +72,7 @@
{
"slug": "Sodium",
"version": "0.5.8",
"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.20.4-0.5.8/sodium-fabric-0.5.8+mc1.20.4.jar"
"download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/4GyXKCLd/sodium-fabric-0.5.8%2Bmc1.20.4.jar"
},
{
"slug": "Cloth-Config",
Expand Down Expand Up @@ -46,7 +100,7 @@
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/B23zGLmw/voicechat-fabric-1.20.4-2.5.12.jar"
},
{
"slug": "Modern-Fix",
"slug": "ModernFix",
"version": "5.10.0",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/vxDb5tOq/modernfix-fabric-5.10.0%2Bmc1.20.3.jar"
},
Expand Down Expand Up @@ -83,7 +137,7 @@
{
"slug": "Vivecraft",
"version": "1.1.1",
"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.20.1/vivecraft.jar"
"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.20/vivecraft.jar"
},
{
"slug": "Fabric-API",
Expand All @@ -104,8 +158,8 @@
},
{
"slug": "Sodium",
"version": "0.5.8",
"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.20.1-0.5.8/sodium-fabric-0.5.8+mc1.20.1.jar"
"version": "0.5.11",
"download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/ygf8cVZg/sodium-fabric-0.5.11%2Bmc1.20.1.jar"
},
{
"slug": "Cloth-Config",
Expand Down Expand Up @@ -143,7 +197,7 @@
"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/gEYXa8hg/voicechat-fabric-1.20.1-2.5.12.jar"
},
{
"slug": "Modern-Fix",
"slug": "ModernFix",
"version": "5.9.0",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/FDGaMHFj/modernfix-fabric-5.9.0%2Bmc1.20.1.jar"
}
Expand All @@ -155,7 +209,7 @@
{
"slug": "Vivecraft",
"version": "1.1.1",
"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.19.4/vivecraft.jar"
"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.19.4/vivecraft.jar"
},
{
"slug": "Fabric-API",
Expand Down Expand Up @@ -187,7 +241,7 @@
{
"slug": "Sodium",
"version": "0.4.10",
"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.19.4-0.4.11/sodium-fabric-mc1.19.4-0.4.11+build.1.jar"
"download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/b4hTi3mo/sodium-fabric-mc1.19.4-0.4.10%2Bbuild.24.jar"
},
{
"slug": "Cloth-Config",
Expand Down Expand Up @@ -235,7 +289,7 @@
"download_link": "https://cdn.modrinth.com/data/Kw7Sm3Xf/versions/5QKzTtlI/noxesium-0.1.8.jar"
},
{
"slug": "Modern-Fix",
"slug": "ModernFix",
"version": "5.7.2",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/LXlsO4Vo/modernfix-fabric-5.7.2%2Bmc1.19.4.jar"
}
Expand All @@ -247,7 +301,7 @@
{
"slug": "Vivecraft",
"version": "1.1.3",
"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.19.2/vivecraft.jar"
"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.19/vivecraft.jar"
},
{
"slug": "Fabric-API",
Expand Down Expand Up @@ -284,7 +338,7 @@
{
"slug": "Sodium",
"version": "0.4.4",
"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.19.2-0.4.4/Sodium.jar"
"download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/rAfhHfow/sodium-fabric-mc1.19.2-0.4.4%2Bbuild.18.jar"
},
{
"slug": "Cloth-Config",
Expand Down Expand Up @@ -317,7 +371,7 @@
"download_link": "https://cdn.modrinth.com/data/Kw7Sm3Xf/versions/WhRq6Q4n/noxesium-0.1.4.jar"
},
{
"slug": "Modern-Fix",
"slug": "ModernFix",
"version": "5.9.0",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/b1FKKAz8/modernfix-fabric-5.9.0%2Bmc1.19.2.jar"
}
Expand All @@ -329,7 +383,7 @@
{
"slug": "Vivecraft",
"version": "1.1.3",
"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.18.2/vivecraft.jar"
"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftMod/releases/download/v5.1.0-1.18/vivecraft.jar"
},
{
"slug": "Fabric-API",
Expand Down Expand Up @@ -365,8 +419,8 @@
},
{
"slug": "Sodium",
"version": "0.5.0",
"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.18.2-0.4.1/Sodium.jar"
"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",
Expand Down Expand Up @@ -404,11 +458,11 @@
"download_link": "https://cdn.modrinth.com/data/fQEb0iXm/versions/0.1.9/krypton-0.1.9.jar"
},
{
"slug": "Modern-Fix",
"slug": "ModernFix",
"version": "5.9.0",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/qNrVNwfw/modernfix-fabric-5.9.0%2Bmc1.18.2.jar"
}
]
}
]
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jun 04 16:34:57 EDT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 0dcb75f

Please sign in to comment.