From 4fed9f0e07ecf6dc43bbaa2460ae828b45c2e2c7 Mon Sep 17 00:00:00 2001 From: Hugman Date: Sun, 6 Jun 2021 19:30:36 +0200 Subject: [PATCH] Cleanup - Added back translations --- .github/workflows/publish_new_version.yml | 2 +- gradle.properties | 2 +- src/main/java/com/hugman/promenade/Promenade.java | 4 ++-- .../{PromenadeColumnBlocks.java => PromenadeColumns.java} | 4 +++- src/main/resources/assets/promenade/lang/en_us.json | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) rename src/main/java/com/hugman/promenade/compat/init/{PromenadeColumnBlocks.java => PromenadeColumns.java} (86%) diff --git a/.github/workflows/publish_new_version.yml b/.github/workflows/publish_new_version.yml index 8878d9a0..924c3b2a 100644 --- a/.github/workflows/publish_new_version.yml +++ b/.github/workflows/publish_new_version.yml @@ -43,7 +43,7 @@ jobs: if: ${{ runner.os != 'Windows' }} run: chmod +x ./gradlew - name: Build and release - run: ./gradlew generateChangelog downloadTranslations build curseforge github modrinth --stacktrace --parallel -PlastTag="v${{ github.event.inputs.previousVersion }}" -PcurrentTag="v${{ github.event.inputs.version }}" + run: ./gradlew downloadTranslations generateChangelog build curseforge github modrinth --stacktrace --parallel -PlastTag="v${{ github.event.inputs.previousVersion }}" -PcurrentTag="v${{ github.event.inputs.version }}" env: CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} diff --git a/gradle.properties b/gradle.properties index f3bfc0ff..4eaf5962 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,7 +30,7 @@ modrinth_mod_loaders=fabric # check these on https://fabricmc.net/versions.html minecraft_version=1.17-rc1 -yarn_mappings=1.17-rc1+build.1 +yarn_mappings=1.17-rc1+build.5 loader_version=0.11.3 fabric_version=0.34.8+1.17 # https://github.com/DawnTeamMC/DawnAPI diff --git a/src/main/java/com/hugman/promenade/Promenade.java b/src/main/java/com/hugman/promenade/Promenade.java index 97ccdbb8..d229eb43 100644 --- a/src/main/java/com/hugman/promenade/Promenade.java +++ b/src/main/java/com/hugman/promenade/Promenade.java @@ -1,7 +1,7 @@ package com.hugman.promenade; import com.hugman.dawn.api.object.ModData; -import com.hugman.promenade.compat.init.PromenadeColumnBlocks; +import com.hugman.promenade.compat.init.PromenadeColumns; import com.hugman.promenade.config.PromenadeConfig; import com.hugman.promenade.init.PromenadeBlocks; import com.hugman.promenade.init.PromenadeEntities; @@ -39,7 +39,7 @@ public void onInitialize() { PromenadeConfiguredSurfaceBuilders.init(); PromenadeBiomes.init(); if(FabricLoader.getInstance().isModLoaded("columns")) { - PromenadeColumnBlocks.init(); + PromenadeColumns.init(); } MOD_DATA.registerCreators(); PromenadeBiomes.addToGen(); diff --git a/src/main/java/com/hugman/promenade/compat/init/PromenadeColumnBlocks.java b/src/main/java/com/hugman/promenade/compat/init/PromenadeColumns.java similarity index 86% rename from src/main/java/com/hugman/promenade/compat/init/PromenadeColumnBlocks.java rename to src/main/java/com/hugman/promenade/compat/init/PromenadeColumns.java index e0beabb5..cdb588e1 100644 --- a/src/main/java/com/hugman/promenade/compat/init/PromenadeColumnBlocks.java +++ b/src/main/java/com/hugman/promenade/compat/init/PromenadeColumns.java @@ -2,6 +2,7 @@ import com.hugman.dawn.api.creator.BlockCreator; import com.hugman.dawn.api.util.DefaultBlockTemplates; +import com.hugman.promenade.Promenade; import com.hugman.promenade.init.PromenadeBlocks; import com.hugman.promenade.init.PromenadeBundle; import io.github.haykam821.columns.block.ColumnBlock; @@ -9,10 +10,11 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemGroup; -public class PromenadeColumnBlocks extends PromenadeBundle { +public class PromenadeColumns extends PromenadeBundle { public static final Block BLUNITE_COLUMN = add(new BlockCreator.Builder("blunite_column", ColumnBlock::new, FabricBlockSettings.copyOf(PromenadeBlocks.BLUNITE.getBlock(DefaultBlockTemplates.CUBE))).itemGroup(ItemGroup.DECORATIONS).build()); public static final Block CARBONITE_COLUMN = add(new BlockCreator.Builder("carbonite_column", ColumnBlock::new, FabricBlockSettings.copyOf(PromenadeBlocks.CARBONITE.getBlock(DefaultBlockTemplates.CUBE))).itemGroup(ItemGroup.DECORATIONS).build()); public static void init() { + Promenade.LOGGER.info("Initialized Columns compatibility"); } } diff --git a/src/main/resources/assets/promenade/lang/en_us.json b/src/main/resources/assets/promenade/lang/en_us.json index b6a121a5..1d11c55d 100644 --- a/src/main/resources/assets/promenade/lang/en_us.json +++ b/src/main/resources/assets/promenade/lang/en_us.json @@ -172,7 +172,7 @@ "subtitles.promenade.entity.duck.ambient": "Duck quacks", "subtitles.promenade.entity.duck.hurt": "Duck hurts", "subtitles.promenade.entity.duck.death": "Duck dies", - "text.autoconfig.promenade.title": "Wild Explorer Configuration", + "text.autoconfig.promenade.title": "Promenade Configuration", "text.autoconfig.promenade.category.biomes": "Biomes", "text.autoconfig.promenade.category.features": "Features", "text.autoconfig.promenade.category.structures": "Structures",