Merge remote-tracking branch 'origin/1.20' into 1.20

DebuggyTeam · Aug 13, 2023 · a79c5eb · a79c5eb
2 parents eb6c1e8 + 2a2691e
commit a79c5eb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = true
 
 # Mod Properties
-version = 3.4.1+1.20.1
+version = 3.4.3+1.20.1
 maven_group = io.github.debuggyteam
 archives_base_name = architecture_extensions
 

diff --git a/src/main/java/io/github/debuggyteam/architecture_extensions/TypedGroupedBlockItem.java b/src/main/java/io/github/debuggyteam/architecture_extensions/TypedGroupedBlockItem.java
@@ -21,9 +21,6 @@ public class TypedGroupedBlockItem extends BlockItem implements TypedGrouped {
 
 	protected final TypedGroupedBlock typedGroupedBlock;
 
-	@ClientOnly
-	protected Text cachedLocalization = null;
-
 	public <T extends Block & TypedGrouped> TypedGroupedBlockItem(T block, Settings settings) {
 		super(block, settings);
 		typedGroupedBlock = block.getTypedGroupedBlock();
@@ -57,21 +54,16 @@ private Text getBaseTranslationKey() {
 	@Override
 	@ClientOnly
 	public Text getName() {
-		if (cachedLocalization == null) {
+		String translationKey = Util.createTranslationKey("block", Registries.ITEM.getId(this));
+		if (I18n.hasTranslation(translationKey)) {
+			return Text.translatable(translationKey);
+		} else {
+			Text baseBlock = getBaseTranslationKey();
+			String typedGroupedKey = BLOCK_TYPE_PREFIX + "." + typedGroupedBlock.type().toString();
+			Text blockType = Text.translatable(typedGroupedKey);
 
-			String translationKey = Util.createTranslationKey("block", Registries.ITEM.getId(this));
-			if (I18n.hasTranslation(translationKey)) {
-				cachedLocalization = Text.translatable(translationKey);
-			} else {
-				Text baseBlock = getBaseTranslationKey();
-				String typedGroupedKey = BLOCK_TYPE_PREFIX + "." + typedGroupedBlock.type().toString();
-				Text blockType = Text.translatable(typedGroupedKey);
-
-				cachedLocalization = Text.translatable(BLOCKTYPE_BLOCK_KEY, baseBlock, blockType);
-			}
+			return Text.translatable(BLOCKTYPE_BLOCK_KEY, baseBlock, blockType);
 		}
-
-		return cachedLocalization;
 	}
 
 	@Override