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

cleanup from porting

Browse source
This commit is contained in:
Leon 2016-11-15 12:07:21 -05:00
parent d387e37a53
commit afcaffc9b9
140 changed files with 403 additions and 640 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.gradle
View file

@ -23,7 +23,6 @@ repositories {
}
}
//apply plugin: 'scala'
apply plugin: 'forge'
apply plugin: 'curseforge'

2
src/main/java/net/machinemuse/general/NBTTagAccessor.java
View file

@ -59,12 +59,10 @@ public class NBTTagAccessor extends NBTTagCompound {
} catch (Exception e) {
e.printStackTrace();
}
MuseLogger.logError("Unable to access nbt tag map!");
return null;
}
public static List<NBTTagCompound> getValues(NBTTagCompound nbt) {
Set<String> keyset = (Set<String>) nbt.func_150296_c();
ArrayList<NBTTagCompound> a = new ArrayList<>(keyset.size());

2
src/main/java/net/machinemuse/general/gui/MuseIcon.java
View file

@ -117,7 +117,5 @@ public class MuseIcon {
public void register(IIconRegister iconRegister) {
icon = iconRegister.registerIcon(ICON_PREFIX + texturename);
}
}

51
src/main/java/net/machinemuse/general/gui/clickable/ClickableSlider.java
View file

@ -12,57 +12,6 @@ import net.machinemuse.utils.render.MuseRenderer;
*
* Ported to Java by lehjr on 10/19/16.
*/
//public class ClickableSlider extends Clickable {
// public static MusePoint2D pos;
// private static double width;
// public static String name;
// private static final int cornersize = 3;
// private final DrawableMuseRect insideRect;
// private final DrawableMuseRect outsideRect;
// private double valueInternal = 0;
//
// public ClickableSlider(MusePoint2D pos, double width, String name) {
// this.pos = pos;
// this.width = width;
// this.name = name;
// this.position = pos;
//
// this.insideRect = new DrawableMuseRect(position.x() - width / 2.0 - cornersize, position.y() + 8, 0, position.y() + 16, Colour.LIGHTBLUE, Colour.ORANGE);
// this.outsideRect = new DrawableMuseRect(position.x() - width / 2.0 - cornersize, position.y() + 8, position.x() + width / 2.0 + cornersize, position.y() + 16, Colour.LIGHTBLUE, Colour.DARKBLUE);
//
// System.out.println("===========================================================");
// System.out.println("name: " + this.name);
// System.out.println("pos.x: " + this.pos.x());
// System.out.println("pos.y: " + this.pos.y());
// System.out.println("============================================================");
// }
//
// @Override
// public void draw() {
// MuseRenderer.drawCenteredString(name, position.x(), position.y());
// this.insideRect.setRight(position.x() + width * (value() - 0.5) + cornersize);
// this.outsideRect.draw();
// this.insideRect.draw();
// }
//
// @Override
// public boolean hitBox(double x, double y) {
// return Math.abs(position.x() - x) < width / 2 && Math.abs(position.y() + 12 - y) < 4;
// }
//
// public double value() {
// return valueInternal;
// }
//
// public void setValueByX(double x) {
// double v = (x - pos.x()) / width + 0.5;
// valueInternal = MuseMathUtils.clampDouble(v, 0, 1);
// }
//
// public void setValue(double v) {
// valueInternal = v;
// }
//}
public class ClickableSlider extends Clickable {
private final MusePoint2D pos;
private final double width;

6
src/main/java/net/machinemuse/general/gui/frame/DetailedSummaryFrame.java
View file

@ -53,8 +53,6 @@ public class DetailedSummaryFrame extends ScrollableFrame {
int nexty = (int) border.top() + margin;
MuseRenderer.drawCenteredString(StatCollector.translateToLocal("gui.equippedTotals"), (border.left() + border.right())/2, nexty);
nexty += 10;
String formattedValue = MuseStringUtils.formatNumberFromUnits(energy, PowerModule.getUnit(ElectricItemUtils.MAXIMUM_ENERGY));
String name = StatCollector.translateToLocal("gui.energyStorage");
double valueWidth = MuseRenderer.getStringWidth(formattedValue);
@ -88,22 +86,18 @@ public class DetailedSummaryFrame extends ScrollableFrame {
MuseRenderer.drawString(namesList.get(i), border.left() + margin, nexty + 9*i);
}
MuseRenderer.drawRightAlignedString(formattedValue, border.right() - margin, nexty + 9 * (namesList.size() - 1) / 2);
GL11.glPopMatrix();
}
}
@Override
public void onMouseDown(double x, double y, int button) {
// TODO Auto-generated method stub
}
@Override
public void onMouseUp(double x, double y, int button) {
// TODO Auto-generated method stub
}
@Override

1
src/main/java/net/machinemuse/general/gui/frame/IGuiFrame.java
View file

@ -13,5 +13,4 @@ public interface IGuiFrame {
void draw();
List<String> getToolTip(int x, int y);
}

50
src/main/java/net/machinemuse/general/gui/frame/InstallSalvageFrame.java
View file

@ -31,10 +31,14 @@ public class InstallSalvageFrame extends ScrollableFrame {
protected final ClickableButton salvageButton;
protected final EntityClientPlayerMP player;
public InstallSalvageFrame(EntityClientPlayerMP player, MusePoint2D topleft,
public InstallSalvageFrame(EntityClientPlayerMP player,
MusePoint2D topleft,
MusePoint2D bottomright,
Colour borderColour, Colour insideColour,
ItemSelectionFrame targetItem, ModuleSelectionFrame targetModule) {
Colour borderColour,
Colour insideColour,
ItemSelectionFrame targetItem,
ModuleSelectionFrame targetModule) {
super(topleft, bottomright, borderColour, insideColour);
this.player = player;
this.targetItem = targetItem;
@ -42,20 +46,16 @@ public class InstallSalvageFrame extends ScrollableFrame {
double sizex = border.right() - border.left();
double sizey = border.bottom() - border.top();
this.installButton = new ClickableButton(StatCollector.translateToLocal("gui.install"), new MusePoint2D(
border.right() - sizex / 2.0, border.bottom() - sizey
/ 4.0),
this.installButton = new ClickableButton(StatCollector.translateToLocal("gui.install"),
new MusePoint2D(border.right() - sizex / 2.0, border.bottom() - sizey / 4.0),
true);
this.salvageButton = new ClickableButton(StatCollector.translateToLocal("gui.salvage"), new MusePoint2D(
border.left() + sizex / 2.0, border.top() + sizey / 4.0),
true);
this.salvageButton = new ClickableButton(StatCollector.translateToLocal("gui.salvage"),
new MusePoint2D(border.left() + sizex / 2.0, border.top() + sizey / 4.0), true);
}
@Override
public void update(double mousex, double mousey) {
// TODO Auto-generated method stub
}
@Override
@ -122,9 +122,8 @@ public class InstallSalvageFrame extends ScrollableFrame {
ItemStack stack = targetItem.getSelectedItem().getItem();
IPowerModule module = targetModule.getSelectedModule().getModule();
if (!ModuleManager.itemHasModule(stack, module.getDataName())) {
installButton.setEnabled(player.capabilities.isCreativeMode || MuseItemUtils.hasInInventory(
module.getInstallCost(), player.inventory));
installButton.setEnabled(player.capabilities.isCreativeMode ||
MuseItemUtils.hasInInventory(module.getInstallCost(), player.inventory));
installButton.draw();
} else {
salvageButton.draw();
@ -138,25 +137,15 @@ public class InstallSalvageFrame extends ScrollableFrame {
if (selItem != null && selModule != null) {
ItemStack stack = selItem.getItem();
IPowerModule module = selModule.getModule();
if (!ModuleManager.itemHasModule(stack, module.getDataName())) {
if (installButton.hitBox(x, y)) {
doInstall();
}
} else {
if (salvageButton.hitBox(x, y)) {
doSalvage();
}
}
if (!ModuleManager.itemHasModule(stack, module.getDataName()))
if (installButton.hitBox(x, y)) doInstall();
else if (salvageButton.hitBox(x, y)) doSalvage();
}
}
private void doSalvage() {
IPowerModule module = targetModule.getSelectedModule().getModule();
MusePacket newpacket = new MusePacketSalvageModuleRequest(
player,
targetItem.getSelectedItem().inventorySlot,
module.getDataName());
MusePacket newpacket = new MusePacketSalvageModuleRequest(player, targetItem.getSelectedItem().inventorySlot, module.getDataName());
PacketSender.sendToServer(newpacket.getPacket131());
}
@ -170,10 +159,7 @@ public class InstallSalvageFrame extends ScrollableFrame {
if (player.capabilities.isCreativeMode || MuseItemUtils.hasInInventory(module.getInstallCost(), player.inventory)) {
Musique.playClientSound(SoundDictionary.SOUND_GUI_INSTALL, 1);
// Now send request to server to make it legit
MusePacket newpacket = new MusePacketInstallModuleRequest(
player,
targetItem.getSelectedItem().inventorySlot,
module.getDataName());
MusePacket newpacket = new MusePacketInstallModuleRequest(player, targetItem.getSelectedItem().inventorySlot, module.getDataName());
PacketSender.sendToServer(newpacket.getPacket131());
}
}

2
src/main/java/net/machinemuse/general/gui/frame/ItemInfoFrame.java
View file

@ -64,13 +64,11 @@ public class ItemInfoFrame extends ScrollableFrame {
@Override
public void onMouseDown(double x, double y, int button) {
// TODO Auto-generated method stub
}
@Override
public void onMouseUp(double x, double y, int button) {
// TODO Auto-generated method stub
}
@Override

17
src/main/java/net/machinemuse/general/gui/frame/ItemSelectionFrame.java
View file

@ -21,8 +21,12 @@ public class ItemSelectionFrame extends ScrollableFrame {
protected final EntityPlayer player;
protected List<MusePoint2D> itemPoints;
public ItemSelectionFrame(MusePoint2D topleft, MusePoint2D bottomright,
Colour borderColour, Colour insideColour, EntityPlayer player) {
public ItemSelectionFrame(MusePoint2D topleft,
MusePoint2D bottomright,
Colour borderColour,
Colour insideColour,
EntityPlayer player) {
super(topleft, bottomright, borderColour, insideColour);
this.player = player;
List<Integer> slots = MuseItemUtils
@ -40,9 +44,7 @@ public class ItemSelectionFrame extends ScrollableFrame {
new MusePoint2D(centerx, border.top()));
for (MusePoint2D point : targetPoints) {
// Fly from middle over 200 ms
itemPoints.add(new FlyFromPointToPoint2D(
new MusePoint2D(centerx, centery),
point, 200));
itemPoints.add(new FlyFromPointToPoint2D(new MusePoint2D(centerx, centery), point, 200));
}
}
@ -60,9 +62,7 @@ public class ItemSelectionFrame extends ScrollableFrame {
Iterator<MusePoint2D> pointiterator = itemPoints.iterator();
for (int slot : slots) {
ClickableItem clickie = new ClickableItem(
player.inventory.getStackInSlot(slot),
pointiterator.next(), slot);
ClickableItem clickie = new ClickableItem(player.inventory.getStackInSlot(slot), pointiterator.next(), slot);
itemButtons.add(clickie);
}
}
@ -145,5 +145,4 @@ public class ItemSelectionFrame extends ScrollableFrame {
return null;
}
}
}

1
src/main/java/net/machinemuse/general/gui/frame/KeybindConfigFrame.java
View file

@ -293,5 +293,4 @@ public class KeybindConfigFrame implements IGuiFrame {
ClickableKeybinding clickie = new ClickableKeybinding(keybind, newKeybindButton.getPosition().plus(new MusePoint2D(0, -20)), free, false);
KeybindManager.getKeybindings().add(clickie);
}
}

1
src/main/java/net/machinemuse/general/gui/frame/ModuleSelectionFrame.java
View file

@ -198,5 +198,4 @@ public class ModuleSelectionFrame extends ScrollableFrame {
}
return null;
}
}

3
src/main/java/net/machinemuse/general/gui/frame/ModuleTweakFrame.java
View file

@ -63,7 +63,6 @@ public class ModuleTweakFrame extends ScrollableFrame {
if (selectedSlider != null) {
selectedSlider.moveSlider(mousex, mousey);
}
}
@Override
@ -88,7 +87,6 @@ public class ModuleTweakFrame extends ScrollableFrame {
}
MuseRenderer.drawRightAlignedString(formattedValue, border.right() - margin, nexty + 9 * (namesList.size()-1)/2);
nexty += 9*namesList.size()+1;
}
GL11.glPopMatrix();
}
@ -111,7 +109,6 @@ public class ModuleTweakFrame extends ScrollableFrame {
}
}
propertyStrings.put(property.getKey(), currValue);
}
sliders = new LinkedList();

1
src/main/java/net/machinemuse/general/gui/frame/ScrollableFrame.java
View file

@ -97,5 +97,4 @@ public class ScrollableFrame implements IGuiFrame {
// TODO Auto-generated method stub
return null;
}
}

