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 1530d2f33..3c7e681e3 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 @@ -128,13 +128,17 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.generated(MItems.BREAD_MONSTER_SPAWN_EGG, modLocation("item/egg/bread_monster")) provider.generated(MItems.LOADER_SPAWN_EGG, modLocation("item/egg/loader")) - provider.generatedTiered(MItems.BATTERIES, "battery_tier") + provider.capacitorWithGauge(MItems.BATTERY_CRUDE, 10, "battery_gauge_", modLocation("item/battery_tier0")) + provider.capacitorWithGauge(MItems.BATTERY_BASIC, 10, "battery_gauge_", modLocation("item/battery_tier1")) + provider.capacitorWithGauge(MItems.BATTERY_NORMAL, 10, "battery_gauge_", modLocation("item/battery_tier2")) + provider.capacitorWithGauge(MItems.BATTERY_DENSE, 10, "battery_gauge_", modLocation("item/battery_tier3")) + provider.capacitorWithGauge(MItems.BATTERY_CAPACITOR, 10, "battery_gauge_", modLocation("item/battery_tier4")) provider.generated(MItems.BATTERY_CREATIVE) - provider.generated(MItems.PROCEDURAL_BATTERY, modLocation("item/battery_procedural")) + provider.capacitorWithGauge(MItems.PROCEDURAL_BATTERY, 9, "battery_procedural_gauge_", modLocation("item/battery_procedural")) - provider.capacitorWithGauge(MItems.MATTER_CAPACITOR_BASIC, baseTexture = modLocation("item/matter_capacitor_tier1")) - provider.capacitorWithGauge(MItems.MATTER_CAPACITOR_NORMAL, baseTexture = modLocation("item/matter_capacitor_tier2")) - provider.capacitorWithGauge(MItems.MATTER_CAPACITOR_DENSE, baseTexture = modLocation("item/matter_capacitor_tier3")) + provider.capacitorWithGauge(MItems.MATTER_CAPACITOR_BASIC, 8, "matter_capacitor_gauge_", modLocation("item/matter_capacitor_tier1")) + provider.capacitorWithGauge(MItems.MATTER_CAPACITOR_NORMAL, 8, "matter_capacitor_gauge_", modLocation("item/matter_capacitor_tier2")) + provider.capacitorWithGauge(MItems.MATTER_CAPACITOR_DENSE, 8, "matter_capacitor_gauge_", modLocation("item/matter_capacitor_tier3")) provider.generated(MItems.MATTER_CAPACITOR_CREATIVE) provider.generated(MItems.MachineUpgrades.Basic.BLANK, modLocation("item/machine_upgrade_tier1")) @@ -182,8 +186,8 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.upgrade(MItems.MachineUpgrades.Creative.MATTER_STORAGE_FLAT_SMALL, "matter", "creative") - provider.generated(MItems.QUANTUM_BATTERY) - provider.generated(MItems.QUANTUM_CAPACITOR) + provider.capacitorWithGauge(MItems.QUANTUM_BATTERY, 10, "battery_gauge_") + provider.capacitorWithGauge(MItems.QUANTUM_CAPACITOR, 10, "battery_gauge_") provider.generated(MItems.QUANTUM_BATTERY_CREATIVE) provider.generated(MItems.PATTERN_DRIVE_NORMAL, modLocation("item/pattern_drive_tier1")) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/MatteryItemModelProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/MatteryItemModelProvider.kt index fe681f140..63b25454e 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/MatteryItemModelProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/MatteryItemModelProvider.kt @@ -143,7 +143,7 @@ class MatteryItemModelProvider(event: GatherDataEvent) : ItemModelProvider(event .texture("layer1", modLocation("item/machine_upgrade_icon_$upgradeType")) } - fun capacitorWithGauge(item: Item, fillTextures: Int = 8, baseTexture: ResourceLocation?) = exec { + fun capacitorWithGauge(item: Item, fillTextures: Int, gaugePrefix: String, baseTexture: ResourceLocation? = null) = exec { val path = item.registryName!!.path val texture = baseTexture ?: modLocation("item/$path") @@ -152,19 +152,19 @@ class MatteryItemModelProvider(event: GatherDataEvent) : ItemModelProvider(event val basic = withExistingParent(path, GENERATED) .texture("layer0", texture) - .texture("layer1", modLocation("item/matter_capacitor_gauge_$fillTextures")) + .texture("layer1", modLocation("item/${gaugePrefix}$fillTextures")) .override() - .predicate(modLocation("matter_capacitor_fill"), 0f) + .predicate(modLocation("capacitor_gauge"), 0f) .model(empty) .end() for (i in 1 .. fillTextures) { val model = withExistingParent("${path}_fill_$i", GENERATED) .texture("layer0", texture) - .texture("layer1", modLocation("item/matter_capacitor_gauge_$i")) + .texture("layer1", modLocation("item/${gaugePrefix}$i")) basic.override() - .predicate(modLocation("matter_capacitor_fill"), i.toFloat() / fillTextures.toFloat()) + .predicate(modLocation("capacitor_gauge"), i.toFloat() / fillTextures.toFloat()) .model(model) .end() } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt index fcb55735e..5d71f2a39 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -320,11 +320,19 @@ object MRegistry : IBlockItemRegistryAcceptor { } for (item in MItems.MATTER_CAPACITORS) { - ItemProperties.register(item, ResourceLocation(OverdriveThatMatters.MOD_ID, "matter_capacitor_fill")) { stack, _, _, _ -> + ItemProperties.register(item, ResourceLocation(OverdriveThatMatters.MOD_ID, "capacitor_gauge")) { stack, _, _, _ -> val cap = stack.getCapability(MatteryCapability.MATTER_ITEM) ?: return@register 1f (cap.storedMatter / cap.maxStoredMatter).toFloat() } } + + for (item in MItems.ALL_BATTERIES) { + ItemProperties.register(item, ResourceLocation(OverdriveThatMatters.MOD_ID, "capacitor_gauge")) { stack, _, _, _ -> + val energy = stack.matteryEnergy ?: return@register 1f + + (energy.batteryLevel / energy.maxBatteryLevel).toFloat() + } + } } } diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_1.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_1.png new file mode 100644 index 000000000..cf364706d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_1.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_10.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_10.png new file mode 100644 index 000000000..ce5b2666d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_10.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_2.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_2.png new file mode 100644 index 000000000..4815bb435 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_2.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_3.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_3.png new file mode 100644 index 000000000..07408dba9 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_3.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_4.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_4.png new file mode 100644 index 000000000..cdda38e13 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_4.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_5.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_5.png new file mode 100644 index 000000000..d0c4ca6d6 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_5.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_6.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_6.png new file mode 100644 index 000000000..5f1552046 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_6.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_7.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_7.png new file mode 100644 index 000000000..495ebefbc Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_7.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_8.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_8.png new file mode 100644 index 000000000..30718eb5a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_8.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_9.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_9.png new file mode 100644 index 000000000..37715862f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_gauge_9.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural.png index afdf29101..b3b1043a3 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_1.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_1.png new file mode 100644 index 000000000..7ba3c3c4d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_1.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_2.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_2.png new file mode 100644 index 000000000..8b5bc570e Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_2.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_3.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_3.png new file mode 100644 index 000000000..5eb06cc74 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_3.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_4.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_4.png new file mode 100644 index 000000000..70450c03f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_4.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_5.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_5.png new file mode 100644 index 000000000..8c0cd5ce9 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_5.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_6.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_6.png new file mode 100644 index 000000000..c30cabcb7 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_6.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_7.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_7.png new file mode 100644 index 000000000..c62b25269 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_7.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_8.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_8.png new file mode 100644 index 000000000..2a7391311 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_8.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_9.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_9.png new file mode 100644 index 000000000..fa37a3c6a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_procedural_gauge_9.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier0.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier0.png index 9892d8e51..d0ce5a475 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier0.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier0.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier1.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier1.png index 1fee5af1d..e5a33f3c5 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier1.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier1.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier2.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier2.png index d8fbe8ca0..742068645 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier2.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier2.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier3.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier3.png index 892c1097a..2fcd20d79 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier3.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier3.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier4.png b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier4.png index 54a0104ff..febf757c8 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier4.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/battery_tier4.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery.png b/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery.png index 0c9f47982..d2da511c5 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_battery.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_capacitor.png b/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_capacitor.png index ac0dee6d9..8e38228dc 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_capacitor.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/quantum_capacitor.png differ