diff --git a/CHANGELOG.md b/CHANGELOG.md index dc456d467..8ca2c8ca9 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Added new Crafter modes: ignore redstone signal, redstone signal unlocks autocrafting, redstone signal locks autocrafting and redstone pulse inserts next set (replacement for blocking mode) (raoulvdberge) - Added a config option to configure the autocrafting calculation timeout in milliseconds (raoulvdberge) - Added throttling for network devices that can request autocrafting (raoulvdberge) +- Renamed Cut Processors to Raw Processors and those are now made with Processor Binding instead of a Cutting Tool (raoulvdberge) - Fixed an autocrafting bug where it crashed when external inventories couldn't be filled (raoulvdberge) - Fixed a duplication bug with a disconnected Crafting Grid (raoulvdberge) - Fixed oredict autocrafting sometimes reporting that a craftable item is missing (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java b/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java index 20d9d2e1c..7d68030e4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java @@ -24,4 +24,5 @@ public final class RSItems { public static final ItemCover COVER = new ItemCover(); public static final ItemHollowCover HOLLOW_COVER = new ItemHollowCover(); public static final ItemWrench WRENCH = new ItemWrench(); + public static final ItemProcessorBinding PROCESSOR_BINDING = new ItemProcessorBinding(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java index f19b1d18a..5b898032c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java @@ -18,7 +18,6 @@ public class ItemProcessor extends ItemBase { public static final int TYPE_BASIC = 3; public static final int TYPE_IMPROVED = 4; public static final int TYPE_ADVANCED = 5; - public static final int TYPE_CUT_SILICON = 6; public ItemProcessor() { super(new ItemInfo(RS.ID, "processor")); @@ -32,22 +31,20 @@ public class ItemProcessor extends ItemBase { public void registerModels(IModelRegistration modelRegistration) { modelRegistration.setModelVariants( this, - new ResourceLocation(RS.ID, "cut_basic_processor"), - new ResourceLocation(RS.ID, "cut_improved_processor"), - new ResourceLocation(RS.ID, "cut_advanced_processor"), + new ResourceLocation(RS.ID, "raw_basic_processor"), + new ResourceLocation(RS.ID, "raw_improved_processor"), + new ResourceLocation(RS.ID, "raw_advanced_processor"), new ResourceLocation(RS.ID, "basic_processor"), new ResourceLocation(RS.ID, "improved_processor"), - new ResourceLocation(RS.ID, "advanced_processor"), - new ResourceLocation(RS.ID, "cut_silicon") + new ResourceLocation(RS.ID, "advanced_processor") ); - modelRegistration.setModel(this, TYPE_CUT_BASIC, new ModelResourceLocation(RS.ID + ":cut_basic_processor", "inventory")); - modelRegistration.setModel(this, TYPE_CUT_IMPROVED, new ModelResourceLocation(RS.ID + ":cut_improved_processor", "inventory")); - modelRegistration.setModel(this, TYPE_CUT_ADVANCED, new ModelResourceLocation(RS.ID + ":cut_advanced_processor", "inventory")); + modelRegistration.setModel(this, TYPE_CUT_BASIC, new ModelResourceLocation(RS.ID + ":raw_basic_processor", "inventory")); + modelRegistration.setModel(this, TYPE_CUT_IMPROVED, new ModelResourceLocation(RS.ID + ":raw_improved_processor", "inventory")); + modelRegistration.setModel(this, TYPE_CUT_ADVANCED, new ModelResourceLocation(RS.ID + ":raw_advanced_processor", "inventory")); modelRegistration.setModel(this, TYPE_BASIC, new ModelResourceLocation(RS.ID + ":basic_processor", "inventory")); modelRegistration.setModel(this, TYPE_IMPROVED, new ModelResourceLocation(RS.ID + ":improved_processor", "inventory")); modelRegistration.setModel(this, TYPE_ADVANCED, new ModelResourceLocation(RS.ID + ":advanced_processor", "inventory")); - modelRegistration.setModel(this, TYPE_CUT_SILICON, new ModelResourceLocation(RS.ID + ":cut_silicon", "inventory")); } @Override @@ -56,7 +53,7 @@ public class ItemProcessor extends ItemBase { return; } - for (int i = 0; i <= 6; ++i) { + for (int i = 0; i <= 5; ++i) { items.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessorBinding.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessorBinding.java new file mode 100644 index 000000000..f32af3d23 --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessorBinding.java @@ -0,0 +1,10 @@ +package com.raoulvdberge.refinedstorage.item; + +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.item.info.ItemInfo; + +public class ItemProcessorBinding extends ItemBase { + public ItemProcessorBinding() { + super(new ItemInfo(RS.ID, "processor_binding")); + } +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java index 0aacdaee9..e0d45199f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java @@ -220,6 +220,7 @@ public class ProxyCommon { registerBlock(RSBlocks.CRAFTER_MANAGER); registerItem(RSItems.QUARTZ_ENRICHED_IRON); + registerItem(RSItems.PROCESSOR_BINDING); registerItem(RSItems.CUTTING_TOOL); registerItem(RSItems.STORAGE_DISK); registerItem(RSItems.FLUID_STORAGE_DISK); diff --git a/src/main/resources/assets/refinedstorage/advancements/autocrafting.json b/src/main/resources/assets/refinedstorage/advancements/autocrafting.json index c6899c6fd..13a261315 100644 --- a/src/main/resources/assets/refinedstorage/advancements/autocrafting.json +++ b/src/main/resources/assets/refinedstorage/advancements/autocrafting.json @@ -10,7 +10,7 @@ "translate": "advancements.refinedstorage:autocrafting.description" } }, - "parent": "refinedstorage:cutting", + "parent": "refinedstorage:binding", "criteria": { "crafter_in_inventory": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/assets/refinedstorage/advancements/better_than_a_barrel.json b/src/main/resources/assets/refinedstorage/advancements/better_than_a_barrel.json index 3ad615db3..42b88858e 100644 --- a/src/main/resources/assets/refinedstorage/advancements/better_than_a_barrel.json +++ b/src/main/resources/assets/refinedstorage/advancements/better_than_a_barrel.json @@ -10,7 +10,7 @@ "translate": "advancements.refinedstorage:better_than_a_barrel.description" } }, - "parent": "refinedstorage:cutting", + "parent": "refinedstorage:binding", "criteria": { "storage_monitor_in_inventory": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/assets/refinedstorage/advancements/cutting.json b/src/main/resources/assets/refinedstorage/advancements/binding.json similarity index 59% rename from src/main/resources/assets/refinedstorage/advancements/cutting.json rename to src/main/resources/assets/refinedstorage/advancements/binding.json index 0405f2043..aec4f3c57 100644 --- a/src/main/resources/assets/refinedstorage/advancements/cutting.json +++ b/src/main/resources/assets/refinedstorage/advancements/binding.json @@ -1,13 +1,13 @@ { "display": { "icon": { - "item": "refinedstorage:cutting_tool" + "item": "refinedstorage:processor_binding" }, "title": { - "translate": "advancements.refinedstorage:cutting" + "translate": "advancements.refinedstorage:binding" }, "description": { - "translate": "advancements.refinedstorage:cutting.description" + "translate": "advancements.refinedstorage:binding.description" } }, "parent": "refinedstorage:root", @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "item": "refinedstorage:cutting_tool" + "item": "refinedstorage:processor_binding" } ] } diff --git a/src/main/resources/assets/refinedstorage/advancements/connecting.json b/src/main/resources/assets/refinedstorage/advancements/connecting.json index 3ea741bca..2f5f3bd1e 100644 --- a/src/main/resources/assets/refinedstorage/advancements/connecting.json +++ b/src/main/resources/assets/refinedstorage/advancements/connecting.json @@ -10,7 +10,7 @@ "translate": "advancements.refinedstorage:connecting.description" } }, - "parent": "refinedstorage:cutting", + "parent": "refinedstorage:binding", "criteria": { "cable_in_inventory": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/assets/refinedstorage/advancements/detecting.json b/src/main/resources/assets/refinedstorage/advancements/detecting.json index 997953c34..a97074677 100644 --- a/src/main/resources/assets/refinedstorage/advancements/detecting.json +++ b/src/main/resources/assets/refinedstorage/advancements/detecting.json @@ -10,7 +10,7 @@ "translate": "advancements.refinedstorage:detecting.description" } }, - "parent": "refinedstorage:cutting", + "parent": "refinedstorage:binding", "criteria": { "detector_in_inventory": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/assets/refinedstorage/advancements/drives.json b/src/main/resources/assets/refinedstorage/advancements/drives.json index 333b2a278..c4781be81 100644 --- a/src/main/resources/assets/refinedstorage/advancements/drives.json +++ b/src/main/resources/assets/refinedstorage/advancements/drives.json @@ -10,7 +10,7 @@ "translate": "advancements.refinedstorage:drives.description" } }, - "parent": "refinedstorage:cutting", + "parent": "refinedstorage:binding", "criteria": { "disk_drive_in_inventory": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/assets/refinedstorage/advancements/exporting.json b/src/main/resources/assets/refinedstorage/advancements/exporting.json index 625552c66..1b6f49645 100644 --- a/src/main/resources/assets/refinedstorage/advancements/exporting.json +++ b/src/main/resources/assets/refinedstorage/advancements/exporting.json @@ -10,7 +10,7 @@ "translate": "advancements.refinedstorage:exporting.description" } }, - "parent": "refinedstorage:cutting", + "parent": "refinedstorage:binding", "criteria": { "exporter_in_inventory": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/assets/refinedstorage/advancements/importing.json b/src/main/resources/assets/refinedstorage/advancements/importing.json index d04fad785..797f30b24 100644 --- a/src/main/resources/assets/refinedstorage/advancements/importing.json +++ b/src/main/resources/assets/refinedstorage/advancements/importing.json @@ -10,7 +10,7 @@ "translate": "advancements.refinedstorage:importing.description" } }, - "parent": "refinedstorage:cutting", + "parent": "refinedstorage:binding", "criteria": { "importer_in_inventory": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/assets/refinedstorage/advancements/interface_to_the_world.json b/src/main/resources/assets/refinedstorage/advancements/interface_to_the_world.json index 3fb9fa407..d6bcee111 100644 --- a/src/main/resources/assets/refinedstorage/advancements/interface_to_the_world.json +++ b/src/main/resources/assets/refinedstorage/advancements/interface_to_the_world.json @@ -10,7 +10,7 @@ "translate": "advancements.refinedstorage:interface_to_the_world.description" } }, - "parent": "refinedstorage:cutting", + "parent": "refinedstorage:binding", "criteria": { "interface_in_inventory": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/assets/refinedstorage/advancements/more_than_just_storage.json b/src/main/resources/assets/refinedstorage/advancements/more_than_just_storage.json index 0c0ff9fab..28ab1816c 100644 --- a/src/main/resources/assets/refinedstorage/advancements/more_than_just_storage.json +++ b/src/main/resources/assets/refinedstorage/advancements/more_than_just_storage.json @@ -10,7 +10,7 @@ "translate": "advancements.refinedstorage:more_than_just_storage.description" } }, - "parent": "refinedstorage:cutting", + "parent": "refinedstorage:binding", "criteria": { "reader_writer_in_inventory": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/assets/refinedstorage/advancements/security.json b/src/main/resources/assets/refinedstorage/advancements/security.json index c0e542364..0dfe00cad 100644 --- a/src/main/resources/assets/refinedstorage/advancements/security.json +++ b/src/main/resources/assets/refinedstorage/advancements/security.json @@ -10,7 +10,7 @@ "translate": "advancements.refinedstorage:security.description" } }, - "parent": "refinedstorage:cutting", + "parent": "refinedstorage:binding", "criteria": { "security_manager_in_inventory": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/assets/refinedstorage/advancements/storing_externally.json b/src/main/resources/assets/refinedstorage/advancements/storing_externally.json index aad7fbfdd..82e9200b8 100644 --- a/src/main/resources/assets/refinedstorage/advancements/storing_externally.json +++ b/src/main/resources/assets/refinedstorage/advancements/storing_externally.json @@ -10,7 +10,7 @@ "translate": "advancements.refinedstorage:storing_externally.description" } }, - "parent": "refinedstorage:cutting", + "parent": "refinedstorage:binding", "criteria": { "external_storage_in_inventory": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/assets/refinedstorage/advancements/upgrading.json b/src/main/resources/assets/refinedstorage/advancements/upgrading.json index 10b0008ec..58a6b7daf 100644 --- a/src/main/resources/assets/refinedstorage/advancements/upgrading.json +++ b/src/main/resources/assets/refinedstorage/advancements/upgrading.json @@ -11,7 +11,7 @@ "translate": "advancements.refinedstorage:upgrading.description" } }, - "parent": "refinedstorage:cutting", + "parent": "refinedstorage:binding", "criteria": { "upgrade_in_inventory": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/assets/refinedstorage/advancements/wireless.json b/src/main/resources/assets/refinedstorage/advancements/wireless.json index 5159ef085..1d4d215ae 100644 --- a/src/main/resources/assets/refinedstorage/advancements/wireless.json +++ b/src/main/resources/assets/refinedstorage/advancements/wireless.json @@ -10,7 +10,7 @@ "translate": "advancements.refinedstorage:wireless.description" } }, - "parent": "refinedstorage:cutting", + "parent": "refinedstorage:binding", "criteria": { "wireless_transmitter_in_inventory": { "trigger": "minecraft:inventory_changed", diff --git a/src/main/resources/assets/refinedstorage/lang/de_de.lang b/src/main/resources/assets/refinedstorage/lang/de_de.lang index 13b058d75..310c8047c 100755 --- a/src/main/resources/assets/refinedstorage/lang/de_de.lang +++ b/src/main/resources/assets/refinedstorage/lang/de_de.lang @@ -253,13 +253,9 @@ item.refinedstorage:quartz_enriched_iron.name=Quarzangereichertes Eisen item.refinedstorage:core.0.name=Konstruktionskern item.refinedstorage:core.1.name=Destruktionskern item.refinedstorage:silicon.name=Silizium -item.refinedstorage:processor.0.name=Basisprozessorrohling -item.refinedstorage:processor.1.name=Verbesserter Prozessorrohling -item.refinedstorage:processor.2.name=Fortschrittlicher Prozessorrohling item.refinedstorage:processor.3.name=Basisprozessor item.refinedstorage:processor.4.name=Verbesserter Prozessor item.refinedstorage:processor.5.name=Fortschrittlicher Prozessor -item.refinedstorage:processor.6.name=Siliziumrohling item.refinedstorage:storage_part.0.name=1k Speicherkern item.refinedstorage:storage_part.1.name=4k Speicherkern item.refinedstorage:storage_part.2.name=16k Speicherkern @@ -299,8 +295,6 @@ advancements.refinedstorage:connecting=Verbinden advancements.refinedstorage:connecting.description=Platziere zwei Geräte nebeneinander oder verwende ein Kabel um sie zu verbinden advancements.refinedstorage:conditional_connecting=Bedingtes Verbinden advancements.refinedstorage:conditional_connecting.description=Stelle ein Relais her, um eine Verbindung per Redstone zu steuern -advancements.refinedstorage:cutting=Schneiden -advancements.refinedstorage:cutting.description=Stelle einen Prozessorrohling her, indem du Ressourcen mit dem Schneidewerkzeug bearbeitest advancements.refinedstorage:drives=Laufwerke advancements.refinedstorage:drives.description=Stelle ein Laufwerk her um Speicherzellen zu lagern advancements.refinedstorage:manipulating_disks=Speichermanipulation diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.lang b/src/main/resources/assets/refinedstorage/lang/en_us.lang index c48ad746e..4a3a3491e 100644 --- a/src/main/resources/assets/refinedstorage/lang/en_us.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_us.lang @@ -264,13 +264,12 @@ item.refinedstorage:quartz_enriched_iron.name=Quartz Enriched Iron item.refinedstorage:core.0.name=Construction Core item.refinedstorage:core.1.name=Destruction Core item.refinedstorage:silicon.name=Silicon -item.refinedstorage:processor.0.name=Cut Basic Processor -item.refinedstorage:processor.1.name=Cut Improved Processor -item.refinedstorage:processor.2.name=Cut Advanced Processor +item.refinedstorage:processor.0.name=Raw Basic Processor +item.refinedstorage:processor.1.name=Raw Improved Processor +item.refinedstorage:processor.2.name=Raw Advanced Processor item.refinedstorage:processor.3.name=Basic Processor item.refinedstorage:processor.4.name=Improved Processor item.refinedstorage:processor.5.name=Advanced Processor -item.refinedstorage:processor.6.name=Cut Silicon item.refinedstorage:storage_part.0.name=1k Storage Part item.refinedstorage:storage_part.1.name=4k Storage Part item.refinedstorage:storage_part.2.name=16k Storage Part @@ -299,6 +298,7 @@ item.refinedstorage:security_card.owner=Bound to: %s item.refinedstorage:cutting_tool.name=Cutting Tool item.refinedstorage:cover.name=Cover item.refinedstorage:hollow_cover.name=Hollow Cover +item.refinedstorage:processor_binding.name=Processor Binding commands.refinedstorage.createdisk.usage=/createdisk commands.refinedstorage.createdisk.error.notADisk=The given disk item is not a disk. @@ -310,8 +310,6 @@ advancements.refinedstorage:connecting=Connecting advancements.refinedstorage:connecting.description=You can place all the devices next to each other to connect them up, or, use Cable advancements.refinedstorage:conditional_connecting=Conditional connecting advancements.refinedstorage:conditional_connecting.description=Craft a Relay to control if a network signal can pass with redstone -advancements.refinedstorage:cutting=Cutting -advancements.refinedstorage:cutting.description=Cut resources up in cut processors advancements.refinedstorage:drives=Drives advancements.refinedstorage:drives.description=Craft a Disk Drive to be able to store your disks advancements.refinedstorage:manipulating_disks=Manipulating disks @@ -373,4 +371,6 @@ advancements.refinedstorage:storing_externally.description=Use an External Stora advancements.refinedstorage:covering=Covering advancements.refinedstorage:covering.description=Craft a Cover to hide cables advancements.refinedstorage:hollow_covering=Hollow covering -advancements.refinedstorage:hollow_covering.description=Craft a Hollow Cover to hide cables, but still let cable through \ No newline at end of file +advancements.refinedstorage:hollow_covering.description=Craft a Hollow Cover to hide cables, but still let cable through +advancements.refinedstorage:binding=Binding +advancements.refinedstorage:binding.description=Craft Processor Binding to craft the various processors \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang index e890944d8..ab0e23b18 100755 --- a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang +++ b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang @@ -248,13 +248,9 @@ item.refinedstorage:quartz_enriched_iron.name=Кварцевое обогаще item.refinedstorage:core.0.name=Ядро созидания item.refinedstorage:core.1.name=Ядро разрушения item.refinedstorage:silicon.name=Кремний -item.refinedstorage:processor.0.name=Печатный базовый процессор -item.refinedstorage:processor.1.name=Печатный улучшенный процессор -item.refinedstorage:processor.2.name=Печатный продвинутый процессор item.refinedstorage:processor.3.name=Базовый процессор item.refinedstorage:processor.4.name=Улучшенный процессор item.refinedstorage:processor.5.name=Продвинутый процессор -item.refinedstorage:processor.6.name=Печатный кремний item.refinedstorage:storage_part.0.name=Дискетная плата 1Кб item.refinedstorage:storage_part.1.name=Дискетная плата 4Кб item.refinedstorage:storage_part.2.name=Дискетная плата 16Кб @@ -294,8 +290,6 @@ advancements.refinedstorage:connecting=Соединение advancements.refinedstorage:connecting.description=Вы можете разместить все устройства рядом друг с другом, чтобы подключить их, или, используя кабель advancements.refinedstorage:conditional_connecting=Условное подключение advancements.refinedstorage:conditional_connecting.description=Изготовить реле для управления, если сигнал сети может пройти с редстоун -advancements.refinedstorage:cutting=Резка -advancements.refinedstorage:cutting.description=Сокращение ресурсов в обработчиках разреза advancements.refinedstorage:drives=Приводы advancements.refinedstorage:drives.description=Создайте дисковый привод, чтобы иметь возможность хранить ваши диски advancements.refinedstorage:manipulating_disks=Манипулирование дисками diff --git a/src/main/resources/assets/refinedstorage/models/item/cut_advanced_processor.json b/src/main/resources/assets/refinedstorage/models/item/cut_advanced_processor.json deleted file mode 100644 index 54f489497..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/cut_advanced_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/cut_advanced_processor" - } -} diff --git a/src/main/resources/assets/refinedstorage/models/item/cut_basic_processor.json b/src/main/resources/assets/refinedstorage/models/item/cut_basic_processor.json deleted file mode 100644 index f93e54771..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/cut_basic_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/cut_basic_processor" - } -} diff --git a/src/main/resources/assets/refinedstorage/models/item/cut_improved_processor.json b/src/main/resources/assets/refinedstorage/models/item/cut_improved_processor.json deleted file mode 100644 index d3a613661..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/cut_improved_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/cut_improved_processor" - } -} diff --git a/src/main/resources/assets/refinedstorage/models/item/cut_silicon.json b/src/main/resources/assets/refinedstorage/models/item/cut_silicon.json deleted file mode 100644 index 2d8616d83..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/cut_silicon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/cut_silicon" - } -} diff --git a/src/main/resources/assets/refinedstorage/models/item/raw_advanced_processor.json b/src/main/resources/assets/refinedstorage/models/item/raw_advanced_processor.json new file mode 100644 index 000000000..c0441c006 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/raw_advanced_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/raw_advanced_processor" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/raw_basic_processor.json b/src/main/resources/assets/refinedstorage/models/item/raw_basic_processor.json new file mode 100644 index 000000000..f0239bf3b --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/raw_basic_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/raw_basic_processor" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/raw_improved_processor.json b/src/main/resources/assets/refinedstorage/models/item/raw_improved_processor.json new file mode 100644 index 000000000..bd9c6f6b8 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/raw_improved_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/raw_improved_processor" + } +} diff --git a/src/main/resources/assets/refinedstorage/recipes/_constants.json b/src/main/resources/assets/refinedstorage/recipes/_constants.json index ef92de642..1085de9d0 100644 --- a/src/main/resources/assets/refinedstorage/recipes/_constants.json +++ b/src/main/resources/assets/refinedstorage/recipes/_constants.json @@ -20,13 +20,6 @@ "data": 5 } }, - { - "name": "cut_silicon", - "ingredient": { - "item": "refinedstorage:processor", - "data": 6 - } - }, { "name": "construction_core", "ingredient": { @@ -40,12 +33,5 @@ "item": "refinedstorage:core", "data": 1 } - }, - { - "name": "cutting_tool", - "ingredient": { - "item": "refinedstorage:cutting_tool", - "data": 32767 - } } ] \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/cut_silicon.json b/src/main/resources/assets/refinedstorage/recipes/cut_silicon.json deleted file mode 100644 index 31002ce40..000000000 --- a/src/main/resources/assets/refinedstorage/recipes/cut_silicon.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "forge:ore_shapeless", - "ingredients": [ - { - "item": "#cutting_tool" - }, - { - "type": "forge:ore_dict", - "ore": "itemSilicon" - } - ], - "result": { - "item": "refinedstorage:processor", - "data": 6 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/processor_binding.json b/src/main/resources/assets/refinedstorage/recipes/processor_binding.json new file mode 100644 index 000000000..a7d26dd12 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/recipes/processor_binding.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + "SLS", + " " + ], + "key": { + "S": { + "item": "minecraft:string" + }, + "L": { + "item": "minecraft:slime_ball" + } + }, + "result": { + "item": "refinedstorage:processor_binding", + "count": 16 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/cut_advanced_processor.json b/src/main/resources/assets/refinedstorage/recipes/raw_advanced_processor.json similarity index 74% rename from src/main/resources/assets/refinedstorage/recipes/cut_advanced_processor.json rename to src/main/resources/assets/refinedstorage/recipes/raw_advanced_processor.json index 338efae4b..6cc8e62cf 100644 --- a/src/main/resources/assets/refinedstorage/recipes/cut_advanced_processor.json +++ b/src/main/resources/assets/refinedstorage/recipes/raw_advanced_processor.json @@ -2,13 +2,13 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "#cutting_tool" + "item": "refinedstorage:processor_binding" }, { "item": "minecraft:diamond" }, { - "item": "#cut_silicon" + "item": "refinedstorage:silicon" }, { "item": "minecraft:redstone" diff --git a/src/main/resources/assets/refinedstorage/recipes/cut_basic_processor.json b/src/main/resources/assets/refinedstorage/recipes/raw_basic_processor.json similarity index 75% rename from src/main/resources/assets/refinedstorage/recipes/cut_basic_processor.json rename to src/main/resources/assets/refinedstorage/recipes/raw_basic_processor.json index f45565ab9..7b489476e 100644 --- a/src/main/resources/assets/refinedstorage/recipes/cut_basic_processor.json +++ b/src/main/resources/assets/refinedstorage/recipes/raw_basic_processor.json @@ -2,13 +2,13 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "#cutting_tool" + "item": "refinedstorage:processor_binding" }, { "item": "minecraft:iron_ingot" }, { - "item": "#cut_silicon" + "item": "refinedstorage:silicon" }, { "item": "minecraft:redstone" diff --git a/src/main/resources/assets/refinedstorage/recipes/cut_improved_processor.json b/src/main/resources/assets/refinedstorage/recipes/raw_improved_processor.json similarity index 75% rename from src/main/resources/assets/refinedstorage/recipes/cut_improved_processor.json rename to src/main/resources/assets/refinedstorage/recipes/raw_improved_processor.json index 408ac692b..5c3c3ded7 100644 --- a/src/main/resources/assets/refinedstorage/recipes/cut_improved_processor.json +++ b/src/main/resources/assets/refinedstorage/recipes/raw_improved_processor.json @@ -2,13 +2,13 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "#cutting_tool" + "item": "refinedstorage:processor_binding" }, { "item": "minecraft:gold_ingot" }, { - "item": "#cut_silicon" + "item": "refinedstorage:silicon" }, { "item": "minecraft:redstone" diff --git a/src/main/resources/assets/refinedstorage/textures/items/cut_silicon.png b/src/main/resources/assets/refinedstorage/textures/items/cut_silicon.png deleted file mode 100644 index 943b7abbc..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/items/cut_silicon.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/cut_advanced_processor.png b/src/main/resources/assets/refinedstorage/textures/items/raw_advanced_processor.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/items/cut_advanced_processor.png rename to src/main/resources/assets/refinedstorage/textures/items/raw_advanced_processor.png diff --git a/src/main/resources/assets/refinedstorage/textures/items/cut_basic_processor.png b/src/main/resources/assets/refinedstorage/textures/items/raw_basic_processor.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/items/cut_basic_processor.png rename to src/main/resources/assets/refinedstorage/textures/items/raw_basic_processor.png diff --git a/src/main/resources/assets/refinedstorage/textures/items/cut_improved_processor.png b/src/main/resources/assets/refinedstorage/textures/items/raw_improved_processor.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/items/cut_improved_processor.png rename to src/main/resources/assets/refinedstorage/textures/items/raw_improved_processor.png