From 504979f4336cfc0ca9319fdf7f54ac76581118fd Mon Sep 17 00:00:00 2001 From: Rafa <32463720+Rafacasari@users.noreply.github.com> Date: Sat, 29 Jun 2024 08:27:30 -0300 Subject: [PATCH] 1.0.30 (Are we ready?) Some random fixes Refactor some codes --- .../cobbledex/mixins/ItemRendererMixin.java | 4 +- .../com/rafacasari/mod/cobbledex/Cobbledex.kt | 26 ++--- .../mod/cobbledex/CobbledexConfig.kt | 2 + .../mod/cobbledex/CobbledexConstants.kt | 11 +-- .../mod/cobbledex/api/CobbledexDiscovery.kt | 2 +- .../client/gui/CobbledexCollectionGUI.kt | 9 +- .../mod/cobbledex/client/gui/CobbledexGUI.kt | 96 +++++++------------ .../cobbledex/client/gui/menus/BattleMenu.kt | 9 +- .../client/gui/menus/EvolutionMenu.kt | 6 +- .../cobbledex/client/gui/menus/InfoMenu.kt | 10 +- .../cobbledex/client/widget/ArrowButton.kt | 2 +- .../cobbledex/client/widget/CobbledexTab.kt | 2 +- .../client/widget/PokemonEvolutionDisplay.kt | 4 +- .../cobbledex/client/widget/SearchWidget.kt | 4 +- ...odelWidget.kt => SilhouetteModelWidget.kt} | 0 .../client/widget/TypeIconTooltip.kt | 65 ++++++++++--- .../client/widget/entries/PokemonEntry.kt | 4 +- .../client/widget/entries/TextEntry.kt | 2 +- .../cobblemon/extensions/PlayerDiscovery.kt | 30 ------ .../cobblemon/showdown/ShowdownService.kt | 2 +- .../commands/server/CobbledexCommand.kt | 4 +- .../mod/cobbledex/items/CobbledexItem.kt | 14 ++- .../client/handlers/AddToCollectionHandler.kt | 6 +- .../handlers/ReceiveCobbledexHandler.kt | 2 +- .../handlers/ReceiveCollectionDataHandler.kt | 4 +- .../SerializableEvolutionRequirement.kt | 6 +- .../template/SerializablePokemonEvolution.kt | 8 +- .../template/SerializableSpawnCondition.kt | 2 +- .../mod/cobbledex/utils/BiomeUtils.kt | 12 +-- .../mod/cobbledex/utils/CobblemonUtils.kt | 1 + .../mod/cobbledex/utils/MiscUtils.kt | 46 ++++----- .../assets/cobbledex/lang/en_us.json | 2 +- .../mod/cobbledex/fabric/CobbledexFabric.kt | 2 +- .../cobbledex/fabric/CobbledexFabricClient.kt | 4 +- .../mod/cobbledex/forge/CobbledexForge.kt | 6 +- .../cobbledex/forge/CobbledexForgeClient.kt | 4 +- gradle.properties | 2 +- 37 files changed, 199 insertions(+), 216 deletions(-) rename common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/{ModelWidget.kt => SilhouetteModelWidget.kt} (100%) delete mode 100644 common/src/main/kotlin/com/rafacasari/mod/cobbledex/cobblemon/extensions/PlayerDiscovery.kt diff --git a/common/src/main/java/com/rafacasari/mod/cobbledex/mixins/ItemRendererMixin.java b/common/src/main/java/com/rafacasari/mod/cobbledex/mixins/ItemRendererMixin.java index 9cb391f..a1a754d 100644 --- a/common/src/main/java/com/rafacasari/mod/cobbledex/mixins/ItemRendererMixin.java +++ b/common/src/main/java/com/rafacasari/mod/cobbledex/mixins/ItemRendererMixin.java @@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static com.rafacasari.mod.cobbledex.utils.MiscUtilsKt.cobbledexResource; +import com.rafacasari.mod.cobbledex.utils.MiscUtils; @Mixin(ItemRenderer.class) @@ -34,7 +34,7 @@ public abstract class ItemRendererMixin { private void cobbledex$determineCobbledexModel(ItemStack stack, ModelTransformationMode renderMode, boolean leftHanded, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, BakedModel model, CallbackInfo ci) { boolean shouldBe2d = renderMode == ModelTransformationMode.GUI || renderMode == ModelTransformationMode.FIXED; if (shouldBe2d && stack.getItem() instanceof CobbledexItem) { - BakedModel replacementModel = this.models.getModelManager().getModel(new ModelIdentifier(cobbledexResource("cobbledex_icon"), "inventory")); + BakedModel replacementModel = this.models.getModelManager().getModel(new ModelIdentifier(MiscUtils.INSTANCE.cobbledexResource("cobbledex_icon"), "inventory")); if (!model.equals(replacementModel)) { ci.cancel(); renderItem(stack, renderMode, leftHanded, matrices, vertexConsumers, light, overlay, replacementModel); diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/Cobbledex.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/Cobbledex.kt index 628b94d..090982f 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/Cobbledex.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/Cobbledex.kt @@ -20,7 +20,8 @@ import org.slf4j.LoggerFactory import com.rafacasari.mod.cobbledex.network.client.packets.OpenCobbledexPacket import com.rafacasari.mod.cobbledex.network.client.packets.AddToCollectionPacket import com.rafacasari.mod.cobbledex.network.client.packets.ReceiveCollectionDataPacket -import com.rafacasari.mod.cobbledex.utils.cobbledexTextTranslation +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexTextTranslation +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logInfo import net.minecraft.server.network.ServerPlayerEntity import net.minecraft.util.Formatting import java.io.File @@ -41,45 +42,45 @@ object Cobbledex { private var eventsCreated: Boolean = false fun preInitialize(implementation: CobbledexImplementation) { - LOGGER.info("Initializing Cobbledex $VERSION...") + logInfo("Initializing Cobbledex $VERSION...") Cobbledex.implementation = implementation implementation.registerItems() loadConfig() - // TODO: Make our own event so we don't need to depend on Cobblemon PlatformEvents PlatformEvents.SERVER_STARTED.subscribe { _ -> - LOGGER.info("Cobbledex: Server initialized...") - //PlayerDataExtensionRegistry.register(PlayerDiscovery.NAME_KEY, PlayerDiscovery::class.java) + logInfo("Server initialized...") + PlayerDataExtensionRegistry.register(CobbledexDiscovery.NAME_KEY, CobbledexDiscovery::class.java) if (!eventsCreated) { CobblemonEvents.STARTER_CHOSEN.subscribe(Priority.LOW) { registerPlayerDiscovery(it.player, it.pokemon.form, it.pokemon.shiny, DiscoveryRegister.RegisterType.CAUGHT) - val itemStack = ItemStack(CobbledexConstants.Cobbledex_Item, 1) - it.player.giveItemStack(itemStack) + if (getConfig().GiveCobbledexItemOnStarterChosen) { + val itemStack = ItemStack(CobbledexConstants.COBBLEDEX_ITEM, 1) + it.player.giveItemStack(itemStack) + } } - CobblemonEvents.POKEMON_CAPTURED.subscribe(Priority.LOW) { + CobblemonEvents.POKEMON_CAPTURED.subscribe(Priority.LOWEST) { registerPlayerDiscovery(it.player, it.pokemon.form, it.pokemon.shiny, DiscoveryRegister.RegisterType.CAUGHT) } CobblemonEvents.EVOLUTION_COMPLETE.subscribe(Priority.LOW) { val player = it.pokemon.getOwnerPlayer() - if (player != null) { + + if (player != null) registerPlayerDiscovery(player, it.pokemon.form, it.pokemon.shiny, DiscoveryRegister.RegisterType.CAUGHT) - } } - // This should prevent events from being added more than once eventsCreated = true } } PlatformEvents.CLIENT_PLAYER_LOGOUT.subscribe { - CobbledexCollectionGUI.discoveredList.clear() + CobbledexConstants.Client.discoveredList.clear() } PlatformEvents.CLIENT_PLAYER_LOGIN.subscribe { @@ -155,5 +156,4 @@ object Cobbledex { exception.printStackTrace() } } - } \ No newline at end of file diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/CobbledexConfig.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/CobbledexConfig.kt index 26ba3c1..8724afe 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/CobbledexConfig.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/CobbledexConfig.kt @@ -9,6 +9,8 @@ import net.minecraft.server.network.ServerPlayerEntity class CobbledexConfig : IEncodable { + var GiveCobbledexItemOnStarterChosen = true + var HowToFind_IsEnabled = true var HowToFind_NeedSeen = false var HowToFind_NeedCatch = false diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/CobbledexConstants.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/CobbledexConstants.kt index d9a35d4..8c947b1 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/CobbledexConstants.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/CobbledexConstants.kt @@ -1,17 +1,14 @@ package com.rafacasari.mod.cobbledex +import com.rafacasari.mod.cobbledex.api.classes.DiscoveryRegister import net.minecraft.item.Item import net.minecraft.util.Rarity import com.rafacasari.mod.cobbledex.items.CobbledexItem object CobbledexConstants { - - @Suppress("SameParameterValue") - private fun buildErrorMessage(name: String): String { - return "${Cobbledex.MOD_ID}.errors.$name" + object Client { + var discoveredList: MutableMap> = mutableMapOf() } - val invalid_entity by lazy { buildErrorMessage("NotAPokemon") } - - val Cobbledex_Item = CobbledexItem(Item.Settings().maxCount(1).rarity(Rarity.COMMON)) + val COBBLEDEX_ITEM = CobbledexItem(Item.Settings().maxCount(1).rarity(Rarity.COMMON)) } \ No newline at end of file diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/api/CobbledexDiscovery.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/api/CobbledexDiscovery.kt index df8e9f7..a1166ba 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/api/CobbledexDiscovery.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/api/CobbledexDiscovery.kt @@ -10,7 +10,7 @@ import com.google.gson.JsonObject import com.rafacasari.mod.cobbledex.Cobbledex import com.rafacasari.mod.cobbledex.api.classes.DiscoveryRegister import com.rafacasari.mod.cobbledex.network.client.packets.ReceiveCollectionDataPacket -import com.rafacasari.mod.cobbledex.utils.logInfo +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logInfo import net.minecraft.server.network.ServerPlayerEntity class CobbledexDiscovery(val registers: MutableMap> = mutableMapOf()): PlayerDataExtension { diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexCollectionGUI.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexCollectionGUI.kt index 046e8e8..d67d372 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexCollectionGUI.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexCollectionGUI.kt @@ -14,6 +14,7 @@ import com.cobblemon.mod.common.pokemon.FormData import com.cobblemon.mod.common.pokemon.RenderablePokemon import com.cobblemon.mod.common.pokemon.Species import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees +import com.rafacasari.mod.cobbledex.CobbledexConstants.Client.discoveredList import com.rafacasari.mod.cobbledex.api.classes.DiscoveryRegister import com.rafacasari.mod.cobbledex.client.gui.CobbledexGUI.Companion.SCALE import com.rafacasari.mod.cobbledex.client.gui.CobbledexGUI.Companion.TYPE_SPACER @@ -23,9 +24,9 @@ import com.rafacasari.mod.cobbledex.client.widget.SearchWidget import com.rafacasari.mod.cobbledex.client.widget.SilhouetteModelWidget import com.rafacasari.mod.cobbledex.network.client.handlers.SyncServerSettingsHandler import com.rafacasari.mod.cobbledex.utils.CobblemonUtils.drawBlackSilhouettePokemon -import com.rafacasari.mod.cobbledex.utils.cobbledexResource -import com.rafacasari.mod.cobbledex.utils.cobbledexTextTranslation -import com.rafacasari.mod.cobbledex.utils.cobbledexTranslation +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexResource +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexTextTranslation +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexTranslation import net.minecraft.client.MinecraftClient import net.minecraft.client.gui.DrawContext import net.minecraft.client.gui.screen.Screen @@ -39,8 +40,6 @@ import org.joml.Vector3f class CobbledexCollectionGUI : Screen(cobbledexTextTranslation("cobbledex")) { companion object { - var discoveredList: MutableMap> = mutableMapOf() - const val BASE_WIDTH: Int = 349 const val BASE_HEIGHT: Int = 205 const val PORTRAIT_SIZE = 58F 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 index b5d1032..7be3a69 100644 --- 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 @@ -4,9 +4,9 @@ import com.cobblemon.mod.common.CobblemonSounds import com.cobblemon.mod.common.api.gui.blitk import com.cobblemon.mod.common.api.pokemon.PokemonSpecies import com.cobblemon.mod.common.api.text.* +import com.cobblemon.mod.common.api.types.ElementalTypes import com.cobblemon.mod.common.client.CobblemonResources import com.cobblemon.mod.common.client.gui.ExitButton -import com.cobblemon.mod.common.client.gui.TypeIcon import com.cobblemon.mod.common.client.gui.summary.widgets.ModelWidget import com.cobblemon.mod.common.client.render.drawScaledText import com.cobblemon.mod.common.pokemon.FormData @@ -17,23 +17,21 @@ import net.minecraft.client.gui.DrawContext import net.minecraft.client.gui.screen.Screen import net.minecraft.client.sound.PositionedSoundInstance import net.minecraft.sound.SoundEvent -import net.minecraft.text.Style import net.minecraft.util.Identifier import com.rafacasari.mod.cobbledex.client.gui.menus.BattleMenu import com.rafacasari.mod.cobbledex.client.gui.menus.EvolutionMenu import com.rafacasari.mod.cobbledex.client.gui.menus.InfoMenu -import com.rafacasari.mod.cobbledex.client.widget.ArrowButton -import com.rafacasari.mod.cobbledex.client.widget.CobbledexTab -import com.rafacasari.mod.cobbledex.client.widget.LongTextDisplay -import com.rafacasari.mod.cobbledex.client.widget.PokemonEvolutionDisplay +import com.rafacasari.mod.cobbledex.client.widget.* import com.rafacasari.mod.cobbledex.network.server.packets.RequestCobbledexPacket import com.rafacasari.mod.cobbledex.network.template.SerializableItemDrop import com.rafacasari.mod.cobbledex.network.template.SerializablePokemonEvolution import com.rafacasari.mod.cobbledex.network.template.SerializablePokemonSpawnDetail -import com.rafacasari.mod.cobbledex.utils.* -import net.minecraft.text.Text +import com.rafacasari.mod.cobbledex.utils.CobblemonUtils +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexResource +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexTextTranslation +import com.rafacasari.mod.cobbledex.utils.MiscUtils.format -class CobbledexGUI(var selectedPokemon: FormData?, var selectedAspects: Set? = null, val cameFromCollection: Boolean = false) : Screen( +class CobbledexGUI(var selectedPokemon: FormData?, var selectedAspects: Set? = null) : Screen( cobbledexTextTranslation("cobbledex") ) { @@ -65,7 +63,7 @@ class CobbledexGUI(var selectedPokemon: FormData?, var selectedAspects: Set? = null, skipSound: Boolean = false, cameFromCollection: Boolean = false) { if (!skipSound) playSound(CobblemonSounds.PC_ON) - Instance = CobbledexGUI(pokemon, aspects, cameFromCollection) + Instance = CobbledexGUI(pokemon, aspects) MinecraftClient.getInstance().setScreen(Instance) } @@ -87,7 +85,6 @@ class CobbledexGUI(var selectedPokemon: FormData?, var selectedAspects: Set? = null var lastLoadedPreEvolutions: List>>? = null - //var lastLoadedForms: List>>? = null internal fun onServerJoin() { previewPokemon = null @@ -97,7 +94,7 @@ class CobbledexGUI(var selectedPokemon: FormData?, var selectedAspects: Set cobbledexTranslation("cobbledex.texts.evolutions") - CobbledexRelatedMenu.PreEvolutions -> cobbledexTranslation("cobbledex.texts.preevolutions") - CobbledexRelatedMenu.Forms -> cobbledexTranslation("cobbledex.texts.forms") + CobbledexRelatedMenu.Evolutions -> cobbledexTextTranslation("evolutions") + CobbledexRelatedMenu.PreEvolutions -> cobbledexTextTranslation("preevolutions") + CobbledexRelatedMenu.Forms -> cobbledexTextTranslation("forms") } drawScaledText( @@ -294,7 +299,7 @@ class CobbledexGUI(var selectedPokemon: FormData?, var selectedAspects: Set - if (typeWidget != null) { - val typeX: Float? = typeWidget?.x?.toFloat() - val typeY: Float? = typeWidget?.y?.toFloat() - val space: Float = if (previewPokemon?.secondaryType != null) 16f else 8f - if (typeX != null && typeY != null) { - val itemHovered = - mouseX.toFloat() in typeX - space..(typeX + space) && mouseY.toFloat() in typeY..(typeY + 16) - if (itemHovered) { - val typeText = pokemon.primaryType.displayName.setStyle(Style.EMPTY.withBold(true).withColor(pokemon.primaryType.hue)) - - pokemon.secondaryType?.let { secondType -> - typeText.append(Text.of(" & ").bold()) - typeText.append(secondType.displayName.setStyle(Style.EMPTY.withBold(true).withColor(secondType.hue))) - } - - context.drawTooltip(MinecraftClient.getInstance().textRenderer, typeText, mouseX, mouseY) - } - } - } - } + typeWidget.drawTooltip(context, mouseX, mouseY) } override fun shouldPause(): Boolean = false @@ -439,21 +418,16 @@ class CobbledexGUI(var selectedPokemon: FormData?, var selectedAspects: Set(x, y, SLOT_HEIGHT + SLOT_SPACING) { companion object { diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/SearchWidget.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/SearchWidget.kt index 3834dbd..965abd1 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/SearchWidget.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/SearchWidget.kt @@ -4,8 +4,8 @@ import com.cobblemon.mod.common.api.gui.blitk import com.cobblemon.mod.common.api.text.text import com.cobblemon.mod.common.client.CobblemonResources import com.cobblemon.mod.common.client.render.drawScaledText -import com.rafacasari.mod.cobbledex.utils.cobbledexResource -import com.rafacasari.mod.cobbledex.utils.cobbledexTextTranslation +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexResource +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexTextTranslation import net.minecraft.client.MinecraftClient import net.minecraft.client.gui.DrawContext import net.minecraft.client.gui.widget.TextFieldWidget diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/ModelWidget.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/SilhouetteModelWidget.kt similarity index 100% rename from common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/ModelWidget.kt rename to common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/SilhouetteModelWidget.kt diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/TypeIconTooltip.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/TypeIconTooltip.kt index 69c5be3..34749ad 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/TypeIconTooltip.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/TypeIconTooltip.kt @@ -1,37 +1,65 @@ package com.rafacasari.mod.cobbledex.client.widget import com.cobblemon.mod.common.api.gui.blitk +import com.cobblemon.mod.common.api.text.bold +import com.cobblemon.mod.common.api.text.text import com.cobblemon.mod.common.api.types.ElementalType import com.cobblemon.mod.common.util.cobblemonResource +import com.rafacasari.mod.cobbledex.utils.MiscUtils.toMutableText +import com.rafacasari.mod.cobbledex.utils.MiscUtils.withRGBColor +import net.minecraft.client.MinecraftClient import net.minecraft.client.gui.DrawContext import net.minecraft.client.gui.Drawable +import net.minecraft.client.gui.Element +import net.minecraft.client.gui.ScreenPos +import net.minecraft.client.gui.ScreenRect +import net.minecraft.client.gui.Selectable +import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder import net.minecraft.client.gui.widget.ClickableWidget import net.minecraft.client.gui.widget.Widget +import net.minecraft.text.MutableText +import net.minecraft.util.Formatting import java.util.function.Consumer class TypeIconTooltip( - private var x: Number, - private var y: Number, - var type: ElementalType, + private var x: Int, + private var y: Int, + var primaryType: ElementalType, var secondaryType: ElementalType? = null, val centeredX: Boolean = false, val small: Boolean = false, val secondaryOffset: Float = 15F, val doubleCenteredOffset: Float = 7.5F, - val opacity: Float = 1F -) : Drawable, Widget { +) : Drawable, Widget, Element, Selectable { companion object { private const val TYPE_ICON_DIAMETER = 36 private const val SCALE = 0.5F private val typesResource = cobblemonResource("textures/gui/types.png") private val smallTypesResource = cobblemonResource("textures/gui/types_small.png") + + // Import backgrounds here, so we don't need to deal with it on screens } private val diameter = if (small) (TYPE_ICON_DIAMETER / 2) else TYPE_ICON_DIAMETER - fun drawTooltip(context: DrawContext) { + fun drawTooltip(context: DrawContext, mouseX: Int, mouseY: Int) { + val space = if (secondaryType != null) 16 else 8 + val offsetX = if (centeredX) diameter / 2 * SCALE + (if (secondaryType != null) (doubleCenteredOffset) else 0f) else 0f + + if (mouseX.toFloat() in x - offsetX .. (x.toFloat() + offsetX) && mouseY.toFloat() in y.toFloat() .. (y + 16f)) { + val text = mutableListOf() + + text.add(primaryType.displayName.withRGBColor(primaryType.hue).formatted(Formatting.BOLD)) + + secondaryType?.let { secondType -> + text.add(text(" & ").formatted(Formatting.BOLD)) + text.add(secondType.displayName.withRGBColor(secondType.hue).bold()) + } + + context.drawTooltip(MinecraftClient.getInstance().textRenderer, text.toMutableText(false), mouseX, mouseY) + } } @@ -48,7 +76,6 @@ class TypeIconTooltip( width = diameter, uOffset = diameter * it.textureXMultiplier.toFloat() + 0.1, textureWidth = diameter * 18, - alpha = opacity, scale = SCALE ) } @@ -60,9 +87,8 @@ class TypeIconTooltip( y = y.toFloat() / SCALE, height = diameter, width = diameter, - uOffset = diameter * type.textureXMultiplier.toFloat() + 0.1, + uOffset = diameter * primaryType.textureXMultiplier.toFloat() + 0.1, textureWidth = diameter * 18, - alpha = opacity, scale = SCALE ) } @@ -76,11 +102,11 @@ class TypeIconTooltip( } override fun getX(): Int { - return x.toInt() + return x } override fun getY(): Int { - return y.toInt() + return y } override fun getWidth(): Int { @@ -91,7 +117,24 @@ class TypeIconTooltip( return diameter } + override fun setFocused(focused: Boolean) { + + } + + override fun isFocused(): Boolean = false + + override fun forEachChild(consumer: Consumer?) { } + + override fun getNavigationFocus(): ScreenRect { + return ScreenRect(ScreenPos(x, y), width, height) + } + + override fun appendNarrations(builder: NarrationMessageBuilder?) { + } + + override fun getType(): Selectable.SelectionType = Selectable.SelectionType.NONE + } \ No newline at end of file diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/entries/PokemonEntry.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/entries/PokemonEntry.kt index 813cfad..7710354 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/entries/PokemonEntry.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/widget/entries/PokemonEntry.kt @@ -5,11 +5,9 @@ import com.cobblemon.mod.common.api.gui.drawPortraitPokemon import com.cobblemon.mod.common.client.render.drawScaledText import com.cobblemon.mod.common.pokemon.Species import com.rafacasari.mod.cobbledex.client.widget.LongTextDisplay -import com.rafacasari.mod.cobbledex.utils.cobbledexResource -import net.minecraft.client.MinecraftClient +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexResource import net.minecraft.client.gui.DrawContext import net.minecraft.text.OrderedText -import net.minecraft.util.Colors class PokemonEntry(val species: Species, val aspects: Set, val text: OrderedText) : LongTextDisplay.TextDisplayEntry() { companion object 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 index 18678a3..50ee1e4 100644 --- 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,7 @@ package com.rafacasari.mod.cobbledex.client.widget.entries import com.rafacasari.mod.cobbledex.client.widget.LongTextDisplay -import com.rafacasari.mod.cobbledex.utils.logError +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logError import net.minecraft.client.MinecraftClient import net.minecraft.client.gui.DrawContext import net.minecraft.text.OrderedText diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/cobblemon/extensions/PlayerDiscovery.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/cobblemon/extensions/PlayerDiscovery.kt deleted file mode 100644 index 91106e0..0000000 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/cobblemon/extensions/PlayerDiscovery.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.rafacasari.mod.cobbledex.cobblemon.extensions -// -//import com.cobblemon.mod.common.api.storage.player.PlayerDataExtension -//import com.google.gson.* -//import com.rafacasari.mod.cobbledex.Cobbledex -// -//class PlayerDiscovery(val caughtSpecies: MutableSet = hashSetOf()): PlayerDataExtension { -// -// companion object { -// const val NAME_KEY = Cobbledex.MOD_ID -// -// private val GSON = GsonBuilder() -// .disableHtmlEscaping() -// .create() -// } -// -// override fun name(): String { -// return NAME_KEY -// } -// -// override fun serialize(): JsonObject { -// val jsonObject = GSON.toJsonTree(this).asJsonObject -// jsonObject.addProperty(PlayerDataExtension.NAME_KEY, this.name()) -// return jsonObject -// } -// -// override fun deserialize(json: JsonObject): PlayerDataExtension { -// return GSON.fromJson(json, PlayerDiscovery::class.java) -// } -//} \ No newline at end of file diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/cobblemon/showdown/ShowdownService.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/cobblemon/showdown/ShowdownService.kt index 5c104b4..916d2fc 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/cobblemon/showdown/ShowdownService.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/cobblemon/showdown/ShowdownService.kt @@ -1,6 +1,6 @@ package com.rafacasari.mod.cobbledex.cobblemon.showdown -import com.rafacasari.mod.cobbledex.utils.* +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logError import org.graalvm.polyglot.Context import java.io.File diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/commands/server/CobbledexCommand.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/commands/server/CobbledexCommand.kt index f7ed366..78634b5 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/commands/server/CobbledexCommand.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/commands/server/CobbledexCommand.kt @@ -17,8 +17,8 @@ import com.rafacasari.mod.cobbledex.Cobbledex import com.rafacasari.mod.cobbledex.CobbledexConfig import com.rafacasari.mod.cobbledex.commands.arguments.SettingArgumentSuggestion import com.rafacasari.mod.cobbledex.network.client.packets.OpenCobbledexPacket -import com.rafacasari.mod.cobbledex.utils.cobbledexTextTranslation -import com.rafacasari.mod.cobbledex.utils.logError +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexTextTranslation +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logError import net.minecraft.server.command.CommandManager import net.minecraft.server.command.ServerCommandSource import kotlin.reflect.* diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/items/CobbledexItem.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/items/CobbledexItem.kt index edc1029..c5c7066 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/items/CobbledexItem.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/items/CobbledexItem.kt @@ -10,12 +10,12 @@ import net.minecraft.client.item.TooltipContext import net.minecraft.text.Text import net.minecraft.util.* import net.minecraft.world.World -import com.rafacasari.mod.cobbledex.CobbledexConstants import com.rafacasari.mod.cobbledex.Cobbledex +import com.rafacasari.mod.cobbledex.CobbledexConstants import com.rafacasari.mod.cobbledex.api.classes.DiscoveryRegister import com.rafacasari.mod.cobbledex.client.gui.CobbledexCollectionGUI import com.rafacasari.mod.cobbledex.client.gui.CobbledexGUI -import com.rafacasari.mod.cobbledex.utils.cobbledexTextTranslation +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexTextTranslation import net.minecraft.client.gui.screen.Screen import net.minecraft.server.network.ServerPlayerEntity import net.minecraft.text.MutableText @@ -26,7 +26,7 @@ class CobbledexItem(settings: Settings) : Item(settings) { companion object { val totalPokemonDiscovered: Int get() { - return CobbledexCollectionGUI.discoveredList.size + return CobbledexConstants.Client.discoveredList.size } } @@ -73,17 +73,15 @@ class CobbledexItem(settings: Settings) : Item(settings) { if (entity != null) { if (entity !is PokemonEntity) { - if (world.isClient) - user.sendMessage(Text.translatable(CobbledexConstants.invalid_entity)) + if (world.isClient) user.sendMessage(cobbledexTextTranslation("not_a_pokemon")) return TypedActionResult.fail(itemStack) } val target = entity.pokemon - if (world.isClient) { - val discoveryRegister = CobbledexCollectionGUI.discoveredList[target.species.showdownId()]?.contains(target.form.formOnlyShowdownId()) - if (discoveryRegister == true) { + val discoveryRegister = CobbledexConstants.Client.discoveredList[target.species.showdownId()]?.containsKey(target.form.formOnlyShowdownId()) ?: false + if (discoveryRegister) { CobbledexGUI.openCobbledexScreen(target.form, target.aspects) return TypedActionResult.success(itemStack, false) } diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/client/handlers/AddToCollectionHandler.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/client/handlers/AddToCollectionHandler.kt index f5fda46..f0d2f49 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/client/handlers/AddToCollectionHandler.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/client/handlers/AddToCollectionHandler.kt @@ -1,6 +1,6 @@ package com.rafacasari.mod.cobbledex.network.client.handlers -import com.rafacasari.mod.cobbledex.client.gui.CobbledexCollectionGUI +import com.rafacasari.mod.cobbledex.CobbledexConstants.Client.discoveredList import com.rafacasari.mod.cobbledex.network.client.packets.AddToCollectionPacket import com.rafacasari.mod.cobbledex.network.client.IClientNetworkPacketHandler import net.minecraft.client.MinecraftClient @@ -8,11 +8,11 @@ import net.minecraft.client.MinecraftClient object AddToCollectionHandler : IClientNetworkPacketHandler { override fun handle(packet: AddToCollectionPacket, client: MinecraftClient) { - val speciesRegister = CobbledexCollectionGUI.discoveredList[packet.species] + val speciesRegister = discoveredList[packet.species] if (speciesRegister == null) { // Register not found, create it - CobbledexCollectionGUI.discoveredList[packet.species] = mutableMapOf(packet.form to packet.entry) + discoveredList[packet.species] = mutableMapOf(packet.form to packet.entry) } else speciesRegister[packet.form] = packet.entry } diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/client/handlers/ReceiveCobbledexHandler.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/client/handlers/ReceiveCobbledexHandler.kt index 848370b..f6930e0 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/client/handlers/ReceiveCobbledexHandler.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/client/handlers/ReceiveCobbledexHandler.kt @@ -4,7 +4,7 @@ import com.cobblemon.mod.common.api.pokemon.PokemonSpecies import com.rafacasari.mod.cobbledex.client.gui.CobbledexGUI import com.rafacasari.mod.cobbledex.network.client.packets.ReceiveCobbledexPacket import com.rafacasari.mod.cobbledex.network.client.IClientNetworkPacketHandler -import com.rafacasari.mod.cobbledex.utils.logError +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logError import net.minecraft.client.MinecraftClient object ReceiveCobbledexHandler : IClientNetworkPacketHandler { diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/client/handlers/ReceiveCollectionDataHandler.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/client/handlers/ReceiveCollectionDataHandler.kt index 6de7fd2..735f1a9 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/client/handlers/ReceiveCollectionDataHandler.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/client/handlers/ReceiveCollectionDataHandler.kt @@ -1,12 +1,12 @@ package com.rafacasari.mod.cobbledex.network.client.handlers -import com.rafacasari.mod.cobbledex.client.gui.CobbledexCollectionGUI +import com.rafacasari.mod.cobbledex.CobbledexConstants.Client.discoveredList import com.rafacasari.mod.cobbledex.network.client.packets.ReceiveCollectionDataPacket import com.rafacasari.mod.cobbledex.network.client.IClientNetworkPacketHandler import net.minecraft.client.MinecraftClient object ReceiveCollectionDataHandler : IClientNetworkPacketHandler { override fun handle(packet: ReceiveCollectionDataPacket, client: MinecraftClient) { - CobbledexCollectionGUI.discoveredList = packet.discoveredList + discoveredList = packet.discoveredList } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/template/SerializableEvolutionRequirement.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/template/SerializableEvolutionRequirement.kt index e73b1e4..57b4c6a 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/template/SerializableEvolutionRequirement.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/template/SerializableEvolutionRequirement.kt @@ -28,9 +28,9 @@ import com.rafacasari.mod.cobbledex.utils.PacketUtils.writeNullableIdentifier import com.rafacasari.mod.cobbledex.utils.PacketUtils.writeNullableInt import com.rafacasari.mod.cobbledex.utils.PacketUtils.writeNullableIntRange import com.rafacasari.mod.cobbledex.utils.PacketUtils.writeNullableString -import com.rafacasari.mod.cobbledex.utils.cobbledexResource -import com.rafacasari.mod.cobbledex.utils.logInfo -import com.rafacasari.mod.cobbledex.utils.withRGBColor +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexResource +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logInfo +import com.rafacasari.mod.cobbledex.utils.MiscUtils.withRGBColor import net.minecraft.item.ItemStack import net.minecraft.network.PacketByteBuf import net.minecraft.registry.Registries diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/template/SerializablePokemonEvolution.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/template/SerializablePokemonEvolution.kt index ded0884..3a87aed 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/template/SerializablePokemonEvolution.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/template/SerializablePokemonEvolution.kt @@ -22,10 +22,10 @@ import com.rafacasari.mod.cobbledex.utils.PacketUtils.readNullableIdentifier import com.rafacasari.mod.cobbledex.utils.PacketUtils.readNullableString import com.rafacasari.mod.cobbledex.utils.PacketUtils.writeNullableIdentifier import com.rafacasari.mod.cobbledex.utils.PacketUtils.writeNullableString -import com.rafacasari.mod.cobbledex.utils.bold -import com.rafacasari.mod.cobbledex.utils.cobbledexResource -import com.rafacasari.mod.cobbledex.utils.logInfo -import com.rafacasari.mod.cobbledex.utils.logWarn +import com.rafacasari.mod.cobbledex.utils.MiscUtils.bold +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexResource +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logInfo +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logWarn import net.minecraft.block.Block import net.minecraft.item.Item import net.minecraft.item.ItemStack diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/template/SerializableSpawnCondition.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/template/SerializableSpawnCondition.kt index d7b3f3f..e9cdf62 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/template/SerializableSpawnCondition.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/network/template/SerializableSpawnCondition.kt @@ -13,7 +13,7 @@ import com.rafacasari.mod.cobbledex.utils.PacketUtils.writeIntRange import com.rafacasari.mod.cobbledex.utils.PacketUtils.writeNullableBool import com.rafacasari.mod.cobbledex.utils.PacketUtils.writeNullableFloat import com.rafacasari.mod.cobbledex.utils.PacketUtils.writeNullableInt -import com.rafacasari.mod.cobbledex.utils.logError +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logError import net.minecraft.network.PacketByteBuf import net.minecraft.registry.RegistryKeys import net.minecraft.registry.tag.TagKey diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/utils/BiomeUtils.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/utils/BiomeUtils.kt index def7d4a..8a9bdc6 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/utils/BiomeUtils.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/utils/BiomeUtils.kt @@ -1,29 +1,21 @@ package com.rafacasari.mod.cobbledex.utils -import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition -import com.cobblemon.mod.common.api.spawning.detail.PokemonSpawnDetail import net.minecraft.registry.Registry import net.minecraft.registry.RegistryKeys -import net.minecraft.text.MutableText import net.minecraft.util.Identifier import net.minecraft.world.World import net.minecraft.world.biome.Biome -data class CobbledexBiome(val identifier: Identifier, val biome: Biome) -//data class BiomeChecker(val details: PokemonSpawnDetail, val biomeCondition: RegistryLikeCondition, val biomeList : List) - object BiomeUtils { + data class CobbledexBiome(val identifier: Identifier, val biome: Biome) + fun getBiomesRegistry(world: World) : Registry { return world.registryManager.get(RegistryKeys.BIOME) } fun getAllBiomes(world: World) : List { val registry: Registry = world.registryManager.get(RegistryKeys.BIOME) - return getAllBiomes(registry) - } - - private fun getAllBiomes(registry: Registry) : List { return registry.entrySet.map { entry -> CobbledexBiome(entry.key.value, entry.value) } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/utils/CobblemonUtils.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/utils/CobblemonUtils.kt index bc5a932..9ab45cc 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/utils/CobblemonUtils.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/utils/CobblemonUtils.kt @@ -11,6 +11,7 @@ import com.cobblemon.mod.common.entity.PoseType import com.cobblemon.mod.common.pokemon.FormData import com.cobblemon.mod.common.pokemon.Species import com.mojang.blaze3d.systems.RenderSystem +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logError import net.minecraft.client.MinecraftClient import net.minecraft.client.render.VertexConsumer import net.minecraft.client.util.math.MatrixStack diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/utils/MiscUtils.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/utils/MiscUtils.kt index 2dd64f8..3ce8824 100644 --- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/utils/MiscUtils.kt +++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/utils/MiscUtils.kt @@ -1,35 +1,37 @@ package com.rafacasari.mod.cobbledex.utils -import com.cobblemon.mod.common.api.text.add import net.minecraft.text.Text import net.minecraft.util.Identifier import com.rafacasari.mod.cobbledex.Cobbledex import net.minecraft.text.MutableText import net.minecraft.text.TextContent -fun cobbledexResource(path: String) = Identifier(Cobbledex.MOD_ID, path) -fun cobbledexTranslation(key: String) = Text.translatable(key) -fun logInfo(text: String) = Cobbledex.LOGGER.info(text) -fun logWarn(text: String) = Cobbledex.LOGGER.warn(text) -fun logError(text: String) = Cobbledex.LOGGER.error(text) -fun logDebug(text: String) = Cobbledex.LOGGER.debug(text) +object MiscUtils { + fun cobbledexResource(path: String): Identifier = Identifier(Cobbledex.MOD_ID, path) + fun cobbledexTranslation(key: String): MutableText = Text.translatable(key) + fun logInfo(text: String) = Cobbledex.LOGGER.info(text) + fun logWarn(text: String) = Cobbledex.LOGGER.warn(text) + fun logError(text: String) = Cobbledex.LOGGER.error(text) + fun logDebug(text: String) = Cobbledex.LOGGER.debug(text) -fun MutableText.withRGBColor(color: Int) = also { it.style = it.style.withColor(color) } -fun Text.bold() = also { (it as MutableText).style = it.style.withBold(true) } + fun MutableText.withRGBColor(color: Int) = also { it.style = it.style.withColor(color) } + fun Text.bold() = also { (it as MutableText).style = it.style.withBold(true) } -fun Float.format(): String = if (this % 1 == 0f) this.toInt().toString() else this.toString() + fun Float.format(): String = if (this % 1 == 0f) this.toInt().toString() else this.toString() -fun cobbledexTextTranslation(key: String, vararg arg: Any): MutableText { - return Text.translatable("cobbledex.texts.$key", *arg) -} - -fun MutableList.toMutableText(): MutableText = MutableText.of(TextContent.EMPTY).also { - this.forEachIndexed { index, x -> - if (index + 1 < this.size) - x.add("\n") - it.append(x) + fun cobbledexTextTranslation(key: String, vararg arg: Any): MutableText { + return Text.translatable("cobbledex.texts.$key", *arg) } -} -fun MutableList.addEmptyLine() = this.add(Text.empty()) -fun MutableList.emptyLine() = this.add(Text.empty()) \ No newline at end of file + fun MutableList.toMutableText(skipLine: Boolean = true): MutableText = + MutableText.of(TextContent.EMPTY).also { + this.forEachIndexed { index, x -> + it.append(x) + // Add new line + if (skipLine && index + 1 < this.size) it.append("\n") + } + } + + fun MutableList.addEmptyLine() = this.add(Text.empty()) + fun MutableList.emptyLine() = this.add(Text.empty()) +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobbledex/lang/en_us.json b/common/src/main/resources/assets/cobbledex/lang/en_us.json index 5563e0a..9fb641a 100644 --- a/common/src/main/resources/assets/cobbledex/lang/en_us.json +++ b/common/src/main/resources/assets/cobbledex/lang/en_us.json @@ -1,5 +1,4 @@ { - "cobbledex.errors.NotAPokemon": "That's not a Pokémon!", "item.cobbledex.cobbledex_item": "Cobbledex", "cobbledex.texts.cobbledex": "Cobbledex", "cobbledex.texts.weakness": "Is weak against", @@ -36,6 +35,7 @@ "cobbledex.texts.need.view_evolutions": "view evolutions", "cobbledex.texts.need.view_spawns": "view spawns", "cobbledex.texts.need.view_drops": "view drops", + "cobbledex.texts.not_a_pokemon": "That's not a Pokémon!", "cobbledex.texts.tooltip.hold_shift_timestamp": "Hold for timestamps", "cobbledex.texts.new_pokemon_discovered": "You've discovered a new Pokémon: %s", diff --git a/fabric/src/main/kotlin/com/rafacasari/mod/cobbledex/fabric/CobbledexFabric.kt b/fabric/src/main/kotlin/com/rafacasari/mod/cobbledex/fabric/CobbledexFabric.kt index d603988..c56b67d 100644 --- a/fabric/src/main/kotlin/com/rafacasari/mod/cobbledex/fabric/CobbledexFabric.kt +++ b/fabric/src/main/kotlin/com/rafacasari/mod/cobbledex/fabric/CobbledexFabric.kt @@ -43,6 +43,6 @@ object CobbledexFabric : CobbledexImplementation { } override fun registerItems() { - Registry.register(Registries.ITEM, Identifier(Cobbledex.MOD_ID, "cobbledex_item"), CobbledexConstants.Cobbledex_Item) + Registry.register(Registries.ITEM, Identifier(Cobbledex.MOD_ID, "cobbledex_item"), CobbledexConstants.COBBLEDEX_ITEM) } } \ No newline at end of file diff --git a/fabric/src/main/kotlin/com/rafacasari/mod/cobbledex/fabric/CobbledexFabricClient.kt b/fabric/src/main/kotlin/com/rafacasari/mod/cobbledex/fabric/CobbledexFabricClient.kt index 48fda9c..368f3f0 100644 --- a/fabric/src/main/kotlin/com/rafacasari/mod/cobbledex/fabric/CobbledexFabricClient.kt +++ b/fabric/src/main/kotlin/com/rafacasari/mod/cobbledex/fabric/CobbledexFabricClient.kt @@ -2,8 +2,8 @@ package com.rafacasari.mod.cobbledex.fabric import com.mojang.brigadier.CommandDispatcher import com.rafacasari.mod.cobbledex.commands.CobbledexCommands -import com.rafacasari.mod.cobbledex.utils.logError -import com.rafacasari.mod.cobbledex.utils.logInfo +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logError +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logInfo import net.fabricmc.api.ClientModInitializer import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource diff --git a/forge/src/main/kotlin/com/rafacasari/mod/cobbledex/forge/CobbledexForge.kt b/forge/src/main/kotlin/com/rafacasari/mod/cobbledex/forge/CobbledexForge.kt index 84371ca..2a85715 100644 --- a/forge/src/main/kotlin/com/rafacasari/mod/cobbledex/forge/CobbledexForge.kt +++ b/forge/src/main/kotlin/com/rafacasari/mod/cobbledex/forge/CobbledexForge.kt @@ -2,8 +2,8 @@ package com.rafacasari.mod.cobbledex.forge import com.rafacasari.mod.cobbledex.* import com.rafacasari.mod.cobbledex.commands.CobbledexCommands -import com.rafacasari.mod.cobbledex.utils.logError -import com.rafacasari.mod.cobbledex.utils.logInfo +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logError +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logInfo import net.minecraft.server.MinecraftServer import net.minecraft.util.Identifier import net.minecraftforge.api.distmarker.Dist @@ -54,7 +54,7 @@ class CobbledexForge : CobbledexImplementation { with(modBus) { addListener { event -> event.register(ForgeRegistries.Keys.ITEMS) { - it.register(Identifier(Cobbledex.MOD_ID, "cobbledex_item"), CobbledexConstants.Cobbledex_Item) + it.register(Identifier(Cobbledex.MOD_ID, "cobbledex_item"), CobbledexConstants.COBBLEDEX_ITEM) } } } diff --git a/forge/src/main/kotlin/com/rafacasari/mod/cobbledex/forge/CobbledexForgeClient.kt b/forge/src/main/kotlin/com/rafacasari/mod/cobbledex/forge/CobbledexForgeClient.kt index 5138064..0c4c1d4 100644 --- a/forge/src/main/kotlin/com/rafacasari/mod/cobbledex/forge/CobbledexForgeClient.kt +++ b/forge/src/main/kotlin/com/rafacasari/mod/cobbledex/forge/CobbledexForgeClient.kt @@ -1,6 +1,6 @@ package com.rafacasari.mod.cobbledex.forge -import com.rafacasari.mod.cobbledex.utils.cobbledexResource -import com.rafacasari.mod.cobbledex.utils.logInfo +import com.rafacasari.mod.cobbledex.utils.MiscUtils.cobbledexResource +import com.rafacasari.mod.cobbledex.utils.MiscUtils.logInfo import net.minecraft.client.util.ModelIdentifier import net.minecraftforge.client.event.ModelEvent import net.minecraftforge.eventbus.api.IEventBus diff --git a/gradle.properties b/gradle.properties index 833252a..9697d0c 100644 --- 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.29 +mod_version=1.0.30 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