diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..4828304 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,34 @@ +name: Publish Release + +on: [workflow_dispatch] # Manual trigger + +permissions: + contents: write + +jobs: + Build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 20 + uses: actions/setup-java@v3 + with: + distribution: 'adopt' + java-version: 20 + - name: Cache + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + .gradle + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'build.gradle') }} + - uses: gradle/wrapper-validation-action@v1 + - run: | + chmod +x gradlew + ./gradlew build publishCurseForge publish modrinth --stacktrace -Porg.gradle.parallel.threads=4 + env: + CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..0fe63d2 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +## Change +- change modid to `rocknroller` \ No newline at end of file diff --git a/README.md b/README.md index 44b6b0c..3a4ab52 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ # Rock'n Roller -Rock'n Roller is unofficial Item Scroller forge port. Rock'n Roller is a Minecraft mod that adds various -convenience features for moving items inside inventory GUIs. Examples are scrolling the mouse wheel over -slots with items in them or Shift/Ctrl + click + dragging over slots to move items from them in various -ways etc. +Rock'n Roller is unofficial Item Scroller forge port. + +Rock'n Roller is a Minecraft mod that adds various convenience features for moving items inside inventory GUIs. +Examples are scrolling the mouse wheel over slots with items in them or Shift/Ctrl + click + dragging over slots +to move items from them in various ways etc. Item scrolling is basically what the old NEI mod did and Mouse Tweaks also does. This mod has some different drag features compared to Mouse Tweaks, and also some special diff --git a/build.gradle b/build.gradle index 7218d18..544e9c5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,8 @@ plugins { id "dev.architectury.loom" version "1.2-SNAPSHOT" id "maven-publish" + id 'com.modrinth.minotaur' version '2.+' + id 'net.darkhax.curseforgegradle' version '1.+' } sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17 @@ -63,6 +65,41 @@ jar { } } +modrinth { + token = System.getenv("MODRINTH_TOKEN") + + projectId = "${project.modrinth_id}" + versionNumber = "${project.version}" + versionType = "beta" + changelog = file("CHANGELOG.md").getText('UTF-8') + uploadFile = remapJar + additionalFiles = [sourcesJar] + gameVersions = ["1.20", "1.20.1"] + loaders = ["forge", "neoforge"] + dependencies { + required.project("mafglib") + } +} + +task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { + apiToken = System.getenv("CURSEFORGE_TOKEN") + disableVersionDetection() + + def mainFile = upload(project.curseforge_id, remapJar) + mainFile.displayName = "${project.version}" + mainFile.releaseType = "beta" + mainFile.changelog = file("CHANGELOG.md") + mainFile.changelogType = "markdown" + mainFile.addModLoader("Forge", "NeoForge") + mainFile.addJavaVersion("Java 17", "Java 18") + mainFile.addGameVersion("1.20", "1.20.1") + mainFile.addRequirement("mafglib") + + def sourcesFile = mainFile.withAdditionalFile(sourcesJar) + sourcesFile.changelog = file("CHANGELOG.md") + sourcesFile.changelogType = "markdown" +} + // configure the maven publication publishing { publications { diff --git a/gradle.properties b/gradle.properties index 4e4ed23..156297b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,11 +12,13 @@ loom.platform=forge yarn_mappings=1.20.1+build.9 # Mod Properties - mod_version=0.1.0 + mod_version=0.1.1 maven_group=org.thinkingstudio.rocknroller archives_base_name=RocknRoller - mod_id=itemscroller + mod_id=rocknroller mod_author=ThinkingStudio + modrinth_id=hYq29QmW + curseforge_id=916852 # Dependencies - malilib_version=0.1.2-mc1.20.1 \ No newline at end of file + malilib_version=0.1.3-mc1.20.1 \ No newline at end of file diff --git a/icon/400x400.png b/icon/400x400.png new file mode 100644 index 0000000..781c41d Binary files /dev/null and b/icon/400x400.png differ diff --git a/icon/400x400.psd b/icon/400x400.psd new file mode 100644 index 0000000..6543d82 Binary files /dev/null and b/icon/400x400.psd differ diff --git a/src/main/java/fi/dy/masa/itemscroller/Reference.java b/src/main/java/fi/dy/masa/itemscroller/Reference.java index 0d58d70..e26b8de 100644 --- a/src/main/java/fi/dy/masa/itemscroller/Reference.java +++ b/src/main/java/fi/dy/masa/itemscroller/Reference.java @@ -4,7 +4,7 @@ public class Reference { - public static final String MOD_ID = "itemscroller"; + public static final String MOD_ID = "rocknroller"; public static final String MOD_NAME = "Rock'n Roller"; public static final String MOD_VERSION = StringUtils.getModVersionString(MOD_ID); } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 69282c2..7b47b67 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -3,7 +3,7 @@ loaderVersion = "[43,)" license = "LGPLv3" [[mods]] -modId = "itemscroller" +modId = "rocknroller" version = "${version}" displayName = "Rock'n Roller" displayURL="https://github.com/ThinkingStudios/ItemScroller-Forge" #optional @@ -11,26 +11,28 @@ logoFile="icon.png" #optional credits="masa" #optional authors="TexTrue, ThinkingStudio" #optional description = ''' +ItemScroller unofficial forge port. + Move items in inventory GUIs by scrolling the mouse wheel or dragging over slots ''' -[[dependencies.itemscroller]] +[[dependencies.rocknroller]] modId = "forge" mandatory = true versionRange = "[43,)" ordering = "NONE" side = "BOTH" -[[dependencies.itemscroller]] +[[dependencies.rocknroller]] modId = "minecraft" mandatory = true versionRange = "[1.20,)" ordering = "NONE" side = "BOTH" -[[dependencies.itemscroller]] -modId = "malilib" +[[dependencies.rocknroller]] +modId = "mafglib" mandatory = true -versionRange = "[0.1.0,)" +versionRange = "*" ordering = "NONE" side = "BOTH" diff --git a/src/main/resources/icon.png b/src/main/resources/icon.png index 1ee02a2..781c41d 100644 Binary files a/src/main/resources/icon.png and b/src/main/resources/icon.png differ