From 26b79ebd10ce02e896ad7be9612fb1f1fc882f9f Mon Sep 17 00:00:00 2001 From: Aleksey Date: Thu, 9 Jul 2020 10:16:16 +0300 Subject: [PATCH 1/2] 1.16.2 --- .classpath | 190 +++++++++--------- gradle.properties | 10 +- .../justmap/advancedinfo/BiomeInfo.java | 19 +- 3 files changed, 112 insertions(+), 107 deletions(-) diff --git a/.classpath b/.classpath index 44294640..5cd4329e 100644 --- a/.classpath +++ b/.classpath @@ -13,462 +13,452 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - + - + diff --git a/gradle.properties b/gradle.properties index 280a3cb0..434c4d29 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,15 +3,15 @@ org.gradle.jvmargs = -Xmx2G # Fabric Properties # check these on https://fabricmc.net/use -minecraft_version = 1.16.1 -yarn_mappings = 20 -loader_version = 0.8.8+build.202 +minecraft_version = 20w28a +yarn_mappings = 3 +loader_version = 0.8.9+build.203 mod_version = 1.0.0 archives_base_name = justmap # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric -fabric_version = 0.14.1+build.372-1.16 +fabric_version = 0.14.3+build.374-1.16 cloth_version = 4.5.6 -modmenu_version = 1.12.2+build.16 +modmenu_version = 1.12.2+build.17 diff --git a/src/main/java/ru/bulldog/justmap/advancedinfo/BiomeInfo.java b/src/main/java/ru/bulldog/justmap/advancedinfo/BiomeInfo.java index 7ee6c984..09eab480 100644 --- a/src/main/java/ru/bulldog/justmap/advancedinfo/BiomeInfo.java +++ b/src/main/java/ru/bulldog/justmap/advancedinfo/BiomeInfo.java @@ -1,7 +1,11 @@ package ru.bulldog.justmap.advancedinfo; +import net.minecraft.class_5458; import net.minecraft.client.resource.language.I18n; +import net.minecraft.util.Identifier; +import net.minecraft.util.Util; import net.minecraft.world.biome.Biome; + import ru.bulldog.justmap.client.config.ClientParams; import ru.bulldog.justmap.util.RenderUtil.TextAlignment; import ru.bulldog.justmap.util.PosUtil; @@ -9,6 +13,7 @@ public class BiomeInfo extends InfoText { private String title; + private Identifier currentBiome; public BiomeInfo() { super("Void"); @@ -24,8 +29,18 @@ public BiomeInfo(TextAlignment alignment, String title) { public void update() { this.setVisible(ClientParams.showBiome); if (visible && minecraft.world != null) { - Biome currentBiome = minecraft.world.getBiome(PosUtil.currentPos()); - this.setText(title + I18n.translate(currentBiome.getTranslationKey())); + Biome biome = minecraft.world.getBiome(PosUtil.currentPos()); + Identifier biomeId = class_5458.field_25933.getId(biome); + if (biomeId != null && !biomeId.equals(currentBiome)) { + this.currentBiome = biomeId; + this.setText(title + this.getTranslation()); + } else if (biomeId == null) { + this.setText(title + "Unknown"); + } } } + + private String getTranslation() { + return I18n.translate(Util.createTranslationKey("biome", currentBiome)); + } } From 2b4107e2bfb35721d2340084b0befb83229eed2a Mon Sep 17 00:00:00 2001 From: Aleksey Date: Thu, 9 Jul 2020 10:17:38 +0300 Subject: [PATCH 2/2] Bump version --- version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.properties b/version.properties index de5a68b7..03329540 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ -#Wed Jul 08 20:36:46 MSK 2020 +#Thu Jul 09 10:17:08 GMT+03:00 2020 VERSION_MINOR=1 -VERSION_BUILD=92 +VERSION_BUILD=93 VERSION_MAJOR=1