diff --git a/forge/gradle.properties b/forge/gradle.properties index 2b581ce0..fe37f2cb 100644 --- a/forge/gradle.properties +++ b/forge/gradle.properties @@ -2,7 +2,7 @@ kotlin.code.style=official org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -modVersion = 1.20.1-1.1.0-beta.1 +modVersion = 1.20.1-1.1.0-beta.2 mcVersion = 1.20.1 projectId = 480779 modId = temporalsmith diff --git a/forge/src/generated/resources/.cache/4efba764a2d8304738104761170e93e29b1b6d16 b/forge/src/generated/resources/.cache/4efba764a2d8304738104761170e93e29b1b6d16 index c0f25d62..c53d6b0f 100644 --- a/forge/src/generated/resources/.cache/4efba764a2d8304738104761170e93e29b1b6d16 +++ b/forge/src/generated/resources/.cache/4efba764a2d8304738104761170e93e29b1b6d16 @@ -1,3 +1,2 @@ -// 1.20.1 2023-11-24T11:59:52.3856983 atlases generator for temporalsmith -2e3aee5600cc51902b39e716ab778c83910090b2 assets/minecraft/atlases/armor_trims.json +// 1.20.1 2024-01-20T19:17:50.66474 atlases generator for temporalsmith 76927df2f4e630fbd00ac1b9578f5b41d66a10bc assets/minecraft/atlases/blocks.json diff --git a/forge/src/generated/resources/assets/minecraft/atlases/armor_trims.json b/forge/src/generated/resources/assets/minecraft/atlases/armor_trims.json deleted file mode 100644 index 8936142e..00000000 --- a/forge/src/generated/resources/assets/minecraft/atlases/armor_trims.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "sources": [ - { - "type": "minecraft:paletted_permutations", - "palette_key": "minecraft:trims/color_palettes/trim_palette", - "permutations": { - "ruby_amethyst": "minecraft:trims/color_palettes/amethyst", - "ruby_coal": "minecraft:trims/color_palettes/coal", - "ruby_copper": "minecraft:trims/color_palettes/copper", - "ruby_diamond": "minecraft:trims/color_palettes/diamond", - "ruby_emerald": "minecraft:trims/color_palettes/emerald", - "ruby_gold": "minecraft:trims/color_palettes/gold", - "ruby_iron": "minecraft:trims/color_palettes/iron", - "ruby_lapis": "minecraft:trims/color_palettes/lapis", - "ruby_quartz": "minecraft:trims/color_palettes/quartz", - "ruby_redstone": "minecraft:trims/color_palettes/redstone" - }, - "textures": [ - "temporalsmith:trims/items/ruby_head_trim", - "temporalsmith:trims/items/ruby_chest_trim", - "temporalsmith:trims/items/ruby_legs_trim", - "temporalsmith:trims/items/ruby_feet_trim" - ] - } - ] -} \ No newline at end of file diff --git a/forge/src/main/kotlin/io/github/realyusufismail/temporalsmith/datagen/spirit/ModSpriteSourceProvider.kt b/forge/src/main/kotlin/io/github/realyusufismail/temporalsmith/datagen/spirit/ModSpriteSourceProvider.kt index d31a0255..fad65c57 100644 --- a/forge/src/main/kotlin/io/github/realyusufismail/temporalsmith/datagen/spirit/ModSpriteSourceProvider.kt +++ b/forge/src/main/kotlin/io/github/realyusufismail/temporalsmith/datagen/spirit/ModSpriteSourceProvider.kt @@ -18,14 +18,11 @@ */ package io.github.realyusufismail.temporalsmith.datagen.spirit -import com.google.common.collect.ImmutableMap import io.github.realyusufismail.temporalsmith.TemporalSmith import io.github.realyusufismail.temporalsmith.TemporalSmith.TemporalSmith.MOD_ID import java.util.* -import net.minecraft.client.renderer.texture.atlas.sources.PalettedPermutations import net.minecraft.client.renderer.texture.atlas.sources.SingleFile import net.minecraft.data.PackOutput -import net.minecraft.resources.ResourceLocation import net.minecraftforge.common.data.ExistingFileHelper import net.minecraftforge.common.data.SpriteSourceProvider @@ -34,8 +31,6 @@ class ModSpriteSourceProvider(output: PackOutput, exFileHelper: ExistingFileHelp SpriteSourceProvider(output, exFileHelper, MOD_ID) { override fun addSources() { val blockAtlas = atlas(BLOCKS_ATLAS) - val armorTrimsAtlas = atlas(ResourceLocation("armor_trims")) - blockAtlas.addSource( SingleFile(TemporalSmith.getModIdAndName("entity/shield/ruby"), Optional.empty())) @@ -50,27 +45,5 @@ class ModSpriteSourceProvider(output: PackOutput, exFileHelper: ExistingFileHelp blockAtlas.addSource( SingleFile(TemporalSmith.getModIdAndName("entity/shield/graphite"), Optional.empty())) - - // Add the armor trims to ruby armor - armorTrimsAtlas.addSource( - PalettedPermutations( - listOf( - TemporalSmith.getModIdAndName("trims/items/ruby_head_trim"), - TemporalSmith.getModIdAndName("trims/items/ruby_chest_trim"), - TemporalSmith.getModIdAndName("trims/items/ruby_legs_trim"), - TemporalSmith.getModIdAndName("trims/items/ruby_feet_trim")), - ResourceLocation("trims/color_palettes/trim_palette"), - ImmutableMap.builder() - .put("ruby_emerald", ResourceLocation("trims/color_palettes/emerald")) - .put("ruby_lapis", ResourceLocation("trims/color_palettes/lapis")) - .put("ruby_diamond", ResourceLocation("trims/color_palettes/diamond")) - .put("ruby_gold", ResourceLocation("trims/color_palettes/gold")) - .put("ruby_iron", ResourceLocation("trims/color_palettes/iron")) - .put("ruby_redstone", ResourceLocation("trims/color_palettes/redstone")) - .put("ruby_coal", ResourceLocation("trims/color_palettes/coal")) - .put("ruby_copper", ResourceLocation("trims/color_palettes/copper")) - .put("ruby_quartz", ResourceLocation("trims/color_palettes/quartz")) - .put("ruby_amethyst", ResourceLocation("trims/color_palettes/amethyst")) - .build())) } }