Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

change filter texture, fix lens recipe, add filter recipe, fix NPE in ColorUtils

Browse source
This commit is contained in:
asiekierka 2014-12-28 22:31:59 +01:00
parent 4ec969c272
commit 8fba5bb6a1
4 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
buildcraft_resources/assets/buildcraft/textures/blocks/pipeFilter.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 212 B

After

Width:  |  Height:  |  Size: 228 B

BIN
buildcraft_resources/assets/buildcraft/textures/items/pipeFilterItem0.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 229 B

4
common/buildcraft/BuildCraftTransport.java
View file

@ -538,8 +538,10 @@ public class BuildCraftTransport extends BuildCraftMod {
// Lens // Lens
for (int i = 0; i < 16; i++) { for (int i = 0; i < 16; i++) {
BuildcraftRecipeRegistry.assemblyTable.addRecipe("buildcraft:lens:" + i, 10000, new ItemStack(lensItem, i, 4), BuildcraftRecipeRegistry.assemblyTable.addRecipe("buildcraft:lens:" + i, 10000, new ItemStack(lensItem, 2, i),
ColorUtils.getOreDictionaryName(15 - i), "blockGlass", "ingotIron"); ColorUtils.getOreDictionaryName(15 - i), "blockGlass", "ingotIron");
BuildcraftRecipeRegistry.assemblyTable.addRecipe("buildcraft:filter:" + i, 10000, new ItemStack(lensItem, 2, i + 16),
ColorUtils.getOreDictionaryName(15 - i), "blockGlass", Blocks.iron_bars);
} }
// GATES // GATES

4
common/buildcraft/core/utils/ColorUtils.java
View file

@ -54,6 +54,10 @@ public final class ColorUtils {
} }
public static int getColorIDFromDye(ItemStack stack) { public static int getColorIDFromDye(ItemStack stack) {
if (stack == null || stack.getItem() == null) {
return -1;
}
if (stack.getItem() == Items.dye) { if (stack.getItem() == Items.dye) {
return 15 - stack.getItemDamage(); return 15 - stack.getItemDamage();
} }