Skip to content

Commit

Permalink
1.6.0
Browse files Browse the repository at this point in the history
remove telemetry and update checker
bump dependencies
relicense under LGPL3
add gradle publishing
update readme images
  • Loading branch information
isXander committed May 21, 2022
1 parent e2ca548 commit 469fec4
Show file tree
Hide file tree
Showing 10 changed files with 265 additions and 794 deletions.
827 changes: 159 additions & 668 deletions LICENSE

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,10 @@
Zoomify aims to provide the easiest, most configurable and most sexy looking zoom mod you will ever find.

![Zoom Example](https://i.imgur.com/IkNZEpW.gif)
![Behaviour Settings Page](https://i.imgur.com/44TzKiK.png)
![Controls Settings Page](https://i.imgur.com/7ZKhMQ6.png)
![Behaviour Settings Page](https://i.imgur.com/EzQ272C.png)
![Scrolling Settings Page](https://i.imgur.com/qr3enFh.png)
![Controls Settings Page](https://i.imgur.com/pSr5Cjp.png)

### Credits
- [isXander](https://github.com/isXander) - Founder
- [MoonTidez](https://github.com/MoonTidez) - Logo designer
88 changes: 84 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
import com.modrinth.minotaur.dependencies.ModDependency

plugins {
val kotlinVersion: String by System.getProperties()

java
kotlin("jvm") version kotlinVersion
kotlin("plugin.serialization") version kotlinVersion
id("fabric-loom") version "0.11.+"

id("fabric-loom") version "0.12.+"
id("io.github.juuxel.loom-quiltflower") version "1.7.+"

id("com.modrinth.minotaur") version "2.+"
id("com.matthewprenger.cursegradle") version "1.+"
id("com.github.breadmoirai.github-release") version "2.+"
}

group = "dev.isxander"
Expand All @@ -19,9 +27,10 @@ repositories {
maven("https://repo.woverflow.cc/")
}

val minecraftVersion: String by project

dependencies {
val kotlinVersion: String by System.getProperties()
val minecraftVersion: String by project
val yarnVersion: String by project
val loaderVersion: String by project
val fabricVersion: String by project
Expand All @@ -42,8 +51,6 @@ dependencies {
include(implementation("dev.isxander:settxi:2.1.1")!!)
include(modImplementation("dev.isxander:settxi-cloth-impl:1.+:fabric-1.18.2")!!)

include(implementation("org.bundleproject:libversion:0.0.3")!!)

modImplementation("com.terraformersmc:modmenu:3.+")

include(implementation("com.github.llamalad7:mixinextras:0.0.+")!!)
Expand All @@ -69,4 +76,77 @@ tasks {
)
}
}

register("releaseMod") {
group = "mod"

dependsOn("modrinth")
dependsOn("modrinthSyncBody")
dependsOn("curseforge")
dependsOn("githubRelease")
}
}

val changelogText = file("changelogs/${project.version}.md").takeIf { it.exists() }?.readText() ?: "No changelog provided"

val modrinthId: String by project
if (modrinthId.isNotEmpty()) {
modrinth {
token.set(findProperty("modrinth.token")?.toString())
projectId.set(modrinthId)
versionNumber.set("${project.version}")
versionType.set("release")
uploadFile.set(tasks["remapJar"])
gameVersions.set(listOf(minecraftVersion))
loaders.set(listOf("fabric", "quilt"))
changelog.set(changelogText)
syncBodyFrom.set(file("README.md").readText())
dependencies.set(listOf(
ModDependency("9s6osm5g", "required"), // cloth-config
ModDependency("mOgUt4GM", "optional") // modmenu
))
}
}

val curseforgeId: String by project
if (hasProperty("curseforge.token") && curseforgeId.isNotEmpty()) {
curseforge {
apiKey = findProperty("curseforge.token")
project(closureOf<com.matthewprenger.cursegradle.CurseProject> {
mainArtifact(tasks["remapJar"], closureOf<com.matthewprenger.cursegradle.CurseArtifact> {
displayName = "${project.version}"
})

id = curseforgeId
releaseType = "release"
addGameVersion(minecraftVersion)
addGameVersion("Fabric")
addGameVersion("Java 17")

relations(closureOf<com.matthewprenger.cursegradle.CurseRelation> {
requiredDependency("cloth-config")
optionalDependency("modmenu")
})

changelog = changelogText
changelogType = "markdown"
})

options(closureOf<com.matthewprenger.cursegradle.Options> {
forgeGradleIntegration = false
})
}
}

githubRelease {
token(findProperty("github.token")?.toString())

val githubProject: String by project
val split = githubProject.split("/")
owner(split[0])
repo(split[1])
tagName("${project.version}")
targetCommitish("1.18")
body(changelogText)
releaseAssets(tasks["remapJar"].outputs.files)
}
3 changes: 3 additions & 0 deletions changelogs/1.6.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Fix zoom speed being FPS dependent
- Remove telemetry and update checking
- Allow up to 150% zoom speed
12 changes: 8 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
org.gradle.jvmargs=-Xmx2G

kotlin.code.style=official
systemProp.kotlinVersion=1.6.20
systemProp.kotlinVersion=1.6.21

# https://fabricmc.net/develop
minecraftVersion=1.18.2
yarnVersion=1.18.2+build.+
loaderVersion=0.13.+
fabricVersion=0.48.0+1.18.2
fabricKotlinVersion=1.7.2
loaderVersion=0.14.+
fabricVersion=0.53.0+1.18.2
fabricKotlinVersion=1.7.4

modrinthId=w7ThoJFB
curseforgeId=574741
githubProject=isXander/Zoomify
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
34 changes: 1 addition & 33 deletions src/main/kotlin/dev/isxander/zoomify/Zoomify.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,20 @@ package dev.isxander.zoomify

import dev.isxander.zoomify.config.ZoomKeyBehaviour
import dev.isxander.zoomify.config.ZoomifySettings
import dev.isxander.zoomify.api.metrics.UniqueUsersMetric
import dev.isxander.zoomify.api.updater.ZoomifyUpdateChecker
import dev.isxander.zoomify.utils.mc
import dev.isxander.zoomify.zoom.SingleZoomHelper
import dev.isxander.zoomify.zoom.TieredZoomHelper
import net.fabricmc.api.ClientModInitializer
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper
import net.fabricmc.fabric.api.client.networking.v1.ClientLoginConnectionEvents
import net.fabricmc.loader.api.FabricLoader
import net.minecraft.client.option.KeyBinding
import net.minecraft.client.util.InputUtil
import net.minecraft.network.MessageType
import net.minecraft.text.ClickEvent
import net.minecraft.text.LiteralText
import net.minecraft.text.TranslatableText
import net.minecraft.util.Formatting
import org.bundleproject.libversion.Version
import java.util.*

object Zoomify : ClientModInitializer {
val VERSION = Version.of(FabricLoader.getInstance().getModContainer("zoomify").get().metadata.version.friendlyString)
var latestVersion: Version? = null

val guiKey = KeyBinding("zoomify.key.gui", InputUtil.Type.KEYSYM, InputUtil.GLFW_KEY_F8, "zoomify.key.category")

val zoomKey = KeyBinding("zoomify.key.zoom", InputUtil.Type.KEYSYM, InputUtil.GLFW_KEY_C, "zoomify.key.category")

var zooming = false

private val normalZoomHelper = SingleZoomHelper({ ZoomifySettings.initialZoom.toDouble() }, { ZoomifySettings.zoomSpeed.toDouble() / 100.0 }, { ZoomifySettings.zoomTransition })
Expand All @@ -53,25 +40,6 @@ object Zoomify : ClientModInitializer {
mc.setScreen(ZoomifySettings.clothGui(mc.currentScreen))
}
}

ClientLoginConnectionEvents.INIT.register { handler, client ->
if (latestVersion != null) {
val versionString = latestVersion.toString()
val updateUrl = "https://modrinth.com/mod/zoomify/version/$versionString"
val text = TranslatableText("zoomify.update.available", versionString).formatted(Formatting.RED).append(LiteralText(updateUrl).formatted(Formatting.UNDERLINE, Formatting.BLUE).styled { it.withClickEvent(ClickEvent(ClickEvent.Action.OPEN_URL, updateUrl)) })

client.inGameHud.addChatMessage(MessageType.CHAT, text, UUID.randomUUID())
latestVersion = null
}
}

Thread {
UniqueUsersMetric.putApi()
latestVersion = ZoomifyUpdateChecker.getLatestVersion()?.takeIf { it > VERSION }
}.apply {
name = "zoomify-concurrent"
start()
}
}

@JvmStatic
Expand Down

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"sources": "https://github.com/isXander/Zoomify"
},
"icon": "assets/zoomify/zoomify.png",
"license": "GPLv3",
"license": "LGPLv3",
"environment": "client",
"entrypoints": {
"client": [
Expand All @@ -38,7 +38,7 @@
"depends": {
"fabric": "*",
"fabricloader": ">=0.13.0",
"fabric-language-kotlin": ">=1.7.2+kotlin.1.6.20",
"fabric-language-kotlin": ">=1.7.4+kotlin.1.6.21",
"minecraft": "~1.18.2",
"java": ">=17",
"cloth-config": "6.x.x"
Expand Down

0 comments on commit 469fec4

Please sign in to comment.