New Crowdin Translations

.github/workflows/build.yml

@@ -1,23 +1,15 @@
 name: Build
-on:
-  push:
-    branches:
-      - main
-      - dev
+on: [pull_request, push]
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/actions/wrapper-validation@v3
+      - uses: gradle/actions/wrapper-validation@v4
       - uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'microsoft'
       - run: chmod +x ./gradlew
       - run: ./gradlew build
-      - uses: actions/upload-artifact@v3
-        with:
-          name: Artifacts
-          path: build/libs/

.github/workflows/crowdin.yml

@@ -0,0 +1,32 @@
+name: Crowdin
+on:
+  workflow_dispatch:
+    inputs:
+      upload:
+        description: "Whether to upload translations from this repo to Crowdin"
+        type: boolean
+        required: true
+        default: false
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Crowdin Action
+        uses: crowdin/github-action@v2
+        with:
+          upload_sources: true
+          upload_translations: ${{ github.event.inputs.upload }}
+          download_translations: true
+          localization_branch_name: 'crowdin'
+          create_pull_request: true
+          pull_request_title: 'New Crowdin Translations'
+          pull_request_body: 'New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)'
+          pull_request_base_branch_name: 'dev'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2024 Spirit Studios
+Copyright (c) 2024 - 2025 Spirit Studios
 
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this

LICENSE-MUSIC

@@ -0,0 +1,13 @@
+The music for Hollow is created by WorldWidePixel.
+
+Spirit Studios has full rights to use and profit off this music for any work created that may use this music.
+
+You are authorised to use Hollow's music, with a few restrictions. In short:
+- You must provide credit to WorldWidePixel
+- You can not reupload this soundtrack verbatim 
+- You may use this soundtrack under the fair use doctrine including but not limited to the following:
+  - Using this soundtrack in videos or streams
+
+This music is not free, please contact WorldWidePixel for licensing at hello@worldwidepixel.ca.
+
+Copyright (c) (2024 - 2025) WorldWidePixel, All Rights Reserved.

build.gradle.kts

