desync/SciFy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port to 1.21

Browse Source
This commit is contained in:
desyncfy
2024-08-17 10:59:09 -07:00
parent 242fabdadb
commit 9e02764180
6 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -49,12 +49,12 @@ processResources {
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
it.options.release = 17 it.options.release = 21
} }
tasks.withType(KotlinCompile).configureEach { tasks.withType(KotlinCompile).configureEach {
kotlinOptions { kotlinOptions {
jvmTarget = 17 jvmTarget = 21
} }
} }

6
gradle.properties
View File

@@ -8,8 +8,8 @@ org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.20.4 minecraft_version=1.21.1
yarn_mappings=1.20.4+build.3 yarn_mappings=1.21.1+build.3
loader_version=0.15.11 loader_version=0.15.11
fabric_kotlin_version=1.11.0+kotlin.2.0.0 fabric_kotlin_version=1.11.0+kotlin.2.0.0
@@ -19,4 +19,4 @@ maven_group=chickenmanfy.scify
archives_base_name=scify archives_base_name=scify
# Dependencies # Dependencies
fabric_version=0.97.1+1.20.4 fabric_version=0.102.1+1.21.1

46
src/client/kotlin/chickenmanfy/scify/modules/Bars.kt
View File

@@ -47,46 +47,44 @@ class Bars {
val yHealth = 5f val yHealth = 5f
val xReality = 5f val xReality = 5f
val yReality = 10f + height val yReality = 10f + height
HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext?, _: Float -> HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext, _: RenderTickCounter ->
val tessellator: Tessellator = Tessellator.getInstance() val tessellator: Tessellator = Tessellator.getInstance()
val buffer: BufferBuilder = tessellator.buffer val buffer: BufferBuilder = tessellator.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE_COLOR)
val positionMatrix = drawContext?.matrices?.peek()?.positionMatrix val positionMatrix = drawContext.matrices?.peek()?.positionMatrix
if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" || if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" ||
MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" || MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" ||
MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com" || MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com" ||
modDisableOverride) { modDisableOverride) {
if (barsToggle) { if (barsToggle) {
if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599") { if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599") {
buffer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR_TEXTURE) buffer.vertex(positionMatrix, xReality, yReality, 0f).color(1f, 1f, 1f, 1f).texture(0f, 0f)
buffer.vertex(positionMatrix, xReality, yReality, 0f).color(1f, 1f, 1f, 1f).texture(0f, 0f).next() buffer.vertex(positionMatrix, xReality, yReality + height, 0f).color(1f, 1f, 1f, 1f).texture(0f, 1f)
buffer.vertex(positionMatrix, xReality, yReality + height, 0f).color(1f, 1f, 1f, 1f).texture(0f, 1f).next() buffer.vertex(positionMatrix, xReality + width, yReality + height, 0f).color(1f, 1f, 1f, 1f).texture(1f, 1f)
buffer.vertex(positionMatrix, xReality + width, yReality + height, 0f).color(1f, 1f, 1f, 1f).texture(1f, 1f).next() buffer.vertex(positionMatrix, xReality + width, yReality, 0f).color(1f, 1f, 1f, 1f).texture(1f, 0f)
buffer.vertex(positionMatrix, xReality + width, yReality, 0f).color(1f, 1f, 1f, 1f).texture(1f, 0f).next() RenderSystem.setShader { GameRenderer.getPositionTexColorProgram() }
RenderSystem.setShaderTexture(0, Identifier.of("scify", "healthmana/mana/mana_${mana}.png"))
RenderSystem.setShader { GameRenderer.getPositionColorTexProgram() }
RenderSystem.setShaderTexture(0, Identifier("scify", "healthmana/mana/mana_${mana}.png"))
RenderSystem.setShaderColor(1f, 1f, 1f, 1f) RenderSystem.setShaderColor(1f, 1f, 1f, 1f)
tessellator.draw() BufferRenderer.drawWithGlobalProgram(buffer.end())
} }
buffer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR_TEXTURE) buffer.vertex(positionMatrix, xHealth, yHealth, 0f).color(1f, 1f, 1f, 1f).texture(0f, 0f)
/*buffer.vertex(positionMatrix, MinecraftClient.getInstance().window.scaledWidth.toFloat()/2-180, MinecraftClient.getInstance().window.scaledHeight.toFloat() - 40, 0F).color(1f, 1f, 1f, 1f).texture(0f, 0f).next() buffer.vertex(positionMatrix, xHealth, yHealth+height, 0f).color(1f, 1f, 1f, 1f).texture(0f, 1f)
buffer.vertex(positionMatrix, MinecraftClient.getInstance().window.scaledWidth.toFloat()/2-180, MinecraftClient.getInstance().window.scaledHeight.toFloat(), 0F).color(1f, 1f, 1f, 1f).texture(0f, 1f).next() buffer.vertex(positionMatrix, xHealth+width, yHealth+height, 0f).color(1f, 1f, 1f, 1f).texture(1f, 1f)
buffer.vertex(positionMatrix, MinecraftClient.getInstance().window.scaledWidth.toFloat()/2-140, MinecraftClient.getInstance().window.scaledHeight.toFloat(), 0F).color(1f, 1f, 1f, 1f).texture(1f, 1f).next() buffer.vertex(positionMatrix, xHealth+width, yHealth, 0f).color(1f, 1f, 1f, 1f).texture(1f, 0f)
buffer.vertex(positionMatrix, MinecraftClient.getInstance().window.scaledWidth.toFloat()/2-140, MinecraftClient.getInstance().window.scaledHeight.toFloat() - 40, 0F).color(1f, 1f, 1f, 1f).texture(1f, 0f).next()*/
buffer.vertex(positionMatrix, xHealth, yHealth, 0f).color(1f, 1f, 1f, 1f).texture(0f, 0f).next()
buffer.vertex(positionMatrix, xHealth, yHealth+height, 0f).color(1f, 1f, 1f, 1f).texture(0f, 1f).next()
buffer.vertex(positionMatrix, xHealth+width, yHealth+height, 0f).color(1f, 1f, 1f, 1f).texture(1f, 1f).next()
buffer.vertex(positionMatrix, xHealth+width, yHealth, 0f).color(1f, 1f, 1f, 1f).texture(1f, 0f).next()
val maxHealthDivided = MinecraftClient.getInstance().player?.maxHealth?.div(20)?.toInt() val maxHealthDivided = MinecraftClient.getInstance().player?.maxHealth?.div(20)?.toInt()
val health = if (MinecraftClient.getInstance().player?.health?.toInt()?.div(maxHealthDivided!!)!! <= 20) MinecraftClient.getInstance().player?.health?.toInt()?.div(maxHealthDivided!!) else 20 val health = if (MinecraftClient.getInstance().player?.health?.toInt()?.div(maxHealthDivided!!)!! <= 20) MinecraftClient.getInstance().player?.health?.toInt()?.div(maxHealthDivided!!) else 20
RenderSystem.setShader { GameRenderer.getPositionColorTexProgram() } RenderSystem.setShader { GameRenderer.getPositionTexColorProgram() }
RenderSystem.setShaderTexture(0, Identifier("scify", "healthmana/health/health_${health}.png")) RenderSystem.setShaderTexture(0, Identifier.of("scify", "healthmana/health/health_${health}.png"))
RenderSystem.setShaderColor(1f, 1f, 1f, 1f) RenderSystem.setShaderColor(1f, 1f, 1f, 1f)
tessellator.draw() BufferRenderer.drawWithGlobalProgram(buffer.end())
} }
} }
}) })
/*HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext, _: RenderTickCounter ->
val color = -0x10000 // Red
drawContext.fill(0, 0, 100, 100, 0, color)
})*/
} }
} }