3
src/main/java/net/machinemuse/general/gui/frame/StatsFrame.java
View file

@ -41,19 +41,16 @@ public class StatsFrame extends ScrollableFrame {
i++;
}
GL11.glPopMatrix();
}
@Override
public void onMouseDown(double x, double y, int button) {
// TODO Auto-generated method stub
}
@Override
public void onMouseUp(double x, double y, int button) {
// TODO Auto-generated method stub
}
@Override

1
src/main/java/net/machinemuse/general/sound/SoundDictionary.java
View file

@ -27,5 +27,4 @@ public class SoundDictionary {
public static final String SOUND_JETPACK = SOUND_PREFIX + "Jetpack";
public static final String SOUND_SWIMASSIST = SOUND_PREFIX + "SwimAssist";
public static final String SOUND_ELECTROLYZER = SOUND_PREFIX + "WaterElectrolyzer";
}

1
src/main/java/net/machinemuse/powersuits/client/render/block/TinkerTableModel.java
View file

@ -279,5 +279,4 @@ public class TinkerTableModel extends ModelBase {
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
}

2
src/main/java/net/machinemuse/powersuits/client/render/block/TinkerTableRenderer.java
View file

@ -42,9 +42,7 @@ public class TinkerTableRenderer extends MuseTESR implements ISimpleBlockRenderi
// y + 0.5f, y + 1,
// z, z + 1,
// texturex, texturey, texturex2, texturey2);
GL11.glPopMatrix();
}
@Override

