diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 92ad722ba..de6699eca 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -311,21 +311,31 @@ public final class ApiBlocks implements IBlocks .build(); FeatureFactory crafting = registry.features( AEFeature.CraftingCPU ); - this.craftingUnit = crafting.block( "crafting_unit", () -> new BlockCraftingUnit( CraftingUnitType.UNIT ) ).build(); - this.craftingAccelerator = crafting.block( "crafting_accelerator", () -> new BlockCraftingUnit( CraftingUnitType.ACCELERATOR ) ).build(); + this.craftingUnit = crafting.block( "crafting_unit", () -> new BlockCraftingUnit( CraftingUnitType.UNIT ) ) + .useCustomItemModel() + .build(); + this.craftingAccelerator = crafting.block( "crafting_accelerator", () -> new BlockCraftingUnit( CraftingUnitType.ACCELERATOR ) ) + .useCustomItemModel() + .build(); this.craftingStorage1k = crafting.block( "crafting_storage_1k", () -> new BlockCraftingStorage( CraftingUnitType.STORAGE_1K ) ) .item( ItemCraftingStorage::new ) + .useCustomItemModel() .build(); this.craftingStorage4k = crafting.block( "crafting_storage_4k", () -> new BlockCraftingStorage( CraftingUnitType.STORAGE_4K ) ) .item( ItemCraftingStorage::new ) + .useCustomItemModel() .build(); this.craftingStorage16k = crafting.block( "crafting_storage_16k", () -> new BlockCraftingStorage( CraftingUnitType.STORAGE_16K ) ) .item( ItemCraftingStorage::new ) + .useCustomItemModel() .build(); this.craftingStorage64k = crafting.block( "crafting_storage_64k", () -> new BlockCraftingStorage( CraftingUnitType.STORAGE_64K ) ) .item( ItemCraftingStorage::new ) + .useCustomItemModel() + .build(); + this.craftingMonitor = crafting.block( "crafting_monitor", BlockCraftingMonitor::new ) + .useCustomItemModel() .build(); - this.craftingMonitor = crafting.block( "crafting_monitor", BlockCraftingMonitor::new ).build(); this.molecularAssembler = registry.block( "molecular_assembler", BlockMolecularAssembler::new ).features( AEFeature.MolecularAssembler ).build(); this.lightDetector = registry.block( "light_detector", BlockLightDetector::new ).features( AEFeature.LightDetector ).build(); diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_accelerator.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_accelerator.json new file mode 100644 index 000000000..7b29d5b5d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crafting_accelerator.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/crafting/accelerator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_monitor.json new file mode 100644 index 000000000..eaf0429ee --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crafting_monitor.json @@ -0,0 +1,11 @@ +{ + "parent": "block/cube", + "textures": { + "north": "appliedenergistics2:blocks/crafting/monitor", + "east": "appliedenergistics2:blocks/crafting/unit", + "west": "appliedenergistics2:blocks/crafting/unit", + "south": "appliedenergistics2:blocks/crafting/unit", + "up": "appliedenergistics2:blocks/crafting/unit", + "down": "appliedenergistics2:blocks/crafting/unit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_16k.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_16k.json new file mode 100644 index 000000000..52ee88fb6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_16k.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/crafting/storage_16k" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_1k.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_1k.json new file mode 100644 index 000000000..3d0d2beaa --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_1k.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/crafting/storage_1k" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_4k.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_4k.json new file mode 100644 index 000000000..fd48bae5e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_4k.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/crafting/storage_4k" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_64k.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_64k.json new file mode 100644 index 000000000..1dafb740b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_64k.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/crafting/storage_64k" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_unit.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_unit.json new file mode 100644 index 000000000..417043459 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/crafting_unit.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:blocks/crafting/unit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/accelerator.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/accelerator.png new file mode 100644 index 000000000..25f1a3b65 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/accelerator.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/accelerator_fit.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/accelerator_fit.png new file mode 100644 index 000000000..56fcf31ab Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/accelerator_fit.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/fit_solid.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/fit_solid.png new file mode 100644 index 000000000..eea53de71 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/fit_solid.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor.png new file mode 100644 index 000000000..83027f793 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor_fit_dark.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor_fit_dark.png new file mode 100644 index 000000000..6e5c3fa0a Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor_fit_dark.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor_fit_light.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor_fit_light.png new file mode 100644 index 000000000..5a18ba2a6 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor_fit_light.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor_fit_medium.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor_fit_medium.png new file mode 100644 index 000000000..95a8044b4 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor_fit_medium.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor_outer.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor_outer.png new file mode 100644 index 000000000..3aaa5085b Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/monitor_outer.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_16k.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_16k.png new file mode 100644 index 000000000..2671ee304 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_16k.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_16k_fit.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_16k_fit.png new file mode 100644 index 000000000..d54bd4483 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_16k_fit.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_1k.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_1k.png new file mode 100644 index 000000000..fd723f070 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_1k.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_1k_fit.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_1k_fit.png new file mode 100644 index 000000000..8ba2de77e Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_1k_fit.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_4k.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_4k.png new file mode 100644 index 000000000..8a010d140 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_4k.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_4k_fit.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_4k_fit.png new file mode 100644 index 000000000..5e96699fe Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_4k_fit.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_64k.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_64k.png new file mode 100644 index 000000000..c2747925e Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_64k.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_64k_fit.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_64k_fit.png new file mode 100644 index 000000000..4cc8c5124 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/storage_64k_fit.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit.png new file mode 100644 index 000000000..a418d64e7 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit_fit.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit_fit.png new file mode 100644 index 000000000..ef072c914 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit_fit.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit_ring.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit_ring.png new file mode 100644 index 000000000..1cc1a1069 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit_ring.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit_ring_long.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit_ring_long.png new file mode 100644 index 000000000..960702950 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit_ring_long.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit_ring_long_rotated.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit_ring_long_rotated.png new file mode 100644 index 000000000..f00417227 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/crafting/unit_ring_long_rotated.png differ