diff --git a/gradle.properties b/gradle.properties index 0737929d..a5b99b52 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project -mod_version=0.0.0-dev -mod_name=Oreganized +mod_version=4.4.1 +mod_name=Reoreganized mod_author=Team Galena mod_id=oreganized diff --git a/pack/mods/shield-expansion.pw.toml b/pack/mods/shield-expansion.pw.toml index 9e56374c..6738cf8a 100644 --- a/pack/mods/shield-expansion.pw.toml +++ b/pack/mods/shield-expansion.pw.toml @@ -1,13 +1,13 @@ name = "Shield Expansion" -filename = "ShieldExpansion-1.20.1-1.2.2.jar" +filename = "shieldexp-forge-1.20.1-1.3.5.jar" side = "server" [download] -url = "https://cdn.modrinth.com/data/sjxWxSao/versions/gV2H6vzy/ShieldExpansion-1.20.1-1.2.2.jar" -hash-format = "sha512" -hash = "362dd5bdf7504f54bad9575528b8e6c222d7208177fa51c71fe72f78637d17178666d4721ee6076746f9e7633c5a44333b3a3b374aa30bd993d8b2daaf3af4ed" +url = "https://cdn.modrinth.com/data/sjxWxSao/versions/9fDTdQ39/shieldexp-forge-1.20.1-1.3.5.jar" +hash-format = "sha256" +hash = "758ddcba74f541d8fee403eb80f14394c89ac00a1e1f371c30dd188e4143137c" [update] [update.modrinth] mod-id = "sjxWxSao" -version = "gV2H6vzy" +version = "9fDTdQ39" diff --git a/src/main/java/galena/oreganized/client/OreganizedClient.java b/src/main/java/galena/oreganized/client/OreganizedClient.java index 25a5c899..9c1b8e3f 100644 --- a/src/main/java/galena/oreganized/client/OreganizedClient.java +++ b/src/main/java/galena/oreganized/client/OreganizedClient.java @@ -57,8 +57,10 @@ private static void render(Supplier block, RenderType render) { @SubscribeEvent public static void setup(FMLClientSetupEvent event) { - OreganizedClient.registerBlockRenderers(); - OreganizedClient.registerItemProperties(); + event.enqueueWork(() -> { + OreganizedClient.registerBlockRenderers(); + OreganizedClient.registerItemProperties(); + }); } private static void registerItemProperties() { diff --git a/src/main/resources/assets/minecraft/atlases/blocks.json b/src/main/resources/assets/minecraft/atlases/blocks.json new file mode 100644 index 00000000..76cbb043 --- /dev/null +++ b/src/main/resources/assets/minecraft/atlases/blocks.json @@ -0,0 +1,19 @@ +{ + "sources": [ + { + "type": "blueprint:paletted_permutations", + "palette_key": "minecraft:trims/color_palettes/trim_palette", + "permutations": { + "oreganized_electrum": "oreganized:trims/color_palettes/electrum", + "oreganized_lead": "oreganized:trims/color_palettes/lead", + "oreganized_silver": "oreganized:trims/color_palettes/silver" + }, + "textures": [ + "minecraft:trims/items/helmet_trim", + "minecraft:trims/items/chestplate_trim", + "minecraft:trims/items/leggings_trim", + "minecraft:trims/items/boots_trim" + ] + } + ] +} diff --git a/src/main/resources/data/blueprint/tags/trim_material/generates_overrides.json b/src/main/resources/data/blueprint/tags/trim_material/generates_overrides.json new file mode 100644 index 00000000..bfd1aed2 --- /dev/null +++ b/src/main/resources/data/blueprint/tags/trim_material/generates_overrides.json @@ -0,0 +1,7 @@ +{ + "values": [ + "oreganized:lead", + "oreganized:electrum", + "oreganized:silver" + ] +}