Skip to content

Updated to mc 1.21.1 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gatekeep06 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated to mc 1.21.1 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,22 @@ dependencies {
modImplementation("blue.endless:jankson:1.2.2")
}
tasks {
val javaVersion = JavaVersion.VERSION_17
val javaVersion = JavaVersion.VERSION_21
withType<JavaCompile> {
options.encoding = "UTF-8"
sourceCompatibility = javaVersion.toString()
targetCompatibility = javaVersion.toString()
options.release.set(javaVersion.toString().toInt())
}
withType<KotlinCompile> {
kotlinOptions { jvmTarget = javaVersion.toString() }
sourceCompatibility = javaVersion.toString()
targetCompatibility = javaVersion.toString()
}
/**
* deprecated, as i understand
* i hope it doesn't break anything :clueless:
*/
// withType<KotlinCompile> {
// kotlinOptions { jvmTarget = javaVersion.toString() }
// sourceCompatibility = javaVersion.toString()
// targetCompatibility = javaVersion.toString()
// }
jar { from("LICENSE") { rename { "${it}_${base.archivesName}" } } }
processResources {
inputs.property("version", project.version)
Expand Down
18 changes: 9 additions & 9 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ kotlin.code.style=official
org.gradle.jvmargs = -Xmx1G
org.gradle.warning.mode = all
# Check these on https://fabricmc.net/develop/
minecraftVersion=1.20
yarnMappings=1.20+build.1
loaderVersion=0.14.21
minecraftVersion=1.21.1
yarnMappings=1.21+build.4
loaderVersion=0.16.5
#Fabric api
fabricVersion=0.83.0+1.20
loomVersion = 1.0-SNAPSHOT
fabricVersion=0.105.0+1.21.1
loomVersion = 1.7-SNAPSHOT
# Mod Properties
modVersion = 1.2.0
mavenGroup = me.iru
archivesBaseName = waxednotwaxed
# Kotlin
systemProp.kotlinVersion = 1.6.10
fabricKotlinVersion = 1.8.7+kotlin.1.7.22
systemProp.kotlinVersion = 2.0.20
fabricKotlinVersion = 1.12.2+kotlin.2.0.20

clothConfigVersion = 11.0.99
modMenuVersion = 7.0.1
clothConfigVersion = 15.0.140
modMenuVersion = 11.0.2
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 3 additions & 2 deletions src/main/kotlin/me/iru/waxednotwaxed/events/HudRenderHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ import net.minecraft.block.OxidizableSlabBlock
import net.minecraft.block.OxidizableStairsBlock
import net.minecraft.client.MinecraftClient
import net.minecraft.client.gui.DrawContext
import net.minecraft.client.render.RenderTickCounter
import net.minecraft.item.AxeItem
import net.minecraft.util.Identifier

class HudRenderHandler : HudRenderCallback {

override fun onHudRender(drawContext: DrawContext?, tickDelta: Float) {
override fun onHudRender(drawContext: DrawContext?, tickCounter: RenderTickCounter) {
if(drawContext == null ||
!WaxedNotWaxed.config.enabled ||
(WaxedNotWaxed.config.onlyShowWhenHoldingAxe && MinecraftClient.getInstance().player!!.mainHandStack.item !is AxeItem)
Expand All @@ -36,7 +37,7 @@ class HudRenderHandler : HudRenderCallback {
if(waxed) 0xf78204 else 0x09a073
)
drawContext.drawTexture(
Identifier("minecraft", if(waxed) "textures/item/honeycomb.png" else "textures/item/iron_axe.png"),
Identifier.of("minecraft", if(waxed) "textures/item/honeycomb.png" else "textures/item/iron_axe.png"),
screenCenter.x.toInt() + 5,
screenCenter.y.toInt() + 5,
0.0f,
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"fabricloader": ">=0.14.21",
"fabric": "*",
"fabric-language-kotlin": ">=1.8.7+kotlin.1.7.22",
"minecraft": ">=1.20",
"java": ">=17"
"minecraft": ">=1.21.1",
"java": ">=21"
},
"custom": {
"modmenu": {
Expand Down