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'

4
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());
@ -76,4 +74,4 @@ public class NBTTagAccessor extends NBTTagCompound {
}
return a;
}
}
}

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

@ -50,4 +50,4 @@ public class KeyConfigGui extends MuseGui {
super.onGuiClosed();
KeybindManager.writeOutKeybinds();
}
}
}

4
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);
}
}
}

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

@ -22,4 +22,4 @@ public class WaterMeter extends HeatMeter {
RenderState.blendingOff();
MuseTextureUtils.popTexture();
}
}
}

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

19
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;
}
}
}
}

3
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);
}
}
}

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

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

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

@ -62,4 +62,4 @@ public class ModuleSelectionSubFrame {
public MuseRect getBorder() {
return border;
}
}
}

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();

3
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

3
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;
}
}

4
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
@ -73,4 +71,4 @@ public class TinkerTableRenderer extends MuseTESR implements ISimpleBlockRenderi
public int getRenderId() {
return renderId;
}
}
}

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

@ -9,9 +9,8 @@ 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();
}
}

2
src/main/java/net/machinemuse/powersuits/client/render/entity/RenderPlasmaBolt.java
View file

@ -74,4 +74,4 @@ public class RenderPlasmaBolt extends MuseRender {
RenderState.glowOff();
GL11.glPopMatrix();
}
}
}

3
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);
@ -39,4 +38,4 @@ public class RenderSpinningBlade extends MuseRender {
glPopAttrib();
glPopMatrix();
}
}
}

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.");

2
src/main/java/net/machinemuse/powersuits/client/render/item/IArmorModel.java
View file

@ -28,4 +28,4 @@ public interface IArmorModel {
void prep(Entity entity, float par2, float par3, float par4, float par5, float par6, float scale);
void post(Entity entity, float par2, float par3, float par4, float par5, float par6, float scale);
}
}

2
src/main/java/net/machinemuse/powersuits/client/render/item/SMovingArmorModel.java
View file

@ -156,4 +156,4 @@ public class SMovingArmorModel extends ModelPlayer implements IArmorModel {
isSneak = false;
heldItemRight = 0;
}
}
}

5
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,11 +496,10 @@ public class ToolModel extends ModelBase {
setPose(0.5f, -1, 0.5f, -1, 0.5f, -1);
this.boltSize = 0;
}
}
public void setNeutralPose() {
setPose(0.5f, -1, 0.5f, -1, 0.5f, -1);
this.boltSize = 0;
}
}
}

10
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) {
@ -166,4 +158,4 @@ public class ToolRenderer extends MuseRender implements IItemRenderer {
renderplayer.renderFirstPersonArm(mc.thePlayer);
GL11.glPopMatrix();
}
}
}

2
src/main/java/net/machinemuse/powersuits/client/render/item/VanillaArmorModel.java
View file

@ -146,4 +146,4 @@ public class VanillaArmorModel extends ModelBiped implements IArmorModel {
isSneak = false;
heldItemRight = 0;
}
}
}

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

@ -116,17 +116,10 @@ public class DefaultModelSpec {
for (String name: partnames) {
prefArray.add(makePref(model.get(name), colour, glow));
}
return prefArray;
}
public static NBTTagCompound makePref(ModelPartSpec partSpec, Integer colourindex, Boolean glow) {
return partSpec.multiSet(new NBTTagCompound(), null, glow, colourindex);
}
}
}

2
src/main/java/net/machinemuse/powersuits/client/render/modelspec/ModelPartSpec.java
View file

@ -88,4 +88,4 @@ public class ModelPartSpec
this.setColourIndex(nbt, (c != null) ? c : defaultcolourindex);
return nbt;
}
}
}

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

@ -78,7 +78,4 @@ public class RenderPart extends ModelRenderer {
GL11.glRotatef(180, 1.0F, 0.0F, 0.0F);
GL11.glTranslated(offsetX, offsetY - 26, offsetZ);
}
}
}

2
src/main/java/net/machinemuse/powersuits/common/InstallCost.java
View file

@ -9,4 +9,4 @@ public class InstallCost {
public String modId;
public Integer itemMetadata;
public Integer itemQuantity;
}
}

2
src/main/java/net/machinemuse/powersuits/control/KeybindKeyHandler.java
View file

@ -71,4 +71,4 @@ public class KeybindKeyHandler {
}
}
}
}
}

