Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ThatGravyBoat/RewardClaim
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.5
Choose a base ref
...
head repository: ThatGravyBoat/RewardClaim
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 8 commits
  • 47 files changed
  • 2 contributors

Commits on May 3, 2022

  1. Update data.json

    ThatGravyBoat authored May 3, 2022
    Copy the full SHA
    495859f View commit details
  2. Update data.json

    ThatGravyBoat authored May 3, 2022
    Copy the full SHA
    a5f48ee View commit details

Commits on May 4, 2022

  1. Copy the full SHA
    42f9c22 View commit details
  2. Merge pull request #4 from romangraef/master

    Prevent double clicks on two different rewards from activating double clicks
    ThatGravyBoat authored May 4, 2022
    Copy the full SHA
    e194d84 View commit details

Commits on Jun 24, 2024

  1. Update

    Closes #7
    ThatGravyBoat committed Jun 24, 2024
    Copy the full SHA
    4c813f2 View commit details

Commits on Aug 17, 2024

  1. make things work on modern versions

    ThatGravyBoat committed Aug 17, 2024
    Copy the full SHA
    3d5dd0e View commit details

Commits on Nov 4, 2024

  1. update mixins and fix refmap

    ThatGravyBoat committed Nov 4, 2024
    Copy the full SHA
    3dce00c View commit details

Commits on Dec 7, 2024

  1. Update data.json

    ThatGravyBoat authored Dec 7, 2024
    Copy the full SHA
    10829cc View commit details
Showing with 841 additions and 256 deletions.
  1. +0 −83 build.gradle
  2. +155 −0 build.gradle.kts
  3. +3 −3 data.json
  4. +10 −1 gradle.properties
  5. +2 −2 gradle/wrapper/gradle-wrapper.properties
  6. +24 −0 root.gradle.kts
  7. +0 −28 settings.gradle
  8. +38 −0 settings.gradle.kts
  9. +0 −19 src/main/kotlin/tech/thatgravyboat/rewardclaim/Command.kt
  10. +2 −2 src/main/kotlin/tech/thatgravyboat/rewardclaim/ExternalConfiguration.kt
  11. +52 −0 src/main/kotlin/tech/thatgravyboat/rewardclaim/Initializer.kt
  12. +4 −64 src/main/kotlin/tech/thatgravyboat/rewardclaim/RewardClaim.kt
  13. +28 −0 src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/Multithreading.kt
  14. +29 −0 src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformEvents.kt
  15. +37 −0 src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformUtils.kt
  16. +0 −1 src/main/kotlin/tech/thatgravyboat/rewardclaim/types/RewardRarity.kt
  17. +49 −51 src/main/kotlin/tech/thatgravyboat/rewardclaim/ui/RewardClaimGui.kt
  18. +35 −0 src/main/resources/fabric.mod.json
  19. +2 −2 src/main/resources/mcmod.info
  20. +1 −0 versions/1.12.2-1.8.9.txt
  21. +4 −0 versions/1.12.2-forge/gradle.properties
  22. +8 −0 versions/1.12.2-forge/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformEvents.kt
  23. +19 −0 versions/1.12.2-forge/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformUtils.kt
  24. +8 −0 versions/1.17.1-fabric/gradle.properties
  25. +8 −0 versions/1.17.1-fabric/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformEvents.kt
  26. +19 −0 versions/1.17.1-fabric/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformUtils.kt
  27. +4 −0 versions/1.17.1-forge/gradle.properties
  28. +8 −0 versions/1.17.1-forge/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformEvents.kt
  29. +19 −0 versions/1.17.1-forge/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformUtils.kt
  30. +8 −0 versions/1.18.1-fabric/gradle.properties
  31. +8 −0 versions/1.18.1-fabric/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformEvents.kt
  32. +19 −0 versions/1.18.1-fabric/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformUtils.kt
  33. +8 −0 versions/1.19-fabric/gradle.properties
  34. +8 −0 versions/1.19-fabric/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformEvents.kt
  35. +19 −0 versions/1.19-fabric/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformUtils.kt
  36. +8 −0 versions/1.20.1-fabric/gradle.properties
  37. +26 −0 versions/1.20.1-fabric/src/main/java/tech/thatgravyboat/rewardclaim/mixins/MinecraftClientMixin.java
  38. +13 −0 versions/1.20.1-fabric/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformEvents.kt
  39. +41 −0 versions/1.20.1-fabric/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformUtils.kt
  40. +10 −0 versions/1.20.1-fabric/src/main/resources/mixins.rewardclaim.json
  41. +11 −0 versions/1.21-fabric/gradle.properties
  42. +26 −0 versions/1.21-fabric/src/main/java/tech/thatgravyboat/rewardclaim/mixins/MinecraftClientMixin.java
  43. +13 −0 versions/1.21-fabric/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformEvents.kt
  44. +40 −0 versions/1.21-fabric/src/main/kotlin/tech/thatgravyboat/rewardclaim/platform/PlatformUtils.kt
  45. +10 −0 versions/1.21-fabric/src/main/resources/mixins.rewardclaim.json
  46. +4 −0 versions/1.8.9-forge/gradle.properties
  47. +1 −0 versions/mainProject
