From 1a1ec6fee814d27aa4443aa17e18366ea21352b0 Mon Sep 17 00:00:00 2001 From: TheDoctorSoda Date: Sun, 6 Mar 2016 23:47:17 -0800 Subject: [PATCH] [TEXTURES] Energy storage upgrade and wrench update & more scrapbox loot --- src/main/java/techreborn/init/ModRecipes.java | 29 +++++++++++++++--- .../techreborn/textures/items/tool/wrench.png | Bin 492 -> 468 bytes .../UpgradeBackingTemplate.png | Bin .../items/upgrade/upgradeEnergyStorage.png | Bin 0 -> 410 bytes .../{misc => upgrade}/upgradeOverclock.png | Bin 5 files changed, 25 insertions(+), 4 deletions(-) rename src/main/resources/assets/techreborn/textures/items/{misc => upgrade}/UpgradeBackingTemplate.png (100%) create mode 100644 src/main/resources/assets/techreborn/textures/items/upgrade/upgradeEnergyStorage.png rename src/main/resources/assets/techreborn/textures/items/{misc => upgrade}/upgradeOverclock.png (100%) 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 13970162292ac495d6a11c4bda1b2e0d14f60de9..5e61569d3593dc5f6e64957fe58eb2e1b017c9d3 100644 GIT binary patch delta 382 zcmV-^0fGMP1JnbMJPL9E01|QmUS(V3kwzzfQb|NXR5(v#AO!yZ|Bn?D4M2()q#OO8 z607-tdW$*;soMSj zx=J@76IJu%2xYJsP5@K5xyIxFrdqH68!DW^8bEkBcq z|I72O{x2`E`@g)<0qmWL(OUnzgA}nF0Moo8-|qjiT)Y3%<8=S`g{%JWkJR`-EnfTo zq-gd3y%ldHFirrHTvzG< zj;eJP?*Hedn__4NVVnRYxdIqXAbMJ&9*VP(F-`!IoRh5ce@cw{|B2AlMNktmK-Pea ci31D_0Ff|=V@ey+f&c&j07*qoM6N<$g0Snk7ytkO delta 407 zcmV;I0cifz1MCBkJPLCF01|Tnj3T)QkwzzfYDq*vR5(wSkliaoVI0Sg$c2~Gu(VFO zK%F(EwY+3ehO(7tXht$oyPCJPg>dDH@@K8w7)xVYGg}91V@Ay7*ZCbC&dFIjKJ~5V z`98nT^PCP-2>`0m3=Kc}jo^bE(p#Lc{l_IVR16q#cVNTqW~V}?RD_0}k0y}c>K2xN zN|{m-8hSl(;B&WESSsa=-z0Wrkp^>zgLprkLh0Bc3Y6?Rhh)$q?p2Wn-vT`-ZJUta z8$dz$2gQ9W9s*`0d}i=Vjp`Rj^2>$=g`IxzJ`VRY^@w{r5MO0+y{t!SrB#&wTp*R% zwRYq@2Jnk|#OC!lpZgW$Q6QBc3oNpK-Y&#kI)vSAh&gpatx-HZWffA$p(aM)wmd!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=f}XnDBSHhvbG?|%t8gJ&fHlfRRpEgjW9z$Jen~Qo zS_<|mc2^mg4jhT$IML1f?uQ>^LhcIggN2iq{rv9O=f%b6W;HP{i7~*sw^HW#yp$TL z!yInE7{tW#&nz|QTl{^_&Y7P-A6s60clNTAHH^%D`K5c^o7#Zk$l&Sf=d#Wzp$Pz| CN0?6l literal 0 HcmV?d00001 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