tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Added metal fragment textures & other crafting

Browse source
This commit is contained in:
DarkGuardsman 2013-09-21 22:22:33 -04:00
parent c9b7e5be06
commit 4a2dd3eca1
13 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
resources/assets/dark/textures/items/CopperScraps.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 929 B

BIN
resources/assets/dark/textures/items/IronScraps.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 857 B

BIN
resources/assets/dark/textures/items/MetalFragments.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
resources/assets/dark/textures/items/WoodScraps.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 646 B

BIN
resources/assets/dark/textures/items/aluminumScraps.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/assets/dark/textures/items/bronzeScraps.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 915 B

BIN
resources/assets/dark/textures/items/goldScraps.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 867 B

BIN
resources/assets/dark/textures/items/leadScraps.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 931 B

BIN
resources/assets/dark/textures/items/silverScraps.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 977 B

BIN
resources/assets/dark/textures/items/steelScraps.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 919 B

BIN
resources/assets/dark/textures/items/tinScraps.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

18
src/dark/core/common/CoreRecipeLoader.java
View file

@ -113,6 +113,8 @@ public class CoreRecipeLoader extends RecipeLoader
ItemStack scraps = EnumMaterial.getStack(mat, EnumOrePart.SCRAPS, 1);
ItemStack plates = EnumMaterial.getStack(mat, EnumOrePart.PLATES, 1);
ItemStack rubble = EnumMaterial.getStack(mat, EnumOrePart.RUBBLE, 1);
ItemStack rod = EnumMaterial.getStack(mat, EnumOrePart.ROD, 1);
ItemStack tube = EnumMaterial.getStack(mat, EnumOrePart.TUBE, 1);
//Dust recipes
if (mat.shouldCreateItem(EnumOrePart.DUST))
@ -128,6 +130,8 @@ public class CoreRecipeLoader extends RecipeLoader
ProcessorRecipes.createRecipe(ProcessorType.GRINDER, plates, dust);
ProcessorRecipes.createSalvageDamageOutput(ProcessorType.GRINDER, plates, dust);
dust.stackSize = 1;
ProcessorRecipes.createRecipe(ProcessorType.GRINDER, rod, dust);
ProcessorRecipes.createRecipe(ProcessorType.GRINDER, tube, dust);
}
// Salvaging recipe
@ -142,17 +146,23 @@ public class CoreRecipeLoader extends RecipeLoader
ProcessorRecipes.createRecipe(ProcessorType.CRUSHER, rubble, scraps);
scraps.stackSize = 1;
ProcessorRecipes.createSalvageDamageOutput(ProcessorType.CRUSHER, ingot, scraps);
ProcessorRecipes.createRecipe(ProcessorType.CRUSHER, rod, scraps);
ProcessorRecipes.createRecipe(ProcessorType.CRUSHER, tube, scraps);
}
ingot.stackSize = 1;
if (mat.shouldCreateItem(EnumOrePart.TUBE))
{
new RecipeGrid(mat.getStack(EnumOrePart.TUBE, 3), 3, 1).setRowOne(ingot, ingot, ingot).RegisterRecipe();
new RecipeGrid(mat.getStack(EnumOrePart.ROD, 1), 1, 1).setRowOne(mat.getStack(EnumOrePart.TUBE, 1)).RegisterRecipe();
tube.stackSize = 3;
new RecipeGrid(tube, 3, 1).setRowOne(ingot, ingot, ingot).RegisterRecipe();
new RecipeGrid(tube, 1, 1).setRowOne(rod).RegisterRecipe();
tube.stackSize = 1;
}
if (mat.shouldCreateItem(EnumOrePart.ROD))
{
new RecipeGrid(mat.getStack(EnumOrePart.ROD, 3), 2, 1).setRowOne(ingot, ingot).RegisterRecipe();
rod.stackSize = 2;
new RecipeGrid(rod, 2, 1).setRowOne(ingot, ingot).RegisterRecipe();
rod.stackSize = 1;
}
if (mat.shouldCreateItem(EnumOrePart.PLATES))
{
@ -160,7 +170,7 @@ public class CoreRecipeLoader extends RecipeLoader
}
if (mat.shouldCreateItem(EnumOrePart.GEARS))
{
new RecipeGrid(mat.getStack(EnumOrePart.GEARS, 1), 3, 3).setRowOne(null, ingot, null).setRowTwo(ingot, Item.stick, ingot).setRowThree(null, ingot, null).RegisterRecipe();
new RecipeGrid(mat.getStack(EnumOrePart.GEARS, 4), 3, 3).setRowOne(null, ingot, null).setRowTwo(ingot, (mat.shouldCreateItem(EnumOrePart.ROD) ? rod : Item.stick), ingot).setRowThree(null, ingot, null).RegisterRecipe();
}
}

10
src/dark/core/common/items/EnumMaterial.java
View file

@ -16,12 +16,12 @@ import dark.core.common.CoreRecipeLoader;
* @author DarkGuardsman */
public enum EnumMaterial
{
WOOD("Wood", EnumOrePart.INGOTS, EnumOrePart.PLATES, EnumOrePart.RUBBLE, EnumOrePart.ROD),
STONE("Stone", EnumOrePart.INGOTS),
WOOD("Wood", EnumOrePart.INGOTS, EnumOrePart.PLATES, EnumOrePart.RUBBLE, EnumOrePart.ROD, EnumOrePart.GEARS),
STONE("Stone", EnumOrePart.INGOTS, EnumOrePart.SCRAPS),
IRON("Iron", EnumOrePart.INGOTS),
OBBY("Obby", EnumOrePart.INGOTS, EnumOrePart.RUBBLE),
OBBY("Obby", EnumOrePart.INGOTS, EnumOrePart.RUBBLE, EnumOrePart.SCRAPS, EnumOrePart.PLATES),
GOLD("Gold", EnumOrePart.GEARS, EnumOrePart.INGOTS),
COAL("Coal", EnumOrePart.GEARS, EnumOrePart.TUBE, EnumOrePart.PLATES, EnumOrePart.RUBBLE),
COAL("Coal", EnumOrePart.GEARS, EnumOrePart.TUBE, EnumOrePart.PLATES, EnumOrePart.RUBBLE, EnumOrePart.SCRAPS),
COPPER("Copper"),
TIN("Tin", EnumOrePart.GEARS, EnumOrePart.TUBE),
@ -100,7 +100,7 @@ public enum EnumMaterial
public boolean shouldCreateItem(EnumOrePart part)
{
if (part == EnumOrePart.ROD || part == EnumOrePart.TUBE || part == EnumOrePart.RUBBLE)
if (part == EnumOrePart.ROD || part == EnumOrePart.TUBE)
{
return false;
}