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/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/infinite_water_source.json b/src/main/resources/assets/overdrive_that_matters/models/block/infinite_water_source.json new file mode 100644 index 000000000..3daef1784 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/infinite_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/models/block/painter.json b/src/main/resources/assets/overdrive_that_matters/models/block/painter.json new file mode 100644 index 000000000..eda781060 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/painter.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/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/painting_table.png b/src/main/resources/assets/overdrive_that_matters/textures/block/painting_table.png new file mode 100644 index 000000000..e5c6dc2ee Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/painting_table.png differ 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 1cff8f467..786132f8b 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_tritanium_ore.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_tritanium_ore.png differ 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 53a1f0e06..b8ad6556b 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/tritanium_ore.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/tritanium_ore.png differ 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 000000000..d1737a8fd Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source.png differ 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 000000000..f1effd65a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_mask.png differ 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 000000000..4c55238ef Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_misc.png differ 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 000000000..d78517297 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png differ 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..55c29419e --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/block/water_source_pump.png.mcmeta @@ -0,0 +1 @@ +{ "animation": { "frametime": 2 } } \ No newline at end of file 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 d36635b4d..ebe4faa74 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/chest_upgrader.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/chest_upgrader.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/electromotor.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/electromotor.png index d36635b4d..261b0b139 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/electromotor.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/electromotor.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_ingot.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_ingot.png index 29c707230..252e126c3 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_ingot.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_ingot.png differ 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 7e121ec37..b7f21ffc2 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/resources/tritanium_ore_clump.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/resources/tritanium_ore_clump.png differ 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" -}