83 changes: 0 additions & 83 deletions build.gradle

This file was deleted.

155 changes: 155 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
import gg.essential.gradle.util.*
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile

plugins {
kotlin("jvm")
id("gg.essential.multi-version")
id("gg.essential.defaults")
id("com.github.johnrengelman.shadow")
id("net.kyori.blossom")
}

val mod_name: String by project
val mod_version: String by project
val mod_id: String by project

preprocess {
vars.put("MODERN", if (project.platform.mcMinor >= 16) 1 else 0)
}

blossom {
replaceToken("@VER@", mod_version)
replaceToken("@NAME@", mod_name)
replaceToken("@ID@", mod_id)
replaceToken("@DEBUG@", true)
}

version = mod_version
group = "tech.thatgravyboat"
base {
archivesName.set(mod_name)
}

tasks.compileKotlin.setJvmDefault(if (platform.mcVersion >= 11400) "all" else "all-compatibility")
loom.noServerRunConfigs()
loom {
mixin.defaultRefmapName.set("mixins.${mod_id}.refmap.json")
}

repositories {
maven("https://maven.teamresourceful.com/repository/thatgravyboat/")
maven("https://maven.teamresourceful.com/repository/maven-private/")
maven("https://maven.terraformersmc.com/releases/")
maven("https://repo.essential.gg/repository/maven-public/")
}

val shade: Configuration by configurations.creating {
configurations.implementation.get().extendsFrom(this)
}

dependencies {
val elementa_version: String by project
val vigilance_version: String by project
val universal_version: String by project
val essential_version: String? by project
if (platform.isFabric) {
val fabricApiVersion: String by project
val fabricLanguageKotlinVersion: String by project
val modMenuVersion: String by project
modImplementation("net.fabricmc.fabric-api:fabric-api:$fabricApiVersion")
modImplementation("net.fabricmc:fabric-language-kotlin:$fabricLanguageKotlinVersion")
modImplementation("com.terraformersmc:modmenu:$modMenuVersion")
modImplementation("include"("gg.essential:elementa-${elementa_version}")!!)
modImplementation("include"("gg.essential:vigilance-${vigilance_version}")!!)
modImplementation("include"("gg.essential:universalcraft-${universal_version}")!!)
} else {
compileOnly("gg.essential:essential-${essential_version ?: platform}")
shade("gg.essential:loader-launchwrapper:1.1.3") {
isTransitive = false
}
}
}