2
src/main/java/net/machinemuse/powersuits/control/KeybindManager.java
View file

@ -127,4 +127,4 @@ public class KeybindManager {
e.printStackTrace();
}
}
}
}

2
src/main/java/net/machinemuse/powersuits/control/PlayerInputMap.java
View file

@ -106,4 +106,4 @@ public class PlayerInputMap {
public void refresh() {
this.lastSentMap.setTo(this);
}
}
}

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

@ -94,4 +94,4 @@ public class EntityLuxCapacitor extends EntityThrowable {
this.setDead();
}
}
}
}

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

@ -152,4 +152,4 @@ public class EntityPlasmaBolt extends EntityThrowable {
this.setDead();
}
}
}
}

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

@ -134,4 +134,4 @@ public class EntitySpinningBlade extends EntityThrowable {
}
}
}
}
}

4
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() {
}
}
}

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

@ -250,4 +250,4 @@ public class ClientTickHandler {
}
}
}
}
}

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

@ -40,4 +40,4 @@ public class HarvestEventHandler {
}
}
}
}

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

@ -96,4 +96,4 @@ public class MovementManager {
double ticks = velocity / DEFAULT_GRAVITY;
return -0.5 * DEFAULT_GRAVITY * ticks * ticks;
}
}
}

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

@ -19,4 +19,4 @@ public class PlayerLoginHandlerThingy {
EntityPlayer player = e.player;
PacketSender.sendTo(new MusePacketPropertyModifierConfig(player, null), (EntityPlayerMP)player);
}
}
}

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

@ -87,8 +87,4 @@ public class PlayerUpdateHandler {
}
}
}
}
}

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

@ -120,6 +120,4 @@ public class RenderEventHandler {
}
}
}
}
}

2
src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorBoots.java
View file

@ -29,4 +29,4 @@ public class ItemPowerArmorBoots extends ItemPowerArmor implements IMetalArmor
public boolean isMetalArmor(final ItemStack itemStack, final EntityPlayer entityPlayer) {
return true;
}
}
}

2
src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorHelmet.java
View file

@ -61,4 +61,4 @@ public class ItemPowerArmorHelmet extends ItemPowerArmor implements IArmorNatura
public boolean canBreathe(final ItemStack helm, final EntityPlayer player, final IBreathableArmor.EnumGearType geartype) {
return ModuleManager.itemHasActiveModule(helm, AirtightSealModule.AIRTIGHT_SEAL_MODULE);
}
}
}

8
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) {
}
}
}

2
src/main/java/net/machinemuse/powersuits/network/packets/MPSPacketList.java
View file

@ -25,4 +25,4 @@ public class MPSPacketList {
MusePacketHandler.packagers.put(10, MusePacketColourInfo.getPackagerInstance());
MusePacketHandler.packagers.put(11, MusePacketPropertyModifierConfig.getPackagerInstance());
}
}
}

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;
}
}

5
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);
@ -179,4 +180,4 @@ public abstract class PowerModuleBase implements ILocalizeableModule {
public String getUnlocalizedName() {
return "Unknown Module";
}
}
}

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;

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

@ -21,4 +21,4 @@ public class PropertyModifierLinearAdditive implements IPropertyModifier {
public String getTradeoffName() {
return tradeoffName;
}
}
}

7
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) {
}
}
}

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

@ -6,8 +6,7 @@ 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);
}
}
}

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

@ -48,4 +48,4 @@ public class ApiaristArmorModule extends PowerModuleBase {
public String getTextureFile() {
return "silkWisp";
}
}
}

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

@ -41,4 +41,4 @@ public class BasicPlatingModule extends PowerModuleBase {
public String getDescription() {
return "Basic plating is heavy but protective.";
}
}
}

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

@ -41,4 +41,4 @@ public class DiamondPlatingModule extends PowerModuleBase {
public String getDescription() {
return "Advanced plating is lighter, harder, and more protective than Basic but much harder to make.";
}
}
}

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

@ -41,4 +41,4 @@ public class EnergyShieldModule extends PowerModuleBase {
public String getDescription() {
return "Energy shields are much lighter than plating, but consume energy.";
}
}
}

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

@ -39,4 +39,4 @@ public class HazmatModule extends PowerModuleBase {
public String getTextureFile() {
return "greenstar";
}
}
}

