Anvilcraft/ModularPowersuits
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removed SU battery recipe, maybe fixed minimap flicker

Browse source
This commit is contained in:
MachineMuse 2013-02-05 06:11:11 -07:00
parent 9e34b4d228
commit 7a44a95ae5
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/minecraft/net/machinemuse/powersuits/common/RecipeManager.java
View file

@ -320,7 +320,6 @@ public class RecipeManager {
String copper = "ingotCopper";
ItemStack reBattery = ModCompatability.getIC2Item("reBattery").copy();
ItemStack fullBattery = ModCompatability.getIC2Item("chargedReBattery").copy();
ItemStack suBattery = ModCompatability.getIC2Item("suBattery").copy();
ItemStack energyCrystal = ModCompatability.getIC2Item("energyCrystal").copy();
ItemStack lapotronCrystal = ModCompatability.getIC2Item("lapotronCrystal").copy();
ItemStack iridiumOre = ModCompatability.getIC2Item("iridiumOre").copy();
@ -422,10 +421,6 @@ public class RecipeManager {
"WBW",
'W', ItemComponent.wiring.copy(),
'B', fullBattery);
Ic2Recipes.addCraftingRecipe(ItemComponent.lvcapacitor,
"WBW",
'W', ItemComponent.wiring.copy(),
'B', suBattery);
Ic2Recipes.addCraftingRecipe(ItemComponent.mvcapacitor,
"WBW",

29
src/minecraft/net/machinemuse/powersuits/tick/RenderTickHandler.java
View file

@ -2,6 +2,8 @@ package net.machinemuse.powersuits.tick;
import java.util.EnumSet;
import net.machinemuse.api.IPowerModule;
import net.machinemuse.api.ModuleManager;
import net.machinemuse.api.MuseItemUtils;
import net.machinemuse.general.MuseRenderer;
import net.machinemuse.general.MuseStringUtils;
@ -50,20 +52,21 @@ public class RenderTickHandler implements ITickHandler {
if (stack != null && stack.getItem() instanceof IModularItem) {
MuseRenderer.blendingOn();
NBTTagCompound itemTag = MuseItemUtils.getMuseItemTag(stack);
// if (itemTag.hasKey("Mode")) {
// String mode = itemTag.getString("Mode");
// IPowerModule module = ModuleManager.getModule(mode);
MuseIcon currentMode = MuseIcon.WEAPON_ELECTRIC;
MuseIcon nextMode = MuseIcon.WEAPON_FIRE;
MuseIcon prevMode = MuseIcon.WEAPON_GRAVITY;
if (itemTag.hasKey("Mode")) {
String mode = itemTag.getString("Mode");
IPowerModule module = ModuleManager.getModule(mode);
MuseIcon currentMode = MuseIcon.WEAPON_ELECTRIC;
MuseIcon nextMode = MuseIcon.WEAPON_FIRE;
MuseIcon prevMode = MuseIcon.WEAPON_GRAVITY;
MuseRenderer.drawIconPartial(screen.getScaledWidth_double() / 2.0 - 105.0 + 20.0 * i, screen.getScaledHeight_double() - 30,
prevMode, Colour.WHITE.withAlpha(0.4), 0, 0, 16, 8);
MuseRenderer.drawIconAt(screen.getScaledWidth_double() / 2.0 - 89.0 + 20.0 * i, screen.getScaledHeight_double() - 40,
currentMode, Colour.WHITE.withAlpha(0.7));
MuseRenderer.drawIconPartial(screen.getScaledWidth_double() / 2.0 - 73.0 + 20.0 * i, screen.getScaledHeight_double() - 30,
nextMode, Colour.WHITE.withAlpha(0.4), 0, 0, 16, 8);
// }
MuseRenderer.drawIconPartial(screen.getScaledWidth_double() / 2.0 - 105.0 + 20.0 * i, screen.getScaledHeight_double() - 30,
prevMode, Colour.WHITE.withAlpha(0.4), 0, 0, 16, 8);
MuseRenderer.drawIconAt(screen.getScaledWidth_double() / 2.0 - 89.0 + 20.0 * i, screen.getScaledHeight_double() - 40,
currentMode, Colour.WHITE.withAlpha(0.7));
MuseRenderer.drawIconPartial(screen.getScaledWidth_double() / 2.0 - 73.0 + 20.0 * i, screen.getScaledHeight_double() - 30,
nextMode, Colour.WHITE.withAlpha(0.4), 0, 0, 16, 8);
MuseRenderer.blendingOff();
}
}
}
}