diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml index 580353a..09f2a02 100644 --- a/.github/workflows/pack.yml +++ b/.github/workflows/pack.yml @@ -3,11 +3,25 @@ on: [push] jobs: build: runs-on: ubuntu-latest + if: ${{ !contains(github.event.head_commit.message, 'nobuild') }} steps: - - uses: actions/checkout@v3 - - run: ./pack.sh - - name: Upload artifact - uses: actions/upload-artifact@v3 + - uses: actions/checkout@v4 + - name: Generate Pack + run: ./pack.sh + - name: Upload Artifact + uses: actions/upload-artifact@v4 with: name: babric-b1.7.3.zip path: ./babric-b1.7.3.zip + - name: Create Shorthand Hash + id: vars + run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + - name: Create Release + uses: softprops/action-gh-release@v2 + with: + files: babric-b1.7.3.zip + name: ${{ steps.vars.outputs.sha_short }} (Generated Release) + body: | + Autogenerated release via actions. + https://github.com/Glass-Series/babric-prism-instance/releases/download/${{ steps.vars.outputs.sha_short }}/babric-b1.7.3.zip + tag_name: ${{ steps.vars.outputs.sha_short }} diff --git a/.gitignore b/.gitignore index a18ea64..d86ac64 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.zip +.idea \ No newline at end of file diff --git a/.packignore b/.packignore index 853781e..8643049 100644 --- a/.packignore +++ b/.packignore @@ -1,5 +1,7 @@ .git/* -.gitignore +.github/* .minecraft/* +.idea/* +.gitignore README.md pack.sh \ No newline at end of file diff --git a/README.md b/README.md index 8f4e8aa..182e708 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Instance with b1.7.3 babric included for [PrismLauncher](https://github.com/PrismLauncher/PrismLauncher) (should work on MultiMC aswell) # Usage -1. Go to [releases](https://github.com/babric/prism-instance/releases) +1. Go to [releases](https://github.com/Glass-Series/babric-prism-instance/releases) 2. Drag and drop the download link into your PrismLauncher 3. Pick the name and click OK! diff --git a/instance.cfg b/instance.cfg index eb4c558..e9effed 100644 --- a/instance.cfg +++ b/instance.cfg @@ -1,3 +1,5 @@ InstanceType=OneSix +JvmArgs="-Dapple.awt.application.appearance=system" +OverrideJavaArgs=true name=babric b1.7.3 iconKey=fabric diff --git a/mmc-pack.json b/mmc-pack.json index f1e60ff..9c46b19 100644 --- a/mmc-pack.json +++ b/mmc-pack.json @@ -2,17 +2,17 @@ "components": [ { "cachedName": "LWJGL 2", - "cachedVersion": "2.9.4-babric.1", + "cachedVersion": "2.9.4+legacyfabric.9", "cachedVolatile": true, "dependencyOnly": true, "uid": "org.lwjgl", - "version": "2.9.4-babric.1" + "version": "2.9.4+legacyfabric.9" }, { "cachedName": "Minecraft", "cachedRequires": [ { - "suggests": "2.9.4-nightly-20150209", + "suggests": "2.9.4+legacyfabric.9", "uid": "org.lwjgl" } ], @@ -37,19 +37,20 @@ "cachedVersion": "b1.7.3", "cachedVolatile": true, "dependencyOnly": true, - "uid": "babric.intermediary", + "uid": "net.fabricmc.intermediary", "version": "b1.7.3" }, { "cachedName": "Fabric Loader", "cachedRequires": [ { - "uid": "babric.intermediary" + "equals": "b1.7.3", + "uid": "net.fabricmc.intermediary" } ], - "cachedVersion": "0.15.6-babric.2", + "cachedVersion": "0.16.7", "uid": "net.fabricmc.fabric-loader", - "version": "0.15.6-babric.2" + "version": "0.16.7" } ], "formatVersion": 1 diff --git a/patches/babric.json b/patches/babric.json index 1d5ec16..dd843af 100644 --- a/patches/babric.json +++ b/patches/babric.json @@ -37,6 +37,9 @@ { "name": "com.google.guava:guava:31.0.1-jre" }, + { + "name": "com.google.guava:failureaccess:1.0.1" + }, { "name": "org.apache.commons:commons-lang3:3.12.0" }, diff --git a/patches/net.fabricmc.fabric-loader.json b/patches/net.fabricmc.fabric-loader.json deleted file mode 100644 index 1f6909a..0000000 --- a/patches/net.fabricmc.fabric-loader.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "formatVersion": 1, - "libraries": [ - { - "name": "net.fabricmc:sponge-mixin:0.12.5+mixin.0.8.5", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "org.ow2.asm:asm:9.6", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "org.ow2.asm:asm-analysis:9.6", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "org.ow2.asm:asm-commons:9.6", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "org.ow2.asm:asm-tree:9.6", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "org.ow2.asm:asm-util:9.6", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "babric:fabric-loader:0.15.6-babric.2", - "url": "https://maven.glass-launcher.net/babric/" - } - ], - "mainClass": "net.fabricmc.loader.impl.launch.knot.KnotClient", - "name": "Fabric Loader", - "requires": [ - { - "uid": "babric.intermediary" - } - ], - "type": "release", - "uid": "net.fabricmc.fabric-loader", - "version": "0.15.6-babric.2" -} diff --git a/patches/babric.intermediary.json b/patches/net.fabricmc.intermediary.json similarity index 70% rename from patches/babric.intermediary.json rename to patches/net.fabricmc.intermediary.json index bb28e92..4882b01 100644 --- a/patches/babric.intermediary.json +++ b/patches/net.fabricmc.intermediary.json @@ -2,12 +2,12 @@ "formatVersion": 1, "libraries": [ { - "name": "babric:intermediary:b1.7.3", + "name": "babric:intermediary-upstream:b1.7.3", "url": "https://maven.glass-launcher.net/babric" } ], "name": "Intermediary Mappings", - "releaseTime": "2022-03-20T00:31:28.800Z", + "releaseTime": "2024-10-18T18:57:03.000Z", "requires": [ { "equals": "b1.7.3", @@ -15,7 +15,7 @@ } ], "type": "release", - "uid": "babric.intermediary", + "uid": "net.fabricmc.intermediary", "version": "b1.7.3", "volatile": true } diff --git a/patches/net.minecraft.json b/patches/net.minecraft.json new file mode 100644 index 0000000..f0d5602 --- /dev/null +++ b/patches/net.minecraft.json @@ -0,0 +1,41 @@ +{ + "+traits": [ + "legacyLaunch", + "legacyServices", + "texturepacks" + ], + "assetIndex": { + "id": "pre-1.6", + "sha1": "3d8e55480977e32acd9844e545177e69a52f594b", + "size": 74091, + "totalSize": 49505710, + "url": "https://piston-meta.mojang.com/v1/packages/3d8e55480977e32acd9844e545177e69a52f594b/pre-1.6.json" + }, + "compatibleJavaMajors": [ + 17 + ], + "compatibleJavaName": "java-runtime-gamma", + "formatVersion": 1, + "mainJar": { + "downloads": { + "artifact": { + "sha1": "43db9b498cb67058d2e12d394e6507722e71bb45", + "size": 1465375, + "url": "https://launcher.mojang.com/v1/objects/43db9b498cb67058d2e12d394e6507722e71bb45/client.jar" + } + }, + "name": "com.mojang:minecraft:b1.7.3:client" + }, + "minecraftArguments": "${auth_player_name} ${auth_session} --gameDir ${game_directory} --assetsDir ${game_assets}", + "name": "Minecraft", + "releaseTime": "2011-07-08T00:00:00+02:00", + "requires": [ + { + "suggests": "2.9.4+legacyfabric.9", + "uid": "org.lwjgl" + } + ], + "type": "old_beta", + "uid": "net.minecraft", + "version": "b1.7.3" +} diff --git a/patches/org.lwjgl.json b/patches/org.lwjgl.json index 2ecbad7..55c30ab 100644 --- a/patches/org.lwjgl.json +++ b/patches/org.lwjgl.json @@ -9,11 +9,26 @@ "size": 10362, "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar" }, + "natives-linux-arm32": { + "sha1": "f3c455b71c5146acb5f8a9513247fc06db182fd5", + "size": 4521, + "url": "https://github.com/theofficialgman/lwjgl3-binaries-arm32/raw/lwjgl-2.9.4/jinput-platform-2.0.5-natives-linux.jar" + }, + "natives-linux-arm64": { + "sha1": "42b388ccb7c63cec4e9f24f4dddef33325f8b212", + "size": 10932, + "url": "https://github.com/theofficialgman/lwjgl3-binaries-arm64/raw/lwjgl-2.9.4/jinput-platform-2.0.5-natives-linux.jar" + }, "natives-osx": { "sha1": "53f9c919f34d2ca9de8c51fc4e1e8282029a9232", "size": 12186, "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar" }, + "natives-osx-arm64": { + "sha1": "5189eb40db3087fb11ca063b68fa4f4c20b199dd", + "size": 10031, + "url": "https://github.com/r58Playz/jinput-m1/raw/main/plugins/OSX/bin/jinput-platform-2.0.5.jar" + }, "natives-windows": { "sha1": "385ee093e01f587f30ee1c8a2ee7d408fd732e16", "size": 155179, @@ -29,7 +44,10 @@ "name": "net.java.jinput:jinput-platform:2.0.5", "natives": { "linux": "natives-linux", + "linux-arm32": "natives-linux-arm32", + "linux-arm64": "natives-linux-arm64", "osx": "natives-osx", + "osx-arm64": "natives-osx-arm64", "windows": "natives-windows" } }, @@ -59,26 +77,29 @@ "META-INF/" ] }, - "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-babric.1", - "url": "https://maven.glass-launcher.net/babric/", + "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4+legacyfabric.9", + "url": "https://maven.legacyfabric.net/", "natives": { "linux": "natives-linux", + "linux-arm32": "natives-linux", + "linux-arm64": "natives-linux", "osx": "natives-osx", + "osx-arm64": "natives-osx", "windows": "natives-windows" } }, { - "name": "org.lwjgl.lwjgl:lwjgl:2.9.4-babric.1", - "url": "https://maven.glass-launcher.net/babric/" + "name": "org.lwjgl.lwjgl:lwjgl:2.9.4+legacyfabric.9", + "url": "https://maven.legacyfabric.net/" }, { - "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-babric.1", - "url": "https://maven.glass-launcher.net/babric/" + "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4+legacyfabric.9", + "url": "https://maven.legacyfabric.net/" } ], "name": "LWJGL 2", "type": "release", "uid": "org.lwjgl", - "version": "2.9.4-babric.1", + "version": "2.9.4+legacyfabric.9", "volatile": true -} +} \ No newline at end of file