1
src/main/java/net/machinemuse/powersuits/client/render/entity/MuseRender.java
View file

@ -9,7 +9,6 @@ import net.minecraft.util.ResourceLocation;
* Created: 4:31 PM, 8/3/13
*/
public abstract class MuseRender extends Render {
@Override
protected ResourceLocation getEntityTexture(Entity entity) {
return null;

1
src/main/java/net/machinemuse/powersuits/client/render/entity/RenderLuxCapacitorEntity.java
View file

@ -46,5 +46,4 @@ public class RenderLuxCapacitorEntity extends MuseRender {
glPopMatrix();
MuseTextureUtils.popTexture();
}
}

1
src/main/java/net/machinemuse/powersuits/client/render/entity/RenderSpinningBlade.java
View file

@ -10,7 +10,6 @@ public class RenderSpinningBlade extends MuseRender {
@Override
public void doRender(Entity entity, double x, double y, double z, float yaw, float partialticktime) {
glPushMatrix();
glPushAttrib(GL_ENABLE_BIT);
glDisable(GL_CULL_FACE);

1
src/main/java/net/machinemuse/powersuits/client/render/item/ArmorModelInstance.java
View file

@ -14,7 +14,6 @@ public class ArmorModelInstance {
public static ModelBiped getInstance() {
// TODO: Actual (skinned) vanilla model as low bandwitdth alternative
if (instance == null) {
try {
MuseLogger.logInfo("Attempting to load Smart Moving armor model.");

3
src/main/java/net/machinemuse/powersuits/client/render/item/ToolModel.java
View file

@ -392,7 +392,6 @@ public class ToolModel extends ModelBase {
// GL11.glRotatef(xtap, 1, 0, 0);
// GL11.glRotatef(ytap, 0, 1, 0);
// GL11.glRotatef(ztap, 0, 0, 1);
} else {
GL11.glScaled(-scale1, scale1, scale1);
GL11.glRotatef(-90, 0, 1, 0);
@ -402,7 +401,6 @@ public class ToolModel extends ModelBase {
GL11.glRotatef(1.5F, 0, 0, 1);
GL11.glTranslatef(2 / 4.0F, 3 / 4.0F, 1 / 4.0F);
GL11.glTranslatef(-2, -1, 4);
}
GL11.glPushMatrix();
// Compensate for offset when Sebk was doing his rendering
@ -498,7 +496,6 @@ public class ToolModel extends ModelBase {
setPose(0.5f, -1, 0.5f, -1, 0.5f, -1);
this.boltSize = 0;
}
}
public void setNeutralPose() {

8
src/main/java/net/machinemuse/powersuits/client/render/item/ToolRenderer.java
View file

@ -59,12 +59,9 @@ public class ToolRenderer extends MuseRender implements IItemRenderer {
public void renderItem(ItemRenderType type, ItemStack itemStack, Object... data) {
boolean drawIcon = false;
ItemPowerFist item = (ItemPowerFist) itemStack.getItem();
Colour colour = ((IModularItemBase) item).getColorFromItemStack(itemStack);
Colour glow = ((IModularItemBase) item).getColorFromItemStack(itemStack);
switch (type) {
case ENTITY:
RenderBlocks renderEntity = (RenderBlocks) data[0];
@ -80,13 +77,11 @@ public class ToolRenderer extends MuseRender implements IItemRenderer {
case EQUIPPED:
RenderBlocks renderEquipped = (RenderBlocks) data[0];
EntityLivingBase entityEquipped = (EntityLivingBase) data[1];
if (entityEquipped instanceof EntityPlayer) {
model.setPoseForPlayer((EntityPlayer) entityEquipped, itemStack);
} else {
model.setNeutralPose();
}
model.render(entityEquipped, 1, false, colour, glow);
break;
case FIRST_PERSON_MAP:
@ -94,7 +89,6 @@ public class ToolRenderer extends MuseRender implements IItemRenderer {
TextureManager engineFirstPerson = (TextureManager) data[1];
MapData mapDataFirstPerson = (MapData) data[2];
model.setPoseForPlayer(playerFirstPerson, itemStack);
model.render(playerFirstPerson, 1, true, colour, glow);
break;
case EQUIPPED_FIRST_PERSON:
@ -105,7 +99,6 @@ public class ToolRenderer extends MuseRender implements IItemRenderer {
} else {
model.setNeutralPose();
}
model.render(entityEquFP, 1, true, colour, glow);
break;
default:
@ -132,7 +125,6 @@ public class ToolRenderer extends MuseRender implements IItemRenderer {
@Override
public void doRender(Entity var1, double var2, double var4, double var6, float var8, float var9) {
}
public void renderFirstPersonArm(EntityClientPlayerMP entityclientplayermp, float par1) {

7
src/main/java/net/machinemuse/powersuits/client/render/modelspec/DefaultModelSpec.java
View file

@ -116,12 +116,6 @@ public class DefaultModelSpec {
for (String name: partnames) {
prefArray.add(makePref(model.get(name), colour, glow));
}
return prefArray;
}
@ -129,4 +123,3 @@ public class DefaultModelSpec {
return partSpec.multiSet(new NBTTagCompound(), null, glow, colourindex);
}
}

3
src/main/java/net/machinemuse/powersuits/client/render/modelspec/RenderPart.java
View file

@ -79,6 +79,3 @@ public class RenderPart extends ModelRenderer {
GL11.glTranslated(offsetX, offsetY - 26, offsetZ);
}
}

2
src/main/java/net/machinemuse/powersuits/entity/TileEntityPortal.java
View file

@ -6,8 +6,6 @@ import net.minecraft.tileentity.TileEntity;
* Created by Eximius88 on 2/4/14.
*/
public class TileEntityPortal extends TileEntity {
public TileEntityPortal() {
}
}

4
src/main/java/net/machinemuse/powersuits/event/PlayerUpdateHandler.java
View file

@ -88,7 +88,3 @@ public class PlayerUpdateHandler {
}
}
}

2
src/main/java/net/machinemuse/powersuits/event/RenderEventHandler.java
View file

@ -121,5 +121,3 @@ public class RenderEventHandler {
}
}
}

6
src/main/java/net/machinemuse/powersuits/item/MPSItemElectricTool.java
View file

@ -62,7 +62,6 @@ public class MPSItemElectricTool extends ItemTool implements IModularItemBase, I
return MuseElectricItem.getInstance().giveEnergyTo(stack, provided);
}
/* Industrialcraft 2 -------------------------------------------------------------------------- */
@Override
public IMuseElectricItem getManager(ItemStack stack) {
@ -129,7 +128,6 @@ public class MPSItemElectricTool extends ItemTool implements IModularItemBase, I
return MuseElectricItem.getInstance().getEmptyItem(itemStack);
}
/* Thermal Expansion -------------------------------------------------------------------------- */
@Override
public int receiveEnergy(ItemStack stack, int energy, boolean simulate) {
@ -151,7 +149,6 @@ public class MPSItemElectricTool extends ItemTool implements IModularItemBase, I
return MuseElectricItem.getInstance().getMaxEnergyStored(theItem);
}
/* Applied Energistics 2 ---------------------------------------------------------------------- */
@Override
public double injectAEPower(ItemStack stack, double ae) {
@ -178,7 +175,6 @@ public class MPSItemElectricTool extends ItemTool implements IModularItemBase, I
return MuseElectricItem.getInstance().getPowerFlow(stack);
}
/* IModularItemBase ------------------------------------------------------------------------------ */
@Override
public Colour getGlowFromItemStack(ItemStack stack) {
@ -205,7 +201,6 @@ public class MPSItemElectricTool extends ItemTool implements IModularItemBase, I
return 0;
}
/* MPSItemElectricTool ------------------------------------------------------------------------ */
@Override
public double getPlayerEnergy(EntityPlayer player) {
@ -219,6 +214,5 @@ public class MPSItemElectricTool extends ItemTool implements IModularItemBase, I
@Override
public void givePlayerEnergy(EntityPlayer player, double joulesToGive) {
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/PowerModule.java
View file

@ -67,5 +67,4 @@ public class PowerModule extends PowerModuleBase {
public String getTextureFile() {
return textureFile;
}
}

3
src/main/java/net/machinemuse/powersuits/powermodule/PowerModuleBase.java
View file

@ -134,7 +134,8 @@ public abstract class PowerModuleBase implements ILocalizeableModule {
}
public PowerModuleBase addSimpleTradeoff(IPowerModule module, String tradeoffName, String firstPropertyName, String firstUnits,
double firstPropertyBase, double firstPropertyMultiplier, String secondPropertyName, String secondUnits, double secondPropertyBase,
double firstPropertyBase, double firstPropertyMultiplier, String secondPropertyName,
String secondUnits, double secondPropertyBase,
double secondPropertyMultiplier) {
this.addBaseProperty(firstPropertyName, firstPropertyBase, firstUnits);
this.addTradeoffProperty(tradeoffName, firstPropertyName, firstPropertyMultiplier);

1
src/main/java/net/machinemuse/powersuits/powermodule/PropertyModifierFlatAdditive.java
View file

@ -14,5 +14,4 @@ public class PropertyModifierFlatAdditive implements IPropertyModifier {
public double applyModifier(NBTTagCompound moduleTag, double value) {
return value + this.valueAdded;
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/PropertyModifierIntLinearAdditive.java
View file

@ -4,7 +4,6 @@ import net.machinemuse.utils.MuseItemUtils;
import net.minecraft.nbt.NBTTagCompound;
public class PropertyModifierIntLinearAdditive extends PropertyModifierLinearAdditive {
protected int roundTo = 0;
protected int offset = 0;

5
src/main/java/net/machinemuse/powersuits/powermodule/RightClickPowerModule.java
View file

@ -19,17 +19,14 @@ public class RightClickPowerModule extends PowerModule implements IRightClickMod
@Override
public void onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
}
@Override
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY,
float hitZ) {
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
return false;
}
@Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) {
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/ToggleablePowerModule.java
View file

@ -6,7 +6,6 @@ import net.machinemuse.api.moduletrigger.IToggleableModule;
import java.util.List;
public class ToggleablePowerModule extends PowerModule implements IToggleableModule {
public ToggleablePowerModule(String name, List<IModularItem> validItems, String textureFile, String category) {
super(name, validItems, textureFile, category);
}

1
src/main/java/net/machinemuse/powersuits/powermodule/armor/HeatSinkModule.java
View file

@ -43,5 +43,4 @@ public class HeatSinkModule extends PowerModuleBase {
public String getTextureFile() {
return "heatresistantplating2";
}
}

2
src/main/java/net/machinemuse/powersuits/powermodule/armor/MechanicalAssistance.java
View file

@ -61,11 +61,9 @@ public class MechanicalAssistance extends PowerModuleBase implements IPlayerTick
@Override
public void onPlayerTickActive(EntityPlayer player, ItemStack item) {
ElectricItemUtils.drainPlayerEnergy(player, ModuleManager.computeModularProperty(item, POWER_USAGE));
}
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/armor/NitrogenCoolingSystem.java
View file

@ -45,7 +45,6 @@ public class NitrogenCoolingSystem extends PowerModuleBase implements IPlayerTic
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
}
@Override

2
src/main/java/net/machinemuse/powersuits/powermodule/energy/AdvancedSolarGenerator.java
View file

@ -36,8 +36,6 @@ public class AdvancedSolarGenerator extends PowerModuleBase implements IPlayerTi
addInstallCost(MuseItemUtils.copyAndResize(ItemComponent.solarPanel, 3));
addInstallCost(MuseItemUtils.copyAndResize(ItemComponent.controlCircuit, 2));
addInstallCost(MuseItemUtils.copyAndResize(ItemComponent.computerChip, 1));
}
@Override

5
src/main/java/net/machinemuse/powersuits/powermodule/energy/CoalGenerator.java
View file

@ -55,14 +55,9 @@ public class CoalGenerator extends PowerModuleBase implements IPlayerTickModule,
if (ModuleManager.computeModularProperty(item, MAX_COAL_STORAGE) - MuseItemUtils.getCoalLevel(item) < 1) {
i = inv.getSizeInventory() + 1;
}
}
}
}
}
@Override

1
src/main/java/net/machinemuse/powersuits/powermodule/misc/AirtightSealModule.java
View file

@ -40,5 +40,4 @@ public class AirtightSealModule extends PowerModuleBase {
public String getTextureFile() {
return "glasspane";
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/misc/CoolingSystemModule.java
View file

@ -64,5 +64,4 @@ public class CoolingSystemModule extends PowerModuleBase implements IPlayerTickM
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/misc/CosmeticGlowModule.java
View file

@ -47,5 +47,4 @@ public class CosmeticGlowModule extends PowerModuleBase {
public String getTextureFile() {
return "netherstar";
}
}

2
src/main/java/net/machinemuse/powersuits/powermodule/misc/InPlaceAssemblerModule.java
View file

@ -54,7 +54,6 @@ public class InPlaceAssemblerModule extends PowerModuleBase implements IRightCli
player.openGui(ModularPowersuits.getInstance(), 4, world, (int) player.posX, (int) player.posY, (int) player.posZ);
}
@Override
public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
}
@ -67,5 +66,4 @@ public class InPlaceAssemblerModule extends PowerModuleBase implements IRightCli
@Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) {
}
}

4
src/main/java/net/machinemuse/powersuits/powermodule/misc/MagnetModule.java
View file

@ -69,7 +69,6 @@ public class MagnetModule extends PowerModuleBase implements IPlayerTickModule,
return "Generates a magnetic field strong enough to attract items towards the player. WARNING: This module drains power continuously. Turn it off when not needed. (Keybind menu: k)";
}
@Override
public void onPlayerTickActive(EntityPlayer player, ItemStack stack) {
if (ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, MAGNET_ENERGY_CONSUMPTION)) {
@ -118,13 +117,10 @@ public class MagnetModule extends PowerModuleBase implements IPlayerTickModule,
}
}
}
}
}
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/misc/NightVisionModule.java
View file

