Skip to content

Commit 72c02ee

Browse files
committed
it works haha
1 parent 94e407e commit 72c02ee

7 files changed

Lines changed: 14 additions & 16 deletions

File tree

src/main/java/net/diamonddev/simpletrims/data/SimpleTrimsDataLoader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import net.minecraft.registry.Registries;
99
import net.minecraft.resource.ResourceManager;
1010
import net.minecraft.util.Identifier;
11+
import net.minecraft.util.Language;
1112
import org.jetbrains.annotations.Nullable;
1213

1314
import java.io.InputStream;
@@ -127,7 +128,7 @@ public HashMap<String, String> getTranslationHashmap() {
127128
}
128129

129130
public String getTranslation(String langcode) {
130-
return getTranslationHashmap().containsKey(langcode) ? getTranslationHashmap().get(langcode) : getReferrableTranslationKey();
131+
return getTranslationHashmap().containsKey(langcode) ? getTranslationHashmap().get(langcode) : getTranslationHashmap().containsKey(Language.DEFAULT_LANGUAGE) ? getTranslationHashmap().get(Language.DEFAULT_LANGUAGE) : getReferrableTranslationKey();
131132
}
132133

133134
public String getNamespace() {

src/main/java/net/diamonddev/simpletrims/mixin/PalettedPermutationsAtlasSourceMixin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public abstract class PalettedPermutationsAtlasSourceMixin {
5252
SimpleTrims.LOGGER.info("Successfully tricked PalettedPermutations into loading an EncodedPalette! '{}'", identifier);
5353
cir.setReturnValue(colors);
5454
} catch (Exception e) {
55-
throw new RuntimeException("Failed to trick PalettedPermutations into loading an EncodedPalette", e);
55+
SimpleTrims.LOGGER.error("Failed to trick PalettedPermutations into loading an EncodedPalette. This will cause all SimpleTrims Materials to stop working. Please fix it! Problematic Palette ID: " + identifier, e);
56+
cir.cancel();
5657
}
5758
}
5859
}

src/main/resources/assets/simpletrims/lang/en_us.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/main/resources/data/simpletrims/encodable_palettes/end_stone.png

Whitespace-only changes.

src/main/resources/data/simpletrims/simple_trim_material/dirt.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
{
88
"lang": "en_us",
99
"string": "Dirt Material"
10+
},
11+
{
12+
"lang": "fr_fr",
13+
"string": "la matierielle de dirty"
1014
}
1115
]
1216
},

src/main/resources/data/simpletrims/simple_trim_material/end_stone.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/main/resources/data/simpletrims/simple_trim_material/ender_pearl.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33

44
"description": {
55
"color": "#349988",
6-
"translate": "trim_material.test.ender"
6+
"translations" : [
7+
{
8+
"lang": "en_us",
9+
"string": "Ender Pearl Material"
10+
}
11+
]
712
},
813
"ingredient": "minecraft:ender_pearl"
914
}

0 commit comments

Comments
 (0)