diff --git a/build.gradle b/build.gradle index e097203..491607e 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,7 @@ repositories { includeGroup "maven.modrinth" } } + maven { url "https://maven.isxander.dev/releases" } } dependencies { @@ -27,7 +28,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "maven.modrinth:yacl:${project.yacl_version}" + modImplementation "dev.isxander:yet-another-config-lib:${project.yacl_version}" modImplementation "maven.modrinth:modmenu:${project.modmenu_version}" modImplementation "maven.modrinth:sodium:${project.sodium_version}" } diff --git a/gradle.properties b/gradle.properties index ae8a7ef..9106b0a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ maven_group=dev.ultimatchamp archives_base_name=FabricBetterGrass # Dependencies -fabric_version=0.100.0+1.21 -yacl_version=3.4.4+1.20.6-fabric +fabric_version=0.100.1+1.21 +yacl_version=3.5.0+1.21-fabric modmenu_version=11.0.0-beta.1 sodium_version=mc1.20.6-0.5.8 diff --git a/src/main/java/dev/ultimatchamp/bettergrass/FabricBetterGrassBakedModel.java b/src/main/java/dev/ultimatchamp/bettergrass/FabricBetterGrassBakedModel.java index 456facd..5595329 100644 --- a/src/main/java/dev/ultimatchamp/bettergrass/FabricBetterGrassBakedModel.java +++ b/src/main/java/dev/ultimatchamp/bettergrass/FabricBetterGrassBakedModel.java @@ -1,11 +1,13 @@ package dev.ultimatchamp.bettergrass; +import dev.isxander.yacl3.api.NameableEnum; import dev.ultimatchamp.bettergrass.config.FabricBetterGrassConfig; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; import net.minecraft.block.BlockState; import net.minecraft.client.render.model.BakedModel; +import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.random.Random; @@ -24,8 +26,20 @@ public boolean isVanillaAdapter() { return false; } - public enum BetterGrassMode { - OFF, FAST, FANCY + public enum BetterGrassMode implements NameableEnum { + OFF("options.off"), + FAST("options.graphics.fast"), + FANCY("options.graphics.fancy"); + + private final String displayName; + BetterGrassMode(String displayName) { + this.displayName = displayName; + } + + @Override + public Text getDisplayName() { + return Text.translatable(displayName); + } } @Override @@ -78,7 +92,7 @@ private static boolean canConnect(BlockState self, BlockState adjacent) { } private static boolean isSnowy(BlockRenderView world, BlockPos selfPos) { - return String.valueOf(world.getBlockState(selfPos)).contains("block}[snowy=true]"); + return String.valueOf(world.getBlockState(selfPos)).contains("[snowy=true]"); } @SuppressWarnings("deprecation") diff --git a/src/main/java/dev/ultimatchamp/bettergrass/config/FabricBetterGrassConfig.java b/src/main/java/dev/ultimatchamp/bettergrass/config/FabricBetterGrassConfig.java index 39246b3..edec5c5 100644 --- a/src/main/java/dev/ultimatchamp/bettergrass/config/FabricBetterGrassConfig.java +++ b/src/main/java/dev/ultimatchamp/bettergrass/config/FabricBetterGrassConfig.java @@ -4,6 +4,7 @@ import dev.isxander.yacl3.config.v2.api.SerialEntry; import dev.isxander.yacl3.config.v2.api.autogen.AutoGen; import dev.isxander.yacl3.config.v2.api.autogen.Boolean; +import dev.isxander.yacl3.config.v2.api.autogen.CustomName; import dev.isxander.yacl3.config.v2.api.autogen.EnumCycler; import dev.isxander.yacl3.config.v2.api.serializer.GsonConfigSerializerBuilder; import dev.ultimatchamp.bettergrass.FabricBetterGrassBakedModel; @@ -16,7 +17,7 @@ public class FabricBetterGrassConfig { private static final ConfigClassHandler HANDLER = ConfigClassHandler.createBuilder(FabricBetterGrassConfig.class) - .id(new Identifier("bettergrass", "bettergrass_config")) + .id(Identifier.of("bettergrass", "bettergrass_config")) .serializer(config -> GsonConfigSerializerBuilder.create(config) .setPath(FabricLoader.getInstance().getConfigDir().resolve("bettergrass.json5")) .setJson5(true) @@ -38,16 +39,19 @@ public class FabricBetterGrassConfig { @SerialEntry(comment = "Additional\n(default: false)") @AutoGen(category = "additional", group = "connectedblocks") + @CustomName("block.minecraft.dirt_path") @Boolean(formatter = Boolean.Formatter.YES_NO, colored = true) public boolean dirtPaths = false; @SerialEntry(comment = "(default: false)") @AutoGen(category = "additional", group = "connectedblocks") + @CustomName("block.minecraft.farmland") @Boolean(formatter = Boolean.Formatter.YES_NO, colored = true) public boolean farmLands = false; @SerialEntry(comment = "(default: true)") @AutoGen(category = "additional", group = "connectedblocks") + @CustomName("block.minecraft.snow") @Boolean(formatter = Boolean.Formatter.YES_NO, colored = true) public boolean snowy = true; diff --git a/src/main/java/dev/ultimatchamp/bettergrass/mixin/MixinSodiumGameOptionsPages.java b/src/main/java/dev/ultimatchamp/bettergrass/mixin/MixinSodiumGameOptionsPages.java index 77d47d7..902d71c 100644 --- a/src/main/java/dev/ultimatchamp/bettergrass/mixin/MixinSodiumGameOptionsPages.java +++ b/src/main/java/dev/ultimatchamp/bettergrass/mixin/MixinSodiumGameOptionsPages.java @@ -35,7 +35,7 @@ private static void betterGrass(CallbackInfoReturnable cir, List FabricBetterGrassConfig.instance().dirtPaths = value, @@ -44,7 +44,7 @@ private static void betterGrass(CallbackInfoReturnable cir, List FabricBetterGrassConfig.instance().farmLands = value, @@ -53,7 +53,7 @@ private static void betterGrass(CallbackInfoReturnable cir, List FabricBetterGrassConfig.instance().snowy = value, diff --git a/src/main/resources/assets/bettergrass/lang/en_us.json b/src/main/resources/assets/bettergrass/lang/en_us.json index 4a6f7a9..28924d8 100644 --- a/src/main/resources/assets/bettergrass/lang/en_us.json +++ b/src/main/resources/assets/bettergrass/lang/en_us.json @@ -3,15 +3,9 @@ "yacl3.config.bettergrass:bettergrass_config.category.config": "General", "yacl3.config.bettergrass:bettergrass_config.betterGrassMode":"Better Grass Mode", "yacl3.config.bettergrass:bettergrass_config.betterGrassMode.desc":"\u00A74Off \u00A7r- Grass Blocks look normal\n\u00A73Fast \u00A7r- Top Grass texture will be applied to all sides of the Grass Blocks (fast)\n\u00A7dFancy \u00A7r- Top Grass texture will be applied dynamically to required sides of the Grass Blocks (slow)\n\n\u00A7cWorld reload or F3+A is required to apply changes.", - "yacl3.config.enum.BetterGrassMode.off":"\u00A74Off", - "yacl3.config.enum.BetterGrassMode.fast":"\u00A73Fast", - "yacl3.config.enum.BetterGrassMode.fancy":"\u00A7dFancy", "yacl3.config.bettergrass:bettergrass_config.category.additional":"Additional", "yacl3.config.bettergrass:bettergrass_config.category.additional.group.connectedblocks":"Connected Blocks", - "yacl3.config.bettergrass:bettergrass_config.dirtPaths":"Dirt Paths", "yacl3.config.bettergrass:bettergrass_config.dirtPaths.desc":"Connects dirt paths too!\n\n\u00A7cMay cause some visual bugs!", - "yacl3.config.bettergrass:bettergrass_config.farmLands":"Farmlands", "yacl3.config.bettergrass:bettergrass_config.farmLands.desc":"Connects farmlands too!\n\n\u00A7cMay cause some visual bugs!", - "yacl3.config.bettergrass:bettergrass_config.snowy":"Snowy grass", "yacl3.config.bettergrass:bettergrass_config.snowy.desc":"Connects snowy grass too!" } diff --git a/src/main/resources/assets/bettergrass/lang/et_ee.json b/src/main/resources/assets/bettergrass/lang/et_ee.json index 57ca996..677241f 100644 --- a/src/main/resources/assets/bettergrass/lang/et_ee.json +++ b/src/main/resources/assets/bettergrass/lang/et_ee.json @@ -3,15 +3,9 @@ "yacl3.config.bettergrass:bettergrass_config.category.config": "Üldine", "yacl3.config.bettergrass:bettergrass_config.betterGrassMode":"Parema muru režiim", "yacl3.config.bettergrass:bettergrass_config.betterGrassMode.desc":"\u00A74Väljas \u00A7r- tavapärase välimusega muruplokid\n\u00A73Kiire \u00A7r- pealmine murutekstuur rakendatakse muruplokkide kõigile külgedele (kiire)\n\u00A7dUhke \u00A7r- pealmine murutekstuur rakendatakse dünaamiliselt muruplokkide vajalikele külgedele (aeglane)\n\n\u00a7cMuudatuste rakendamiseks on vajalik maailma taaslaadimine või F3+A.", - "yacl3.config.enum.BetterGrassMode.off":"\u00A74Väljas", - "yacl3.config.enum.BetterGrassMode.fast":"\u00A73Kiire", - "yacl3.config.enum.BetterGrassMode.fancy":"\u00A7dUhke", "yacl3.config.bettergrass:bettergrass_config.category.additional":"Täiendavad", "yacl3.config.bettergrass:bettergrass_config.category.additional.group.connectedblocks":"Ühendatud plokid", - "yacl3.config.bettergrass:bettergrass_config.dirtPaths":"Mullarajad", "yacl3.config.bettergrass:bettergrass_config.dirtPaths.desc":"Ühendab ka mullaradasid!\n\n\u00A7cVõib põhjustada visuaalseid ebaühtlusi!", - "yacl3.config.bettergrass:bettergrass_config.farmLands":"Põllumaa", "yacl3.config.bettergrass:bettergrass_config.farmLands.desc":"Ühendab ka põllumaaplokke!\n\n\u00A7cVõib põhjustada visuaalseid ebaühtlusi!", - "yacl3.config.bettergrass:bettergrass_config.snowy":"Snowy grass", "yacl3.config.bettergrass:bettergrass_config.snowy.desc":"Connects snowy grass too!" } diff --git a/src/main/resources/assets/bettergrass/lang/it_it.json b/src/main/resources/assets/bettergrass/lang/it_it.json index 1a22011..b6d35af 100644 --- a/src/main/resources/assets/bettergrass/lang/it_it.json +++ b/src/main/resources/assets/bettergrass/lang/it_it.json @@ -3,15 +3,9 @@ "yacl3.config.bettergrass:bettergrass_config.category.config": "Generali", "yacl3.config.bettergrass:bettergrass_config.betterGrassMode":"Modalità Erba Migliorata", "yacl3.config.bettergrass:bettergrass_config.betterGrassMode.desc":"\u00A74Disattivata \u00A7r- Blocchi di erba classici\n\u00A73Rapida \u00A7r- La texture superiore verrà applicata a tutti il lati del blocco d'erba (veloce)\n\u00A7dDettagliata \u00A7r- La texture superiore verrà applicata dinamicamnete a i lati del blocco d'erba richiesti (lento)\n\n\u00A7cPer rendere effettivi i cambiamenti è necessario un ricaricamento del mondo o F3+A.", - "yacl3.config.enum.BetterGrassMode.off":"\u00A74Off", - "yacl3.config.enum.BetterGrassMode.fast":"\u00A73Rapida", - "yacl3.config.enum.BetterGrassMode.fancy":"\u00A7dDettagliata", "yacl3.config.bettergrass:bettergrass_config.category.additional":"Aggiuntive", "yacl3.config.bettergrass:bettergrass_config.category.additional.group.connectedblocks":"Blocchi Connessi", - "yacl3.config.bettergrass:bettergrass_config.dirtPaths":"Sentiero sterrato", "yacl3.config.bettergrass:bettergrass_config.dirtPaths.desc":"Connetti anche i sentieri sterrati!\n\n\u00A7cPotrebbe causare dei bug visuali!", - "yacl3.config.bettergrass:bettergrass_config.farmLands":"Terra zappata", "yacl3.config.bettergrass:bettergrass_config.farmLands.desc":"Connectti anche la terra zappata!\n\n\u00A7cPotrebbe causare dei bug visuali!", - "yacl3.config.bettergrass:bettergrass_config.snowy":"Snowy grass", "yacl3.config.bettergrass:bettergrass_config.snowy.desc":"Connects snowy grass too!" } diff --git a/src/main/resources/assets/bettergrass/lang/ru_ru.json b/src/main/resources/assets/bettergrass/lang/ru_ru.json index 6ee04be..b97beb7 100644 --- a/src/main/resources/assets/bettergrass/lang/ru_ru.json +++ b/src/main/resources/assets/bettergrass/lang/ru_ru.json @@ -3,15 +3,9 @@ "yacl3.config.bettergrass:bettergrass_config.category.config": "Основные настройки", "yacl3.config.bettergrass:bettergrass_config.betterGrassMode":"Режим улучшенной травы", "yacl3.config.bettergrass:bettergrass_config.betterGrassMode.desc":"\u00A74Выкл \u00A7r- Блоки травы выглядят как обычно\n\u00A73Быстро \u00A7r- Верхняя текстура блока травы будет применена ко всем его сторонам (быстро)\n\u00A7dДетально \u00A7r- Верхняя текстура блока травы будет применена только к некоторым его сторонам (медленно)\n\n\u00A7cПерезапуск мира или F3+A необходимы чтобы применить эти изменения.", - "yacl3.config.enum.BetterGrassMode.off":"\u00A74Выкл", - "yacl3.config.enum.BetterGrassMode.fast":"\u00A73Быстро", - "yacl3.config.enum.BetterGrassMode.fancy":"\u00A7dДетально", "yacl3.config.bettergrass:bettergrass_config.category.additional":"Additional", "yacl3.config.bettergrass:bettergrass_config.category.additional.group.connectedblocks":"Connected Blocks", - "yacl3.config.bettergrass:bettergrass_config.dirtPaths":"Dirt Paths", "yacl3.config.bettergrass:bettergrass_config.dirtPaths.desc":"Connects dirt paths too!\n\n\u00A7cMay cause some visual bugs!", - "yacl3.config.bettergrass:bettergrass_config.farmLands":"Farmlands", "yacl3.config.bettergrass:bettergrass_config.farmLands.desc":"Connects farmlands too!\n\n\u00A7cMay cause some visual bugs!", - "yacl3.config.bettergrass:bettergrass_config.snowy":"Snowy grass", "yacl3.config.bettergrass:bettergrass_config.snowy.desc":"Connects snowy grass too!" } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 6ea4006..ee43aa9 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,7 +29,7 @@ "depends": { "fabricloader": ">=0.15.11", "fabric": "*", - "minecraft": "1.20.x", + "minecraft": "~1.21-", "yet_another_config_lib_v3": "*" }, "custom": {