@ -58,7 +58,6 @@ public class NightVisionModule extends PowerModuleBase implements IPlayerTickMod
} else {
onPlayerTickInactive(player, item);
}
}
@Override

1
src/main/java/net/machinemuse/powersuits/powermodule/misc/WaterElectrolyzerModule.java
View file

@ -71,5 +71,4 @@ public class WaterElectrolyzerModule extends PowerModuleBase implements IPlayerT
public String getTextureFile() {
return "waterelectrolyzer";
}
}

5
src/main/java/net/machinemuse/powersuits/powermodule/movement/BlinkDriveModule.java
View file

@ -70,17 +70,14 @@ public class BlinkDriveModule extends PowerModuleBase implements IRightClickModu
MusePlayerUtils.teleportEntity(player, hitMOP);
world.playSoundAtEntity(player, "mob.endermen.portal", 0.5F, 0.4F / ((float) Math.random() * 0.4F + 0.8F));
}
}
@Override
public void onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
}
@Override
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY,
float hitZ) {
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
return false;
}

1
src/main/java/net/machinemuse/powersuits/powermodule/movement/ClimbAssistModule.java
View file

@ -56,5 +56,4 @@ public class ClimbAssistModule extends PowerModuleBase implements IToggleableMod
// TODO Auto-generated method stub
return "climbassist";
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/movement/FlightControlModule.java
View file