3
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";
}
}
}

4
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) {
}
}
}

3
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
@ -72,4 +71,4 @@ public class NitrogenCoolingSystem extends PowerModuleBase implements IPlayerTic
public String getDescription() {
return "Cools down heat-producing modules even faster than the standard cooling system.";
}
}
}

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

@ -103,4 +103,4 @@ public class WaterTankModule extends PowerModuleBase implements IPlayerTickModul
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
}
}
}

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

@ -47,4 +47,4 @@ public class AdvancedBatteryModule extends PowerModuleBase {
public String getDescription() {
return "Integrate a more advanced battery to store more energy.";
}
}
}

4
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
@ -95,4 +93,4 @@ public class AdvancedSolarGenerator extends PowerModuleBase implements IPlayerTi
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
}
}
}

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

@ -47,4 +47,4 @@ public class BasicBatteryModule extends PowerModuleBase {
public String getDescription() {
return "Integrate a battery to allow the item to store energy.";
}
}
}

7
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
@ -94,4 +89,4 @@ public class CoalGenerator extends PowerModuleBase implements IPlayerTickModule,
public String getDescription() {
return "Generate power with solid fuels";
}
}
}

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

@ -47,4 +47,4 @@ public class EliteBatteryModule extends PowerModuleBase {
public String getDescription() {
return "Integrate a the most advanced battery to store an extensive amount of energy.";
}
}
}

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

@ -85,4 +85,4 @@ public class KineticGeneratorModule extends PowerModuleBase implements IPlayerTi
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
}
}
}

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

@ -82,4 +82,4 @@ public class SolarGeneratorModule extends PowerModuleBase implements IPlayerTick
@Override
public void onPlayerTickInactive(EntityPlayer player, ItemStack item) {
}
}
}

3
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";
}
}
}

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

@ -36,4 +36,4 @@ public class CitizenJoeStyle extends PowerModuleBase {
public String getDescription() {
return "An alternative armor texture, c/o CitizenJoe of IC2 forums.";
}
}
}

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

@ -56,4 +56,4 @@ public class ClockModule extends PowerModuleBase implements IToggleableModule {
public String getDescription() {
return "A clock on the run that shows you the time, no matter where you are. Toggleable by keybinds.";
}
}
}

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

@ -56,4 +56,4 @@ public class CompassModule extends PowerModuleBase implements IToggleableModule
public String getDescription() {
return "A compass on the run that shows you your direction, no matter where you are. Toggleable by keybinds.";
}
}
}

3
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) {
}
}
}

3
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";
}
}
}

4
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) {
}
}
}

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

@ -80,4 +80,4 @@ public class InvisibilityModule extends PowerModuleBase implements IPlayerTickMo
public String getTextureFile() {
return "bluedrone";
}
}
}

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) {
}
}

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

@ -133,4 +133,4 @@ public class MobRepulsorModule extends PowerModuleBase implements IPlayerTickMod
}
}
}
}
}

3
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
@ -80,4 +79,4 @@ public class NightVisionModule extends PowerModuleBase implements IPlayerTickMod
public String getTextureFile() {
return "nightvision";
}
}
}

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

@ -50,4 +50,4 @@ public class ThaumGogglesModule extends PowerModuleBase implements IToggleableMo
public String getTextureFile() {
return "bluestar";
}
}
}

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

@ -47,4 +47,4 @@ public class TintModule extends PowerModuleBase {
public String getDescription() {
return "Give your armor some coloured tinting to customize your armor's appearance.";
}
}
}

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

@ -43,4 +43,4 @@ public class TransparentArmorModule extends PowerModuleBase {
public String getDescription() {
return "Make the item transparent, so you can show off your skin without losing armor.";
}
}
}

3
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";
}
}
}

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

@ -70,21 +70,18 @@ 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;
}
@Override
public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) {
}
}
}

3
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.";
}
}

3
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";
}
}

4
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";
}
}

3
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";
}
}
}

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

@ -46,4 +46,4 @@ public class ShockAbsorberModule extends PowerModuleBase implements IToggleableM
public String getTextureFile() {
return "shockabsorber";
}
}
}

3
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";
}
}
}

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

@ -27,5 +27,4 @@ public class UUID {
nbt.setLong("UUIDMost", most);
return nbt;
}
}
}

Some files were not shown because too many files have changed in this diff Show more