diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 7b366f6ba..2f7858e97 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -113,17 +113,34 @@ public class ModRecipes { ScrapboxList.addItemStackToList(new ItemStack(Items.reeds)); ScrapboxList.addItemStackToList(new ItemStack(Items.spider_eye)); ScrapboxList.addItemStackToList(new ItemStack(Items.slime_ball)); + ScrapboxList.addItemStackToList(new ItemStack(Items.rotten_flesh)); + ScrapboxList.addItemStackToList(new ItemStack(Items.sign)); + ScrapboxList.addItemStackToList(new ItemStack(Items.writable_book)); + ScrapboxList.addItemStackToList(new ItemStack(Items.cooked_beef)); + ScrapboxList.addItemStackToList(new ItemStack(Items.name_tag)); + ScrapboxList.addItemStackToList(new ItemStack(Items.saddle)); + ScrapboxList.addItemStackToList(new ItemStack(Items.redstone)); + ScrapboxList.addItemStackToList(new ItemStack(Items.gunpowder)); + ScrapboxList.addItemStackToList(new ItemStack(Items.rabbit_hide)); + ScrapboxList.addItemStackToList(new ItemStack(Items.rabbit_foot)); + ScrapboxList.addItemStackToList(new ItemStack(Items.apple)); ScrapboxList.addItemStackToList(ItemGems.getGemByName("ruby")); - ScrapboxList.addItemStackToList(ItemDusts.getDustByName("iron")); - ScrapboxList.addItemStackToList(ItemDusts.getDustByName("gold")); - ScrapboxList.addItemStackToList(ItemDusts.getDustByName("copper")); - ScrapboxList.addItemStackToList(ItemDusts.getDustByName("tin")); + ScrapboxList.addItemStackToList(ItemGems.getGemByName("sapphire")); + ScrapboxList.addItemStackToList(ItemGems.getGemByName("peridot")); + ScrapboxList.addItemStackToList(ItemGems.getGemByName("redGarnet")); + ScrapboxList.addItemStackToList(ItemGems.getGemByName("yellowGarnet")); + ScrapboxList.addItemStackToList(ItemCells.getCellByName("empty")); + ScrapboxList.addItemStackToList(ItemCells.getCellByName("water")); ScrapboxList.addItemStackToList(ItemParts.getPartByName("scrap")); + ScrapboxList.addItemStackToList(ItemParts.getPartByName("rubber")); ScrapboxList.addItemStackToList(new ItemStack(Blocks.trapdoor)); ScrapboxList.addItemStackToList(new ItemStack(Blocks.brick_block)); ScrapboxList.addItemStackToList(new ItemStack(Blocks.crafting_table)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.pumpkin)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.netherrack)); + ScrapboxList.addItemStackToList(new ItemStack(Blocks.grass)); ScrapboxList.addItemStackToList(new ItemStack(Blocks.dirt, 1, 0)); ScrapboxList.addItemStackToList(new ItemStack(Blocks.dirt, 1, 1)); ScrapboxList.addItemStackToList(new ItemStack(Blocks.sand, 1, 0)); @@ -172,6 +189,10 @@ public class ModRecipes { ScrapboxList.addItemStackToList(new ItemStack(ModBlocks.rubberSapling)); + for(String i : ItemDusts.types){ + ScrapboxList.addItemStackToList(ItemDusts.getDustByName(i)); + } + registerDyable(Blocks.carpet); registerDyable(Blocks.stained_glass); registerDyable(Blocks.stained_glass_pane); diff --git a/src/main/resources/assets/techreborn/textures/items/tool/wrench.png b/src/main/resources/assets/techreborn/textures/items/tool/wrench.png index 139701622..5e61569d3 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/tool/wrench.png and b/src/main/resources/assets/techreborn/textures/items/tool/wrench.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/misc/UpgradeBackingTemplate.png b/src/main/resources/assets/techreborn/textures/items/upgrade/UpgradeBackingTemplate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/misc/UpgradeBackingTemplate.png rename to src/main/resources/assets/techreborn/textures/items/upgrade/UpgradeBackingTemplate.png diff --git a/src/main/resources/assets/techreborn/textures/items/upgrade/upgradeEnergyStorage.png b/src/main/resources/assets/techreborn/textures/items/upgrade/upgradeEnergyStorage.png new file mode 100644 index 000000000..17107818f Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/items/upgrade/upgradeEnergyStorage.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/misc/upgradeOverclock.png b/src/main/resources/assets/techreborn/textures/items/upgrade/upgradeOverclock.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/misc/upgradeOverclock.png rename to src/main/resources/assets/techreborn/textures/items/upgrade/upgradeOverclock.png