@ -42,5 +42,4 @@ public class FlightControlModule extends PowerModuleBase implements IToggleableM
public String getDescription() {
return "An integrated control circuit to help you fly better. Press Z to go down.";
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/movement/GliderModule.java
View file

@ -80,5 +80,4 @@ public class GliderModule extends PowerModuleBase implements IToggleableModule,
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/movement/JetBootsModule.java
View file

@ -105,5 +105,4 @@ public class JetBootsModule extends PowerModuleBase implements IToggleableModule
public String getTextureFile() {
return "jetboots";
}
}

2
src/main/java/net/machinemuse/powersuits/powermodule/movement/JetPackModule.java
View file

@ -97,7 +97,6 @@ public class JetPackModule extends PowerModuleBase implements IToggleableModule,
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
if ((FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) && NuminaConfig.useSounds()) {
Musique.stopPlayerSound(player, SoundDictionary.SOUND_JETPACK);
}
@ -107,5 +106,4 @@ public class JetPackModule extends PowerModuleBase implements IToggleableModule,
public String getTextureFile() {
return "jetpack";
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/movement/JumpAssistModule.java
View file

@ -73,5 +73,4 @@ public class JumpAssistModule extends PowerModuleBase implements IToggleableModu
public String getTextureFile() {
return "jumpassist";
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/movement/ParachuteModule.java
View file

@ -73,5 +73,4 @@ public class ParachuteModule extends PowerModuleBase implements IToggleableModul
public String getTextureFile() {
return "parachute";
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/movement/SwimAssistModule.java
View file

@ -107,5 +107,4 @@ public class SwimAssistModule extends PowerModuleBase implements IToggleableModu
public String getTextureFile() {
return "swimboost";
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/movement/UUID.java
View file

@ -28,4 +28,3 @@ public class UUID {
return nbt;
}
}

5
src/main/java/net/machinemuse/powersuits/powermodule/tool/AOEPickUpgradeModule.java
View file

@ -22,14 +22,11 @@ public class AOEPickUpgradeModule extends PowerModuleBase implements IBlockBreak
public static final String MODULE_AOE_PICK_UPGRADE = "Diamond Drill Upgrade";
//public static final ItemStack ironPickaxe = new ItemStack(Item.pickaxeIron);
public static final String ENERGY_CONSUMPTION = "Energy Consumption";
public AOEPickUpgradeModule(List<IModularItem> validItems) {
super(validItems);
addInstallCost(MuseItemUtils.copyAndResize(ItemComponent.solenoid, 1));
//addInstallCost(new ItemStack(Item.diamond, 3));
addBaseProperty(ENERGY_CONSUMPTION, 5, "J");
}
@Override
@ -57,7 +54,6 @@ public class AOEPickUpgradeModule extends PowerModuleBase implements IBlockBreak
return "An updrade that will allow the pickaxe module to mine a 3x3 area of blocks";
}
@Override
public boolean canHarvestBlock(ItemStack itemStack, Block block, int i, EntityPlayer entityPlayer) {
return false;
@ -70,6 +66,5 @@ public class AOEPickUpgradeModule extends PowerModuleBase implements IBlockBreak
@Override
public void handleBreakSpeed(PlayerEvent.BreakSpeed breakSpeed) {
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/tool/AquaAffinityModule.java
View file

@ -80,5 +80,4 @@ public class AquaAffinityModule extends PowerModuleBase implements IBlockBreakin
public String getTextureFile() {
return "aquaaffinity";
}
}

7
src/main/java/net/machinemuse/powersuits/powermodule/tool/DimensionalRiftModule.java
View file

@ -60,7 +60,6 @@ public class DimensionalRiftModule extends PowerModuleBase implements IRightClic
@Override
public void onRightClick(EntityPlayer playerClicking, World world, ItemStack item) {
if ((playerClicking.ridingEntity == null) && (playerClicking.riddenByEntity == null) && ((playerClicking instanceof EntityPlayerMP))) {
EntityPlayerMP thePlayer = (EntityPlayerMP) playerClicking;
if (thePlayer.dimension != -1) {
@ -82,19 +81,14 @@ public class DimensionalRiftModule extends PowerModuleBase implements IRightClic
yPos++;
}
(thePlayer).setPositionAndUpdate(coords.posX + 0.5D, yPos, coords.posZ + 0.5D);
}
ElectricItemUtils.drainPlayerEnergy(thePlayer, ModuleManager.computeModularProperty(item, DIMENSIONAL_RIFT_ENERGY_GENERATION));
MuseHeatUtils.heatPlayer(thePlayer, ModuleManager.computeModularProperty(item, DIMENSIONAL_RIFT_HEAT_GENERATION));
}
}
@Override
public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
}
@Override
@ -104,6 +98,5 @@ public class DimensionalRiftModule extends PowerModuleBase implements IRightClic
@Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) {
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/tool/FieldTinkerModule.java
View file

@ -66,4 +66,3 @@ public class FieldTinkerModule extends PowerModuleBase implements IRightClickMod
player.openGui(ModularPowersuits.getInstance(), 2, world, (int)player.posX, (int)player.posY, (int)player.posZ);
}
}

3
src/main/java/net/machinemuse/powersuits/powermodule/tool/HoeModule.java
View file

@ -78,8 +78,7 @@ public class HoeModule extends PowerModuleBase implements IPowerModule, IRightCl
}
@Override
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY,
float hitZ) {
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
return false;
}

2
src/main/java/net/machinemuse/powersuits/powermodule/tool/LeafBlowerModule.java
View file