tasks.processResources {
inputs.property("id", mod_id)
inputs.property("name", mod_name)
val java = when {
project.platform.mcMinor >= 21 -> 21
project.platform.mcMinor == 20 && project.platform.mcPatch >= 5 -> 21
project.platform.mcMinor >= 18 -> 17
project.platform.mcMinor == 17 -> 16
else -> 8
}
val compatLevel = "JAVA_${java}"
inputs.property("java", java)
inputs.property("java_level", compatLevel)
inputs.property("version", mod_version)
inputs.property("mcVersionStr", project.platform.mcVersionStr)
filesMatching(listOf("mcmod.info", "mixins.${mod_id}.json", "mods.toml")) {
expand(mapOf(
"id" to mod_id,
"name" to mod_name,
"java" to java,
"java_level" to compatLevel,
"version" to mod_version,
"mcVersionStr" to project.platform.mcVersionStr
))
}
filesMatching("fabric.mod.json") {
expand(mapOf(
"id" to mod_id,
"name" to mod_name,
"java" to java,
"java_level" to compatLevel,
"version" to mod_version,
"mcVersionStr" to project.platform.mcVersionStr.substringBeforeLast(".") + ".x"
))
}
}

tasks {
withType<KotlinJvmCompile>().configureEach {
compilerOptions {
languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_6
apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_6
}
}
withType(Jar::class.java) {
if (project.platform.isFabric) {
exclude("mcmod.info", "mods.toml")
} else {
exclude("fabric.mod.json", "mixins.${mod_id}.json")
if (project.platform.isLegacyForge) {
exclude("mods.toml")
} else {
exclude("mcmod.info")
}
}
}
named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
archiveClassifier.set("dev")
configurations = listOf(shade)
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
remapJar {
input.set(shadowJar.get().archiveFile)
archiveClassifier.set("")
}
jar {
if (project.platform.isLegacyForge) {
manifest {
attributes(
mapOf(
"ModSide" to "CLIENT",
"TweakOrder" to "0",
"TweakClass" to "gg.essential.loader.stage0.EssentialSetupTweaker",
"ForceLoadAsMod" to true
)
)
}
}
dependsOn(shadowJar)
archiveClassifier.set("")
enabled = false
}
}
6 changes: 3 additions & 3 deletions data.json
Original file line number Diff line number Diff line change
@@ -116,10 +116,10 @@
"imageType": "small"
}
},
"rewardRegex": "Click the link to visit our website and claim your reward: https://rewards\\.hypixel\\.net/claim-reward/(?<id>[A-Za-z0-9]{8})",
"rewardRegex": "(?:Click the link to visit our website and claim your reward: |Clique no link para visitar o nosso site e coletar a sua recompensa: |点击链接访问我们的网站并领取奖励:|點選連結前往官方網站並領取獎勵:|Kliknutím na odkaz si zobrazíš náš web, kde si můžeš vyzvednout odměnu: |Klik på linket for at besøge vores hjemmeside og gør krav på din belønning: |Klik de link om onze website te bezoeken, en je beloning te verkrijgen: |Klikkaa linkkiä vieraillaksesi nettisivuillamme ja lunastaaksesi palkintosi: |Cliquez sur le lien pour visiter notre site et réclamer votre récompense: |Klicke den Link, um unsere Webseite zu besuchen und deine Belohnung abzuholen: |Κάνε κλικ στο σύνδεσμο για να επισκεφτείς την ιστοσελίδα μας και να διεκδικήσεις την ανταμοιβή σου: |Kattints a linkre hogy meglátogasd a weboldalunkat és begyűjtsd a jutalmadat: |Clicca il link per visitare il sito e riscattare la tua ricompensa: |リンクをクリックしてウェブサイトにアクセスし、報酬を獲得してください:|저희의 웹 사이트에 방문하고 보상을 수령하려면 링크를 클릭하세요: |Klikk på lenken for å besøke nettsiden vår og gjøre krav på belønningen din: |Click th' link t' visit our website an' plunder yer treasure: |Kliknij link, aby odwiedzić naszą stronę internetową i odebrać swoją nagrodę: |Clica no link para visitares o nosso site e receberes o prémio: |Apasă pe link pentru a ne vizita site-ul și pentru a-ți revendica recompensa: |Нажмите на ссылку, чтобы перейти на наш сайт и забрать свою награду: |Haz clic en el link para visitar nuestra web y recoger tu recompensa: |Klicka på länken för att besöka vår hemsida och hämta din belöning: |Sitemize gidip ödülünü almak için bağlantıya tıkla: |Натисніть на посилання, щоб відвідати наш сайт і забрати свою нагороду: )https:\/\/rewards\.hypixel\.net\/claim-reward\/(?<id>[A-Za-z0-9]{8})",
"missedRewardRegex": "We noticed you haven't claimed your free Daily Reward yet!\\nTo choose your reward you have to click the link to visit our website! As a reminder, here's your link for today: https://rewards\\.hypixel\\.net/claim-reward/(?<id>[A-Za-z0-9]{8})",
"userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.54 Safari/537.36",
"disabled": false,
"disabledMessage": "Reward Claim was disabled by the mod author for an unknown reason.",
"disabledMessage2": "Reward Claim was disabled by the mod author for an unknown reason."
"disabledMessage": "Hypixel's domains were hacked and to make sure reward claim doesnt auto lead you to them I have disabled the mod. Join discord in /rewardclaim for me to turn it back on when its all good.",
"disabledMessage2": "Hypixel's domains were hacked and to make sure reward claim doesnt auto lead you to them I have disabled the mod. Join discord in /rewardclaim for me to turn it back on when its all good."
}
11 changes: 10 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
org.gradle.jvmargs=-Xmx2G
mod_name = Gravy's Reward Claim
mod_id = gravyrewardclaim
mod_version = 1.1.0
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.configureoncommand=true6
org.gradle.parallel.threads=4
org.gradle.jvmargs=-Xmx3G
essential.defaults.loom=0
4 changes: 2 additions & 2 deletions 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-6.8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists
24 changes: 24 additions & 0 deletions root.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
plugins {
kotlin("jvm") version "1.9.24" apply false
id("net.kyori.blossom") version "1.3.2" apply false
id("com.github.johnrengelman.shadow") version "8.1.1" apply false
id("gg.essential.multi-version.root")
}

