From 368e488908ffc28cac6ba8f2149367b1a85bd371 Mon Sep 17 00:00:00 2001 From: Shiewk Date: Sun, 28 Jul 2024 14:27:20 +0200 Subject: [PATCH 1/3] Update license in fabric.mod.json --- src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f11aa51..3a15e04 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -10,7 +10,7 @@ "contact": { "repo": "https://github.com/Shiewk/BedrockDeathScreen" }, - "license": "unlicense", + "license": "Apache-2.0", "icon": "assets/bedrockdeathscreen/icon.png", "environment": "client", "entrypoints": { From 873da5b89148822495d7a919742acbb61d6a452f Mon Sep 17 00:00:00 2001 From: Shiewk Date: Sun, 28 Jul 2024 14:37:06 +0200 Subject: [PATCH 2/3] Add score text --- .../client/screen/BedrockDeathScreen.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/de/shiewk/bedrockdeathscreen/client/screen/BedrockDeathScreen.java b/src/main/java/de/shiewk/bedrockdeathscreen/client/screen/BedrockDeathScreen.java index 198c502..fc42751 100644 --- a/src/main/java/de/shiewk/bedrockdeathscreen/client/screen/BedrockDeathScreen.java +++ b/src/main/java/de/shiewk/bedrockdeathscreen/client/screen/BedrockDeathScreen.java @@ -8,6 +8,7 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; import net.minecraft.text.MutableText; import net.minecraft.text.Text; +import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; @@ -17,6 +18,7 @@ public class BedrockDeathScreen extends DeathScreen { private int ticksSinceDeath = 0; private final Text message; + private Text scoreText = Text.empty(); private static final Text menuMessage = Text.translatable("deathScreen.titleScreen"); private static final MutableText confirmQuitText = Text.translatable("deathScreen.quit.confirm"); private Text respawnMessage; @@ -167,6 +169,10 @@ public class BedrockDeathScreen extends DeathScreen { context.getMatrices().pop(); context.drawCenteredTextWithShadow(this.textRenderer, this.message, this.width / 2, (int) (this.height / 3.5), new Color(255, 255, 255, textOpacity).getRGB()); } + final int scoreTextOpacity = (int) Math.min(255, (totalDelta - 1250f) / 3f); + if (scoreTextOpacity > 0){ + context.drawCenteredTextWithShadow(this.textRenderer, this.scoreText, this.width / 2, (int) (this.height / 3.5) + 12, new Color(255, 255, 255, scoreTextOpacity).getRGB()); + } } if (!confirmingExit){ if (totalDelta > 1250f){ @@ -188,6 +194,9 @@ public class BedrockDeathScreen extends DeathScreen { @Override protected void init() { this.respawnMessage = this.hardcore ? Text.translatable("deathScreen.spectate") : Text.translatable("deathScreen.respawn"); + if (this.client != null && this.client.player != null) { + this.scoreText = Text.translatable("deathScreen.score.value", Text.literal(Integer.toString(this.client.player.getScore())).formatted(Formatting.YELLOW)); + } } @Override From fcd4869316cb182029b57a84f08411a4cbe2158b Mon Sep 17 00:00:00 2001 From: Shiewk Date: Sun, 28 Jul 2024 14:38:01 +0200 Subject: [PATCH 3/3] Update to version 1.2.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 04fc4a8..3a7d156 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.15.11 # Mod Properties - mod_version = 1.1 + mod_version = 1.2.0 maven_group = de.shiewk archives_base_name = BedrockDeathScreen