1.0.24

Removed TextHandlerAccessor mixin, should prevent issues on some specific Environments Added Craft Recipe!
Rafacasari · Jun 22, 2024 · 41a11e7 · 41a11e7
1 parent 80a2e21
commit 41a11e7
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 22 deletions.
diff --git a/common/src/main/java/com/rafacasari/mod/cobbledex/mixins/TextHandlerAccessor.java b/common/src/main/java/com/rafacasari/mod/cobbledex/mixins/TextHandlerAccessor.java
diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexGUI.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexGUI.kt
@@ -375,6 +375,20 @@ class CobbledexGUI(var selectedPokemon: FormData?, var selectedAspects: Set<Stri
 
     fun setPreviewPokemon(pokemon: FormData?, pokemonAspects: Set<String>? = null)
     {
+        // TODO: Implement this when make the shiny/gender buttons
+        //  This should be possible to get all possible choice-features
+        //  Will be useful for Pokémon that have a lot of non-form variants (recolors)
+//        if (pokemon != null) {
+//            val species = pokemon.species
+//            val features = SpeciesFeatureAssignments.getFeatures(species).mapNotNull { featureName ->
+//                val feature: SpeciesFeatureProvider<out SpeciesFeature>? = SpeciesFeatures.getFeature(featureName)
+//
+//                if (feature != null && feature is ChoiceSpeciesFeatureProvider)
+//                    return@mapNotNull featureName to feature.choices
+//                else return@mapNotNull null
+//            }.toMap()
+//        }
+
         val x = (width - BASE_WIDTH) / 2
         val y = (height - BASE_HEIGHT) / 2
 

diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/menus/BattleMenu.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/menus/BattleMenu.kt
@@ -8,6 +8,7 @@ import com.cobblemon.mod.common.pokemon.FormData
 import com.rafacasari.mod.cobbledex.client.widget.LongTextDisplay
 import com.rafacasari.mod.cobbledex.utils.TypeChartUtils
 import com.rafacasari.mod.cobbledex.utils.withRGBColor
+import net.minecraft.text.Text
 
 object BattleMenu {
     fun drawText(longTextDisplay: LongTextDisplay?, pokemon: FormData?) {
@@ -20,7 +21,8 @@ object BattleMenu {
 
         elementalMultipliers.filter { it.key != 1f }.forEach { elementalKey ->
 
-            longTextDisplay.addText("${elementalKey.key}x damage from".text())
+            val translation = Text.translatable("cobbledex.texts.battle.damage_from", elementalKey.key)
+            longTextDisplay.addText(translation)
 
             val typesText = elementalKey.value.fold("".text()) { acc, element ->
                 if (elementalKey.value.first() != element)
@@ -29,7 +31,6 @@ object BattleMenu {
                 acc.add(element.displayName.bold().withRGBColor(element.hue))
             }
 
-
             longTextDisplay.addText(typesText, false)
         }
 

diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/entries/TextEntry.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/entries/TextEntry.kt
@@ -1,7 +1,6 @@
 package com.rafacasari.mod.cobbledex.client.widget.entries
 
 import com.rafacasari.mod.cobbledex.client.widget.LongTextDisplay
-import com.rafacasari.mod.cobbledex.mixins.TextHandlerAccessor
 import com.rafacasari.mod.cobbledex.utils.logError
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.DrawContext
@@ -57,10 +56,12 @@ class TextEntry(private val line: OrderedText?, private val shadow: Boolean = fa
             var charX = x.toFloat()
             val charY = y.toFloat()
 
-            text.accept { _, style, codePoint ->
+
+            text.accept { index, style, codePoint ->
                 try {
-                    val widthRetriever = (textRenderer.textHandler as TextHandlerAccessor).cobbledexWidthRetriever
-                    val charWidth = widthRetriever.getWidth(codePoint, style)
+                    val charWidth: Float = textRenderer.textHandler.getWidth {
+                        x -> x.accept(index, style, codePoint)
+                    }
 
                     if (pMouseX!! >= charX && pMouseX < charX + charWidth && pMouseY!! >= charY && pMouseY < charY + textRenderer.fontHeight) {
                         hoveredStyle = style

diff --git a/common/src/main/resources/assets/cobbledex/lang/en_us.json b/common/src/main/resources/assets/cobbledex/lang/en_us.json
@@ -14,6 +14,7 @@
   "cobbledex.texts.weight": "Weight",
   "cobbledex.texts.height": "Height",
   "cobbledex.texts.select": "Select",
+  "cobbledex.texts.battle.damage_from": "%sx damage from:",
 
   "cobbledex.texts.drops.item": "%s | %s%% | %sx",
   "cobbledex.texts.weather.clear": "Clear",

diff --git a/common/src/main/resources/cobbledex-common.mixins.json b/common/src/main/resources/cobbledex-common.mixins.json
@@ -4,7 +4,6 @@
   "compatibilityLevel": "JAVA_17",
   "minVersion": "0.8",
   "client": [
-    "TextHandlerAccessor",
     "ItemRendererMixin"
   ],
   "injectors": {

diff --git a/common/src/main/resources/data/cobbledex/recipes/cobbledex_crafting.json b/common/src/main/resources/data/cobbledex/recipes/cobbledex_crafting.json
@@ -0,0 +1,30 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "pattern": [
+    "iai",
+    "gbg",
+    "iri"
+  ],
+  "key": {
+    "i": {
+      "item": "minecraft:iron_ingot"
+    },
+    "r": {
+      "item": "minecraft:redstone"
+    },
+    "b": {
+      "item": "minecraft:book"
+    },
+    "g": {
+      "item": "minecraft:glass_pane"
+    },
+    "a": {
+      "item": "cobblemon:red_apricorn"
+    }
+  },
+  "result": {
+    "item": "cobbledex:cobbledex_item",
+    "count": 1
+  }
+}
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ mod_id=cobbledex
 
 generated_file_name_addon=-1.20.1
 archives_base_name=cobbledex-1.20.1
-mod_version=1.0.23
+mod_version=1.0.24
 mod_description=A mod to track your progress on Cobblemon. Fabric and Forge compatible.
 mod_icon=assets/cobbledex/icon.png
 repository=https://github.com/rafacasari/cobbledex