diff --git a/src/main/java/storagecraft/proxy/ClientProxy.java b/src/main/java/storagecraft/proxy/ClientProxy.java index 6bca345ea..88781f277 100644 --- a/src/main/java/storagecraft/proxy/ClientProxy.java +++ b/src/main/java/storagecraft/proxy/ClientProxy.java @@ -11,7 +11,10 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import storagecraft.StorageCraftBlocks; import storagecraft.StorageCraftItems; +import storagecraft.item.ItemCore; +import storagecraft.item.ItemProcessor; import storagecraft.item.ItemStorageCell; +import storagecraft.item.ItemStoragePart; import storagecraft.render.BlockCableRenderer; import storagecraft.render.ItemCableRenderer; import storagecraft.tile.TileCable; @@ -31,6 +34,28 @@ public class ClientProxy extends CommonProxy "storagecraft:creative_storage_cell" ); + ModelBakery.addVariantName(StorageCraftItems.STORAGE_PART, + "storagecraft:1k_storage_part", + "storagecraft:4k_storage_part", + "storagecraft:16k_storage_part", + "storagecraft:64k_storage_part" + ); + + ModelBakery.addVariantName(StorageCraftItems.PROCESSOR, + "storagecraft:basic_printed_processor", + "storagecraft:improved_printed_processor", + "storagecraft:advanced_printed_processor", + "storagecraft:basic_processor", + "storagecraft:improved_processor", + "storagecraft:advanced_processor", + "storagecraft:printed_silicon" + ); + + ModelBakery.addVariantName(StorageCraftItems.CORE, + "storagecraft:construction_core", + "storagecraft:destruction_core" + ); + ClientRegistry.bindTileEntitySpecialRenderer(TileCable.class, new BlockCableRenderer()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(StorageCraftBlocks.CABLE), new ItemCableRenderer()); @@ -48,5 +73,27 @@ public class ClientProxy extends CommonProxy mesher.register(StorageCraftItems.STORAGE_CELL, ItemStorageCell.TYPE_16K, new ModelResourceLocation("storagecraft:16k_storage_cell", "inventory")); mesher.register(StorageCraftItems.STORAGE_CELL, ItemStorageCell.TYPE_64K, new ModelResourceLocation("storagecraft:64k_storage_cell", "inventory")); mesher.register(StorageCraftItems.STORAGE_CELL, ItemStorageCell.TYPE_CREATIVE, new ModelResourceLocation("storagecraft:creative_storage_cell", "inventory")); + + mesher.register(StorageCraftItems.STORAGE_PART, ItemStoragePart.TYPE_1K, new ModelResourceLocation("storagecraft:1k_storage_part", "inventory")); + mesher.register(StorageCraftItems.STORAGE_PART, ItemStoragePart.TYPE_4K, new ModelResourceLocation("storagecraft:4k_storage_part", "inventory")); + mesher.register(StorageCraftItems.STORAGE_PART, ItemStoragePart.TYPE_16K, new ModelResourceLocation("storagecraft:16k_storage_part", "inventory")); + mesher.register(StorageCraftItems.STORAGE_PART, ItemStoragePart.TYPE_64K, new ModelResourceLocation("storagecraft:64k_storage_part", "inventory")); + + mesher.register(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_BASIC, new ModelResourceLocation("storagecraft:basic_printed_processor", "inventory")); + mesher.register(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_IMPROVED, new ModelResourceLocation("storagecraft:improved_printed_processor", "inventory")); + mesher.register(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_ADVANCED, new ModelResourceLocation("storagecraft:advanced_printed_processor", "inventory")); + mesher.register(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_BASIC, new ModelResourceLocation("storagecraft:basic_processor", "inventory")); + mesher.register(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_IMPROVED, new ModelResourceLocation("storagecraft:improved_processor", "inventory")); + mesher.register(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_ADVANCED, new ModelResourceLocation("storagecraft:advanced_processor", "inventory")); + mesher.register(StorageCraftItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_SILICON, new ModelResourceLocation("storagecraft:printed_silicon", "inventory")); + + mesher.register(StorageCraftItems.SILICON, 0, new ModelResourceLocation("storagecraft:silicon", "inventory")); + + mesher.register(StorageCraftItems.QUARTZ_ENRICHED_IRON, 0, new ModelResourceLocation("storagecraft:quartz_enriched_iron", "inventory")); + + mesher.register(StorageCraftItems.CORE, ItemCore.TYPE_CONSTRUCTION, new ModelResourceLocation("storagecraft:construction_core", "inventory")); + mesher.register(StorageCraftItems.CORE, ItemCore.TYPE_DESTRUCTION, new ModelResourceLocation("storagecraft:destruction_core", "inventory")); + + mesher.register(StorageCraftItems.WIRELESS_GRID_PLATE, 0, new ModelResourceLocation("storagecraft:wireless_grid_plate", "inventory")); } } diff --git a/src/main/resources/assets/storagecraft/models/item/16k_storage_part.json b/src/main/resources/assets/storagecraft/models/item/16k_storage_part.json new file mode 100644 index 000000000..8685841f9 --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/16k_storage_part.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/16k_storage_part" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/1k_storage_part.json b/src/main/resources/assets/storagecraft/models/item/1k_storage_part.json new file mode 100644 index 000000000..733d9961e --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/1k_storage_part.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/1k_storage_part" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/4k_storage_part.json b/src/main/resources/assets/storagecraft/models/item/4k_storage_part.json new file mode 100644 index 000000000..b9492b3ff --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/4k_storage_part.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/4k_storage_part" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/64k_storage_part.json b/src/main/resources/assets/storagecraft/models/item/64k_storage_part.json new file mode 100644 index 000000000..3aa4ad9ce --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/64k_storage_part.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/64k_storage_part" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/advanced_printed_processor.json b/src/main/resources/assets/storagecraft/models/item/advanced_printed_processor.json new file mode 100644 index 000000000..707dd93ff --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/advanced_printed_processor.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/advanced_printed_processor" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/advanced_processor.json b/src/main/resources/assets/storagecraft/models/item/advanced_processor.json new file mode 100644 index 000000000..fedc918b7 --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/advanced_processor.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/advanced_processor" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/basic_printed_processor.json b/src/main/resources/assets/storagecraft/models/item/basic_printed_processor.json new file mode 100644 index 000000000..89a4cc181 --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/basic_printed_processor.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/basic_printed_processor" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/basic_processor.json b/src/main/resources/assets/storagecraft/models/item/basic_processor.json new file mode 100644 index 000000000..ec5b731fc --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/basic_processor.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/basic_processor" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/construction_core.json b/src/main/resources/assets/storagecraft/models/item/construction_core.json new file mode 100644 index 000000000..7c1645610 --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/construction_core.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/destruction_core" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/destruction_core.json b/src/main/resources/assets/storagecraft/models/item/destruction_core.json new file mode 100644 index 000000000..f2d86dcc6 --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/destruction_core.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/construction_core" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/improved_printed_processor.json b/src/main/resources/assets/storagecraft/models/item/improved_printed_processor.json new file mode 100644 index 000000000..9f4814c37 --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/improved_printed_processor.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/improved_printed_processor" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/improved_processor.json b/src/main/resources/assets/storagecraft/models/item/improved_processor.json new file mode 100644 index 000000000..e96d6038f --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/improved_processor.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/improved_processor" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/printed_silicon.json b/src/main/resources/assets/storagecraft/models/item/printed_silicon.json new file mode 100644 index 000000000..2bee945c5 --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/printed_silicon.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/printed_silicon" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/quartz_enriched_iron.json b/src/main/resources/assets/storagecraft/models/item/quartz_enriched_iron.json new file mode 100644 index 000000000..d6c967c7b --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/quartz_enriched_iron.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/quartz_enriched_iron" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/silicon.json b/src/main/resources/assets/storagecraft/models/item/silicon.json new file mode 100644 index 000000000..14a47f487 --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/silicon.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/silicon" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/models/item/wireless_grid_plate.json b/src/main/resources/assets/storagecraft/models/item/wireless_grid_plate.json new file mode 100644 index 000000000..ce84b7009 --- /dev/null +++ b/src/main/resources/assets/storagecraft/models/item/wireless_grid_plate.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "storagecraft:items/wireless_grid_plate" + }, + "display": { + "thirdperson": { + "rotation": [-90, 0, 0], + "translation": [0, 1, -3], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson": { + "rotation": [0, -135, 25], + "translation": [0, 4, 2], + "scale": [1.7, 1.7, 1.7] + } + } +} diff --git a/src/main/resources/assets/storagecraft/textures/items/storagePart2.png b/src/main/resources/assets/storagecraft/textures/items/16k_storage_part.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/storagePart2.png rename to src/main/resources/assets/storagecraft/textures/items/16k_storage_part.png diff --git a/src/main/resources/assets/storagecraft/textures/items/storagePart0.png b/src/main/resources/assets/storagecraft/textures/items/1k_storage_part.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/storagePart0.png rename to src/main/resources/assets/storagecraft/textures/items/1k_storage_part.png diff --git a/src/main/resources/assets/storagecraft/textures/items/storagePart1.png b/src/main/resources/assets/storagecraft/textures/items/4k_storage_part.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/storagePart1.png rename to src/main/resources/assets/storagecraft/textures/items/4k_storage_part.png diff --git a/src/main/resources/assets/storagecraft/textures/items/storagePart3.png b/src/main/resources/assets/storagecraft/textures/items/64k_storage_part.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/storagePart3.png rename to src/main/resources/assets/storagecraft/textures/items/64k_storage_part.png diff --git a/src/main/resources/assets/storagecraft/textures/items/processor2.png b/src/main/resources/assets/storagecraft/textures/items/advanced_printed_processor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/processor2.png rename to src/main/resources/assets/storagecraft/textures/items/advanced_printed_processor.png diff --git a/src/main/resources/assets/storagecraft/textures/items/processor5.png b/src/main/resources/assets/storagecraft/textures/items/advanced_processor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/processor5.png rename to src/main/resources/assets/storagecraft/textures/items/advanced_processor.png diff --git a/src/main/resources/assets/storagecraft/textures/items/processor0.png b/src/main/resources/assets/storagecraft/textures/items/basic_printed_processor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/processor0.png rename to src/main/resources/assets/storagecraft/textures/items/basic_printed_processor.png diff --git a/src/main/resources/assets/storagecraft/textures/items/processor3.png b/src/main/resources/assets/storagecraft/textures/items/basic_processor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/processor3.png rename to src/main/resources/assets/storagecraft/textures/items/basic_processor.png diff --git a/src/main/resources/assets/storagecraft/textures/items/core0.png b/src/main/resources/assets/storagecraft/textures/items/construction_core.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/core0.png rename to src/main/resources/assets/storagecraft/textures/items/construction_core.png diff --git a/src/main/resources/assets/storagecraft/textures/items/core1.png b/src/main/resources/assets/storagecraft/textures/items/destruction_core.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/core1.png rename to src/main/resources/assets/storagecraft/textures/items/destruction_core.png diff --git a/src/main/resources/assets/storagecraft/textures/items/processor1.png b/src/main/resources/assets/storagecraft/textures/items/improved_printed_processor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/processor1.png rename to src/main/resources/assets/storagecraft/textures/items/improved_printed_processor.png diff --git a/src/main/resources/assets/storagecraft/textures/items/processor4.png b/src/main/resources/assets/storagecraft/textures/items/improved_processor.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/processor4.png rename to src/main/resources/assets/storagecraft/textures/items/improved_processor.png diff --git a/src/main/resources/assets/storagecraft/textures/items/processor6.png b/src/main/resources/assets/storagecraft/textures/items/printed_silicon.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/processor6.png rename to src/main/resources/assets/storagecraft/textures/items/printed_silicon.png diff --git a/src/main/resources/assets/storagecraft/textures/items/quartzEnrichedIron.png b/src/main/resources/assets/storagecraft/textures/items/quartz_enriched_iron.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/quartzEnrichedIron.png rename to src/main/resources/assets/storagecraft/textures/items/quartz_enriched_iron.png diff --git a/src/main/resources/assets/storagecraft/textures/items/wirelessGridPlate.png b/src/main/resources/assets/storagecraft/textures/items/wireless_grid_plate.png similarity index 100% rename from src/main/resources/assets/storagecraft/textures/items/wirelessGridPlate.png rename to src/main/resources/assets/storagecraft/textures/items/wireless_grid_plate.png