@ -17,7 +17,6 @@ import net.minecraft.world.World;
import java.util.List;
/**
* Created by User: Andrew2448
* 7:13 PM 4/21/13
@ -141,6 +140,5 @@ public class LeafBlowerModule extends PowerModuleBase implements IRightClickModu
@Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) {
}
}

6
src/main/java/net/machinemuse/powersuits/powermodule/tool/LuxCapacitor.java
View file

@ -75,12 +75,10 @@ public class LuxCapacitor extends PowerModuleBase implements IRightClickModule {
@Override
public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
}
@Override
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY,
float hitZ) {
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
// TODO Auto-generated method stub
return false;
}
@ -88,7 +86,5 @@ public class LuxCapacitor extends PowerModuleBase implements IRightClickModule {
@Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) {
// TODO Auto-generated method stub
}
}

92
src/main/java/net/machinemuse/powersuits/powermodule/tool/OmniProbeModule.java
View file

@ -25,17 +25,16 @@ import java.util.List;
*
* TODO: Fix ProjectRed (may require PR to ProjectRed)
*/
public class OmniProbeModule extends PowerModuleBase implements IRightClickModule, IPlayerTickModule {
public static final String MODULE_OMNIPROBE = "Prototype OmniProbe";
private ItemStack conduitProbe;
private ItemStack rednetMeter;
private ItemStack cpmPSD;
private ItemStack rcMeter;
private ItemStack prDebugger;
public static final String MODULE_OMNIPROBE = "Prototype OmniProbe";
private ItemStack conduitProbe;
private ItemStack rednetMeter;
private ItemStack cpmPSD;
private ItemStack rcMeter;
private ItemStack prDebugger;
// private ItemStack teMultimeter;
public OmniProbeModule(List<IModularItem> validItems) {
public OmniProbeModule(List<IModularItem> validItems) {
super(validItems);
addInstallCost(MuseItemUtils.copyAndResize(ItemComponent.controlCircuit, 4));
ItemStack tHighest = GameRegistry.findItemStack("minecraft", "comparator", 1);
@ -66,45 +65,44 @@ public OmniProbeModule(List<IModularItem> validItems) {
conduitProbe = GameRegistry.findItemStack("EnderIO", "itemConduitProbe", 1);
tHighest = conduitProbe;
}
addInstallCost(tHighest);
}
}
@Override
public String getTextureFile() {
@Override
public String getTextureFile() {
return "omniprobe";
}
}
@Override
public String getCategory() {
@Override
public String getCategory() {
return MuseCommonStrings.CATEGORY_TOOL;
}
}
@Override
public String getDataName() {
@Override
public String getDataName() {
return MODULE_OMNIPROBE;
}
}
@Override
public String getUnlocalizedName() {
@Override
public String getUnlocalizedName() {
return "omniProbe";
}
}
@Override
public String getDescription() {
@Override
public String getDescription() {
return "A prototype multi-use probe integrated into your power tool.";
}
}
@Override
public void onRightClick(EntityPlayer player, World world, ItemStack item) {
}
@Override
public void onRightClick(EntityPlayer player, World world, ItemStack item) {
}
@Override
public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
}
@Override
public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
}
@Override
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
@Override
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
int block = Block.getIdFromBlock(world.getBlock(x, y, z));
/* Project Red seems to do something odd with its debugger. Will have to look into this. */
@ -139,41 +137,37 @@ public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World wo
return conduitProbe.getItem().onItemUse(itemStack, player, world, x, y, z, side, hitX, hitY, hitZ);
}
}
return false;
}
@Override
public void onPlayerTickActive(EntityPlayer player, ItemStack item) {
}
@Override
public void onPlayerTickActive(EntityPlayer player, ItemStack item) {
if (!MuseItemUtils.getEIOFacadeTransparency(item)) {
MuseItemUtils.setEIONoCompete(item, MODULE_OMNIPROBE);
MuseItemUtils.setEIOFacadeTransparency(item, true);
}
}
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
}
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
if ((MuseItemUtils.getEIONoCompete(item) != null) && (!MuseItemUtils.getEIONoCompete(item).isEmpty())) {
if (MuseItemUtils.getEIONoCompete(item).equals(MODULE_OMNIPROBE)) {
MuseItemUtils.setEIONoCompete(item, "");
if (MuseItemUtils.getEIOFacadeTransparency(item)) {
MuseItemUtils.setEIOFacadeTransparency(item, false);
}
}
} else {
if (MuseItemUtils.getEIOFacadeTransparency(item)) {
MuseItemUtils.setEIOFacadeTransparency(item, false);
}
}
}
}
public float minF(float a, float b) {
public float minF(float a, float b) {
return a < b ? a : b;
}
}
@Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) {
}
@Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) {
}
}

2
src/main/java/net/machinemuse/powersuits/powermodule/tool/OmniWrenchModule.java
View file

@ -57,7 +57,6 @@ public class OmniWrenchModule extends PowerModuleBase implements IRightClickModu
@Override
public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
}
@Override
@ -77,6 +76,5 @@ public class OmniWrenchModule extends PowerModuleBase implements IRightClickModu
@Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) {
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/tool/OreScannerModule.java
View file

@ -53,7 +53,6 @@ public class OreScannerModule extends PowerModuleBase implements IRightClickModu
for (int i = 0; i < oreNames.length; i++) {
ores.add(i, OreDictionary.getOres(oreNames[i]));
}
fillMap();
}

79
src/main/java/net/machinemuse/powersuits/powermodule/tool/PersonalShrinkingModule.java
View file

@ -22,52 +22,52 @@ import java.util.List;
*/
public class PersonalShrinkingModule extends PowerModuleBase implements IRightClickModule, IPlayerTickModule {
public static final String MODULE_CM_PSD = "Personal Shrinking Device";
private final ItemStack cpmPSD;
public static final String MODULE_CM_PSD = "Personal Shrinking Device";
private final ItemStack cpmPSD;
public PersonalShrinkingModule(List<IModularItem> validItems) {
public PersonalShrinkingModule(List<IModularItem> validItems) {
super(validItems);
addInstallCost(MuseItemUtils.copyAndResize(ItemComponent.controlCircuit, 4));
cpmPSD = GameRegistry.findItemStack("CompactMachines", "psd", 1);
addInstallCost(cpmPSD);
}
}
@Override
public String getTextureFile() {
@Override
public String getTextureFile() {
return "psd";
}
}
@Override
public String getCategory() {
@Override
public String getCategory() {
return MuseCommonStrings.CATEGORY_TOOL;
}
}
@Override
public String getDataName() {
@Override
public String getDataName() {
return MODULE_CM_PSD;
}
}
@Override
public String getUnlocalizedName() {
@Override
public String getUnlocalizedName() {
return "cmPSD";
}
}
@Override
public String getDescription() {
@Override
public String getDescription() {
return "A Compact Machines Personal Shrinking Device integrated into your power tool.";
}
}
@Override
public void onRightClick(EntityPlayer player, World world, ItemStack item) {
@Override
public void onRightClick(EntityPlayer player, World world, ItemStack item) {
cpmPSD.getItem().onItemRightClick(item, world, player);
}
}
@Override
public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
}
@Override
public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
}
@Override
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
@Override
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
if (world.isRemote && player instanceof EntityPlayerMP) {
int block = Block.getIdFromBlock(world.getBlock(x, y, z));
if (block == Block.getIdFromBlock(GameRegistry.findBlock("CompactMachines", "machine"))) {
@ -77,28 +77,27 @@ public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World wo
}
}
return false;
}
}
@Override
public void onPlayerTickActive(EntityPlayer player, ItemStack item) {
@Override
public void onPlayerTickActive(EntityPlayer player, ItemStack item) {
if (!MuseItemUtils.getCanShrink(item)) {
MuseItemUtils.setCanShrink(item, true);
}
}
}
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
if (MuseItemUtils.getCanShrink(item)) {
MuseItemUtils.setCanShrink(item, false);
}
}
}
public float minF(float a, float b) {
public float minF(float a, float b) {
return a < b ? a : b;
}
}
@Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) {
}
@Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) {
}
}

