Rewrite some of the logic behind the matter fabricator, now works with ic2 scrap as well.

Closes #1002 and Closes #822

(cherry picked from commit 93ccd8b)
This commit is contained in:
modmuss50 2017-03-13 10:22:06 +00:00
parent 76332ee946
commit bbf93c3ae3
No known key found for this signature in database
GPG key ID: 203A5ED4D3E48BEA
3 changed files with 27 additions and 44 deletions

View file

@ -79,6 +79,7 @@ public class IC2Dict {
IC2Duplicates.CARBON_FIBER.setIc2Stack(ItemName.crafting.getItemStack("carbon_fibre"));
IC2Duplicates.CARBON_MESH.setIc2Stack(ItemName.crafting.getItemStack("carbon_mesh"));
IC2Duplicates.REFINED_IRON.setIc2Stack(ItemName.plate.getItemStack("iron"));
IC2Duplicates.SCRAP.setIc2Stack(ItemName.crafting.getItemStack(CraftingItemType.scrap));
//Rubber - ore dic: itemRubber, hidden from JEI
//Rubber Sap - only used to make rubber, hidden from JEI
//Rubber tree blocks, hidden when deduplication is on, and rubber tress are not set to gen, includes tree taps

View file

@ -65,7 +65,8 @@ public enum IC2Duplicates {
MIXED_METAL(ItemIngots.getIngotByName("mixed_metal")),
CARBON_FIBER(ItemParts.getPartByName("carbon_fiber")),
CARBON_MESH(ItemParts.getPartByName("carbon_mesh")),
REFINED_IRON(ItemIngots.getIngotByName("refined_iron"));
REFINED_IRON(ItemIngots.getIngotByName("refined_iron")),
SCRAP(ItemParts.getPartByName("scrap"));
ItemStack ic2Stack;
ItemStack trStack;