From a51a4a3ad081f56f4ed13e3508d567ab2322b906 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Mon, 22 Jan 2024 20:25:47 +0300 Subject: [PATCH 1/5] datagen biome modifiers for ores --- .../ru/dbotthepony/mc/otm/datagen/DataGen.kt | 2 + .../ru/dbotthepony/mc/otm/datagen/OreGen.kt | 58 ++++++++++++++++--- .../overdrive_that_matters/tritanium_ore.json | 9 --- 3 files changed, 53 insertions(+), 16 deletions(-) delete mode 100644 src/main/resources/data/overdrive_that_matters/forge/biome_modifier/overdrive_that_matters/tritanium_ore.json diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt index 71851784c..92894f6aa 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -20,6 +20,7 @@ import net.minecraftforge.common.data.ForgeAdvancementProvider import net.minecraftforge.eventbus.api.SubscribeEvent import net.minecraftforge.fml.common.Mod import net.minecraftforge.data.event.GatherDataEvent +import net.minecraftforge.registries.ForgeRegistries import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.android.AndroidResearchDataProvider import ru.dbotthepony.mc.otm.block.* @@ -531,6 +532,7 @@ object DataGen { .add(Registries.DAMAGE_TYPE, ::registerDamageTypes) .add(Registries.CONFIGURED_FEATURE, ::registerConfiguredFeatures) .add(Registries.PLACED_FEATURE, ::registerPlacedFeatures) + .add(ForgeRegistries.Keys.BIOME_MODIFIERS, ::registerBiomeModifiers) event.generator.addProvider(event.includeServer(), DatapackBuiltinEntriesProvider(event.generator.packOutput, event.lookupProvider, registrySetBuilder, setOf(MOD_ID))) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/OreGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/OreGen.kt index 2e7de16ef..f438c84d7 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/OreGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/OreGen.kt @@ -1,10 +1,13 @@ package ru.dbotthepony.mc.otm.datagen +import net.minecraft.core.HolderSet import net.minecraft.core.RegistrySetBuilder import net.minecraft.core.registries.Registries import net.minecraft.data.worldgen.BootstapContext import net.minecraft.resources.ResourceKey +import net.minecraft.tags.BiomeTags import net.minecraft.tags.BlockTags +import net.minecraft.world.level.levelgen.GenerationStep import net.minecraft.world.level.levelgen.VerticalAnchor import net.minecraft.world.level.levelgen.feature.ConfiguredFeature import net.minecraft.world.level.levelgen.feature.Feature @@ -15,10 +18,19 @@ import net.minecraft.world.level.levelgen.placement.InSquarePlacement import net.minecraft.world.level.levelgen.placement.PlacedFeature import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest import net.minecraftforge.common.data.DatapackBuiltinEntriesProvider +import net.minecraftforge.common.world.BiomeModifier +import net.minecraftforge.common.world.ForgeBiomeModifiers import net.minecraftforge.data.event.GatherDataEvent +import net.minecraftforge.registries.ForgeRegistries import ru.dbotthepony.mc.otm.registry.MBlocks -private val oreKey by lazy { ResourceKey.create(Registries.CONFIGURED_FEATURE, modLocation("tritanium_ore")) } +private object ConfiguredFeatures { + val TRITANIUM_ORE = key("tritanium_ore") + + private fun key(name: String): ResourceKey> { + return ResourceKey.create(Registries.CONFIGURED_FEATURE, modLocation(name)) + } +} fun registerConfiguredFeatures(context: BootstapContext>) { val stone = TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES) @@ -29,16 +41,23 @@ fun registerConfiguredFeatures(context: BootstapContext> OreConfiguration.target(deepslate, MBlocks.DEEPSLATE_TRITANIUM_ORE.defaultBlockState()), ) - context.register(oreKey, ConfiguredFeature(Feature.ORE, OreConfiguration(target, 9))) + context.register(ConfiguredFeatures.TRITANIUM_ORE, ConfiguredFeature(Feature.ORE, OreConfiguration(target, 9))) +} + +private object PlacedFeatures { + val NORMAL_TRITANIUM = key("normal_tritanium") + val DEEP_TRITANIUM = key("deep_tritanium") + + private fun key(name: String): ResourceKey { + return ResourceKey.create(Registries.PLACED_FEATURE, modLocation(name)) + } } fun registerPlacedFeatures(context: BootstapContext) { - fun location(name: String) = ResourceKey.create(Registries.PLACED_FEATURE, modLocation(name)) - val configured = context.lookup(Registries.CONFIGURED_FEATURE) - val ore = configured.getOrThrow(oreKey) + val ore = configured.getOrThrow(ConfiguredFeatures.TRITANIUM_ORE) - context.register(location("normal_tritanium"), PlacedFeature( + context.register(PlacedFeatures.NORMAL_TRITANIUM, PlacedFeature( ore, listOf( CountPlacement.of(8), @@ -47,7 +66,7 @@ fun registerPlacedFeatures(context: BootstapContext) { ) )) - context.register(location("deep_tritanium"), PlacedFeature( + context.register(PlacedFeatures.DEEP_TRITANIUM, PlacedFeature( ore, listOf( CountPlacement.of(10), @@ -56,3 +75,28 @@ fun registerPlacedFeatures(context: BootstapContext) { ) )) } + +private object BiomeModifiers { + val TRITANIUM_ORE = key("tritanium_ore") + + private fun key(name: String): ResourceKey { + return ResourceKey.create(ForgeRegistries.Keys.BIOME_MODIFIERS, modLocation(name)) + } +} + +fun registerBiomeModifiers(context: BootstapContext) { + val placed = context.lookup(Registries.PLACED_FEATURE) + val biomes = context.lookup(Registries.BIOME) + + context.register( + BiomeModifiers.TRITANIUM_ORE, + ForgeBiomeModifiers.AddFeaturesBiomeModifier( + biomes.getOrThrow(BiomeTags.IS_OVERWORLD), + HolderSet.direct( + placed.getOrThrow(PlacedFeatures.NORMAL_TRITANIUM), + placed.getOrThrow(PlacedFeatures.DEEP_TRITANIUM) + ), + GenerationStep.Decoration.UNDERGROUND_ORES + ) + ) +} diff --git a/src/main/resources/data/overdrive_that_matters/forge/biome_modifier/overdrive_that_matters/tritanium_ore.json b/src/main/resources/data/overdrive_that_matters/forge/biome_modifier/overdrive_that_matters/tritanium_ore.json deleted file mode 100644 index 2624ac791..000000000 --- a/src/main/resources/data/overdrive_that_matters/forge/biome_modifier/overdrive_that_matters/tritanium_ore.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "forge:add_features", - "biomes": "#minecraft:is_overworld", - "features": [ - "overdrive_that_matters:deep_tritanium", - "overdrive_that_matters:normal_tritanium" - ], - "step": "underground_ores" -} From eb60c371ed117c763258f66b855dba9ed76e6524 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 29 Jan 2024 02:54:49 +0600 Subject: [PATCH 2/5] Painting table and water source models --- .../models/block/painting_table.json | 233 ++++++++++++++++++ .../models/block/water_source.json | 164 ++++++++++++ .../textures/block/painting_table.png | Bin 0 -> 831 bytes .../textures/block/water_source.png | Bin 0 -> 542 bytes .../textures/block/water_source_mask.png | Bin 0 -> 284 bytes .../textures/block/water_source_misc.png | Bin 0 -> 401 bytes .../textures/block/water_source_pump.png | Bin 0 -> 554 bytes .../block/water_source_pump.png.mcmeta | 6 + 8 files changed, 403 insertions(+) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/painting_table.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/water_source.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/painting_table.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/water_source.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/water_source_mask.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/water_source_misc.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png.mcmeta diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/painting_table.json b/src/main/resources/assets/overdrive_that_matters/models/block/painting_table.json new file mode 100644 index 000000000..eda781060 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/painting_table.json @@ -0,0 +1,233 @@ +{ + "credit": "Made with Blockbench", + "render_type": "cutout", + "texture_size": [64, 32], + "textures": { + "0": "overdrive_that_matters:block/painting_table", + "particle": "overdrive_that_matters:block/painting_table" + }, + "elements": [ + { + "name": "body", + "from": [0, 8, 0], + "to": [16, 10, 16], + "faces": { + "north": {"uv": [0, 11, 4, 12], "texture": "#0"}, + "east": {"uv": [8, 3, 4, 4], "texture": "#0"}, + "south": {"uv": [12, 11, 16, 12], "texture": "#0"}, + "west": {"uv": [4, 3, 8, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 4, 8], "texture": "#0"}, + "down": {"uv": [0, 0, 4, 8], "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 0, 0], + "to": [16, 2, 15], + "faces": { + "north": {"uv": [0, 15, 4, 16], "texture": "#0"}, + "east": {"uv": [7.75, 7, 4, 8], "texture": "#0"}, + "south": {"uv": [12, 15, 16, 16], "texture": "#0"}, + "west": {"uv": [4, 7, 7.75, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 4, 7.5], "texture": "#0"}, + "down": {"uv": [0, 0, 4, 7.5], "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 2, 5], + "to": [16, 8, 15], + "faces": { + "north": {"uv": [0, 12, 4, 15], "texture": "#0"}, + "east": {"uv": [7.75, 4, 5.25, 7], "texture": "#0"}, + "south": {"uv": [12, 12, 16, 15], "texture": "#0"}, + "west": {"uv": [5.25, 4, 7.75, 7], "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 10, 9], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [4, 11.5, 8, 14.5], "texture": "#0"}, + "east": {"uv": [7.75, 0, 6, 3], "texture": "#0"}, + "south": {"uv": [12, 8, 16, 11], "texture": "#0"}, + "west": {"uv": [6, 0, 7.75, 3], "texture": "#0"}, + "up": {"uv": [4, 8, 8, 11.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "cartridge", + "from": [10, 2, 1], + "to": [12, 8, 5], + "faces": { + "north": {"uv": [8.75, 0, 9.25, 3], "texture": "#0"}, + "east": {"uv": [7.75, 0, 8.75, 3], "texture": "#0"}, + "west": {"uv": [8.75, 0, 7.75, 3], "texture": "#0"} + } + }, + { + "name": "cartridge", + "from": [7, 2, 1], + "to": [9, 8, 5], + "faces": { + "north": {"uv": [11.75, 0, 12.25, 3], "texture": "#0"}, + "east": {"uv": [10.75, 0, 11.75, 3], "texture": "#0"}, + "west": {"uv": [11.75, 0, 10.75, 3], "texture": "#0"} + } + }, + { + "name": "cartridge", + "from": [13, 2, 1], + "to": [15, 8, 5], + "faces": { + "north": {"uv": [10.25, 0, 10.75, 3], "texture": "#0"}, + "east": {"uv": [9.25, 0, 10.25, 3], "texture": "#0"}, + "west": {"uv": [10.25, 0, 9.25, 3], "texture": "#0"} + } + }, + { + "name": "screenframe", + "from": [1.5, 7.3, 1], + "to": [5.5, 11.3, 2], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3.5, 14, 0.5]}, + "faces": { + "east": {"uv": [5, 0, 6, 0.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5, 0.5, 6, 2.5], "texture": "#0"}, + "west": {"uv": [5, 0, 6, 0.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [5, 0, 6, 0.5], "texture": "#0"}, + "down": {"uv": [5, 0, 6, 0.5], "texture": "#0"} + } + }, + { + "name": "screen", + "from": [1.5, 7.3, 1], + "to": [5.5, 11.3, 1], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3.5, 14, 0.5]}, + "faces": { + "north": {"uv": [4, 0, 5, 2], "texture": "#0"} + }, + "forge_data": { + "block_light": 15 + } + }, + { + "from": [1, 2, 1], + "to": [6, 8, 5], + "faces": { + "north": {"uv": [9, 7, 10.25, 10], "texture": "#0"}, + "east": {"uv": [8, 7, 9, 10], "texture": "#0"}, + "west": {"uv": [10.25, 7, 11.25, 10], "texture": "#0"} + } + }, + { + "name": "arm", + "from": [11, 11.5, 7.5], + "to": [12, 18.5, 9.5], + "rotation": {"angle": -45, "axis": "x", "origin": [11.5, 14, 8.5]}, + "faces": { + "north": {"uv": [0, 9.5, 1.75, 10], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 10, 1.75, 11], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 9.5, 1.75, 10], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 11, 1.75, 10], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "arm", + "from": [10.5, 12.54537, 5.01779], + "to": [12.5, 18.54537, 8.01779], + "rotation": {"angle": 22.5, "axis": "x", "origin": [11.5, 18.27582, 6.35928]}, + "faces": { + "north": {"uv": [2.5, 8, 4, 9], "rotation": 270, "texture": "#0"}, + "east": {"uv": [2.5, 9, 4, 10.5], "rotation": 270, "texture": "#0"}, + "south": {"uv": [2.5, 8, 4, 9], "rotation": 270, "texture": "#0"}, + "west": {"uv": [2.5, 9, 4, 10.5], "rotation": 270, "texture": "#0"}, + "up": {"uv": [2, 9.5, 2.5, 11], "texture": "#0"}, + "down": {"uv": [2, 8, 2.5, 9.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "baseplate", + "from": [1, 9.5, 1], + "to": [15, 10.5, 8], + "faces": { + "north": {"uv": [8, 6.5, 11.5, 7], "texture": "#0"}, + "east": {"uv": [8, 6.5, 9.75, 7], "texture": "#0"}, + "south": {"uv": [8, 6.5, 11.5, 7], "texture": "#0"}, + "west": {"uv": [9.75, 6.5, 11.5, 7], "texture": "#0"}, + "up": {"uv": [8, 3, 11.5, 6.5], "texture": "#0"} + } + }, + { + "name": "support", + "from": [1, 0, 15], + "to": [5, 8, 16], + "faces": { + "east": {"uv": [13.25, 0, 13.5, 4], "texture": "#0"}, + "south": {"uv": [12.25, 0, 13.25, 4], "texture": "#0"}, + "west": {"uv": [13.25, 0, 13.5, 4], "texture": "#0"}, + "down": {"uv": [12.25, 4, 13.25, 4.5], "texture": "#0"} + } + }, + { + "name": "support", + "from": [11, 0, 15], + "to": [15, 8, 16], + "faces": { + "east": {"uv": [13.25, 0, 13.5, 4], "texture": "#0"}, + "south": {"uv": [12.25, 0, 13.25, 4], "texture": "#0"}, + "west": {"uv": [13.25, 0, 13.5, 4], "texture": "#0"}, + "down": {"uv": [12.25, 4, 13.25, 4.5], "texture": "#0"} + } + }, + { + "name": "mesh", + "from": [0, 10, 0], + "to": [0, 13, 9], + "faces": { + "east": {"uv": [0, 8, 2, 9.5], "texture": "#0"}, + "west": {"uv": [2, 8, 0, 9.5], "texture": "#0"} + } + }, + { + "name": "mesh", + "from": [16, 10, 0], + "to": [16, 13, 9], + "faces": { + "east": {"uv": [0, 8, 2, 9.5], "texture": "#0"}, + "west": {"uv": [2, 8, 0, 9.5], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/water_source.json b/src/main/resources/assets/overdrive_that_matters/models/block/water_source.json new file mode 100644 index 000000000..3daef1784 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/water_source.json @@ -0,0 +1,164 @@ +{ + "credit": "Made with Blockbench", + "render_type": "cutout", + "texture_size": [32, 32], + "textures": { + "0": "overdrive_that_matters:block/water_source_misc", + "1": "overdrive_that_matters:block/water_source", + "2": "overdrive_that_matters:block/water_source_pump", + "particle": "overdrive_that_matters:block/water_source" + }, + "elements": [ + { + "name": "body", + "from": [10, 0, 0], + "to": [16, 16, 9], + "faces": { + "north": {"uv": [0, 0, 3, 8], "texture": "#1"}, + "east": {"uv": [12.5, 8, 8, 16], "texture": "#1"}, + "south": {"uv": [13, 0, 16, 8], "texture": "#0"}, + "west": {"uv": [8, 0, 12.5, 8], "texture": "#1"}, + "up": {"uv": [0, 8, 3, 12.5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 9, 3, 13.5], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "body", + "from": [0, 10, 0], + "to": [10, 16, 9], + "faces": { + "north": {"uv": [3, 0, 8, 3], "texture": "#1"}, + "south": {"uv": [8, 0, 13, 3], "texture": "#0"}, + "west": {"uv": [8, 0, 12.5, 3], "texture": "#1"}, + "up": {"uv": [3, 8, 8, 12.5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [8, 8, 3, 12.5], "texture": "#1"} + } + }, + { + "name": "body", + "from": [0, 0, 0], + "to": [10, 6, 9], + "faces": { + "north": {"uv": [3, 5, 8, 8], "texture": "#1"}, + "south": {"uv": [8, 5, 13, 8], "texture": "#0"}, + "west": {"uv": [8, 5, 12.5, 8], "texture": "#1"}, + "up": {"uv": [3, 8, 8, 12.5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [3, 9, 8, 13.5], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "body", + "from": [0, 6, 5], + "to": [10, 10, 9], + "faces": { + "north": {"uv": [3, 3, 8, 5], "texture": "#1"}, + "south": {"uv": [8, 3, 13, 5], "texture": "#0"}, + "west": {"uv": [10.5, 3, 12.5, 5], "texture": "#1"} + } + }, + { + "name": "pump", + "from": [9, 1, 9], + "to": [15, 14, 15], + "faces": { + "east": {"uv": [0, 0, 3, 6.5], "texture": "#0"}, + "south": {"uv": [6, 0, 12, 13], "texture": "#2"}, + "west": {"uv": [0, 0, 3, 6.5], "texture": "#0"}, + "up": {"uv": [3, 0, 6, 3], "texture": "#0"}, + "down": {"uv": [3, 0, 6, 3], "texture": "#0"} + } + }, + { + "name": "pump", + "from": [1, 1, 9], + "to": [7, 14, 15], + "faces": { + "east": {"uv": [0, 0, 3, 6.5], "texture": "#0"}, + "south": {"uv": [0, 0, 6, 13], "texture": "#2"}, + "west": {"uv": [0, 0, 3, 6.5], "texture": "#0"}, + "up": {"uv": [3, 0, 6, 3], "texture": "#0"}, + "down": {"uv": [3, 0, 6, 3], "texture": "#0"} + } + }, + { + "name": "pump", + "from": [2, 14, 10], + "to": [14, 15, 14], + "faces": { + "north": {"uv": [0, 13.5, 6, 14], "texture": "#1"}, + "east": {"uv": [6, 14, 6.5, 16], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 13.5, 6, 14], "texture": "#1"}, + "west": {"uv": [6, 14, 6.5, 16], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 14, 6, 16], "texture": "#1"}, + "down": {"uv": [0, 14, 6, 16], "texture": "#1"} + } + }, + { + "name": "mesh", + "from": [0, 0, 9], + "to": [16, 16, 16], + "faces": { + "east": {"uv": [8, 8, 4.5, 16], "texture": "#0"}, + "south": {"uv": [8, 8, 16, 16], "texture": "#0"}, + "west": {"uv": [4.5, 8, 8, 16], "texture": "#0"}, + "up": {"uv": [0, 8, 3.5, 16], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 8, 3.5, 16], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "mesh", + "from": [0, 16, 9], + "to": [16, 0, 16], + "faces": { + "east": {"uv": [8, 8, 4.5, 16], "texture": "#0"}, + "south": {"uv": [8, 8, 16, 16], "texture": "#0"}, + "west": {"uv": [4.5, 8, 8, 16], "texture": "#0"}, + "up": {"uv": [0, 8, 3.5, 16], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 8, 3.5, 16], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "body", + "from": [1, 6, 1], + "to": [10, 10, 5], + "faces": { + "north": {"uv": [3, 3, 7.5, 5], "texture": "#1"}, + "west": {"uv": [8.5, 3, 10.5, 5], "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [0, 180, 0] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/painting_table.png b/src/main/resources/assets/overdrive_that_matters/textures/block/painting_table.png new file mode 100644 index 0000000000000000000000000000000000000000..e5c6dc2eedae8af7a6d02d85b2bd4de3b46ee7be GIT binary patch literal 831 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`Ljrt4T-DUn{@-Bu|G=}pzCIx#L0elpBqW5P?+nBA8w?9x9%0Bo!%+N$ zq5j4(hWED_{=a1~H8uVJ|G$`+SW!{Y?c2BKnVP0mw&XVT$L3eHx3{mI>jO0SVx2-1 zkdi40@(Ttk#swI}H$A!zRL5E15n0T@z;_6Q8AUa`8W3O=ImaV{rLEN{|}{B&HJb4 zH@sRmn_KaS$fCo~4}Yx4aSZ2KcU_w&;1I*pa|({)!9JX96=_UTUyMBD=Nnm^elVM@ zbBC0M*%g&rB02}NxlC3FtysO9@ruLLjs}4>Yk2ReM?5*iXRERf%wD;=a!Nvok9E&9}xZOV)JO{mx$~>`ia%>ye{T80?Hdkm-*hnj>Mp4>mgydQPh`a|)V%WKj*SO%(d6g* z(sR$Rejgj69LRfKs&A2*5!W8mrS6>_daDk0Nbp^>VAZSZIq$gl@39>cu^Ntd&1?+c z<~^HQ*l@XwPmXkW|dd_!tUocKMC1&+7vp7d^1 z{{HS-17kywvE!RkMZ1F{w~i-0;52jC{3z8yl1EOpvGl`6?y%oZS^+!-Pd+j#{9t$> z+;HOBq6c1ko$hmfo%XEl^ZCQ)*PefWz+#_qg8b_oce|dbCx>1H>+e{n5b8RkKq%(S za!!42Ywo3wcQqYLW#YD(+1NU*kw2y&_Tkz_+kFMGjjLuA#7o~PWGYqoxcE{jtNpXq zxsBg{3tksJv|DidlyiFAciw;7f5YqjcV+MN$y@K*|CXrhOb+s40VXyEPgg&ebxsLQ E0NX}-JOBUy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/water_source.png b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source.png new file mode 100644 index 0000000000000000000000000000000000000000..d1737a8fd54dfd756a52bbda606ed71a8c288b5a GIT binary patch literal 542 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilg0(?STwY9ZFLP8P}5{_*N7ZVf9ZR-F3|9@anM zpo4-vT^vI!{8J}&Z);KDaAhpbky$zO|NooS2fWtJmDB4<;1&=x=I-v4Tz1n%^M6~1 zSEb|ADL1z*DY5+Ua>8FN9_dGa3Rc`)_p)I54jHenuYD9JJDxencu}&d;=I zooL*4f&0omnF&msU60taJzuoW|1GxWR@CaohxMXCQo*v%5`WG+&(X+OcyVst>f8r6 z7I5;+m3+Qwa^lgpiWZ=un_WNDB{6?yJZhD2Uv`cBwugL)a@R!a-c-xg?YDoEFRyFf Survu6<_w;$elF{r5}E*R*yK+D literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..f1effd65ad0e577ba6de2ecb1657f1dec94eb2d2 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikh0(?STpFe+o?AWmzH*Nq0*0J8$1X5QLba4!^@V`1Skne~B2kZQz|JM383+_(M68=}_p?k4Ypk)sOqb$qB zk3BI>#~me-3Iz-#q7zTg=a_tG&bObZnq64)bZ(nZFnsg=HS_idB46(;yd-ccd99B1 z){{z4WDFQjcRyf_jC{!v&Z*0w{m_4s&b}nudfv@kfts0j4&*6?OPL>WnB4ZE`2_po Xn_Mp1`q%w{j$-h1^>bP0l+XkKVBBR$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_misc.png b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_misc.png new file mode 100644 index 0000000000000000000000000000000000000000..4c55238ef41647cf51fe592f32640a07c0b2ebdc GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?STi;9Zs>+7|(wbj(r+S}VrO-(~WLV%LOrgK$*6h}#rU+{kjV7S-3 zHxekuS>O>_%)r2R7=#&*=dVZs3cmAnaSXBWpBls{bXbAM$m;R`dK&|styk~n-Pj$q zu%mP7jjucluH6#)q4AB0$3{emVedCNW6l%emS0%e9d~m}^)R|!5G!}gmv86UY1z^c zvY?Y|4okhYi^s+T^P`_=9%0(Qy`t?(Rg(7BYr>nI6|StF?66i%qoCaQyWu0>4X--d z-hDXiesF<;+Kjag4X1Nd`kFR!Kl}7lVEUs&d(;f#;?!ecoY2B-oOk@m|CxzW0~++Y6!TJo}q$fIesNboFyt=akR{008TnsQ>@~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png new file mode 100644 index 0000000000000000000000000000000000000000..d78517297e9723debea5752da26158f5172a0d21 GIT binary patch literal 554 zcmeAS@N?(olHy`uVBq!ia0vp^0t^g{3>?frR&Nhm4Ul3i4sv&5Sa(k5C6L3C?&#~t zz_78O`%fY(kgp!#6XIG_R8(JI-`?J?rluw)CT41C8WIwckdW}7fx$ZQj79W8bE&E zz4cV`EFS*SKQq`(cXMpLIiu%@at5!3hFwK~n84yRY4@j!)rAf1Z-93Gij}*PGkM#m z1sB_zFF7g5324YvoS2frIQim-hR0eqe32$^-Q`MN3Yfgzx%gho5oYD9-26M`t)Dgi zcrw8~+up|K`$vl`nNJqGbo)2IyALwcAxiYavx^@bqEy2!3k5SQD)j!gpmCbK&v**#2bT8@ZTEVwDcw^vn8BKJ|_7Irxm1sP5w h$^43%&woo|<2@h8gsyy5v=A6444$rjF6*2UngC(E=Nte4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png.mcmeta b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png.mcmeta new file mode 100644 index 000000000..d0da1eb25 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 2, + "interpolate": true + } +} \ No newline at end of file From 58ed338c7a19927cd63d60e78df78fa99c9d9d91 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 29 Jan 2024 03:03:39 +0600 Subject: [PATCH 3/5] Various texture updates --- .../textures/item/chest_upgrader.png | Bin 2437 -> 266 bytes .../textures/item/component/electromotor.png | Bin 2437 -> 522 bytes .../item/component/tritanium_ingot.png | Bin 253 -> 257 bytes .../item/resources/tritanium_ore_clump.png | Bin 263 -> 299 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/chest_upgrader.png b/src/main/resources/assets/overdrive_that_matters/textures/item/chest_upgrader.png index d36635b4d3d72a5dd2644f4bd55341d6da866d5b..ebe4faa74eadb2018bf85487238ca08b39b86de5 100644 GIT binary patch delta 244 zcmZn_?qX8x4DfU3<&xrJU|`_&^l%9R(gGmN!3-odboqlPDk{_~2Ka=y{%2s&*4DQ1 z@SnT;OyjH-xlR4C`Bi?g>D%q>=9!uTRj+?!A_}CqOM?7@|HA=;mp|htpfG2FM`SSr z1K)lSX0%`pRsjk|d%8G=XavWeiRL??z~OR{$!qFg{T)2~$yOg1e{cD+(fI$F>x(PA zSYxsiCK^5qS;{g^^78h?wY_;C_#D|6$Ub5aU}yN!xVG}a0q6B>55C`MJd?%#t2t0t ds^I(^=KIp@&T^uUZUOCK@O1TaS?83{1ON&XSE>L2 delta 2432 zcmV-`34ivA0)-PHiBL{Q4GJ0x0000DNk~Le0000W0000W2m$~A0Q?y3qmdyXe+h6% zS#tmY4!{5a4!{9w)`zZJjkY>wb;}+i^bu_gMVX#MEe?A$v*Na(MM4QcKvNOrc zVt#pbv5sJ!F;>@gp66QYx>Ssko*|F+b~vfvjo)&zJV}yR)rwHAdF9Y#e=9J0gTAr@ zH)yX@#d@8fNU|s29e2Vu&SY6CxO_G}Rf^zIO2Kvf#!Z}3-{SXPyt}%bQ%d|+3tK9s zYfUNTRB)S1-?d!FF7bjJhzy=F&-0SJ==AzOJUbZwv<+sO=GpoAcxSKM>Bn&l zC_erC;cPZ1gx0$84G&PlV@rMa_I{q1Cl}|sCWdKHgjrXDQ&}Uie3t^a!=ZQk=qH}rKEJqtoB#aRCyR9gJbL}!<@Ex{ zfJIF<2x$kw>Dk%r8krNSX0~YpAIq_eB9Ee!(Ha2NH3M#oWyB3*dUE>Z*Z*O+j_%B6 zvvANd4C~qSY#m3VfAJW=7eyfi(m-&EGQ~w*sA>^s8Q2OBYrvyxN|wuYr9e?&ML97l zt*TO`X?%SAG)gvUq4@89^NwTtzyK)y+8Bo;<(=%B7aGmAs;pFk_@iEC*WyFp>51W&NQzpQa7f- zku1yb1;hhne`#5moG{<_vHHzdU-_QdYdN9glz^!yuU9GRF3sZg^}>?+&i=sl`FuVb zj|K-j+oH&1oj4K>Da$krA@RX}R8?Koy3|Mts??H+6e$pM9!x)eb_(b#31_ zObem}Xi)-E8ohSwjn`hN^JJ?(^aAhU7hkkOKlJ_Wf9*kDD#vsb3c9M0cHoKX!A+7= z+>27-AH08m`u(>p*B*r7{A&K>*=a`PaS4+Y;QhaN7>)l^I@H{iiV-(%;Vh)tumYZe;vYD4O z&lFU*$dWA2fNG~5T2ymgwnGnb@PmPbGnUEHe=IjmHl1C>Inh)>04}c9wJL}G&Rh52 z0A~zSY*uT_u)LO^7WsUgetUX3y;@x@mYkC;-!NtxASWk-w&y`wYvrLi_`WL*PHG+m zodObJImgqJ>GkHv`3AL3h1lKQ&$BA4;L#9DZrjf6eE#V8`+tA&==^w7O|Q88^LF@8ID1qdRv8-9ayCyJ$zGoQy{=-+M7h zV~AR&Rd2MtxLo9E5rn;(K=-Azd%fZA)zzZi^7p#I!4`nwd6cAS8U$_A^!R%Zei62O z!?HD_Uf92N=jgRpUfJE7kUV>E|BZJaf4mKRQU4$-;_y7@@mJqCmiz7F$2$jyagv}L z=saUYO-B8G+YUU-6wGtM9%|dJW!wCnH-F~(es^mSc0rs@(CYO2-SM#Z@=srotVWi? z0F3v9Fj1$-XrgF=a zf)mGTioviN>BSaT@2FXY^$@OX}UAr?J5J|b= zI9?F=t+Ys2i%Y1I;FuB!+%<5$f8&5gMHca2|LS$LJzAG|2R(sl&-e2p2d}O!&Uus> zS&8Y0Gk%VRC5|ifooK|KPnh8|jb& zuQ?YCs?K;6ML??;29F+o<|tUNQeDg!S6&FQ^5Zl%g+O!W=#I3qOzz?=f1}dyOxpvq zi?XT-N#g|Vn!oq^J7h6TonID#4y4khW)cmP2`LN{ zXPZS`gT_!UDs5@FOjTINa3+xIn`}3YiGXv!@@6RVFjCrK(CZLOP=E;ytBbr$DqX-8 z3?JCjLJbWE zZEYId5V*7z2n|gUs7uq~(9+T%gwqK+DQz~nG&FSaeRsd(uFL$ukN57+_xs-a@n{~J zrUmVkTCLWCojL^UIFocbZQ3a_e;f`yntu(-<+52chm;9NXk%-a%-jma_fKgunK-(c z1`tQ1QA#G0{5&3yX*!)!yC~CA?bb1I=5vF#QTgPnPnYo!)ppicY#0XRt{heM3QI4xr@PIzz0hrj{VsKD!(Xs{^r?(eBOH5?RI?&2E^P4 knHX(8{{7EfL}d%29|k6;f~n?p^Z)<=07*qoM6N<$g6eqMTmS$7 delta 2424 zcmV-;35WKI1cehJiBL{Q4GJ0x0000DNk~Le0000W0000W2m$~A0Q?y3qmdyff4~3$ z4!{9w)`zZJjkY>wb;}+i^bu_gMVX#MEe?A$v*Na(MM4QcKvNOrcVt#pbv5sJ! zF;>@gp66QYx>Ssko*|F+b~vfvjo)&zJV}yR)rwHAdF9Y#D=>P4zOn;1e`v2$#d@8f zNU|s29e2Vu&SY6CxO_G}Rf^zIO2Kvf#!Z}3-{SXPyt}%bQ%d|+3tK9sYfUNTRB)S1 z-?d!FF7bjJhzy=F&-0SJ==AzOJUbZwv<+sO=GpoAcxSKM>Bn&lC_erC;cPZ1 zgx0$84G&PlV@rMa_I{q1Cl}|sCWdKHgjrXDQ&)De+fce_dZIm_&3^42FFG zSgLBdK|Tmpe>}Uie3t^a!=ZQk=qH}rKEJqtoB#aRCyR9gJbL}!<@Ex{fJIF<2x$kw z>Dk%r8krNSX0~YpAIq_eB9Ee!(Ha2NH3M#oWyB3*dUE>Z*Z*O+j_%B6vvANd4C~qS zY#m3V@fg4tMIi*ze?V}GGQ~w*sA>^s8Q2OBYrvyxN|wuYr9e?&ML97lt*TO`X?%SA zG)gvUq4@89^NwTtzyK)y+8Bo;<(=% zB7aGmAs;pFk_@iEC*WyFp>51W&NQzpQa7f-ku1yb1;hhn zX<3+@FyHsFfBMZ=U-_QdYdN9glz^!yuU9GRF3sZg^}>?+&i=sl`FuVbj|K-j+oH&1 zoj4K>Da$krA@RX}R8?Koy3|Mts??H+6e$pM9!x)eb_(b#31_Obem}Xi)-E z8ohSwjn`hN^JJ?(^aAhU7hkkOKlJ_W?Ll5D$8;15f4ZuWcHoKX!A+7=+>27-AH08m z`u(>p*B*r7{A&K>*=a`PaS4+Y;QhaN7>)l^I@H{iiV-(%;Vh)tumYZe;vYD4O&lFU*$dWA2 zfNG~5T2ymgwnGnb@PmPbGnUEHEH_Oyon6E^f6-Jy04}c9wJL}G&Rh520A~zSY*uT_ zu)LO^7WsUgetUX3y;@x@mYkC;-!NtxASWk-w&y`wYvrLi_`WL*PHG+modObJImgqJ z>GkHv`3AL3h1lKQ&$BA4;L#9DZrjf6eE#V8`+tA&o?oEcnj>==^w7O|Q88^LF@8ID1qdRv8-9ayCyJ$zGoQy{=-+M7hV~AR&Rd2Mt zxLo9E5rn;(K=-Azd%fZA)zzZi^7p#I!4`nwd6cAS8U$_A^!R%Zei62O!?HD_Uf92N z=jgRpUfJE7kUV>E|BZJaybXL&{~#;kfABo#@mJqCmiz7F$2$jyagv}L=saUYO-B8G z+YUU-6wGtM9%|dJW!wCnH-F~(es^mSc0rs@(CYO2-SM#Z@=srotVWi?0F3v9Fj1$- zXrgF=af)mGTioviN z>BSaT@2FXY^$@OX}UAr?J5J|b=I9?F=t+Ys2 zi%Y1I;FuB!+%<5$S&8Y0Gk%VRC5|ifooK|KPnh8|jb&uQ?YCs?K;6 zML??;29F+o<|tUNQeDg!S6&FQ^5Zl%g+O!W=#I3qOzz?=qtft9+XJ(Uf3m6xN#g|V zn!oq^J7h6TonID#4yCVu1P9tn#fB`$O4}LTgEP^mi$MaBQ00f}p$CF&;8&yQQYQ}7oJ_kUi02apcrR?M`SSr z1K$A}u?QuLe)n3tdy?|io z;}4VC-7k2QKh({*p{V>pDocuMk=p-P=N22E$!g)7nb@Ln_2{W5)3O2=%&|_G=9chP gXw&lgokuMBTf$jRu-eEL0Ig#1boFyt=akR{0NHm;(*OVf delta 182 zcmZo<`pY=MzrJzSin+VbXlrZ7=2tN=Fa*3Xj|Wm5B|(0{{~>_kUi02apcrR?M`SSr z1K&XqX529``z=r~%G1R$L?gJi&r^s&k>iL|%FqA(%LP9^NGwv?=;dJdhxJV*6NBK| z#GHv*JHj?Fl(o#zefn85Oe?N_M3=VQ&@Jyt~UGyw1&ac)z4*}Q$iB}-X2JC diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/resources/tritanium_ore_clump.png b/src/main/resources/assets/overdrive_that_matters/textures/item/resources/tritanium_ore_clump.png index 7e121ec3799284928d206589d1372e66453baddd..b7f21ffc20cdc180f9537b6b0481d1839ba9088f 100644 GIT binary patch delta 242 zcmZo?TFo@Uv0gF2C&bmp!#}sFf9{!0^-DV&XRVmK`%G?MrM9-VUu?Q>S|S4j1NY-> zeGpX=FD;G z|C_pZ<}MGelj&>JcL@#PywbrNh3%go{C^ZmFd>HV~K hFZ<>GF^4_h!{89fma93{@Gj6H44$rjF6*2UngEaFV~zj- delta 206 zcmZ3@)Xp@)v0gO5C&bmp!#}sFf9~!xjk8v0Yis+(rZX@wEaYVP52V;jg8YL2g8_q- zH?td1h_k>WvY3H^Z$Ah#TCfJI00lEVT^vI+f@Axl`HmQH9I3ef|AcJwuBg⁡U;3 z&Z^rdw)}SO_Yhxe&@Ez>7T-Ea^P7`QyRbXU-7C@0TRIqZ^Eibs-CZKU6Mv`QTQ|w) zP)F1iX0F}~6{fEbdG{>X61R5$RsHAxS!Px;JdtAF&bPPcG0;*5Pgg&ebxsLQ09(RO AUH||9 From a885ea4d87e93fc9d321b42149de17332730d370 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 29 Jan 2024 04:15:13 +0600 Subject: [PATCH 4/5] Models and more texture updates --- .../mc/otm/datagen/blocks/BlockStates.kt | 3 ++ .../mc/otm/datagen/items/ItemModels.kt | 3 ++ ...source.json => infinite_water_source.json} | 0 .../{painting_table.json => painter.json} | 0 .../models/item/matter_cable.json | 50 ------------------ .../resource/deepslate_tritanium_ore.png | Bin 283 -> 312 bytes .../textures/block/resource/tritanium_ore.png | Bin 285 -> 303 bytes 7 files changed, 6 insertions(+), 50 deletions(-) rename src/main/resources/assets/overdrive_that_matters/models/block/{water_source.json => infinite_water_source.json} (100%) rename src/main/resources/assets/overdrive_that_matters/models/block/{painting_table.json => painter.json} (100%) delete mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/matter_cable.json diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt index 68846f7b9..8cf6bd9b6 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt @@ -114,6 +114,9 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.ENERGY_SERVO.values) provider.block(MBlocks.COBBLESTONE_GENERATOR.values) + provider.block(MBlocks.PAINTER) + provider.block(MBlocks.INFINITE_WATER_SOURCE) + provider.exec { for (block in MBlocks.ESSENCE_STORAGE.values) { provider.getVariantBuilder(block).forAllStates { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index daadb672c..349820416 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -186,6 +186,9 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.coloredWithBaseBlock(MItems.MATTER_RECYCLER, "matter_recycler", "_idle") provider.coloredWithBaseBlock(MItems.COBBLESTONE_GENERATOR, "cobblestone_generator") + provider.block(MItems.PAINTER, "painter") + provider.block(MItems.INFINITE_WATER_SOURCE, "infinite_water_source") + provider.exec { provider.withExistingParent("essence_storage", modLocation("block/essence_storage_empty")) .override() diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/water_source.json b/src/main/resources/assets/overdrive_that_matters/models/block/infinite_water_source.json similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/models/block/water_source.json rename to src/main/resources/assets/overdrive_that_matters/models/block/infinite_water_source.json diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/painting_table.json b/src/main/resources/assets/overdrive_that_matters/models/block/painter.json similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/models/block/painting_table.json rename to src/main/resources/assets/overdrive_that_matters/models/block/painter.json diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/matter_cable.json b/src/main/resources/assets/overdrive_that_matters/models/item/matter_cable.json deleted file mode 100644 index 530e26553..000000000 --- a/src/main/resources/assets/overdrive_that_matters/models/item/matter_cable.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent": "block/block", - "texture_size": [16, 16], - "textures": { - "0": "overdrive_that_matters:block/matter_cable", - "particle": "#0" - }, - "elements": [ - { - "from": [6, 6, 6], - "to": [10, 10, 10], - "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#0"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#0"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#0"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#0"} - } - }, - { - "from": [0, 6, 6], - "to": [6, 10, 10], - "faces": { - "north": {"uv": [4, 0, 10, 4], "texture": "#0"}, - "south": {"uv": [10, 0, 4, 4], "texture": "#0"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#0"}, - "up": {"uv": [10, 0, 4, 4], "texture": "#0"}, - "down": {"uv": [10, 0, 4, 4], "texture": "#0"} - } - }, - { - "from": [10, 6, 6], - "to": [16, 10, 10], - "faces": { - "north": {"uv": [10, 0, 16, 4], "texture": "#0"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#0"}, - "south": {"uv": [16, 0, 10, 4], "texture": "#0"}, - "up": {"uv": [16, 0, 10, 4], "texture": "#0"}, - "down": {"uv": [16, 0, 10, 4], "texture": "#0"} - } - } - ], - "gui_light": "front", - "display": { - "gui": { - "rotation": [0, 0, 0], - "translation": [0, 0, 0], - "scale": [1, 1, 1] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_tritanium_ore.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_tritanium_ore.png index 1cff8f4670747feb3f2dcc59752182040481b240..786132f8bd80ddc8e4cf2b0c6daa61388c936f73 100644 GIT binary patch delta 255 zcmV0$PflHDox99|ny5`?VQr3i zZGw-T%(8!_iTfo%4FCWD32;bRa{vGizW@LZzX3P}QzQTY0GCNbK~xyiV_;NLG8Pn4 zR$@?gF%DByGFD~~WE4toaW*k#FcO`tVaOmT#NZsZ+E_GAPzZKJEoDIlW6ec^YKvWr85o3&O_Yoj1%M186$L>hK>&`KACBG7;hg{g002ovPDHLk FV1f~(VC?_^ delta 226 zcmV<803H9h0-FMmL4O`lOjJdAd3j`HWKmI3Jv~D&FE?$1k6mwiJV;MYU1v2lH3vgX zr~m)}32;bRa{vGizW@LZzX3P}QzQTY0ES6KK~xyi4a+eOf3pSX4;ApY*;9-!2pu}!mh@y cj|cMf2Ug-6IQTjhGynhq07*qoM6N<$g3Df60{{R3 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/tritanium_ore.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/tritanium_ore.png index 53a1f0e06ec0c70ecaca97e0905cfb8cfce08ec1..b8ad6556b1732e6369f12f84cfc51303748b7d6d 100644 GIT binary patch delta 246 zcmVMSL{lR{)ru|?NN#nj ze;FQ2Pcdk9b;&9u;(E*R{^_A*=cDdISaF}aMhOfy$s(tKfknGGx?xr=i^FNsg7qU@ wzegT&eo6DmGGN|I(c4c_rPE)6q{V^o3%?;5HdZ`J!vFvP07*qoM6N<$f>6C?(f|Me delta 208 zcmV;>05AWq0-XYoK_?ziOjJdWkB@(Ue{^(oXlQ6$TwHB}k6mwiJV;MYU1v2lHR~Of zs*!ORe~3v$K~xyi70xjZf-o2c(2s;L^ZkUqEncA5#967q187fRDkGvv!{`K~-dJ7V z^Z Date: Mon, 29 Jan 2024 11:44:47 +0600 Subject: [PATCH 5/5] Fuck interpolation --- .../textures/block/water_source_pump.png.mcmeta | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png.mcmeta b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png.mcmeta index d0da1eb25..55c29419e 100644 --- a/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png.mcmeta +++ b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png.mcmeta @@ -1,6 +1 @@ -{ - "animation": { - "frametime": 2, - "interpolate": true - } -} \ No newline at end of file +{ "animation": { "frametime": 2 } } \ No newline at end of file