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 3686becd2..3ef5c0e9e 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 @@ -77,6 +77,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.generated(MItems.ExopackUpgrades.INVENTORY_UPGRADE_CREATIVE) provider.generated(MItems.ExopackUpgrades.CRAFTING_UPGRADE) + provider.generated(MItems.ExopackUpgrades.SMELTING_UPGRADE) provider.component(MItems.TRITANIUM_DUST) provider.component(MItems.TRITANIUM_INGOT) @@ -97,6 +98,22 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.generated(MItems.MATTER_CAPACITOR_DENSE, modLocation("item/matter_capacitor_tier3")) provider.generated(MItems.MATTER_CAPACITOR_CREATIVE) + provider.generated(MItems.CreativeUpgrades.SPEED, modLocation("item/upgrade_speed")) + + provider.generated(MItems.CreativeUpgrades.ENERGY_CONSUMPTION, modLocation("item/upgrade_energy")) + provider.generated(MItems.CreativeUpgrades.ENERGY_THROUGHPUT, modLocation("item/upgrade_energy")) + provider.generated(MItems.CreativeUpgrades.ENERGY_THROUGHPUT_FLAT, modLocation("item/upgrade_energy")) + provider.generated(MItems.CreativeUpgrades.ENERGY_THROUGHPUT_FLAT_SMALL, modLocation("item/upgrade_energy")) + + provider.generated(MItems.CreativeUpgrades.ENERGY_STORAGE, modLocation("item/upgrade_capacity")) + provider.generated(MItems.CreativeUpgrades.ENERGY_STORAGE_FLAT, modLocation("item/upgrade_capacity")) + provider.generated(MItems.CreativeUpgrades.ENERGY_STORAGE_FLAT_SMALL, modLocation("item/upgrade_capacity")) + + provider.generated(MItems.CreativeUpgrades.FAILSAFE, modLocation("item/upgrade_failure")) + provider.generated(MItems.CreativeUpgrades.FAILURE, modLocation("item/upgrade_failure")) + + provider.generated(MItems.CreativeUpgrades.PROCESSING_ITEMS, modLocation("item/upgrade_processing")) + provider.generated(MItems.QUANTUM_BATTERY) provider.generated(MItems.QUANTUM_CAPACITOR) provider.generated(MItems.QUANTUM_BATTERY_CREATIVE) diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/zpm_battery.json b/src/main/resources/assets/overdrive_that_matters/models/item/zpm_battery.json index 6fa136c36..4e8564c07 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/zpm_battery.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/zpm_battery.json @@ -1,4 +1,5 @@ { + "credit": "Made with Blockbench", "textures": { "0": "overdrive_that_matters:item/zpm_battery" }, diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/roflite_alloy_1.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/roflite_alloy_1.png new file mode 100644 index 000000000..7dc22ae16 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/roflite_alloy_1.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/roflite_alloy_2.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/roflite_alloy_2.png new file mode 100644 index 000000000..14d4e1fb8 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/roflite_alloy_2.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/roflite_alloy_top.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/roflite_alloy_top.png new file mode 100644 index 000000000..d0cd682da Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/roflite_alloy_top.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/roflite_alloy_ingot.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/roflite_alloy_ingot.png new file mode 100644 index 000000000..27b68126b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/roflite_alloy_ingot.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/exopack_smelting_upgrade.png b/src/main/resources/assets/overdrive_that_matters/textures/item/exopack_smelting_upgrade.png new file mode 100644 index 000000000..478a9479a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/exopack_smelting_upgrade.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/exosuit_crafting_upgrade.png b/src/main/resources/assets/overdrive_that_matters/textures/item/exosuit_crafting_upgrade.png index ab31babfc..0712ac982 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/exosuit_crafting_upgrade.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/exosuit_crafting_upgrade.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_capacity.png b/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_capacity.png new file mode 100644 index 000000000..6eb8335b6 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_capacity.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_energy.png b/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_energy.png new file mode 100644 index 000000000..6403f04c2 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_energy.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_failure.png b/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_failure.png new file mode 100644 index 000000000..c9dca5ab9 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_failure.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_processing.png b/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_processing.png new file mode 100644 index 000000000..39bfd8aa6 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_processing.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_speed.png b/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_speed.png new file mode 100644 index 000000000..0a1af7fd9 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/upgrade_speed.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/zpm_battery.png b/src/main/resources/assets/overdrive_that_matters/textures/item/zpm_battery.png index 619e2afa1..b4c9a0a1e 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/zpm_battery.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/zpm_battery.png differ