Skip to content

Commit

Permalink
Brom
Browse files Browse the repository at this point in the history
  • Loading branch information
enjarai committed Jun 5, 2024
1 parent 8b30fd5 commit 82e832f
Show file tree
Hide file tree
Showing 15 changed files with 230 additions and 179 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
- Fixed an issue preventing vanilla clients from joining servers with the mod installed.
- Added Mexican Spanish translations (Thanks @TheLegendofSaram)
- Added an option to make Elytras reappear while flying. (Thanks @EminGT)
- Fixed button tooltips not appearing at all.
26 changes: 16 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
id 'fabric-loom' version '1.6-SNAPSHOT'
id 'maven-publish'
id "me.modmuss50.mod-publish-plugin" version "0.4.4"
id 'me.fallenbreath.yamlang' version '1.3.1'
}

sourceCompatibility = JavaVersion.VERSION_21
Expand Down Expand Up @@ -33,23 +34,23 @@ repositories {

dependencies {
// To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
minecraft "com.mojang:minecraft:${property("deps.minecraft")}"
mappings "net.fabricmc:yarn:${property("deps.yarn")}:v2"
modImplementation "net.fabricmc:fabric-loader:${property("deps.fabricloader")}"

// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${property("deps.fabric-api")}"

modImplementation("nl.enjarai:cicada-lib:${project.cicada_version}") {
modImplementation("nl.enjarai:cicada-lib:${property("deps.cicada")}") {
exclude group: "net.fabricmc.fabric-api"
}

// Mod Menu integration.
modImplementation "com.terraformersmc:modmenu:${modmenu_version}"
modImplementation "com.terraformersmc:modmenu:${property("deps.modmenu")}"

// Cardinal Components for shrimple™ server syncing.
modImplementation(include("org.ladysnake.cardinal-components-api:cardinal-components-base:${project.cardinal_components_version}"))
modImplementation(include("org.ladysnake.cardinal-components-api:cardinal-components-entity:${project.cardinal_components_version}"))
modImplementation(include("org.ladysnake.cardinal-components-api:cardinal-components-base:${property("deps.cardinal-components-api")}"))
modImplementation(include("org.ladysnake.cardinal-components-api:cardinal-components-entity:${property("deps.cardinal-components-api")}"))

// Make it easier to test skin compat.
// modImplementation 'com.ptsmods:devlogin:2.1'
Expand All @@ -63,7 +64,7 @@ processResources {
}
}

version = "$version+$minecraft_version"
version = "$version+${property("deps.minecraft")}"

tasks.withType(JavaCompile).configureEach {
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
Expand All @@ -83,6 +84,11 @@ jar {
}
}

yamlang {
targetSourceSets = [sourceSets.main]
inputDir = "assets/showmeyourskin/lang"
}

// configure the maven publication
publishing {
publications {
Expand All @@ -106,7 +112,7 @@ loom {

publishMods {
file = remapJar.archiveFile
displayName = "${property('mod_version')} for ${property('minecraft_version')}"
displayName = "${property('mod_version')} for ${property('deps.minecraft')}"
version = project.version
changelog = getRootProject().file("CHANGELOG.md").text
type = STABLE
Expand Down
16 changes: 8 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.20.5
yarn_mappings=1.20.5+build.1
loader_version=0.15.10
deps.minecraft=1.20.6
deps.yarn=1.20.6+build.3
deps.fabricloader=0.15.10

# Mod Properties
mod_version = 1.10.2
mod_version = 1.11.0
maven_group = nl.enjarai
archives_base_name = show-me-your-skin

Expand All @@ -20,9 +20,9 @@ mod_github=enjarai/show-me-your-skin
git_branch=master

# Dependencies
fabric_version=0.97.8+1.20.5
deps.fabric-api=0.99.4+1.20.6
# https://modrinth.com/mod/modmenu/versions
modmenu_version=10.0.0-beta.1
cicada_version=0.7.1+1.20.5-and-above
deps.modmenu=10.0.0-beta.1
deps.cicada=0.7.2+1.20.5-and-above
# https://github.com/OnyxStudios/Cardinal-Components-API/releases
cardinal_components_version=6.0.0-rc1
deps.cardinal-components-api=6.0.0
32 changes: 0 additions & 32 deletions src/main/resources/assets/showmeyourskin/lang/en_us.json

This file was deleted.

40 changes: 40 additions & 0 deletions src/main/resources/assets/showmeyourskin/lang/en_us.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
category:
showmeyourskin:
showmeyourskin: Show Me Your Skin!
key:
showmeyourskin:
open_settings: Open Armor Config
global_toggle:
.: Toggle Mod
enable: "§aEnabled §rarmor rendering customisation."
disable: "§cDisabled §rarmor rendering customisation."
gui:
showmeyourskin:
armorScreen:
title:
.: Armor Config
serverIntegrated: Armor Config (Server)
serverOverrides: Armor Config (Local Overrides)
globalToggleTooltip: Global toggle, press %1$s to toggle ingame.
overridesEnabled: "Enable local overrides.\n(not visible to other players)"
overridesConfigure: "Configure local overrides.\n(not visible to other players)"
global: Global
synced: Synced
overridden: Overridden
playerName: "%s"
playerSelector: Armor Config
piece:
head: "Helmet: %d%%"
chest: "Chestplate: %d%%"
legs: "Leggings: %d%%"
feet: "Boots: %d%%"
elytra: "Elytra: %d%%"
shield: "Shield: %d%%"
hat: "Hat: %d%%"
glintTooltip: Enable enchantment glint
combatTooltip: Automatically disable transparency in combat
nameTagTooltip: Show player name tag
showElytraTooltip: Show Elytra
shieldGlintTooltip: Show enchantment glint on shield
openButtonTooltip: Open armor transparency override
deleteButtonTooltip: Delete transparency override
32 changes: 0 additions & 32 deletions src/main/resources/assets/showmeyourskin/lang/es_mx.json

This file was deleted.

40 changes: 40 additions & 0 deletions src/main/resources/assets/showmeyourskin/lang/es_mx.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
category:
showmeyourskin:
showmeyourskin: Show Me Your Skin!
key:
showmeyourskin:
open_settings: Abrir configuración de armadura
global_toggle:
.: Alternar Mod
enable: "§aHabilitado§r personalización de armadura."
disable: "§cDeshabilitado§r personalización de armadura."
gui:
showmeyourskin:
armorScreen:
title:
.: Configuración de Armadura
serverIntegrated: Configuración de Armadura (Servidor)
serverOverrides: Configuración de Armadura (Anulaciones Locales)
globalToggleTooltip: Alternar globalmente, presiona %1$s para alternar en el juego.
overridesEnabled: "Habilitar anulaciones locales.\n(no visible para otros jugadores)"
overridesConfigure: "Configurar anulaciones locales.\n(no visible para otros jugadores)"
global: Global
synced: Sincronizado
overridden: Anulado
playerName: "%s"
playerSelector: Configuración de Armadura
piece:
head: "Yelmo: %d%%"
chest: "Pechera: %d%%"
legs: "Grebas: %d%%"
feet: "Botas: %d%%"
elytra: "Elytra: %d%%"
shield: "Escudo: %d%%"
hat: "Sombrero: %d%%"
glintTooltip: Habilitar brillo de encantamiento
combatTooltip: Desactivar automáticamente la transparencia en combate
nameTagTooltip: Mostrar etiqueta de nombre del jugador
showElytraTooltip: Mostrar Elytra
shieldGlintTooltip: Mostrar brillo de encantamiento en el escudo
openButtonTooltip: Abrir anulación de transparencia de armadura
deleteButtonTooltip: Eliminar anulación de transparencia
23 changes: 0 additions & 23 deletions src/main/resources/assets/showmeyourskin/lang/nl_nl.json

This file was deleted.

30 changes: 30 additions & 0 deletions src/main/resources/assets/showmeyourskin/lang/nl_nl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
category:
showmeyourskin:
showmeyourskin: Show Me Your Skin!
key:
showmeyourskin:
open_settings: Open Harnas Configuratie
global_toggle:
.: Globale Schakelaar
enable: Harnas render aanpassingen aangezet.
disable: Harnas render aanpassingen uitgezet.
gui:
showmeyourskin:
armorScreen:
globalToggleTooltip: Globale schakel, druk op %1$s om aan of uit te zetten in het spel.
global: Globaal
playerSelector: Harnas Configuratie
piece:
head: "Helm: %d%%"
chest: "Kuras: %d%%"
legs: "Beenstukken: %d%%"
feet: "Laarzen: %d%%"
elytra: "Dekschild: %d%%"
shield: "Schild: %d%%"
glintTooltip: Activeer betoveringsgloed
combatTooltip: Deactiveer automatisch de transparantie in een gevecht
nameTagTooltip: Laat het naamplaatje van de speler zien
showElytraTooltip: Laat Dekschild zien
shieldGlintTooltip: Betoveringsgloed laten zien op schild
openButtonTooltip: Open harnas transparantie overschrijving
deleteButtonTooltip: Verwijder transparantie overschrijving
31 changes: 0 additions & 31 deletions src/main/resources/assets/showmeyourskin/lang/ru_ru.json

This file was deleted.

39 changes: 39 additions & 0 deletions src/main/resources/assets/showmeyourskin/lang/ru_ru.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
category:
showmeyourskin:
showmeyourskin: Show Me Your Skin!
key:
showmeyourskin:
open_settings: Открыть настройки брони
global_toggle:
.: Переключить режим
enable: "§aВключить §rперсонализацию отрисовки брони."
disable: "§cОтключить §rперсонализацию отрисовки брони."
gui:
showmeyourskin:
armorScreen:
title:
.: Настройка брони
serverIntegrated: Настройка брони (Сервер)
serverOverrides: Настройка брони (Локальные переопределения)
globalToggleTooltip: Переключение на общие, нажмите %1$s для внутриигрового переключения.
overridesEnabled: "Включить локальные переопределения.\n(не видно другим игрокам)"
overridesConfigure: "Настройка локальных переопределения.\n(не видно другим игрокам)"
global: Общие
synced: Синхронизировано
overridden: Переопределено
playerName: "%s"
playerSelector: Настройка брони
piece:
head: "Шлем: %d%%"
chest: "Нагрудник: %d%%"
legs: "Поножи: %d%%"
feet: "Ботинки: %d%%"
elytra: "Элитры: %d%%"
shield: "Щит: %d%%"
glintTooltip: Включить мерцание чар
combatTooltip: Автоматически отключать прозрачность в бою
nameTagTooltip: Показать тэг имени игрока
showElytraTooltip: Показать элитры
shieldGlintTooltip: Показать на щите мерцание чара
openButtonTooltip: Открыть переопределение прозрачности брони
deleteButtonTooltip: Удалить переопределение прозрачности
Loading

0 comments on commit 82e832f

Please sign in to comment.