preprocess {
"1.21-fabric"(12100, "yarn") {
"1.20.1-fabric"(12001, "yarn") {
"1.19-fabric"(11900, "yarn") {
"1.18.1-fabric"(11801, "yarn") {
"1.17.1-fabric"(11701, "yarn") {
"1.17.1-forge"(11701, "srg") {
"1.12.2-forge"(11202, "srg") {
"1.8.9-forge"(10809, "srg", file("versions/1.12.2-1.8.9.txt"))
}
}
}
}
}
}
}
}
28 changes: 0 additions & 28 deletions settings.gradle

This file was deleted.

38 changes: 38 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven("https://maven.fabricmc.net")
maven("https://maven.architectury.dev/")
maven("https://maven.minecraftforge.net")
maven("https://repo.essential.gg/repository/maven-public")
maven("https://repo.polyfrost.org/releases")
}
plugins {
val egtVersion = "0.6.1"
id("gg.essential.multi-version.root") version egtVersion
}
}

val mod_name: String by settings

rootProject.name = mod_name
rootProject.buildFileName = "root.gradle.kts"

listOf(
"1.8.9-forge",
"1.12.2-forge",
"1.17.1-forge",
"1.17.1-fabric",
"1.18.1-fabric",
"1.19-fabric",
"1.20.1-fabric",
"1.21-fabric",
).forEach { version ->
include(":$version")
project(":$version").apply {
projectDir = file("versions/$version")
buildFileName = "../../build.gradle.kts"
}

}
19 changes: 0 additions & 19 deletions src/main/kotlin/tech/thatgravyboat/rewardclaim/Command.kt

This file was deleted.

Loading