tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Added OreDict-based dye recipes, fixed MekanismTools item positioning

Browse source
This commit is contained in:
Aidan C. Brady 2014-06-14 14:16:33 +02:00
parent 6ede9308e8
commit a40ab961c6
4 changed files with 50 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/main/java/mekanism/api/EnumColor.java
View file

@ -9,25 +9,25 @@ import net.minecraft.util.StatCollector;
*/ */
public enum EnumColor public enum EnumColor
{ {
BLACK("\u00a70", "black", new int[] {0, 0, 0}, 0), BLACK("\u00a70", "black", "Black", new int[] {0, 0, 0}, 0),
DARK_BLUE("\u00a71", "darkBlue", new int[] {0, 0, 170}, 4), DARK_BLUE("\u00a71", "darkBlue", "Blue", new int[] {0, 0, 170}, 4),
DARK_GREEN("\u00a72", "darkGreen", new int[] {0, 170, 0}, 2), DARK_GREEN("\u00a72", "darkGreen", "Green", new int[] {0, 170, 0}, 2),
DARK_AQUA("\u00a73", "darkAqua", new int[] {0, 170, 170}, 6), DARK_AQUA("\u00a73", "darkAqua", "Cyan", new int[] {0, 170, 170}, 6),
DARK_RED("\u00a74", "darkRed", new int[] {170, 0, 0}, -1), DARK_RED("\u00a74", "darkRed", null, new int[] {170, 0, 0}, -1),
PURPLE("\u00a75", "purple", new int[] {170, 0, 170}, 5), PURPLE("\u00a75", "purple", "Purple", new int[] {170, 0, 170}, 5),
ORANGE("\u00a76", "orange", new int[] {255, 170, 0}, 14), ORANGE("\u00a76", "orange", "Orange", new int[] {255, 170, 0}, 14),
GREY("\u00a77", "grey", new int[] {170, 170, 170}, 7), GREY("\u00a77", "grey", "LightGray", new int[] {170, 170, 170}, 7),
DARK_GREY("\u00a78", "darkGrey", new int[] {85, 85, 85}, 8), DARK_GREY("\u00a78", "darkGrey", "Gray", new int[] {85, 85, 85}, 8),
INDIGO("\u00a79", "indigo", new int[] {85, 85, 255}, 12), INDIGO("\u00a79", "indigo", "LightBlue", new int[] {85, 85, 255}, 12),
BRIGHT_GREEN("\u00a7a", "brightGreen", new int[] {85, 255, 85}, 10), BRIGHT_GREEN("\u00a7a", "brightGreen", "Lime", new int[] {85, 255, 85}, 10),
AQUA("\u00a7b", "aqua", new int[] {85, 255, 255}, -1), AQUA("\u00a7b", "aqua", null, new int[] {85, 255, 255}, -1),
RED("\u00a7c", "red", new int[] {255, 0, 0}, 1), RED("\u00a7c", "red", "Red", new int[] {255, 0, 0}, 1),
PINK("\u00a7d", "pink", new int[] {255, 85, 255}, 13), PINK("\u00a7d", "pink", "Magenta", new int[] {255, 85, 255}, 13),
YELLOW("\u00a7e", "yellow", new int[] {255, 255, 85}, 11), YELLOW("\u00a7e", "yellow", "Yellow", new int[] {255, 255, 85}, 11),
WHITE("\u00a7f", "white", new int[] {255, 255, 255}, 15), WHITE("\u00a7f", "white", "White", new int[] {255, 255, 255}, 15),
//Extras for dye-completeness //Extras for dye-completeness
BROWN("\u00a76", "brown", new int[] {150, 75, 0}, 3), BROWN("\u00a76", "brown", "Brown", new int[] {150, 75, 0}, 3),
BRIGHT_PINK("\u00a7d", "brightPink", new int[] {255, 192, 203}, 9); BRIGHT_PINK("\u00a7d", "brightPink", "Pink", new int[] {255, 192, 203}, 9);
public static EnumColor[] DYES = new EnumColor[] {BLACK, RED, DARK_GREEN, BROWN, DARK_BLUE, PURPLE, DARK_AQUA, GREY, DARK_GREY, BRIGHT_PINK, BRIGHT_GREEN, YELLOW, INDIGO, PINK, ORANGE, WHITE}; public static EnumColor[] DYES = new EnumColor[] {BLACK, RED, DARK_GREEN, BROWN, DARK_BLUE, PURPLE, DARK_AQUA, GREY, DARK_GREY, BRIGHT_PINK, BRIGHT_GREEN, YELLOW, INDIGO, PINK, ORANGE, WHITE};
@ -40,11 +40,14 @@ public enum EnumColor
/** A friendly name of the color. */ /** A friendly name of the color. */
public String unlocalizedName; public String unlocalizedName;
public String dyeName;
private EnumColor(String s, String n, int[] rgb, int meta) private EnumColor(String s, String n, String dye, int[] rgb, int meta)
{ {
code = s; code = s;
unlocalizedName = n; unlocalizedName = n;
dyeName = dye;
rgbCode = rgb; rgbCode = rgb;
mcMeta = meta; mcMeta = meta;
} }
@ -62,6 +65,11 @@ public enum EnumColor
{ {
return StatCollector.translateToLocal("dye." + unlocalizedName); return StatCollector.translateToLocal("dye." + unlocalizedName);
} }
public String getOreDictName()
{
return dyeName;
}
/** /**
* Gets the name of this color with it's color prefix code. * Gets the name of this color with it's color prefix code.

2
src/main/java/mekanism/client/render/item/ItemRenderingHandler.java
View file

@ -415,8 +415,8 @@ public class ItemRenderingHandler implements IItemRenderer
else if(item.getItem() instanceof ItemPartTransmitter) else if(item.getItem() instanceof ItemPartTransmitter)
{ {
GL11.glTranslated(-0.5, -0.5, -0.5); GL11.glTranslated(-0.5, -0.5, -0.5);
GL11.glDisable(GL11.GL_CULL_FACE);
MekanismRenderer.blendOn(); MekanismRenderer.blendOn();
GL11.glDisable(GL11.GL_CULL_FACE);
RenderPartTransmitter.getInstance().renderItem(TransmitterType.values()[item.getItemDamage()]); RenderPartTransmitter.getInstance().renderItem(TransmitterType.values()[item.getItemDamage()]);
GL11.glEnable(GL11.GL_CULL_FACE); GL11.glEnable(GL11.GL_CULL_FACE);
MekanismRenderer.blendOff(); MekanismRenderer.blendOff();

18
src/main/java/mekanism/common/Mekanism.java
View file

@ -655,39 +655,39 @@ public class Mekanism
for(int i = 0; i < EnumColor.DYES.length-1; i++) for(int i = 0; i < EnumColor.DYES.length-1; i++)
{ {
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockHDPE, 4, i), new Object[] { CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockHDPE, 4, i), new Object[] {
"SSS", "SDS", "SSS", Character.valueOf('S'), new ItemStack(Polyethene, 1, 2), Character.valueOf('D'), new ItemStack(Items.dye, 1, i) "SSS", "SDS", "SSS", Character.valueOf('S'), new ItemStack(Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
})); }));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowPanel, 2, i), new Object[] { CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowPanel, 2, i), new Object[] {
"PSP", "SDS", "GSG", Character.valueOf('P'), Blocks.glass_pane, Character.valueOf('S'), new ItemStack(Polyethene, 1, 2), Character.valueOf('D'), new ItemStack(Items.dye, 1, i), Character.valueOf('G'), Items.glowstone_dust "PSP", "SDS", "GSG", Character.valueOf('P'), Blocks.glass_pane, Character.valueOf('S'), new ItemStack(Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName, Character.valueOf('G'), Items.glowstone_dust
})); }));
} }
for(int i = 0; i < EnumColor.DYES.length; i++) for(int i = 0; i < EnumColor.DYES.length; i++)
{ {
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(Balloon, 2, i), new Object[] { CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(Balloon, 2, i), new Object[] {
Items.leather, Items.string, new ItemStack(Items.dye, 1, i) Items.leather, Items.string, "dye" + EnumColor.DYES[i].dyeName
})); }));
for(int j = 0; j < EnumColor.DYES.length; j++) for(int j = 0; j < EnumColor.DYES.length; j++)
{ {
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(Balloon, 1, i), new Object[] { CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(Balloon, 1, i), new Object[] {
new ItemStack(Balloon, 1, j), new ItemStack(Items.dye, 1, i) new ItemStack(Balloon, 1, j), "dye" + EnumColor.DYES[i].dyeName
})); }));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockHDPE, 4, i), new Object[] { CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockHDPE, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(BlockHDPE, 1, j), Character.valueOf('D'), new ItemStack(Items.dye, 1, i) " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(BlockHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
})); }));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockSlickHDPE, 4, i), new Object[] { CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockSlickHDPE, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(BlockSlickHDPE, 1, j), Character.valueOf('D'), new ItemStack(Items.dye, 1, i) " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(BlockSlickHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
})); }));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockGlowHDPE, 4, i), new Object[] { CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockGlowHDPE, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(BlockGlowHDPE, 1, j), Character.valueOf('D'), new ItemStack(Items.dye, 1, i) " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(BlockGlowHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
})); }));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockReinforcedHDPE, 4, i), new Object[] { CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockReinforcedHDPE, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(BlockReinforcedHDPE, 1, j), Character.valueOf('D'), new ItemStack(Items.dye, 1, i) " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(BlockReinforcedHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
})); }));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowPanel, 4, i), new Object[] { CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowPanel, 4, i), new Object[] {
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(GlowPanel, 1, j), Character.valueOf('D'), new ItemStack(Items.dye, 1, i) " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(GlowPanel, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
})); }));
} }

26
src/main/java/mekanism/tools/common/MekanismTools.java
View file

@ -618,19 +618,6 @@ public class MekanismTools implements IModule
GlowstoneAxe.setHarvestLevel("axe", toolGLOWSTONE.getHarvestLevel()); GlowstoneAxe.setHarvestLevel("axe", toolGLOWSTONE.getHarvestLevel());
GlowstoneShovel.setHarvestLevel("shovel", toolGLOWSTONE.getHarvestLevel()); GlowstoneShovel.setHarvestLevel("shovel", toolGLOWSTONE.getHarvestLevel());
//Base Paxels
WoodPaxel = new ItemMekanismPaxel(ToolMaterial.WOOD).setUnlocalizedName("WoodPaxel");
StonePaxel = new ItemMekanismPaxel(ToolMaterial.STONE).setUnlocalizedName("StonePaxel");
IronPaxel = new ItemMekanismPaxel(ToolMaterial.IRON).setUnlocalizedName("IronPaxel");
DiamondPaxel = new ItemMekanismPaxel(ToolMaterial.EMERALD).setUnlocalizedName("DiamondPaxel");
GoldPaxel = new ItemMekanismPaxel(ToolMaterial.GOLD).setUnlocalizedName("GoldPaxel");
WoodPaxel.setHarvestLevel("paxel", ToolMaterial.WOOD.getHarvestLevel());
StonePaxel.setHarvestLevel("paxel", ToolMaterial.STONE.getHarvestLevel());
IronPaxel.setHarvestLevel("paxel", ToolMaterial.IRON.getHarvestLevel());
DiamondPaxel.setHarvestLevel("paxel", ToolMaterial.EMERALD.getHarvestLevel());
GoldPaxel.setHarvestLevel("paxel", ToolMaterial.GOLD.getHarvestLevel());
//Steel //Steel
SteelHelmet = new ItemMekanismArmor(armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 0).setUnlocalizedName("SteelHelmet"); SteelHelmet = new ItemMekanismArmor(armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 0).setUnlocalizedName("SteelHelmet");
SteelChestplate = new ItemMekanismArmor(armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 1).setUnlocalizedName("SteelChestplate"); SteelChestplate = new ItemMekanismArmor(armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 1).setUnlocalizedName("SteelChestplate");
@ -648,6 +635,19 @@ public class MekanismTools implements IModule
SteelAxe.setHarvestLevel("axe", toolSTEEL.getHarvestLevel()); SteelAxe.setHarvestLevel("axe", toolSTEEL.getHarvestLevel());
SteelShovel.setHarvestLevel("shovel", toolSTEEL.getHarvestLevel()); SteelShovel.setHarvestLevel("shovel", toolSTEEL.getHarvestLevel());
//Base Paxels
WoodPaxel = new ItemMekanismPaxel(ToolMaterial.WOOD).setUnlocalizedName("WoodPaxel");
StonePaxel = new ItemMekanismPaxel(ToolMaterial.STONE).setUnlocalizedName("StonePaxel");
IronPaxel = new ItemMekanismPaxel(ToolMaterial.IRON).setUnlocalizedName("IronPaxel");
DiamondPaxel = new ItemMekanismPaxel(ToolMaterial.EMERALD).setUnlocalizedName("DiamondPaxel");
GoldPaxel = new ItemMekanismPaxel(ToolMaterial.GOLD).setUnlocalizedName("GoldPaxel");
WoodPaxel.setHarvestLevel("paxel", ToolMaterial.WOOD.getHarvestLevel());
StonePaxel.setHarvestLevel("paxel", ToolMaterial.STONE.getHarvestLevel());
IronPaxel.setHarvestLevel("paxel", ToolMaterial.IRON.getHarvestLevel());
DiamondPaxel.setHarvestLevel("paxel", ToolMaterial.EMERALD.getHarvestLevel());
GoldPaxel.setHarvestLevel("paxel", ToolMaterial.GOLD.getHarvestLevel());
Mekanism.configuration.save(); Mekanism.configuration.save();
//Registrations //Registrations