9
src/main/java/net/machinemuse/powersuits/powermodule/tool/ShovelModule.java
View file

@ -66,17 +66,12 @@ public class ShovelModule extends PowerModuleBase implements IBlockBreakingModul
return true;
String effectiveTool = block.getHarvestTool(metadata);
// some blocks like stairs do no not have a tool assigned to them
if (effectiveTool == null)
{
{
if (emulatedTool.func_150997_a/*getStrVsBlock*/(block) >= ((ItemTool) emulatedTool.getItem()).func_150913_i/*getToolMaterial*/().getEfficiencyOnProperMaterial())
{
if (effectiveTool == null) {
if (emulatedTool.func_150997_a/*getStrVsBlock*/(block) >= ((ItemTool) emulatedTool.getItem()).func_150913_i/*getToolMaterial*/().getEfficiencyOnProperMaterial()) {
return true;
}
}
}
return effectiveTool == "shovel";
}

151
src/main/java/net/machinemuse/powersuits/powermodule/tool/TerminalHandler.java
View file

@ -27,22 +27,21 @@ import java.util.Set;
@Optional.InterfaceList({
@Optional.Interface(iface = "extracells.api.IWirelessFluidTermHandler", modid = "extracells", striprefs = true),
@Optional.Interface(iface = "appeng.api.features.IWirelessTermHandler", modid = "appliedenergistics2", striprefs = true)
})
})
public class TerminalHandler implements IWirelessTermHandler, IWirelessFluidTermHandler {
@Optional.Method(modid = "appliedenergistics2")
@Override
public boolean canHandle(ItemStack is) {
@Optional.Method(modid = "appliedenergistics2")
@Override
public boolean canHandle(ItemStack is) {
if(is == null)
return false;
if(is.getUnlocalizedName() == null)
return false;
return is.getUnlocalizedName().equals("item.powerFist");
}
}
@Optional.Method(modid = "appliedenergistics2")
@Override
public boolean usePower(EntityPlayer entityPlayer, double v, ItemStack itemStack) {
@Optional.Method(modid = "appliedenergistics2")
@Override
public boolean usePower(EntityPlayer entityPlayer, double v, ItemStack itemStack) {
boolean ret = false;
if (( v * ModCompatibility.getAE2Ratio() ) < ( ElectricItemUtils.getPlayerEnergy( entityPlayer ) * ModCompatibility.getAE2Ratio() ))
{
@ -51,17 +50,17 @@ public boolean usePower(EntityPlayer entityPlayer, double v, ItemStack itemStack
}
return ret;
}
}
@Optional.Method(modid = "appliedenergistics2")
@Override
public boolean hasPower(EntityPlayer entityPlayer, double v, ItemStack itemStack) {
@Optional.Method(modid = "appliedenergistics2")
@Override
public boolean hasPower(EntityPlayer entityPlayer, double v, ItemStack itemStack) {
return (( v * ModCompatibility.getAE2Ratio() ) < ( ElectricItemUtils.getPlayerEnergy(entityPlayer) * ModCompatibility.getAE2Ratio() ));
}
}
@Optional.Method(modid = "appliedenergistics2")
@Override
public IConfigManager getConfigManager(ItemStack itemStack) {
@Optional.Method(modid = "appliedenergistics2")
@Override
public IConfigManager getConfigManager(ItemStack itemStack) {
IConfigManager config = new WirelessConfig(itemStack);
config.registerSetting( Settings.SORT_BY, SortOrder.NAME );
config.registerSetting( Settings.VIEW_MODE, ViewItems.ALL );
@ -69,11 +68,11 @@ public IConfigManager getConfigManager(ItemStack itemStack) {
config.readFromNBT(itemStack.getTagCompound());
return config;
}
}
@Optional.Method(modid = "appliedenergistics2")
@Override
public String getEncryptionKey(ItemStack item) {
@Optional.Method(modid = "appliedenergistics2")
@Override
public String getEncryptionKey(ItemStack item) {
{
if (item == null) {
return null;
@ -84,11 +83,11 @@ public String getEncryptionKey(ItemStack item) {
}
return null;
}
}
}
@Optional.Method(modid = "appliedenergistics2")
@Override
public void setEncryptionKey(ItemStack item, String encKey, String name) {
@Optional.Method(modid = "appliedenergistics2")
@Override
public void setEncryptionKey(ItemStack item, String encKey, String name) {
{
if (item == null) {
return;
@ -98,91 +97,89 @@ public void setEncryptionKey(ItemStack item, String encKey, String name) {
tag.setString("encKey", encKey);
}
}
}
}
@Optional.Method(modid = "extracells")
@Override
public boolean isItemNormalWirelessTermToo(ItemStack is) {
@Optional.Method(modid = "extracells")
@Override
public boolean isItemNormalWirelessTermToo(ItemStack is) {
return true;
}
}
@Optional.Method(modid = "appliedenergistics2")
private static void registerAEHandler(TerminalHandler handler){
@Optional.Method(modid = "appliedenergistics2")
private static void registerAEHandler(TerminalHandler handler){
AEApi.instance().registries().wireless().registerWirelessHandler(handler);
}
}
@Optional.Method(modid = "extracells")
private static void registerECHandler(TerminalHandler handler){
@Optional.Method(modid = "extracells")
private static void registerECHandler(TerminalHandler handler){
ECApi.instance().registerWirelessFluidTermHandler(handler);
}
}
public static void registerHandler() {
public static void registerHandler() {
if (Loader.isModLoaded("appliedenergistics2")) {
TerminalHandler handler = new TerminalHandler();
registerAEHandler(handler);
if (Loader.isModLoaded("extracells")) {
registerECHandler(handler);
}
}
}
}
public static NBTTagCompound openNbtData(ItemStack item) {
public static NBTTagCompound openNbtData(ItemStack item) {
NBTTagCompound compound = item.getTagCompound();
if (compound == null) {
item.setTagCompound(compound = new NBTTagCompound());
}
return compound;
}
}
@Optional.Interface(iface = "appeng.api.util.IConfigManager", modid = "appliedenergistics2", striprefs = true)
class WirelessConfig implements IConfigManager {
@Optional.Interface(iface = "appeng.api.util.IConfigManager", modid = "appliedenergistics2", striprefs = true)
class WirelessConfig implements IConfigManager {
private final Map<Settings, Enum<?>> enums = new EnumMap<>(Settings.class);
private final Map<Settings, Enum<?>> enums = new EnumMap<>(Settings.class);
final ItemStack stack;
final ItemStack stack;
public WirelessConfig(ItemStack itemStack) {
public WirelessConfig(ItemStack itemStack) {
stack = itemStack;
}
}
@Optional.Method(modid = "appliedenergistics2")
@Override
public Enum<?> getSetting(Settings arg0) {
@Optional.Method(modid = "appliedenergistics2")
@Override
public Enum<?> getSetting(Settings arg0) {
if(enums.containsKey(arg0)) {
return enums.get(arg0);
}
return null;
}
}
@Optional.Method(modid = "appliedenergistics2")
@Override
public Set<Settings> getSettings() {
@Optional.Method(modid = "appliedenergistics2")
@Override
public Set<Settings> getSettings() {
return enums.keySet();
}
}
@Optional.Method(modid = "appliedenergistics2")
@Override
public Enum putSetting(Settings arg0, Enum arg1) {
@Optional.Method(modid = "appliedenergistics2")
@Override
public Enum putSetting(Settings arg0, Enum arg1) {
enums.put(arg0, arg1);
writeToNBT(stack.getTagCompound());
return arg1;
}
}
@Optional.Method(modid = "appliedenergistics2")
@Override
public void registerSetting(Settings arg0, Enum arg1) {
@Optional.Method(modid = "appliedenergistics2")
@Override
public void registerSetting(Settings arg0, Enum arg1) {
if(!enums.containsKey(arg0)) {
putSetting(arg0, arg1);
}
}
}
@Optional.Method(modid = "appliedenergistics2")
@Override
public void readFromNBT(NBTTagCompound tagCompound)
{
@Optional.Method(modid = "appliedenergistics2")
@Override
public void readFromNBT(NBTTagCompound tagCompound)
{
NBTTagCompound tag = null;
if(tagCompound.hasKey("configWirelessTerminal")) {
tag = tagCompound.getCompoundTag("configWirelessTerminal");
@ -216,15 +213,14 @@ public void readFromNBT(NBTTagCompound tagCompound)
}
catch (IllegalArgumentException ignored)
{
}
}
}
}
@Optional.Method(modid = "appliedenergistics2")
@Override
public void writeToNBT(NBTTagCompound tagCompound)
{
@Optional.Method(modid = "appliedenergistics2")
@Override
public void writeToNBT(NBTTagCompound tagCompound)
{
NBTTagCompound tag = new NBTTagCompound();
if(tagCompound.hasKey("configWirelessTerminal")) {
tag = tagCompound.getCompoundTag("configWirelessTerminal");
@ -235,9 +231,6 @@ public void writeToNBT(NBTTagCompound tagCompound)
tag.setString( e.name(), enums.get( e ).toString() );
}
tagCompound.setTag("configWirelessTerminal", tag);
}
}
}
}
}

10
src/main/java/net/machinemuse/powersuits/powermodule/weapon/BladeLauncherModule.java
View file

@ -61,29 +61,23 @@ public class BladeLauncherModule extends PowerModuleBase implements IRightClickM
@Override
public void onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
}
@Override
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY,
float hitZ) {
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
return false;
}
@Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) {
// int chargeTicks = Math.max(itemStack.getMaxItemUseDuration() - par4,
// 10);
// int chargeTicks = Math.max(itemStack.getMaxItemUseDuration() - par4, 10);
if (!world.isRemote) {
double energyConsumption = ModuleManager.computeModularProperty(itemStack, BLADE_ENERGY);
if (ElectricItemUtils.getPlayerEnergy(player) > energyConsumption) {
ElectricItemUtils.drainPlayerEnergy(player, energyConsumption);
EntitySpinningBlade blade = new EntitySpinningBlade(world, player);
world.spawnEntityInWorld(blade);
}
}
}
}