@@ -1,3 +1,5 @@
+import com.modrinth.minotaur.ModrinthExtension
+
 plugins {
     java
     alias(libs.plugins.fabric.loom)
@@ -92,7 +94,7 @@ modrinth {
     projectId.set(mod.id)
     versionNumber.set(mod.version)
     uploadFile.set(tasks.remapJar)
-    gameVersions.addAll(libs.versions.minecraft.get(), "1.21.1")
+    gameVersions.addAll(libs.versions.minecraft.get())
     loaders.addAll("fabric", "quilt")
     syncBodyFrom.set(rootProject.file("README.md").readText())
     dependencies {

crowdin.yml

@@ -0,0 +1,30 @@
+"project_id_env": "CROWDIN_PROJECT_ID"
+"api_token_env": "CROWDIN_PERSONAL_TOKEN"
+"base_path": "."
+
+"preserve_hierarchy": true
+
+"files": [
+  {
+    "source": "/**/lang/en_us.json",
+    "translation": "/**/lang/%locale%.json",
+    "languages_mapping": {
+      "locale": {
+        "zh-CN": "zh_cn",
+        "zh-HK": "zh_hk",
+        "zh-TW": "zh_tw",
+        "en-GB": "en_gb",
+        "en-US": "en_us",
+        "fr": "fr_fr",
+        "de": "de_de",
+        "id": "id_id",
+        "it": "it_it",
+        "ja": "ja_jp",
+        "pt-PT": "pt_pt",
+        "pt-BR": "pt_br",
+        "ru": "ru_ru",
+        "uk": "uk_ua"
+      }
+    }
+  }
+]

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
-mod.version = 1.3.1
+mod.version = 1.3.2
 mod.group = dev.spiritstudios
 mod.id = hollow

gradle/libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
-fabric_loom = "1.9-SNAPSHOT"
+fabric_loom = "1.11-SNAPSHOT"
 minotaur = "2.+"
 
-minecraft = "1.21"
-yarn = "1.21+build.9"
+minecraft = "1.21.5"
+yarn = "1.21.5+build.1"
 
-fabric_loader = "0.16.5"
-fabric_api = "0.109.0+1.21.1"
+fabric_loader = "0.16.14"
+fabric_api = "0.128.1+1.21.5"
 
-specter = "1.1.1"
+specter = "1.1.9"
 
-lambdynamiclights = "3.1.2+1.21.1"
+lambdynamiclights = "4.2.9+1.21.5"
 
 [plugins]
 fabric_loom = { id = "fabric-loom", version.ref = "fabric_loom" }
@@ -28,6 +28,7 @@ specter_block = { group = "dev.spiritstudios.specter", name = "specter-block", v
 specter_config = { group = "dev.spiritstudios.specter", name = "specter-config", version.ref = "specter" }
 specter_core = { group = "dev.spiritstudios.specter", name = "specter-core", version.ref = "specter" }
 specter_serialization = { group = "dev.spiritstudios.specter", name = "specter-serialization", version.ref = "specter" }
+specter_gui = { group = "dev.spiritstudios.specter", name = "specter-gui", version.ref = "specter" }
 specter_entity = { group = "dev.spiritstudios.specter", name = "specter-entity", version.ref = "specter" }
 specter_item = { group = "dev.spiritstudios.specter", name = "specter-item", version.ref = "specter" }
 specter_registry = { group = "dev.spiritstudios.specter", name = "specter-registry", version.ref = "specter" }
@@ -45,5 +46,6 @@ specter = [
     "specter_item",
     "specter_registry",
     "specter_render",
+    "specter_gui",
     "specter_serialization"
 ]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/client/java/dev/spiritstudios/hollow/HollowClient.java

@@ -1,24 +1,21 @@
 package dev.spiritstudios.hollow;
 
 import dev.spiritstudios.hollow.particle.FireflyJarParticle;
-import dev.spiritstudios.hollow.registry.HollowBlockEntityTypes;
-import dev.spiritstudios.hollow.registry.HollowBlocks;
-import dev.spiritstudios.hollow.registry.HollowEntityTypes;
-import dev.spiritstudios.hollow.registry.HollowItems;
+import dev.spiritstudios.hollow.particle.ScreamParticle;
+import dev.spiritstudios.hollow.block.entity.HollowBlockEntityTypes;
+import dev.spiritstudios.hollow.block.HollowBlocks;
+import dev.spiritstudios.hollow.entity.HollowEntityTypes;
 import dev.spiritstudios.hollow.registry.HollowParticleTypes;
 import dev.spiritstudios.hollow.render.block.EchoingPotBlockEntityRenderer;
+import dev.spiritstudios.hollow.render.block.EchoingVaseBlockEntityRenderer;
+import dev.spiritstudios.hollow.render.block.JarBlockEntityRenderer;
 import dev.spiritstudios.hollow.render.entity.FireflyEntityRenderer;
-import dev.spiritstudios.hollow.render.entity.JarBlockEntityRenderer;
-import dev.spiritstudios.specter.api.config.ModMenuHelper;
+import dev.spiritstudios.specter.api.config.client.ModMenuHelper;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
-import net.minecraft.client.color.world.BiomeColors;
-import net.minecraft.client.item.ModelPredicateProviderRegistry;
 import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
-import net.minecraft.util.Identifier;
-import net.minecraft.world.biome.GrassColors;
 
 public class HollowClient implements ClientModInitializer {
     @Override
@@ -27,51 +24,30 @@ public void onInitializeClient() {
 
         EntityRendererRegistry.register(HollowEntityTypes.FIREFLY, FireflyEntityRenderer::new);
 
-        ParticleFactoryRegistry.getInstance().register(
-                HollowParticleTypes.FIREFLY_JAR,
-                FireflyJarParticle.Factory::new
-        );
-
-        ModelPredicateProviderRegistry.register(
-                HollowItems.COPPER_HORN,
-                Identifier.ofVanilla("tooting"),
-                (stack, world, entity, seed) -> entity != null && entity.isUsingItem() && entity.getActiveItem() == stack ? 1.0F : 0.0F
-        );
-
-        // region Color Providers
-        ColorProviderRegistry.ITEM.register(
-                (stack, tintIndex) -> tintIndex == 0 ? 0x71C35C : -1,
-                HollowItems.GIANT_LILYPAD, HollowItems.LOTUS_LILYPAD
-        );
+        ParticleFactoryRegistry.getInstance().register(HollowParticleTypes.FIREFLY_JAR, FireflyJarParticle.Factory::new);
+        ParticleFactoryRegistry.getInstance().register(HollowParticleTypes.SCREAM, ScreamParticle.Factory::new);
 
         ColorProviderRegistry.BLOCK.register(
                 (state, world, pos, tintIndex) ->
                         world != null && pos != null ? 0x208030 : 0x71C35C,
                 HollowBlocks.GIANT_LILYPAD, HollowBlocks.LOTUS_LILYPAD
         );
 
-
-//        ColorProviderRegistry.BLOCK.register((state, world, pos, tintIndex) ->
-//                        tintIndex != 0 ?
-//                                world != null && pos != null ? BiomeColors.getGrassColor(world, pos) : GrassColors.getDefaultColor() :
-//                                -1,
-//                HollowBlocks.BLUE_WILDFLOWER,
-//                HollowBlocks.WHITE_WILDFLOWER,
-//                HollowBlocks.PURPLE_WILDFLOWER,
-//                HollowBlocks.PINK_WILDFLOWER
-//        );
-        // endregion
-
         // region Block Entity Renderers
         BlockEntityRendererFactories.register(
-                HollowBlockEntityTypes.JAR_BLOCK_ENTITY,
+                HollowBlockEntityTypes.JAR,
                 JarBlockEntityRenderer::new
         );
 
         BlockEntityRendererFactories.register(
-                HollowBlockEntityTypes.ECHOING_POT_BLOCK_ENTITY,
+                HollowBlockEntityTypes.ECHOING_POT,
                 EchoingPotBlockEntityRenderer::new
         );
+
+        BlockEntityRendererFactories.register(
+                HollowBlockEntityTypes.ECHOING_VASE,
+                EchoingVaseBlockEntityRenderer::new
+        );
         // endregion
     }
 }

src/client/java/dev/spiritstudios/hollow/datagen/ClientBlockMetatagProvider.java → src/client/java/dev/spiritstudios/hollow/datagen/HollowClientBlockMetatagProvider.java

@@ -1,22 +1,23 @@
 package dev.spiritstudios.hollow.datagen;
 
 import dev.spiritstudios.hollow.block.HollowLogBlock;
-import dev.spiritstudios.hollow.registry.HollowBlocks;
+import dev.spiritstudios.hollow.block.HollowBlocks;
 import dev.spiritstudios.specter.api.core.reflect.ReflectionHelper;
 import dev.spiritstudios.specter.api.registry.metatag.datagen.MetatagProvider;
-import dev.spiritstudios.specter.api.render.BlockRenderLayer;
-import dev.spiritstudios.specter.api.render.RenderMetatags;
+import dev.spiritstudios.specter.api.render.client.BlockRenderLayer;
+import dev.spiritstudios.specter.api.render.client.RenderMetatags;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.minecraft.block.Block;
 import net.minecraft.data.DataOutput;
+import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.RegistryWrapper;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
-public class ClientBlockMetatagProvider extends MetatagProvider<Block> {
-    protected ClientBlockMetatagProvider(FabricDataOutput dataOutput, CompletableFuture<RegistryWrapper.WrapperLookup> registriesFuture) {
-        super(dataOutput, registriesFuture, DataOutput.OutputType.RESOURCE_PACK);
+public class HollowClientBlockMetatagProvider extends MetatagProvider<Block> {
+    protected HollowClientBlockMetatagProvider(FabricDataOutput dataOutput, CompletableFuture<RegistryWrapper.WrapperLookup> registriesFuture) {
+        super(dataOutput, RegistryKeys.BLOCK, registriesFuture, DataOutput.OutputType.RESOURCE_PACK);
     }
 
     @Override
@@ -29,10 +30,6 @@ protected void configure(Consumer<MetatagBuilder<Block, ?>> provider, RegistryWr
         ).forEach(pair ->
                 renderLayer.put(pair.value(), BlockRenderLayer.CUTOUT_MIPPED));
 
-//        renderLayer.put(HollowBlocks.BLUE_WILDFLOWER, BlockRenderLayer.CUTOUT);
-//        renderLayer.put(HollowBlocks.WHITE_WILDFLOWER, BlockRenderLayer.CUTOUT);
-//        renderLayer.put(HollowBlocks.PURPLE_WILDFLOWER, BlockRenderLayer.CUTOUT);
-//        renderLayer.put(HollowBlocks.PINK_WILDFLOWER, BlockRenderLayer.CUTOUT);
         renderLayer.put(HollowBlocks.PAEONIA, BlockRenderLayer.CUTOUT);
         renderLayer.put(HollowBlocks.POTTED_PAEONIA, BlockRenderLayer.CUTOUT);
         renderLayer.put(HollowBlocks.ROOTED_ORCHID, BlockRenderLayer.CUTOUT);
@@ -55,6 +52,6 @@ protected void configure(Consumer<MetatagBuilder<Block, ?>> provider, RegistryWr
 
     @Override
     public String getName() {
-        return super.getName() + " for Blocks (Client)";
+        return super.getName() + " (Client)";
     }
 }