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 433ac243f..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.generated(MItems.MATTER_CAPACITOR_BASIC, modLocation("item/matter_capacitor_tier1")) - provider.generated(MItems.MATTER_CAPACITOR_NORMAL, modLocation("item/matter_capacitor_tier2")) - provider.generated(MItems.MATTER_CAPACITOR_DENSE, 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 a29a176f6..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,6 +143,33 @@ class MatteryItemModelProvider(event: GatherDataEvent) : ItemModelProvider(event .texture("layer1", modLocation("item/machine_upgrade_icon_$upgradeType")) } + fun capacitorWithGauge(item: Item, fillTextures: Int, gaugePrefix: String, baseTexture: ResourceLocation? = null) = exec { + val path = item.registryName!!.path + val texture = baseTexture ?: modLocation("item/$path") + + val empty = withExistingParent("${path}_empty", GENERATED) + .texture("layer0", texture) + + val basic = withExistingParent(path, GENERATED) + .texture("layer0", texture) + .texture("layer1", modLocation("item/${gaugePrefix}$fillTextures")) + .override() + .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/${gaugePrefix}$i")) + + basic.override() + .predicate(modLocation("capacitor_gauge"), i.toFloat() / fillTextures.toFloat()) + .model(model) + .end() + } + } + companion object { val ARMOR_TRIM_MATERIALS = listOf("quartz", "iron", "netherite", "redstone", "copper", "gold", "emerald", "diamond", "lapis", "amethyst") val GENERATED = ResourceLocation("minecraft", "item/generated") diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt index f975684ad..ac77282b2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt @@ -29,6 +29,7 @@ import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.util.countingLazy import ru.dbotthepony.mc.otm.graph.matter.SimpleMatterNode +import ru.dbotthepony.mc.otm.util.math.toDecimal import java.util.function.BooleanSupplier class MatterBottlerBlockEntity(blockPos: BlockPos, blockState: BlockState) : @@ -271,8 +272,8 @@ class MatterBottlerBlockEntity(blockPos: BlockPos, blockState: BlockState) : initialCapacity = initialCapacity ?: it.storedMatter hasCapacitors = true - val rate = MachinesConfig.MatterBottler.RATE * (1.0 + upgrades.speedBonus) - val energyRate = MachinesConfig.MatterBottler.VALUES.energyConsumption * (1.0 + upgrades.speedBonus) + val rate = MachinesConfig.MatterBottler.RATE * (Decimal.ONE + upgrades.speedBonus.toDecimal()) + val energyRate = MachinesConfig.MatterBottler.VALUES.energyConsumption * (Decimal.ONE + upgrades.speedBonus.toDecimal()) val energyRatio = if (energyRate <= Decimal.ZERO) Decimal.ONE else energy.extractEnergy(energyRate, true) / energyRate val matterExtracted = matter.receiveMatter(it.extractMatterChecked(rate, true), true) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterDustItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterDustItem.kt index d28d2caf3..92cc40e3a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterDustItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterDustItem.kt @@ -163,6 +163,13 @@ class MatterDustItem : Item(Properties().stacksTo(64)), IMatterItem { return matter(stack) >= ItemsConfig.MATTER_DUST_CAPACITY } + fun makeStack(matterValue: Decimal = Decimal.ONE, count: Int = 1): ItemStack { + val stack = ItemStack(this, count) + matter(stack, matterValue) + + return stack + } + override fun overrideStackedOnOther( pStack: ItemStack, pSlot: Slot, 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 ccb666bc1..5d71f2a39 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -36,6 +36,7 @@ import ru.dbotthepony.mc.otm.block.decorative.CargoCrateBlock import ru.dbotthepony.mc.otm.block.decorative.ComputerTerminalBlock import ru.dbotthepony.mc.otm.block.decorative.StarChairBlock import ru.dbotthepony.mc.otm.block.decorative.TritaniumPressurePlate +import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.matteryEnergy import ru.dbotthepony.mc.otm.client.MatteryGUI import ru.dbotthepony.mc.otm.util.ResourceLocation @@ -317,6 +318,21 @@ object MRegistry : IBlockItemRegistryAcceptor { val tag = stack.getOrDefault(MDataComponentTypes.Configurator.CONFIGURATION, CompoundTag()) if (tag.isEmpty) 0f else 1f } + + for (item in MItems.MATTER_CAPACITORS) { + 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/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt index 3f1c0a6a9..f4ddc6df5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt @@ -223,7 +223,7 @@ private fun addMainCreativeTabItems(consumer: CreativeModeTab.Output) { accept(MItems.GRILL.values) - // accept(MItems.MATTER_DUST) + accept(MItems.MATTER_DUST.makeStack()) accept(MItems.TRITANIUM_ORE) accept(MItems.DEEPSLATE_TRITANIUM_ORE) 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/matter_capacitor_gauge_1.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_1.png new file mode 100644 index 000000000..64428f359 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_1.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_2.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_2.png new file mode 100644 index 000000000..f0f560b92 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_2.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_3.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_3.png new file mode 100644 index 000000000..59ad4e415 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_3.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_4.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_4.png new file mode 100644 index 000000000..259e88443 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_4.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_5.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_5.png new file mode 100644 index 000000000..f3281b834 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_5.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_6.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_6.png new file mode 100644 index 000000000..49241e961 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_6.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_7.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_7.png new file mode 100644 index 000000000..ee270f646 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_7.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_8.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_8.png new file mode 100644 index 000000000..4e4b63564 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_gauge_8.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier0.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier0.png index 2bb6e4571..fa28d455d 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier0.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier0.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier1.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier1.png index d19259474..eaadbd348 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier1.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier1.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier2.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier2.png index 773c51f07..15fae90cd 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier2.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier2.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier3.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier3.png index d12d5a1da..bfc1cec47 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier3.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier3.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier4.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier4.png index f39082528..533101fc2 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier4.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_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