diff --git a/1_16/build.sh b/1_16/build.sh index 07a59cd..8650d94 100644 --- a/1_16/build.sh +++ b/1_16/build.sh @@ -1,91 +1,8 @@ -compile(){ +build(){ rm -rf packages mkdir -p packages rm build/libs/*-dev.jar mv build/libs/*.jar packages/ - mv packages/*.jar packages/all.jar -} -extract(){ - rm -rf extract - mkdir -p extract - unzip packages/all.jar -d extract/ > /dev/null -} -linux-x86_64(){ - target=target/linux-x86_64 - name=linux-x86_64.jar - - mkdir -p $target/extract $target/tmp - cp -r extract $target - # rocksdb - mv $target/extract/librocksdbjni-linux64.so $target/tmp - rm $target/extract/librocksdbjni* - mv $target/tmp/librocksdbjni-linux64.so $target/extract - # package - jar -c -f packages/$name -C $target/extract/ . - rm -rf $target -} -linux-x86(){ - target=target/linux-x86 - name=linux-x86.jar - - mkdir -p $target/extract $target/tmp - cp -r extract $target - # rocksdb - mv $target/extract/librocksdbjni-linux32.so $target/tmp - rm $target/extract/librocksdbjni* - mv $target/tmp/librocksdbjni-linux32*.so $target/extract - # package - jar -c -f packages/$name -C $target/extract/ . - rm -rf $target -} -windows-x86_64(){ - target=target/windows-x86_64 - name=windows-x86_64.jar - - mkdir -p $target/extract $target/tmp - cp -r extract $target - # rocksdb - mv $target/extract/librocksdbjni-win64.dll $target/tmp - rm $target/extract/librocksdbjni* - mv $target/tmp/librocksdbjni-win64.dll $target/extract - # package - jar -c -f packages/$name -C $target/extract/ . - rm -rf $target -} -mac-x86_64(){ - target=target/mac-x86_64 - name=mac-x86_64.jar - - mkdir -p $target/extract $target/tmp - cp -r extract $target - # rocksdb - mv $target/extract/librocksdbjni-osx-x86_64.jnilib $target/tmp - rm $target/extract/librocksdbjni* - mv $target/tmp/librocksdbjni-osx-x86_64.jnilib $target/extract - # package - jar -c -f packages/$name -C $target/extract/ . - rm -rf $target -} -all_target(){ - linux-x86_64 - linux-x86 - windows-x86_64 - mac-x86_64 - cd packages - prefix=fabric-1.16- - for files in $(ls *.jar) - do mv $files $prefix$files - done - cd .. -} -clean(){ - rm -rf extract target -} -build(){ - compile - extract - all_target - clean + mv packages/*.jar packages/fabric-1_16.jar } build - diff --git a/1_17/build.sh b/1_17/build.sh index 2565f4e..5e1cd40 100644 --- a/1_17/build.sh +++ b/1_17/build.sh @@ -1,91 +1,8 @@ -compile(){ +build(){ rm -rf packages mkdir -p packages rm build/libs/*-dev.jar mv build/libs/*.jar packages/ - mv packages/*.jar packages/all.jar -} -extract(){ - rm -rf extract - mkdir -p extract - unzip packages/all.jar -d extract/ > /dev/null -} -linux-x86_64(){ - target=target/linux-x86_64 - name=linux-x86_64.jar - - mkdir -p $target/extract $target/tmp - cp -r extract $target - # rocksdb - mv $target/extract/librocksdbjni-linux64.so $target/tmp - rm $target/extract/librocksdbjni* - mv $target/tmp/librocksdbjni-linux64.so $target/extract - # package - jar -c -f packages/$name -C $target/extract/ . - rm -rf $target -} -linux-x86(){ - target=target/linux-x86 - name=linux-x86.jar - - mkdir -p $target/extract $target/tmp - cp -r extract $target - # rocksdb - mv $target/extract/librocksdbjni-linux32.so $target/tmp - rm $target/extract/librocksdbjni* - mv $target/tmp/librocksdbjni-linux32*.so $target/extract - # package - jar -c -f packages/$name -C $target/extract/ . - rm -rf $target -} -windows-x86_64(){ - target=target/windows-x86_64 - name=windows-x86_64.jar - - mkdir -p $target/extract $target/tmp - cp -r extract $target - # rocksdb - mv $target/extract/librocksdbjni-win64.dll $target/tmp - rm $target/extract/librocksdbjni* - mv $target/tmp/librocksdbjni-win64.dll $target/extract - # package - jar -c -f packages/$name -C $target/extract/ . - rm -rf $target -} -mac-x86_64(){ - target=target/mac-x86_64 - name=mac-x86_64.jar - - mkdir -p $target/extract $target/tmp - cp -r extract $target - # rocksdb - mv $target/extract/librocksdbjni-osx-x86_64.jnilib $target/tmp - rm $target/extract/librocksdbjni* - mv $target/tmp/librocksdbjni-osx-x86_64.jnilib $target/extract - # package - jar -c -f packages/$name -C $target/extract/ . - rm -rf $target -} -all_target(){ - linux-x86_64 - linux-x86 - windows-x86_64 - mac-x86_64 - cd packages - prefix=fabric-1.17- - for files in $(ls *.jar) - do mv $files $prefix$files - done - cd .. -} -clean(){ - rm -rf extract target -} -build(){ - compile - extract - all_target - clean + mv packages/*.jar packages/fabric-1_17.jar } build - diff --git a/1_18/build.sh b/1_18/build.sh index e067c2d..ad5a171 100644 --- a/1_18/build.sh +++ b/1_18/build.sh @@ -1,91 +1,8 @@ -compile(){ +build(){ rm -rf packages mkdir -p packages rm build/libs/*-dev.jar mv build/libs/*.jar packages/ - mv packages/*.jar packages/all.jar -} -extract(){ - rm -rf extract - mkdir -p extract - unzip packages/all.jar -d extract/ > /dev/null -} -linux-x86_64(){ - target=target/linux-x86_64 - name=linux-x86_64.jar - - mkdir -p $target/extract $target/tmp - cp -r extract $target - # rocksdb - mv $target/extract/librocksdbjni-linux64.so $target/tmp - rm $target/extract/librocksdbjni* - mv $target/tmp/librocksdbjni-linux64.so $target/extract - # package - jar -c -f packages/$name -C $target/extract/ . - rm -rf $target -} -linux-x86(){ - target=target/linux-x86 - name=linux-x86.jar - - mkdir -p $target/extract $target/tmp - cp -r extract $target - # rocksdb - mv $target/extract/librocksdbjni-linux32.so $target/tmp - rm $target/extract/librocksdbjni* - mv $target/tmp/librocksdbjni-linux32*.so $target/extract - # package - jar -c -f packages/$name -C $target/extract/ . - rm -rf $target -} -windows-x86_64(){ - target=target/windows-x86_64 - name=windows-x86_64.jar - - mkdir -p $target/extract $target/tmp - cp -r extract $target - # rocksdb - mv $target/extract/librocksdbjni-win64.dll $target/tmp - rm $target/extract/librocksdbjni* - mv $target/tmp/librocksdbjni-win64.dll $target/extract - # package - jar -c -f packages/$name -C $target/extract/ . - rm -rf $target -} -mac-x86_64(){ - target=target/mac-x86_64 - name=mac-x86_64.jar - - mkdir -p $target/extract $target/tmp - cp -r extract $target - # rocksdb - mv $target/extract/librocksdbjni-osx-x86_64.jnilib $target/tmp - rm $target/extract/librocksdbjni* - mv $target/tmp/librocksdbjni-osx-x86_64.jnilib $target/extract - # package - jar -c -f packages/$name -C $target/extract/ . - rm -rf $target -} -all_target(){ - linux-x86_64 - linux-x86 - windows-x86_64 - mac-x86_64 - cd packages - prefix=fabric-1.18- - for files in $(ls *.jar) - do mv $files $prefix$files - done - cd .. -} -clean(){ - rm -rf extract target -} -build(){ - compile - extract - all_target - clean + mv packages/*.jar packages/fabric-1_18.jar } build - diff --git a/build.gradle.kts b/build.gradle.kts index 2f70737..ef37d50 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,16 +2,14 @@ plugins { java id("fabric-loom") version "0.10-SNAPSHOT" apply false id("org.jetbrains.kotlin.jvm") version ("1.6.0") - id("org.jetbrains.kotlin.plugin.serialization")version ("1.6.0") id("com.github.johnrengelman.shadow")version ("7.1.0") - id("io.itsusinn.pkg") version "1.2.0" + id("io.itsusinn.pkg") version "1.2.2" } allprojects { group = property("maven_group")!! version = property("mod_version")!! repositories { mavenCentral() - maven("https://jitpack.io") mavenLocal() maven("https://maven.fabricmc.net/") } diff --git a/build.sh b/build.sh index 871f107..7fd9825 100644 --- a/build.sh +++ b/build.sh @@ -17,6 +17,7 @@ build-1_18(){ mv 1_18/packages/* packages/ } build(){ + rm -rf packages mkdir packages ./gradlew clean :1_16:remapJar build-1_16