2
src/client/kotlin/chickenmanfy/scify/modules/Menu.kt
View File

@@ -31,7 +31,7 @@ class Menu : Screen(Text.literal("SciFy Menu")) {
0xff00ff 0xff00ff
) )
val texture = Identifier("scify", "scify.png") val texture = Identifier.of("scify", "scify.png")
context.drawTexture(texture, width / 2 - 32, 20, 0F, 0F, 64, 64, 64, 64) context.drawTexture(texture, width / 2 - 32, 20, 0F, 0F, 64, 64, 64, 64)
} }
public override fun init() { public override fun init() {

5
src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt
View File

@@ -3,6 +3,7 @@ package chickenmanfy.scify.modules
import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback
import net.minecraft.client.MinecraftClient import net.minecraft.client.MinecraftClient
import net.minecraft.client.gui.DrawContext import net.minecraft.client.gui.DrawContext
import net.minecraft.client.render.RenderTickCounter
var watermarkToggle = true var watermarkToggle = true
class Watermark { class Watermark {
@@ -11,7 +12,7 @@ class Watermark {
} }
fun watermark() { fun watermark() {
HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext?, _: Float -> HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext, _: RenderTickCounter ->
if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" || if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" ||
MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" || MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" ||
@@ -20,7 +21,7 @@ class Watermark {
if (watermarkToggle) { if (watermarkToggle) {
val minecraftClient = MinecraftClient.getInstance() val minecraftClient = MinecraftClient.getInstance()
val scifyVersion = "0.2.12" val scifyVersion = "0.2.12"
drawContext?.drawTextWithShadow(minecraftClient.textRenderer,"§nSciFy v${scifyVersion}",minecraftClient.window.scaledWidth - minecraftClient.textRenderer.getWidth("SciFy v${scifyVersion}") - 5, minecraftClient.window.scaledHeight - minecraftClient.textRenderer.fontHeight - 5, 0xff00ff) drawContext.drawTextWithShadow(minecraftClient.textRenderer,"§nSciFy v${scifyVersion}",minecraftClient.window.scaledWidth - minecraftClient.textRenderer.getWidth("SciFy v${scifyVersion}") - 5, minecraftClient.window.scaledHeight - minecraftClient.textRenderer.fontHeight - 5, 0xff00ff)
} }
} }
}) })

4
src/main/resources/fabric.mod.json
View File

@@ -45,10 +45,10 @@
], ],
"depends": { "depends": {
"fabricloader": ">=0.15.6", "fabricloader": ">=0.15.6",
"minecraft": "~1.20.4", "minecraft": "~1.21.1",
"java": ">=17", "java": ">=17",
"fabric-api": "*", "fabric-api": "*",
"fabric-language-kotlin": ">=1.9.22" "fabric-language-kotlin": ">=1.11.0"
}, },
"suggests": { "suggests": {
"Mythicfy": "*" "Mythicfy": "*"