Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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

Expand Down
10 changes: 5 additions & 5 deletions pack/mods/shield-expansion.pw.toml
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 4 additions & 2 deletions src/main/java/galena/oreganized/client/OreganizedClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ private static void render(Supplier<? extends Block> block, RenderType render) {

@SubscribeEvent
public static void setup(FMLClientSetupEvent event) {
OreganizedClient.registerBlockRenderers();
OreganizedClient.registerItemProperties();
event.enqueueWork(() -> {
OreganizedClient.registerBlockRenderers();
OreganizedClient.registerItemProperties();
});
}

private static void registerItemProperties() {
Expand Down
19 changes: 19 additions & 0 deletions src/main/resources/assets/minecraft/atlases/blocks.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"values": [
"oreganized:lead",
"oreganized:electrum",
"oreganized:silver"
]
}