1
src/main/java/net/machinemuse/powersuits/powermodule/weapon/LightningModule.java
View file

@ -20,7 +20,6 @@ import java.util.List;
* 5:56 PM 6/14/13
*/
public class LightningModule extends PowerModuleBase implements IRightClickModule {
public static final String MODULE_LIGHTNING = "Lightning Summoner";
public static final String LIGHTNING_ENERGY_CONSUMPTION = "Energy Consumption";
public static final String HEAT = "Heat Emission";

3
src/main/java/net/machinemuse/powersuits/powermodule/weapon/MeleeAssistModule.java
View file

@ -42,7 +42,8 @@ public class MeleeAssistModule extends PowerModuleBase {
}
@Override
public String getUnlocalizedName() { return "meleeAssist";
public String getUnlocalizedName() {
return "meleeAssist";
}
@Override

5
src/main/java/net/machinemuse/powersuits/powermodule/weapon/PlasmaCannonModule.java
View file

@ -70,12 +70,10 @@ public class PlasmaCannonModule extends PowerModuleBase implements IRightClickMo
@Override
public void onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
}
@Override
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY,
float hitZ) {
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
return false;
}
@ -99,5 +97,4 @@ public class PlasmaCannonModule extends PowerModuleBase implements IRightClickMo
}
}
}
}

5
src/main/java/net/machinemuse/powersuits/powermodule/weapon/RailgunModule.java
View file

@ -139,8 +139,7 @@ public class RailgunModule extends PowerModuleBase implements IRightClickModule,
}
@Override
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY,
float hitZ) {
public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
return false;
}
@ -152,11 +151,9 @@ public class RailgunModule extends PowerModuleBase implements IRightClickModule,
public void onPlayerTickActive(EntityPlayer player, ItemStack stack) {
double timer = MuseItemUtils.getDoubleOrZero(stack, TIMER);
if (timer > 0) MuseItemUtils.setDoubleOrRemove(stack, TIMER, timer - 1 > 0 ? timer - 1 : 0);
}
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
}
}

3
src/main/java/net/machinemuse/powersuits/powermodule/weapon/SonicWeaponModule.java
View file

@ -44,12 +44,10 @@ public class SonicWeaponModule extends PowerModuleBase implements IRightClickMod
@Override
public void onRightClick(EntityPlayer playerClicking, World world, ItemStack item) {
}
@Override
public void onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
}
@Override
@ -60,5 +58,4 @@ public class SonicWeaponModule extends PowerModuleBase implements IRightClickMod
@Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) {
}
}

1
src/main/java/net/machinemuse/utils/MPSTeleporter.java
View file

@ -96,7 +96,6 @@ public class MPSTeleporter extends Teleporter {
}
entity.setLocationAndAngles(ex + 0.5D, ey, ez + 0.5D, entity.rotationYaw, 0.0F);
entity.motionX = (entity.motionY = entity.motionZ = 0.0D);
return true;
}

1
src/main/java/net/machinemuse/utils/MuseCommonStrings.java
View file

@ -106,5 +106,4 @@ public abstract class MuseCommonStrings {
}
return modules;
}
}

1
src/main/java/net/machinemuse/utils/MuseHeatUtils.java
View file

@ -51,7 +51,6 @@ public class MuseHeatUtils {
} else {
return;
}
}
}

1
src/main/java/net/machinemuse/utils/MuseItemUtils.java
View file

@ -363,7 +363,6 @@ public class MuseItemUtils {
NBTTagCompound itemTag = MuseItemUtils.getMuseItemTag(stack);
ModuleManager.toggleModule(itemTag, name, toggleval);
}
}
/**

1
src/main/java/net/machinemuse/utils/render/MuseRenderer.java
View file

@ -366,5 +366,4 @@ public abstract class MuseRenderer {
public static void unRotate() {
BillboardHelper.unRotate();
}
}

1
src/main/java/net/machinemuse/utils/render/MuseStencilManager.java
View file

@ -17,6 +17,5 @@ public class MuseStencilManager {
}
public void stencilOff() {
}
}