From 223732e4ef796a3cf89a377b93d5537e2cbe1420 Mon Sep 17 00:00:00 2001 From: onVoid Date: Sun, 5 Jun 2016 10:50:30 -0700 Subject: [PATCH 1/5] Textures for andesiteDust, graniteDust, and dioriteDust --- .../textures/items/dust/andesiteDust.png | Bin 0 -> 392 bytes .../textures/items/dust/dioriteDust.png | Bin 0 -> 394 bytes .../textures/items/dust/graniteDust.png | Bin 0 -> 445 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/techreborn/textures/items/dust/andesiteDust.png create mode 100644 src/main/resources/assets/techreborn/textures/items/dust/dioriteDust.png create mode 100644 src/main/resources/assets/techreborn/textures/items/dust/graniteDust.png diff --git a/src/main/resources/assets/techreborn/textures/items/dust/andesiteDust.png b/src/main/resources/assets/techreborn/textures/items/dust/andesiteDust.png new file mode 100644 index 0000000000000000000000000000000000000000..d125c7925c1ba92c9ca855d46f4871834517d7b0 GIT binary patch literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=G^tAk28_ZrvZCAbW|YuPggq9%*h>E|vFw*MLG2C9V-A!TD(=<%vb93~dIoxyImUHTq<<-ip zx9R%M%ARWPczc3ML!SEMlG%nl%5y%iST)Q2)vl*LD@&%_Z}{%7SETnm+Ih#3zOEY+ z6O%7*IbkHr+#};~fl)N@v{&T2rhS@Ip4I!lvI6;>1s;*b z3=G^tAk28_ZrvZCAbW|YuPggq9wAO~wbs*b7XXDMN?apKg7ec#$`gxH8440J^Gfvc zQcDy}^bGVYbByc!fNH*ax;Tbd_%EFh-F3)8!1eC-9lVKU3UwZFZtCyztT_W6MOttA z`sR5a=@T{lQTXD^TC44f!b-om3}u=n`W$(zpM92R`uj)HkVQcD_~N5UKexH?D8}f8 zdrj(jdi9i~P9^7t8PB^?1z4mn?Rw(0^2n|PMbA&|HFohQOPjX^*q^KGRMk#B@%_54 zqP|q{$J3Ev0W#@NDj9v38?Qd1Ww7i?V(j~$);#r^zVD3=yea!Ft!E+Uzc%9Y>L_Ww z!r1w(%Pc>vStYfTAz{Ikw94JRD>ceOrkU2?@6?fuU}fM|=nDE*Xt6u|x6uZ@^CgES j+)!*w7C3x<;YoY10_L4sPeP1=0l?tt>gTe~DWM4fu3D2+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/dust/graniteDust.png b/src/main/resources/assets/techreborn/textures/items/dust/graniteDust.png new file mode 100644 index 0000000000000000000000000000000000000000..ef00f87d759317dc32170a7d1a9399aec10d5d26 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=G^tAk28_ZrvZCAbW|YuPggq9zh-r8UFNQZJ>}uiEBhjaDG}zd16s2LqTF@UWr~_ zYKel0o`Ifaj&YqI0|TRmr;B5Vh5yotj{b)n1X_RgO7Sma%gJsHx)s6_y~xmz#o3@M zglkIDfzrFlDE8>E`%Ut>7i)TEJn(bV8 kX2xQX)eA)a^JU$C@bT~~YsLl6z;I>oboFyt=akR{0D_OO0ssI2 literal 0 HcmV?d00001 From 4d29af274e23e074f46327fa314d517528d36a0f Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 5 Jun 2016 11:23:20 +0100 Subject: [PATCH 2/5] Balance power recipes --- src/main/java/techreborn/init/ModRecipes.java | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 289650100..3d681948b 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -365,37 +365,37 @@ public class ModRecipes ItemPlates.getPlateByName("advancedAlloy"), 400, 20)); RecipeHandler.addRecipe( new CompressorRecipe(ItemParts.getPartByName("carbonmesh"), ItemPlates.getPlateByName("carbon"), 400, - 20)); + 2)); RecipeHandler.addRecipe( - new CompressorRecipe(new ItemStack(Items.IRON_INGOT), ItemPlates.getPlateByName("iron"), 400, 20)); + new CompressorRecipe(new ItemStack(Items.IRON_INGOT), ItemPlates.getPlateByName("iron"), 400, 2)); RecipeHandler.addRecipe( new CompressorRecipe(ItemIngots.getIngotByName("copper"), ItemPlates.getPlateByName("copper"), 400, - 20)); + 2)); RecipeHandler.addRecipe( - new CompressorRecipe(ItemIngots.getIngotByName("tin"), ItemPlates.getPlateByName("tin"), 400, 20)); + new CompressorRecipe(ItemIngots.getIngotByName("tin"), ItemPlates.getPlateByName("tin"), 400, 2)); RecipeHandler.addRecipe( new CompressorRecipe(ItemIngots.getIngotByName("aluminum"), ItemPlates.getPlateByName("aluminum"), 400, - 20)); + 2)); RecipeHandler.addRecipe( - new CompressorRecipe(ItemIngots.getIngotByName("brass"), ItemPlates.getPlateByName("brass"), 400, 20)); + new CompressorRecipe(ItemIngots.getIngotByName("brass"), ItemPlates.getPlateByName("brass"), 400, 2)); RecipeHandler.addRecipe( new CompressorRecipe(ItemIngots.getIngotByName("bronze"), ItemPlates.getPlateByName("bronze"), 400, - 20)); + 2)); RecipeHandler.addRecipe( - new CompressorRecipe(ItemIngots.getIngotByName("lead"), ItemPlates.getPlateByName("lead"), 400, 20)); + new CompressorRecipe(ItemIngots.getIngotByName("lead"), ItemPlates.getPlateByName("lead"), 400, 2)); RecipeHandler.addRecipe( new CompressorRecipe(ItemIngots.getIngotByName("silver"), ItemPlates.getPlateByName("silver"), 400, - 20)); + 2)); } static void addExtractorRecipes() { RecipeHandler.addRecipe( new ExtractorRecipe(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber", 3), 400, - 20)); + 2)); RecipeHandler.addRecipe( - new ExtractorRecipe(new ItemStack(ModBlocks.rubberLog), ItemParts.getPartByName("rubber"), 400, 20, + new ExtractorRecipe(new ItemStack(ModBlocks.rubberLog), ItemParts.getPartByName("rubber"), 400, 2, false)); } @@ -417,29 +417,31 @@ public class ModRecipes static void addGrinderRecipes() { // Vanilla + int eutick = 2; + int ticktime = 300; RecipeHandler.addRecipe( - new GrinderRecipe(new ItemStack(Blocks.IRON_ORE), ItemDusts.getDustByName("iron", 2), 100, 20)); + new GrinderRecipe(new ItemStack(Blocks.IRON_ORE), ItemDusts.getDustByName("iron", 2), ticktime, eutick)); RecipeHandler.addRecipe( - new GrinderRecipe(new ItemStack(Blocks.GOLD_ORE), ItemDusts.getDustByName("gold", 2), 100, 20)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Items.COAL), ItemDusts.getDustByName("coal"), 100, 20)); + new GrinderRecipe(new ItemStack(Blocks.GOLD_ORE), ItemDusts.getDustByName("gold", 2), ticktime, eutick)); + RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Items.COAL), ItemDusts.getDustByName("coal"), ticktime, eutick)); RecipeHandler - .addRecipe(new GrinderRecipe(new ItemStack(Blocks.COAL_ORE), new ItemStack(Items.COAL, 2), 100, 20)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Items.BONE), new ItemStack(Items.DYE, 6, 15), 100, 20)); + .addRecipe(new GrinderRecipe(new ItemStack(Blocks.COAL_ORE), new ItemStack(Items.COAL, 2), ticktime, eutick)); + RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Items.BONE), new ItemStack(Items.DYE, 6, 15), ticktime, eutick)); RecipeHandler - .addRecipe(new GrinderRecipe(new ItemStack(Blocks.COBBLESTONE), new ItemStack(Blocks.SAND), 100, 20)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.GRAVEL), new ItemStack(Items.FLINT), 100, 20)); + .addRecipe(new GrinderRecipe(new ItemStack(Blocks.COBBLESTONE), new ItemStack(Blocks.SAND), ticktime, eutick)); + RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.GRAVEL), new ItemStack(Items.FLINT), ticktime, eutick)); // TechReborn RecipeHandler.addRecipe( - new GrinderRecipe(BlockOre2.getOreByName("copper"), ItemDusts.getDustByName("copper", 2), 100, 20)); + new GrinderRecipe(BlockOre2.getOreByName("copper"), ItemDusts.getDustByName("copper", 2), ticktime, eutick)); RecipeHandler.addRecipe( - new GrinderRecipe(BlockOre2.getOreByName("tin"), ItemDusts.getDustByName("tin", 2), 100, 20)); + new GrinderRecipe(BlockOre2.getOreByName("tin"), ItemDusts.getDustByName("tin", 2), ticktime, eutick)); RecipeHandler.addRecipe( - new GrinderRecipe(BlockOre.getOreByName("Lead"), ItemDusts.getDustByName("lead", 2), 100, 20)); + new GrinderRecipe(BlockOre.getOreByName("Lead"), ItemDusts.getDustByName("lead", 2), ticktime, eutick)); RecipeHandler.addRecipe( - new GrinderRecipe(BlockOre.getOreByName("Silver"), ItemDusts.getDustByName("silver", 2), 100, 20)); + new GrinderRecipe(BlockOre.getOreByName("Silver"), ItemDusts.getDustByName("silver", 2), ticktime, eutick)); RecipeHandler - .addRecipe(new GrinderRecipe(ItemGems.getGemByName("ruby"), ItemDusts.getDustByName("ruby"), 100, 20)); + .addRecipe(new GrinderRecipe(ItemGems.getGemByName("ruby"), ItemDusts.getDustByName("ruby"), ticktime, eutick)); } // static void addHammerRecipes() From 83e116f4b54b4b72fa875a286c74352b353ca0d0 Mon Sep 17 00:00:00 2001 From: onVoid Date: Sun, 5 Jun 2016 12:36:39 -0700 Subject: [PATCH 3/5] Added grinder recipes for ingot -> dust --- src/main/java/techreborn/init/ModRecipes.java | 56 ++++++++++++++++--- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 3d681948b..5c2a2107b 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -423,13 +423,16 @@ public class ModRecipes new GrinderRecipe(new ItemStack(Blocks.IRON_ORE), ItemDusts.getDustByName("iron", 2), ticktime, eutick)); RecipeHandler.addRecipe( new GrinderRecipe(new ItemStack(Blocks.GOLD_ORE), ItemDusts.getDustByName("gold", 2), ticktime, eutick)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Items.COAL), ItemDusts.getDustByName("coal"), ticktime, eutick)); - RecipeHandler - .addRecipe(new GrinderRecipe(new ItemStack(Blocks.COAL_ORE), new ItemStack(Items.COAL, 2), ticktime, eutick)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Items.BONE), new ItemStack(Items.DYE, 6, 15), ticktime, eutick)); - RecipeHandler - .addRecipe(new GrinderRecipe(new ItemStack(Blocks.COBBLESTONE), new ItemStack(Blocks.SAND), ticktime, eutick)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.GRAVEL), new ItemStack(Items.FLINT), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(new ItemStack(Items.COAL), ItemDusts.getDustByName("coal"), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(new ItemStack(Blocks.COAL_ORE), new ItemStack(Items.COAL, 2), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(new ItemStack(Items.BONE), new ItemStack(Items.DYE, 6, 15), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(new ItemStack(Blocks.COBBLESTONE), new ItemStack(Blocks.SAND), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(new ItemStack(Blocks.GRAVEL), new ItemStack(Items.FLINT), ticktime, eutick)); // TechReborn RecipeHandler.addRecipe( @@ -442,6 +445,45 @@ public class ModRecipes new GrinderRecipe(BlockOre.getOreByName("Silver"), ItemDusts.getDustByName("silver", 2), ticktime, eutick)); RecipeHandler .addRecipe(new GrinderRecipe(ItemGems.getGemByName("ruby"), ItemDusts.getDustByName("ruby"), ticktime, eutick)); + + // Ingots to Dust + RecipeHandler.addRecipe( + new GrinderRecipe(new ItemStack(Items.IRON_INGOT), ItemDusts.getDustByName("iron", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(new ItemStack(Blocks.GOLD_INGOT), ItemDusts.getDustByName("gold", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("aluminum"), ItemDusts.getDustByName("aluminum", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("brass"), ItemDusts.getDustByName("brass", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("bronze"), ItemDusts.getDustByName("bronze", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("chrome"), ItemDusts.getDustByName("chrome", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("copper"), ItemDusts.getDustByName("copper", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("electrum"), ItemDusts.getDustByName("electrum", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("invar"), ItemDusts.getDustByName("invar", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("lead"), ItemDusts.getDustByName("lead", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("nickel"), ItemDusts.getDustByName("nickel", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("platinum"), ItemDusts.getDustByName("platinum", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("silver"), ItemDusts.getDustByName("silver", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("steel"), ItemDusts.getDustByName("steel", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("tin"), ItemDusts.getDustByName("tin", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("titanium"), ItemDusts.getDustByName("titanium", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("tungsten"), ItemDusts.getDustByName("tungsten", 1), ticktime, eutick)); + RecipeHandler.addRecipe( + new GrinderRecipe(ItemIngots.getIngotByName("zinc"), ItemDusts.getDustByName("zinc", 1), ticktime, eutick)); + } // static void addHammerRecipes() From d84bffce46755f70c0f0e67b66698d1057aa2c72 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 5 Jun 2016 20:37:22 +0100 Subject: [PATCH 4/5] Fix nanosaber --- src/main/java/techreborn/init/ModItems.java | 2 +- src/main/java/techreborn/items/tools/ItemNanosaber.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index cba8404eb..c6d797227 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -273,7 +273,7 @@ public class ModItems wrench = new ItemWrench(); registerItem(wrench, "wrench"); - nanosaber = new ItemNanosaber(); + nanosaber = PoweredItem.createItem(ItemNanosaber.class); registerItem(nanosaber, "nanosaber"); scrapBox = new ItemScrapBox(); diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 862ff6054..c8d96bc0a 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -97,7 +97,6 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo ItemStack inactiveUncharged = new ItemStack(ModItems.nanosaber); inactiveUncharged.setTagCompound(new NBTTagCompound()); inactiveUncharged.getTagCompound().setBoolean("isActive", false); - PoweredItem.setEnergy(0, inactiveUncharged); ItemStack inactiveCharged = new ItemStack(ModItems.nanosaber); inactiveCharged.setTagCompound(new NBTTagCompound()); @@ -107,7 +106,6 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo ItemStack activeUncharged = new ItemStack(ModItems.nanosaber); activeUncharged.setTagCompound(new NBTTagCompound()); activeUncharged.getTagCompound().setBoolean("isActive", true); - PoweredItem.setEnergy(0, activeUncharged); ItemStack activeCharged = new ItemStack(ModItems.nanosaber); activeCharged.setTagCompound(new NBTTagCompound()); @@ -169,9 +167,14 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo @Override public double getDurabilityForDisplay(ItemStack stack) { + if (PoweredItem.getEnergy(stack) > getMaxPower(stack)) + { + return 0; + } double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); return 1 - charge; + } @Override public boolean isRepairable() From 55e6f70900266abe6a86b6406d4ae14fabfde97e Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 5 Jun 2016 20:41:54 +0100 Subject: [PATCH 5/5] Fix last PR --- src/main/java/techreborn/init/ModRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 5c2a2107b..8fd60b2c9 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -450,7 +450,7 @@ public class ModRecipes RecipeHandler.addRecipe( new GrinderRecipe(new ItemStack(Items.IRON_INGOT), ItemDusts.getDustByName("iron", 1), ticktime, eutick)); RecipeHandler.addRecipe( - new GrinderRecipe(new ItemStack(Blocks.GOLD_INGOT), ItemDusts.getDustByName("gold", 1), ticktime, eutick)); + new GrinderRecipe(new ItemStack(Items.GOLD_INGOT), ItemDusts.getDustByName("gold", 1), ticktime, eutick)); RecipeHandler.addRecipe( new GrinderRecipe(ItemIngots.getIngotByName("aluminum"), ItemDusts.getDustByName("aluminum", 1), ticktime, eutick)); RecipeHandler.addRecipe(