From 7247fc7acb9ff3f514005718612b1154f092dfa4 Mon Sep 17 00:00:00 2001 From: Leon Date: Wed, 14 Dec 2016 12:43:48 -0500 Subject: [PATCH] Getting ready for final 1.7.10 RC build --- build.gradle | 1 - .../net/machinemuse/api/ApiaristArmor.java | 72 ++-- .../net/machinemuse/api/IArmorTraits.java | 9 - .../api/{electricity => }/IModularItem.java | 6 +- .../net/machinemuse/api/ModuleManager.java | 49 ++- .../java/net/machinemuse/api/MuseItemTag.java | 4 +- .../api/electricity/AE2ElectricAdapter.java | 34 +- .../api/electricity/ElectricAdapter.java | 19 +- .../api/electricity/ElectricConversions.java | 18 +- .../api/electricity/IC2ElectricAdapter.java | 29 +- .../api/electricity/IMuseElectricItem.java | 74 ++-- .../api/electricity/MuseElectricAdapter.java | 26 +- .../api/electricity/MuseElectricItem.java | 118 +++--- .../api/electricity/TEElectricAdapter.java | 26 +- .../machinemuse/api/omniwrench/OmniWrench.txt | 2 +- .../machinemuse/general/NBTTagAccessor.java | 4 +- .../machinemuse/general/gui/CosmeticGui.java | 34 +- .../machinemuse/general/gui/EnergyMeter.java | 2 +- .../general/gui/GuiFieldTinker.java | 4 +- .../general/gui/GuiTinkerTable.java | 4 +- .../machinemuse/general/gui/KeyConfigGui.java | 10 +- .../net/machinemuse/general/gui/MuseGui.java | 4 +- .../net/machinemuse/general/gui/MuseIcon.java | 4 +- .../general/gui/PortableCraftingGui.java | 2 +- .../machinemuse/general/gui/WaterMeter.java | 2 +- .../general/gui/clickable/Clickable.java | 2 +- .../gui/clickable/ClickableButton.java | 8 +- .../general/gui/clickable/ClickableItem.java | 6 +- .../gui/clickable/ClickableKeybinding.java | 29 +- .../general/gui/clickable/ClickableLabel.java | 7 +- .../gui/clickable/ClickableModule.java | 18 +- .../gui/clickable/ClickableSlider.java | 70 ++-- .../gui/clickable/ClickableTinkerSlider.java | 20 +- .../general/gui/clickable/IClickable.java | 2 +- .../gui/frame/DetailedSummaryFrame.java | 10 +- .../general/gui/frame/IGuiFrame.java | 2 +- .../gui/frame/InstallSalvageFrame.java | 12 +- .../general/gui/frame/ItemInfoFrame.java | 8 +- .../general/gui/frame/ItemModelViewFrame.java | 132 +++--- .../general/gui/frame/ItemSelectionFrame.java | 6 +- .../general/gui/frame/KeybindConfigFrame.java | 16 +- .../gui/frame/ModuleSelectionFrame.java | 14 +- .../gui/frame/ModuleSelectionSubFrame.java | 10 +- .../general/gui/frame/ModuleTweakFrame.java | 6 +- .../general/gui/frame/ScrollableFrame.java | 4 +- .../general/gui/frame/StatsFrame.java | 8 +- .../general/gui/frame/TabSelectFrame.java | 17 +- .../render/block/RenderLuxCapacitorTESR.java | 2 +- .../client/render/block/TinkerTableModel.java | 45 +-- .../render/block/TinkerTableRenderer.java | 6 +- .../client/render/entity/MuseRender.java | 2 +- .../render/entity/RenderPlasmaBolt.java | 2 +- .../render/entity/RenderSpinningBlade.java | 2 +- .../client/render/item/SMovingArmorModel.java | 2 +- .../client/render/item/ToolModel.java | 72 ++-- .../client/render/item/ToolRenderer.java | 14 +- .../client/render/item/VanillaArmorModel.java | 2 +- .../machinemuse/powersuits/common/Config.java | 30 +- .../powersuits/common/InstallCost.java | 2 +- .../powersuits/common/MPSCreativeTab.java | 2 +- .../powersuits/common/MPSItems.java | 7 +- .../powersuits/common/ModCompatibility.java | 26 +- .../powersuits/common/proxy/ClientProxy.java | 4 +- .../powersuits/control/KeybindKeyHandler.java | 34 +- .../powersuits/control/KeybindManager.java | 4 +- .../powersuits/control/PlayerInputMap.java | 4 +- .../powersuits/entity/EntityLuxCapacitor.java | 6 +- .../powersuits/entity/EntityPlasmaBolt.java | 2 +- .../entity/EntitySpinningBlade.java | 2 +- .../powersuits/entity/TileEntityPortal.java | 2 +- .../powersuits/event/HarvestEventHandler.java | 4 +- .../powersuits/event/MovementManager.java | 11 +- .../powersuits/event/PlayerUpdateHandler.java | 5 +- .../item/IModeChangingModularItem.java | 56 ++- .../powersuits/item/IModularItemBase.java | 36 +- .../powersuits/item/ItemComponent.java | 8 +- .../powersuits/item/ItemElectricArmor.java | 7 +- .../powersuits/item/ItemPowerArmor.java | 184 +++++---- .../powersuits/item/ItemPowerArmorBoots.java | 22 +- .../item/ItemPowerArmorChestplate.java | 14 +- .../powersuits/item/ItemPowerArmorHelmet.java | 54 ++- .../item/ItemPowerArmorLeggings.java | 11 +- .../powersuits/item/ItemPowerFist.java | 333 +++++++-------- .../powersuits/item/MPSItemElectricTool.java | 5 +- .../item/ModeChangingModularItem.java | 169 ++++---- .../powersuits/item/ModularItemBase.java | 150 +++---- .../network/packets/MPSPacketList.java | 2 +- .../network/packets/MusePacketColourInfo.java | 5 +- .../packets/MusePacketCosmeticInfo.java | 5 +- .../MusePacketInstallModuleRequest.java | 2 +- .../network/packets/MusePacketPlasmaBolt.java | 2 +- .../packets/MusePacketPlayerUpdate.java | 3 +- .../MusePacketPropertyModifierConfig.java | 22 +- .../MusePacketSalvageModuleRequest.java | 2 +- .../packets/MusePacketToggleRequest.java | 3 +- .../packets/MusePacketTweakRequest.java | 5 +- .../powersuits/powermodule/PowerModule.java | 6 +- .../powermodule/PowerModuleBase.java | 6 +- .../PropertyModifierLinearAdditive.java | 4 +- .../powermodule/RightClickPowerModule.java | 4 +- .../powermodule/ToggleablePowerModule.java | 4 +- .../armor/ApiaristArmorModule.java | 4 +- .../powermodule/armor/BasicPlatingModule.java | 4 +- .../armor/DiamondPlatingModule.java | 4 +- .../powermodule/armor/EnergyShieldModule.java | 4 +- .../powermodule/armor/HazmatModule.java | 4 +- .../powermodule/armor/HeatSinkModule.java | 4 +- .../armor/MechanicalAssistance.java | 4 +- .../armor/NitrogenCoolingSystem.java | 4 +- .../powermodule/armor/WaterTankModule.java | 6 +- .../energy/AdvancedBatteryModule.java | 4 +- .../energy/AdvancedSolarGenerator.java | 4 +- .../energy/BasicBatteryModule.java | 4 +- .../powermodule/energy/CoalGenerator.java | 4 +- .../energy/EliteBatteryModule.java | 4 +- .../energy/KineticGeneratorModule.java | 4 +- .../energy/SolarGeneratorModule.java | 4 +- .../energy/ThermalGeneratorModule.java | 2 +- .../powermodule/misc/AirtightSealModule.java | 4 +- .../powermodule/misc/AutoFeederModule.java | 2 +- .../powermodule/misc/BinocularsModule.java | 2 +- .../powermodule/misc/CitizenJoeStyle.java | 4 +- .../powermodule/misc/ClockModule.java | 4 +- .../powermodule/misc/CompassModule.java | 4 +- .../powermodule/misc/CoolingSystemModule.java | 4 +- .../powermodule/misc/CosmeticGlowModule.java | 4 +- .../misc/InPlaceAssemblerModule.java | 4 +- .../powermodule/misc/InvisibilityModule.java | 4 +- .../powermodule/misc/MagnetModule.java | 2 +- .../powermodule/misc/MobRepulsorModule.java | 4 +- .../powermodule/misc/NightVisionModule.java | 4 +- .../powermodule/misc/ThaumGogglesModule.java | 4 +- .../powermodule/misc/TintModule.java | 4 +- .../misc/TransparentArmorModule.java | 4 +- .../misc/WaterElectrolyzerModule.java | 4 +- .../movement/BlinkDriveModule.java | 4 +- .../movement/ClimbAssistModule.java | 4 +- .../movement/FlightControlModule.java | 2 +- .../powermodule/movement/GliderModule.java | 4 +- .../powermodule/movement/JetBootsModule.java | 2 +- .../powermodule/movement/JetPackModule.java | 4 +- .../movement/JumpAssistModule.java | 2 +- .../powermodule/movement/ParachuteModule.java | 4 +- .../movement/ShockAbsorberModule.java | 4 +- .../movement/SprintAssistModule.java | 2 +- .../movement/SwimAssistModule.java | 4 +- .../tool/AOEPickUpgradeModule.java | 5 +- .../tool/AppEngWirelessFluidModule.java | 4 +- .../tool/AppEngWirelessModule.java | 4 +- .../powermodule/tool/AquaAffinityModule.java | 4 +- .../powermodule/tool/AxeModule.java | 4 +- .../powermodule/tool/ChiselGetter1.java | 12 - .../powermodule/tool/ChiselGetter2.java | 2 +- .../powermodule/tool/ChiselModule.java | 18 +- .../tool/DiamondPickUpgradeModule.java | 2 +- .../tool/DimensionalRiftModule.java | 4 +- .../powermodule/tool/FieldTinkerModule.java | 2 +- .../powermodule/tool/FlintAndSteelModule.java | 8 +- .../powermodule/tool/GrafterModule.java | 4 +- .../powermodule/tool/HoeModule.java | 5 +- .../powermodule/tool/LeafBlowerModule.java | 4 +- .../powermodule/tool/LuxCapacitor.java | 2 +- .../tool/MFFSFieldTeleporterModule.java | 4 +- .../powermodule/tool/OCTerminalModule.java | 2 +- .../powermodule/tool/OmniProbeModule.java | 5 +- .../powermodule/tool/OmniWrenchModule.java | 2 +- .../powermodule/tool/OreScannerModule.java | 12 +- .../tool/PersonalShrinkingModule.java | 6 +- .../powermodule/tool/PickaxeModule.java | 4 +- .../powermodule/tool/RedstoneLaser.java | 103 +++++ .../powermodule/tool/ScoopModule.java | 4 +- .../powermodule/tool/ShearsModule.java | 4 +- .../powermodule/tool/ShovelModule.java | 8 +- .../powermodule/tool/StolenWrenchCode.java | 2 +- .../powermodule/tool/TerminalHandler.java | 379 +++++++++--------- .../weapon/BladeLauncherModule.java | 4 +- .../powermodule/weapon/LightningModule.java | 4 +- .../powermodule/weapon/MeleeAssistModule.java | 4 +- .../weapon/PlasmaCannonModule.java | 4 +- .../powermodule/weapon/RailgunModule.java | 4 +- .../powermodule/weapon/SonicWeaponModule.java | 7 +- .../machinemuse/utils/AddonWaterUtils.java | 2 +- .../net/machinemuse/utils/MPSTeleporter.java | 6 +- .../machinemuse/utils/MuseCommonStrings.java | 2 +- .../net/machinemuse/utils/MuseFileUtils.java | 26 -- .../net/machinemuse/utils/MuseItemUtils.java | 19 +- .../machinemuse/utils/MusePlayerUtils.java | 4 +- .../machinemuse/utils/MuseStringUtils.java | 8 +- .../java/net/machinemuse/utils/ScalaNBT.java | 25 -- .../utils/render/MuseRenderer.java | 4 +- .../utils/render/MuseStencilManager.java | 2 +- .../machinemuse/utils/render/MuseTexture.java | 11 - .../utils/render/TextureBuffer.java | 82 ++-- .../assets/powersuits/lang/en_US.lang | 8 +- src/main/resources/mcmod.info | 2 +- 195 files changed, 1742 insertions(+), 1653 deletions(-) delete mode 100644 src/main/java/net/machinemuse/api/IArmorTraits.java rename src/main/java/net/machinemuse/api/{electricity => }/IModularItem.java (95%) delete mode 100644 src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselGetter1.java create mode 100644 src/main/java/net/machinemuse/powersuits/powermodule/tool/RedstoneLaser.java delete mode 100644 src/main/java/net/machinemuse/utils/MuseFileUtils.java delete mode 100644 src/main/java/net/machinemuse/utils/ScalaNBT.java delete mode 100644 src/main/java/net/machinemuse/utils/render/MuseTexture.java diff --git a/build.gradle b/build.gradle index 8a4d935..29f6409 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,6 @@ buildscript { } } - repositories { maven { name = "ChickenBones" diff --git a/src/main/java/net/machinemuse/api/ApiaristArmor.java b/src/main/java/net/machinemuse/api/ApiaristArmor.java index 44730dc..bcd0c5f 100644 --- a/src/main/java/net/machinemuse/api/ApiaristArmor.java +++ b/src/main/java/net/machinemuse/api/ApiaristArmor.java @@ -1,36 +1,36 @@ -package net.machinemuse.api; - -import cpw.mods.fml.common.Optional; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -/** - * Author: MachineMuse (Claire Semple) - * Created: 6:54 AM, 4/28/13 - * - * Ported to Java by lehjr on 11/4/16. - */ -@Optional.Interface(iface = "forestry.api.apiculture.IArmorApiarist", modid = "Forestry", striprefs = true) -public class ApiaristArmor implements IApiaristArmor { - private static ApiaristArmor INSTANCE; - - public static ApiaristArmor getInstance() { - if (INSTANCE == null) - INSTANCE = new ApiaristArmor(); - return INSTANCE; - } - - - @Optional.Method(modid = "Forestry") - @Override - public boolean protectPlayer(EntityPlayer player, ItemStack armor, String cause, boolean doProtect) { - return false; - } - - @Optional.Method(modid = "Forestry") - @Override - public boolean protectEntity(EntityLivingBase player, ItemStack armor, String cause, boolean doProtect) { - return false; - } -} +//package net.machinemuse.api; +// +//import cpw.mods.fml.common.Optional; +//import net.minecraft.entity.EntityLivingBase; +//import net.minecraft.entity.player.EntityPlayer; +//import net.minecraft.item.ItemStack; +// +///** +// * Author: MachineMuse (Claire Semple) +// * Created: 6:54 AM, 4/28/13 +// * +// * Ported to Java by lehjr on 11/4/16. +// */ +//@Optional.Interface(iface = "forestry.api.apiculture.IArmorApiarist", modid = "Forestry", striprefs = true) +//public class ApiaristArmor implements IApiaristArmor { +// private static ApiaristArmor INSTANCE; +// +// public static ApiaristArmor getInstance() { +// if (INSTANCE == null) +// INSTANCE = new ApiaristArmor(); +// return INSTANCE; +// } +// +// +// @Optional.Method(modid = "Forestry") +// @Override +// public boolean protectPlayer(EntityPlayer player, ItemStack armor, String cause, boolean doProtect) { +// return false; +// } +// +// @Optional.Method(modid = "Forestry") +// @Override +// public boolean protectEntity(EntityLivingBase player, ItemStack armor, String cause, boolean doProtect) { +// return false; +// } +//} diff --git a/src/main/java/net/machinemuse/api/IArmorTraits.java b/src/main/java/net/machinemuse/api/IArmorTraits.java deleted file mode 100644 index 2586c77..0000000 --- a/src/main/java/net/machinemuse/api/IArmorTraits.java +++ /dev/null @@ -1,9 +0,0 @@ -package net.machinemuse.api; - -import net.machinemuse.api.electricity.IModularItem; - -/** - * Ported to Java by lehjr on 11/4/16. - */ -public interface IArmorTraits extends IModularItem, IApiaristArmor { -} diff --git a/src/main/java/net/machinemuse/api/electricity/IModularItem.java b/src/main/java/net/machinemuse/api/IModularItem.java similarity index 95% rename from src/main/java/net/machinemuse/api/electricity/IModularItem.java rename to src/main/java/net/machinemuse/api/IModularItem.java index 53971e1..fb5be4e 100644 --- a/src/main/java/net/machinemuse/api/electricity/IModularItem.java +++ b/src/main/java/net/machinemuse/api/IModularItem.java @@ -1,4 +1,4 @@ -package net.machinemuse.api.electricity; +package net.machinemuse.api; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -16,6 +16,7 @@ public interface IModularItem { /** * Gets the item's extended summary for displaying in the gui. * + * @param player * @param stack * @return */ @@ -38,7 +39,6 @@ public interface IModularItem { */ void drainPlayerEnergy(EntityPlayer player, double drainAmount); - /** * Adds the amount of energy to the player's inventory. * @@ -47,4 +47,4 @@ public interface IModularItem { * @return */ void givePlayerEnergy(EntityPlayer player, double joulesToGive); -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/api/ModuleManager.java b/src/main/java/net/machinemuse/api/ModuleManager.java index 66638c8..0b30c4a 100644 --- a/src/main/java/net/machinemuse/api/ModuleManager.java +++ b/src/main/java/net/machinemuse/api/ModuleManager.java @@ -1,11 +1,13 @@ package net.machinemuse.api; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; -import net.machinemuse.numina.item.IModeChangingItem; +import net.machinemuse.numina.item.NuminaItemUtils; +import net.machinemuse.powersuits.item.IModeChangingModularItem; +import net.machinemuse.utils.MuseItemUtils; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -19,13 +21,13 @@ public class ModuleManager { public static final String ONLINE = "Active"; - protected static final Map> customInstallCosts = new HashMap<>(); - protected static final Map moduleMap = new HashMap<>(); - protected static final List moduleList = new ArrayList<>(); - protected static final List playerTickModules = new ArrayList<>(); - protected static final List rightClickModules = new ArrayList<>(); - protected static final List toggleableModules = new ArrayList<>(); - protected static final List blockBreakingModules = new ArrayList<>(); + protected static final Map> customInstallCosts = new HashMap>(); + protected static final Map moduleMap = new HashMap(); + protected static final List moduleList = new ArrayList(); + protected static final List playerTickModules = new ArrayList(); + protected static final List rightClickModules = new ArrayList(); + protected static final List toggleableModules = new ArrayList(); + protected static final List blockBreakingModules = new ArrayList(); public static List getAllModules() { return moduleList; @@ -81,7 +83,7 @@ public class ModuleManager { return blockBreakingModules; } - public static List getValidModulesForItem(ItemStack stack) { + public static List getValidModulesForItem(EntityPlayer player, ItemStack stack) { List validModules = new ArrayList(); for (IPowerModule module : getAllModules()) { if (module.isValidForItem(stack)) { @@ -91,6 +93,17 @@ public class ModuleManager { return validModules; } + public static List getValidModes(ItemStack itemStack) { + List validModes = new ArrayList<>(); + + for (IRightClickModule rightclickModule : getRightClickModules()) { + if (rightclickModule.isValidForItem(itemStack) && itemHasModule(itemStack, rightclickModule.getDataName())) + validModes.add(rightclickModule.getDataName() ); + } + return validModes; + } + + public static boolean tagHasModule(NBTTagCompound tag, String moduleName) { return tag.hasKey(moduleName); } @@ -142,12 +155,20 @@ public class ModuleManager { // playerEntity.sendChatToPlayer("Server has disallowed this module. Sorry!"); return false; } - if (module instanceof IRightClickModule && itemStack.getItem() instanceof IModeChangingItem) { + if (module instanceof IRightClickModule && itemStack.getItem() instanceof IModeChangingModularItem) { // MuseLogger.logDebug("Module: " + moduleName + " vs Mode: " + - // MuseItemUtils.getActiveMode(itemStack)); - IModeChangingItem item = (IModeChangingItem) itemStack.getItem(); +// MuseItemUtils.getActiveMode(itemStack)); + IModeChangingModularItem item = (IModeChangingModularItem) itemStack.getItem(); + String activeMode = NuminaItemUtils.getTagCompound(itemStack).getString("mode"); + if (!activeMode.isEmpty()) + return moduleName.equals(activeMode); + List validModes = getValidModes(itemStack); + + if (validModes.isEmpty()) + return false; + return validModes.contains(moduleName); +// return moduleName.equals(item.getActiveMode(itemStack)); //<--- FIXME!!! creates an endless loop. - return moduleName.equals(item.getActiveMode(itemStack)); } else { return isModuleOnline(MuseItemTag.getMuseItemTag(itemStack), moduleName); } diff --git a/src/main/java/net/machinemuse/api/MuseItemTag.java b/src/main/java/net/machinemuse/api/MuseItemTag.java index 26272cb..14c0593 100644 --- a/src/main/java/net/machinemuse/api/MuseItemTag.java +++ b/src/main/java/net/machinemuse/api/MuseItemTag.java @@ -19,7 +19,7 @@ public class MuseItemTag { * * @param stack * @return an NBTTagCompound, may be newly created. If stack is null, - * returns null. + * returns null. */ @Nullable public static NBTTagCompound getMuseItemTag(ItemStack stack) { @@ -33,4 +33,4 @@ public class MuseItemTag { stackTag.setTag(NBTPREFIX, properties); return properties; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/api/electricity/AE2ElectricAdapter.java b/src/main/java/net/machinemuse/api/electricity/AE2ElectricAdapter.java index 0b4c4e8..4ae561b 100644 --- a/src/main/java/net/machinemuse/api/electricity/AE2ElectricAdapter.java +++ b/src/main/java/net/machinemuse/api/electricity/AE2ElectricAdapter.java @@ -8,43 +8,35 @@ import net.minecraft.item.ItemStack; * Ported to Java by lehjr on 11/4/16. */ public class AE2ElectricAdapter extends ElectricAdapter { - private final ItemStack stack; - private final IAEItemPowerStorage item; + ItemStack stack; + IAEItemPowerStorage item; - public AE2ElectricAdapter(final ItemStack stack) { + public AE2ElectricAdapter(ItemStack stack) { this.stack = stack; - this.item = (IAEItemPowerStorage)stack.getItem(); - } - - public ItemStack stack() { - return this.stack; - } - - public IAEItemPowerStorage item() { - return this.item; + item = (IAEItemPowerStorage) stack.getItem(); } @Override public double getCurrentEnergy() { - return ElectricConversions.museEnergyFromAE(this.item().getAECurrentPower(this.stack())); + return ElectricConversions.museEnergyFromAE(item.getAECurrentPower(stack)); } @Override public double getMaxEnergy() { - return ElectricConversions.museEnergyFromAE(this.item().getAEMaxPower(this.stack())); + return ElectricConversions.museEnergyFromAE(item.getAEMaxPower(stack)); } @Override - public double drainEnergy(final double requested) { - return ElectricConversions.museEnergyFromAE(this.item().extractAEPower(this.stack(), ElectricConversions.museEnergyToAE(requested))); + public double drainEnergy(double requested) { + return ElectricConversions.museEnergyFromAE(item.extractAEPower(stack, ElectricConversions.museEnergyToAE(requested))); } @Override - public double giveEnergy(final double provided) { - return ElectricConversions.museEnergyFromAE(this.item().injectAEPower(this.stack(), ElectricConversions.museEnergyToAE(provided))); + public double giveEnergy(double provided) { + return ElectricConversions.museEnergyFromAE(item.injectAEPower(stack, ElectricConversions.museEnergyToAE(provided))); } - public AccessRestriction getPowerFlow(final ItemStack stack) { - return AccessRestriction.READ_WRITE; + public AccessRestriction getPowerFlow(ItemStack stack) { + return AccessRestriction.READ_WRITE; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/api/electricity/ElectricAdapter.java b/src/main/java/net/machinemuse/api/electricity/ElectricAdapter.java index bc2c55c..b9500d1 100644 --- a/src/main/java/net/machinemuse/api/electricity/ElectricAdapter.java +++ b/src/main/java/net/machinemuse/api/electricity/ElectricAdapter.java @@ -11,12 +11,21 @@ import net.minecraft.item.ItemStack; * Ported to Java by lehjr on 11/4/16. */ public abstract class ElectricAdapter { - public static ElectricAdapter wrap(final ItemStack stack) { - if (stack == null) { + public static ElectricAdapter wrap(ItemStack stack) { + if (stack == null) + return null; + Item i = stack.getItem(); + if (i instanceof MuseElectricItem) { + return new MuseElectricAdapter(stack); + } else if (ModCompatibility.isRFAPILoaded() && i instanceof IEnergyContainerItem) { + return new TEElectricAdapter(stack); + } else if (ModCompatibility.isIndustrialCraftLoaded() && i instanceof IElectricItem) { + return new IC2ElectricAdapter(stack); + } else if (ModCompatibility.isAppengLoaded() && i instanceof IAEItemPowerStorage) { + return new AE2ElectricAdapter(stack); + } else { return null; } - final Item i = stack.getItem(); - return (i instanceof MuseElectricItem) ? new MuseElectricAdapter(stack) : ((ModCompatibility.isRFAPILoaded() && i instanceof IEnergyContainerItem) ? new TEElectricAdapter(stack) : ((ModCompatibility.isIndustrialCraftLoaded() && i instanceof IElectricItem) ? new IC2ElectricAdapter(stack) : ((ModCompatibility.isAppengLoaded() && i instanceof IAEItemPowerStorage) ? new AE2ElectricAdapter(stack) : null))); } public abstract double getCurrentEnergy(); @@ -26,4 +35,4 @@ public abstract class ElectricAdapter { public abstract double drainEnergy(double requested); public abstract double giveEnergy(double provided); -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/api/electricity/ElectricConversions.java b/src/main/java/net/machinemuse/api/electricity/ElectricConversions.java index cb68b41..74e0364 100644 --- a/src/main/java/net/machinemuse/api/electricity/ElectricConversions.java +++ b/src/main/java/net/machinemuse/api/electricity/ElectricConversions.java @@ -10,40 +10,40 @@ import net.minecraft.item.ItemStack; * * Ported to Java by lehjr on 11/4/16. */ -public final class ElectricConversions { +public class ElectricConversions { /* Industrialcraft 2 -------------------------------------------------------------------------- */ public static final String IC2_TIER = "IC2 Tier"; - public static int getTier(final ItemStack stack) { + public static int getTier(ItemStack stack) { return (int) ModuleManager.computeModularProperty(stack, IC2_TIER); } - public static double museEnergyToEU(final double museEnergy) { + public static double museEnergyToEU(double museEnergy) { return museEnergy / ModCompatibility.getIC2Ratio(); } - public static double museEnergyFromEU(final double eu) { + public static double museEnergyFromEU(double eu) { return eu * ModCompatibility.getIC2Ratio(); } /* Thermal Expansion -------------------------------------------------------------------------- */ - public static int museEnergyToRF(final double museEnergy) { + public static int museEnergyToRF(double museEnergy) { return (int)Math.ceil(museEnergy / ModCompatibility.getRFRatio()); } - public static double museEnergyFromRF(final int rf) { + public static double museEnergyFromRF(int rf) { return rf * ModCompatibility.getRFRatio(); } /* Applied Energistics 2 ---------------------------------------------------------------------- */ - public static double museEnergyFromAE(final double ae) { + public static double museEnergyFromAE(double ae) { return ae * ModCompatibility.getAE2Ratio(); } - public static double museEnergyToAE(final double museEnergy) { + public static double museEnergyToAE(double museEnergy) { return museEnergy / ModCompatibility.getAE2Ratio(); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/api/electricity/IC2ElectricAdapter.java b/src/main/java/net/machinemuse/api/electricity/IC2ElectricAdapter.java index 6c75de3..f78bf23 100644 --- a/src/main/java/net/machinemuse/api/electricity/IC2ElectricAdapter.java +++ b/src/main/java/net/machinemuse/api/electricity/IC2ElectricAdapter.java @@ -8,43 +8,36 @@ import net.minecraft.item.ItemStack; * Ported to Java by lehjr on 11/4/16. */ public class IC2ElectricAdapter extends ElectricAdapter { - private final ItemStack stack; - private final IElectricItem item; + ItemStack stack; + IElectricItem item; - public IC2ElectricAdapter(final ItemStack stack) { + public IC2ElectricAdapter(ItemStack stack) { this.stack = stack; this.item = (IElectricItem)stack.getItem(); } - public ItemStack stack() { - return this.stack; - } - - public IElectricItem item() { - return this.item; - } @Override public double getCurrentEnergy() { - return ElectricConversions.museEnergyFromEU(ElectricItem.manager.getCharge(this.stack())); + return ElectricConversions.museEnergyFromEU(ElectricItem.manager.getCharge(stack)); } @Override public double getMaxEnergy() { - return ElectricConversions.museEnergyFromEU(this.item().getMaxCharge(this.stack())); + return ElectricConversions.museEnergyFromEU(item.getMaxCharge(stack)); } @Override - public double drainEnergy(final double requested) { - return ElectricConversions.museEnergyFromEU(ElectricItem.manager.discharge(this.stack(), ElectricConversions.museEnergyToEU(requested), this.getTier(), true, false, false)); + public double drainEnergy(double requested) { + return ElectricConversions.museEnergyFromEU(ElectricItem.manager.discharge(stack, ElectricConversions.museEnergyToEU(requested), getTier(), true, false, false)); } @Override - public double giveEnergy(final double provided) { - return ElectricConversions.museEnergyFromEU(ElectricItem.manager.charge(this.stack(), ElectricConversions.museEnergyToEU(provided), this.getTier(), true, false)); + public double giveEnergy(double provided) { + return ElectricConversions.museEnergyFromEU(ElectricItem.manager.charge(stack, ElectricConversions.museEnergyToEU(provided), getTier(), true, false)); } public int getTier() { - return this.item().getTier(this.stack()); + return item.getTier(stack); } -} +} \ No newline at end of file diff --git a/src/main/java/net/machinemuse/api/electricity/IMuseElectricItem.java b/src/main/java/net/machinemuse/api/electricity/IMuseElectricItem.java index edb08ad..94bca40 100644 --- a/src/main/java/net/machinemuse/api/electricity/IMuseElectricItem.java +++ b/src/main/java/net/machinemuse/api/electricity/IMuseElectricItem.java @@ -4,6 +4,7 @@ import appeng.api.config.AccessRestriction; import appeng.api.implementations.items.IAEItemPowerStorage; import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Optional; +import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; import net.minecraft.entity.EntityLivingBase; @@ -20,11 +21,13 @@ import net.minecraft.item.ItemStack; @Optional.Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHAPI|energy", striprefs = true), @Optional.Interface(iface = "ic2.api.item.IElectricItemManager", modid = "IC2", striprefs = true), @Optional.Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2", striprefs = true), - @Optional.Interface(iface = "appeng.api.implementations.items.IAEItemPowerStorage", modid = "AE2", striprefs = true)}) -public interface IMuseElectricItem - extends IEnergyContainerItem, + @Optional.Interface(iface = "appeng.api.implementations.items.IAEItemPowerStorage", modid = "AE2", striprefs = true) +}) +public interface IMuseElectricItem extends + IEnergyContainerItem, ISpecialElectricItem, IElectricItemManager, + IElectricItem, IAEItemPowerStorage { /** * Call to get the energy of an item @@ -68,24 +71,29 @@ public interface IMuseElectricItem */ double giveEnergyTo(ItemStack stack, double provided); + /** + * Override max damage of an item. Nothing to do with power, at all :P + */ + int getMaxDamage(ItemStack itemStack); + + /* Industrialcraft 2 -------------------------------------------------------------------------- */ - IMuseElectricItem getManager(ItemStack stack); - @Override - void chargeFromArmor(ItemStack itemStack, EntityLivingBase entity); - - @Override - boolean use(ItemStack itemStack, double amount, EntityLivingBase entity); - boolean canProvideEnergy(ItemStack itemStack); @Override - double getCharge(ItemStack itemStack); + Item getChargedItem(ItemStack itemStack); + @Override + Item getEmptyItem(ItemStack itemStack); + + @Override double getMaxCharge(ItemStack itemStack); + @Override int getTier(ItemStack itemStack); + @Override double getTransferLimit(ItemStack itemStack); @Override @@ -94,35 +102,51 @@ public interface IMuseElectricItem @Override double discharge(ItemStack itemStack, double amount, int tier, boolean ignoreTransferLimit, boolean externally, boolean simulate); + @Override + double getCharge(ItemStack itemStack); + @Override boolean canUse(ItemStack itemStack, double amount); + @Override + boolean use(ItemStack itemStack, double amount, EntityLivingBase entity); + + @Override + void chargeFromArmor(ItemStack itemStack, EntityLivingBase entity); + @Override String getToolTip(ItemStack itemStack); - Item getChargedItem(ItemStack itemStack); - - Item getEmptyItem(ItemStack itemStack); + @Override + IElectricItemManager getManager(ItemStack itemStack); /* Thermal Expansion -------------------------------------------------------------------------- */ - int receiveEnergy(ItemStack stack, int energy, boolean simulate); + @Override + int receiveEnergy(ItemStack itemStack, int energy, boolean simulate); - int extractEnergy(ItemStack stack, int energy, boolean simulate); + @Override + int extractEnergy(ItemStack itemStack, int energy, boolean simulate); - int getEnergyStored(ItemStack theItem); + @Override + int getEnergyStored(ItemStack itemStack); - int getMaxEnergyStored(ItemStack theItem); + @Override + int getMaxEnergyStored(ItemStack itemStack); - int getMaxDamage(ItemStack itemStack); /* Applied Energistics 2 ---------------------------------------------------------------------- */ - double injectAEPower(ItemStack stack, double ae); + @Override + double injectAEPower(ItemStack itemStack, double ae); - double extractAEPower(ItemStack stack, double ae); + @Override + double extractAEPower(ItemStack itemStack, double ae); - double getAEMaxPower(ItemStack stack); + @Override + double getAEMaxPower(ItemStack itemStack); - double getAECurrentPower(ItemStack stack); + @Override + double getAECurrentPower(ItemStack itemStack); - AccessRestriction getPowerFlow(ItemStack stack); -} \ No newline at end of file + @Override + AccessRestriction getPowerFlow(ItemStack itemStack); +} diff --git a/src/main/java/net/machinemuse/api/electricity/MuseElectricAdapter.java b/src/main/java/net/machinemuse/api/electricity/MuseElectricAdapter.java index 8e6d35e..f577ce2 100644 --- a/src/main/java/net/machinemuse/api/electricity/MuseElectricAdapter.java +++ b/src/main/java/net/machinemuse/api/electricity/MuseElectricAdapter.java @@ -6,39 +6,31 @@ import net.minecraft.item.ItemStack; * Ported to Java by lehjr on 11/4/16. */ public class MuseElectricAdapter extends ElectricAdapter { - private final ItemStack stack; - private final MuseElectricItem item; + ItemStack stack; + MuseElectricItem item; - public MuseElectricAdapter(final ItemStack stack) { + public MuseElectricAdapter(ItemStack stack) { this.stack = stack; this.item = (MuseElectricItem)stack.getItem(); } - public ItemStack stack() { - return this.stack; - } - - public MuseElectricItem item() { - return this.item; - } - @Override public double getCurrentEnergy() { - return this.item().getCurrentEnergy(this.stack()); + return item.getCurrentEnergy(stack); } @Override public double getMaxEnergy() { - return this.item().getMaxEnergy(this.stack()); + return item.getMaxEnergy(stack); } @Override - public double drainEnergy(final double requested) { - return this.item().drainEnergyFrom(this.stack(), requested); + public double drainEnergy(double requested) { + return item.drainEnergyFrom(stack, requested); } @Override - public double giveEnergy(final double provided) { - return this.item().giveEnergyTo(this.stack(), provided); + public double giveEnergy(double provided) { + return item.giveEnergyTo(stack, provided); } } diff --git a/src/main/java/net/machinemuse/api/electricity/MuseElectricItem.java b/src/main/java/net/machinemuse/api/electricity/MuseElectricItem.java index 941b00d..943aabe 100644 --- a/src/main/java/net/machinemuse/api/electricity/MuseElectricItem.java +++ b/src/main/java/net/machinemuse/api/electricity/MuseElectricItem.java @@ -2,6 +2,7 @@ package net.machinemuse.api.electricity; import appeng.api.config.AccessRestriction; import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItemManager; import net.machinemuse.api.ModuleManager; import net.machinemuse.utils.ElectricItemUtils; import net.machinemuse.utils.MuseItemUtils; @@ -30,6 +31,7 @@ public class MuseElectricItem extends Item implements IMuseElectricItem { * @param stack ItemStack to set * @return Current energy level */ + @Override public double getCurrentEnergy(ItemStack stack) { return MuseItemUtils.getDoubleOrZero(stack, ElectricItemUtils.CURRENT_ENERGY); } @@ -40,6 +42,7 @@ public class MuseElectricItem extends Item implements IMuseElectricItem { * @param stack ItemStack to set * @return Maximum energy level */ + @Override public double getMaxEnergy(ItemStack stack) { return ModuleManager.computeModularProperty(stack, ElectricItemUtils.MAXIMUM_ENERGY); } @@ -50,6 +53,7 @@ public class MuseElectricItem extends Item implements IMuseElectricItem { * @param stack ItemStack to set * @param energy Level to set it to */ + @Override public void setCurrentEnergy(ItemStack stack, double energy) { MuseItemUtils.setDoubleOrRemove(stack, ElectricItemUtils.CURRENT_ENERGY, Math.min(energy, getMaxEnergy(stack))); } @@ -61,6 +65,7 @@ public class MuseElectricItem extends Item implements IMuseElectricItem { * @param requested Amount of energy to drain * @return Amount of energy successfully drained */ + @Override public double drainEnergyFrom(ItemStack stack, double requested) { double available = getCurrentEnergy(stack); if (available > requested) { @@ -79,10 +84,10 @@ public class MuseElectricItem extends Item implements IMuseElectricItem { * @param provided Amount of energy to add * @return Amount of energy added */ + @Override public double giveEnergyTo(ItemStack stack, double provided) { double available = getCurrentEnergy(stack); double max = getMaxEnergy(stack); - if (available + provided < max) { setCurrentEnergy(stack, available + provided); return provided; @@ -92,38 +97,38 @@ public class MuseElectricItem extends Item implements IMuseElectricItem { } } + @Override + public int getMaxDamage(ItemStack itemStack) { + return 0; + } + /* Industrialcraft 2 -------------------------------------------------------------------------- */ - public IMuseElectricItem getManager(ItemStack stack) { - return this; - } - @Override - public void chargeFromArmor(ItemStack itemStack, EntityLivingBase entity) { - ElectricItem.rawManager.chargeFromArmor(itemStack, entity); - } - - @Override - public boolean use(ItemStack itemStack, double amount, EntityLivingBase entity) { - return ElectricItem.rawManager.use(itemStack, ElectricConversions.museEnergyToEU(amount), entity); - } - public boolean canProvideEnergy(ItemStack itemStack) { return true; } @Override - public double getCharge(ItemStack itemStack) { - return ElectricConversions.museEnergyToEU(getCurrentEnergy(itemStack)); + public Item getChargedItem(ItemStack itemStack) { + return this; } + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } + + @Override public double getMaxCharge(ItemStack itemStack) { return ElectricConversions.museEnergyToEU(getMaxEnergy(itemStack)); } + @Override public int getTier(ItemStack itemStack) { return ElectricConversions.getTier(itemStack); } + @Override public double getTransferLimit(ItemStack itemStack) { return ElectricConversions.museEnergyToEU(Math.sqrt(getMaxEnergy(itemStack))); } @@ -150,82 +155,99 @@ public class MuseElectricItem extends Item implements IMuseElectricItem { return ElectricConversions.museEnergyToEU(taken); } + @Override + public double getCharge(ItemStack itemStack) { + return ElectricConversions.museEnergyToEU(getCurrentEnergy(itemStack)); + } + @Override public boolean canUse(ItemStack itemStack, double amount) { return ElectricConversions.museEnergyFromEU(amount) < getCurrentEnergy(itemStack); } + @Override + public boolean use(ItemStack itemStack, double amount, EntityLivingBase entity) { + return ElectricItem.rawManager.use(itemStack, ElectricConversions.museEnergyToEU(amount), entity); + } + + @Override + public void chargeFromArmor(ItemStack itemStack, EntityLivingBase entity) { + ElectricItem.rawManager.chargeFromArmor(itemStack, entity); + } + @Override public String getToolTip(ItemStack itemStack) { // return itemStack.getTooltip(Minecraft.getMinecraft().thePlayer, false).toString(); // enabling this doubles up the tooltips return ""; } - public Item getChargedItem(ItemStack itemStack) { + @Override + public IElectricItemManager getManager(ItemStack itemStack) { return this; } - public Item getEmptyItem(ItemStack itemStack) { - return this; - } /* Thermal Expansion -------------------------------------------------------------------------- */ - public int receiveEnergy(ItemStack stack, int energy, boolean simulate) { - double current = getCurrentEnergy(stack); + @Override + public int receiveEnergy(ItemStack itemStack, int energy, boolean simulate) { + double current = getCurrentEnergy(itemStack); double receivedME = ElectricConversions.museEnergyFromRF(energy); - double eatenME = giveEnergyTo(stack, receivedME); - if (simulate) { - setCurrentEnergy(stack, current); - } + double eatenME = giveEnergyTo(itemStack, receivedME); + if (simulate) setCurrentEnergy(itemStack, current); return ElectricConversions.museEnergyToRF(eatenME); } - public int extractEnergy(ItemStack stack, int energy, boolean simulate) { - double current = getCurrentEnergy(stack); + @Override + public int extractEnergy(ItemStack itemStack, int energy, boolean simulate) { + double current = getCurrentEnergy(itemStack); double requesteddME = ElectricConversions.museEnergyFromRF(energy); - double takenME = drainEnergyFrom(stack, requesteddME); + double takenME = drainEnergyFrom(itemStack, requesteddME); if (simulate) { - setCurrentEnergy(stack, current); + setCurrentEnergy(itemStack, current); } return ElectricConversions.museEnergyToRF(takenME); } - public int getEnergyStored(ItemStack theItem) { - return ElectricConversions.museEnergyToRF(getCurrentEnergy(theItem)); + @Override + public int getEnergyStored(ItemStack itemStack) { + return ElectricConversions.museEnergyToRF(getCurrentEnergy(itemStack)); } - public int getMaxEnergyStored(ItemStack theItem) { - return ElectricConversions.museEnergyToRF(getMaxEnergy(theItem)); + @Override + public int getMaxEnergyStored(ItemStack itemStack) { + return ElectricConversions.museEnergyToRF(getMaxEnergy(itemStack)); } - public int getMaxDamage(ItemStack itemStack) { - return 0; - } /* Applied Energistics 2 ---------------------------------------------------------------------- */ - public double injectAEPower(ItemStack stack, double ae) { - double current = getCurrentEnergy(stack); + @Override + public double injectAEPower(ItemStack itemStack, double ae) { + double current = getCurrentEnergy(itemStack); double recieved = ElectricConversions.museEnergyFromAE(ae); - setCurrentEnergy(stack, current); + setCurrentEnergy(itemStack, current); return ElectricConversions.museEnergyToAE(recieved); } - public double extractAEPower(ItemStack stack, double ae) { - double current = getCurrentEnergy(stack); + @Override + public double extractAEPower(ItemStack itemStack, double ae) { + double current = getCurrentEnergy(itemStack); double taken = ElectricConversions.museEnergyFromAE(ae); - setCurrentEnergy(stack, current); + setCurrentEnergy(itemStack, current); return ElectricConversions.museEnergyToAE(taken); } - public double getAEMaxPower(ItemStack stack) { - return ElectricConversions.museEnergyToAE(getCurrentEnergy(stack)); + @Override + public double getAEMaxPower(ItemStack itemStack) { + return ElectricConversions.museEnergyToAE(getCurrentEnergy(itemStack)); } - public double getAECurrentPower(ItemStack stack) { - return ElectricConversions.museEnergyToAE(getCurrentEnergy(stack)); + @Override + public double getAECurrentPower(ItemStack itemStack) { + return ElectricConversions.museEnergyToAE(getCurrentEnergy(itemStack)); } - public AccessRestriction getPowerFlow(ItemStack stack) { + @Override + public AccessRestriction getPowerFlow(ItemStack itemStack) { return AccessRestriction.READ_WRITE; } } diff --git a/src/main/java/net/machinemuse/api/electricity/TEElectricAdapter.java b/src/main/java/net/machinemuse/api/electricity/TEElectricAdapter.java index 3348d35..3e77e19 100644 --- a/src/main/java/net/machinemuse/api/electricity/TEElectricAdapter.java +++ b/src/main/java/net/machinemuse/api/electricity/TEElectricAdapter.java @@ -7,39 +7,31 @@ import net.minecraft.item.ItemStack; * Ported to Java by lehjr on 11/4/16. */ public class TEElectricAdapter extends ElectricAdapter { - private final ItemStack stack; - private final IEnergyContainerItem item; + ItemStack stack; + IEnergyContainerItem item; - public TEElectricAdapter(final ItemStack stack) { + public TEElectricAdapter(ItemStack stack) { this.stack = stack; this.item = (IEnergyContainerItem)stack.getItem(); } - public ItemStack stack() { - return this.stack; - } - - public IEnergyContainerItem item() { - return this.item; - } - @Override public double getCurrentEnergy() { - return ElectricConversions.museEnergyFromRF(this.item().getEnergyStored(this.stack())); + return ElectricConversions.museEnergyFromRF(item.getEnergyStored(stack)); } @Override public double getMaxEnergy() { - return ElectricConversions.museEnergyFromRF(this.item().getMaxEnergyStored(this.stack())); + return ElectricConversions.museEnergyFromRF(item.getMaxEnergyStored(stack)); } @Override - public double drainEnergy(final double requested) { - return ElectricConversions.museEnergyFromRF(this.item().extractEnergy(this.stack(), ElectricConversions.museEnergyToRF(requested), false)); + public double drainEnergy(double requested) { + return ElectricConversions.museEnergyFromRF(item.extractEnergy(stack, ElectricConversions.museEnergyToRF(requested), false)); } @Override - public double giveEnergy(final double provided) { - return ElectricConversions.museEnergyFromRF(this.item().receiveEnergy(this.stack(), ElectricConversions.museEnergyToRF(provided), false)); + public double giveEnergy(double provided) { + return ElectricConversions.museEnergyFromRF(item.receiveEnergy(stack, ElectricConversions.museEnergyToRF(provided), false)); } } diff --git a/src/main/java/net/machinemuse/api/omniwrench/OmniWrench.txt b/src/main/java/net/machinemuse/api/omniwrench/OmniWrench.txt index 9083023..7d4af63 100644 --- a/src/main/java/net/machinemuse/api/omniwrench/OmniWrench.txt +++ b/src/main/java/net/machinemuse/api/omniwrench/OmniWrench.txt @@ -4,7 +4,7 @@ //import cofh.api.item.IToolHammer //import cpw.mods.fml.common.FMLCommonHandler //import mods.railcraft.api.core.items.IToolCrowbar -//import net.machinemuse.api.electricity.IModularItem +//import net.machinemuse.api.IModularItem //import net.machinemuse.powersuits.powermodule.tool.{MFFSFieldTeleporterModule, OmniWrenchModule} //import net.machinemuse.utils.ElectricItemUtils //import net.minecraft.entity.item.EntityMinecart diff --git a/src/main/java/net/machinemuse/general/NBTTagAccessor.java b/src/main/java/net/machinemuse/general/NBTTagAccessor.java index 13eb510..da22530 100644 --- a/src/main/java/net/machinemuse/general/NBTTagAccessor.java +++ b/src/main/java/net/machinemuse/general/NBTTagAccessor.java @@ -67,7 +67,7 @@ public class NBTTagAccessor extends NBTTagCompound { public static List getValues(NBTTagCompound nbt) { Set keyset = (Set) nbt.func_150296_c(); - ArrayList a = new ArrayList<>(keyset.size()); + ArrayList a = new ArrayList(keyset.size()); for (String key : keyset) { NBTBase c = nbt.getTag(key); if (c instanceof NBTTagCompound) { @@ -76,4 +76,4 @@ public class NBTTagAccessor extends NBTTagCompound { } return a; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/CosmeticGui.java b/src/main/java/net/machinemuse/general/gui/CosmeticGui.java index 3b9991c..02424f9 100644 --- a/src/main/java/net/machinemuse/general/gui/CosmeticGui.java +++ b/src/main/java/net/machinemuse/general/gui/CosmeticGui.java @@ -14,10 +14,10 @@ import net.minecraft.item.ItemStack; * Ported to Java by lehjr on 10/19/16. */ public class CosmeticGui extends MuseGui { - final EntityPlayer player; - final int worldx; - final int worldy; - final int worldz; + EntityPlayer player; + int worldx; + int worldy; + int worldz; ItemSelectionFrame itemSelect; ItemStack lastSelectedItem; @@ -60,20 +60,20 @@ public class CosmeticGui extends MuseGui { frames.add(colourpicker); PartManipContainer partframe = new PartManipContainer( - itemSelect, colourpicker, - new MusePoint2D(absX(-0.95F), absY(0.025f)), - new MusePoint2D(absX(+0.95F), absY(0.95f)), - Colour.LIGHTBLUE.withAlpha(0.8F), - Colour.DARKBLUE.withAlpha(0.8F)); - frames.add(partframe); + itemSelect, colourpicker, + new MusePoint2D(absX(-0.95F), absY(0.025f)), + new MusePoint2D(absX(+0.95F), absY(0.95f)), + Colour.LIGHTBLUE.withAlpha(0.8F), + Colour.DARKBLUE.withAlpha(0.8F)); + frames.add(partframe); TabSelectFrame tabFrame = new TabSelectFrame( - player, - new MusePoint2D(absX(-0.95F), absY(-1.05f)), - new MusePoint2D(absX(0.95F), absY(-0.95f)), - worldx, worldy, worldz); - frames.add(tabFrame); - } + player, + new MusePoint2D(absX(-0.95F), absY(-1.05f)), + new MusePoint2D(absX(0.95F), absY(-0.95f)), + worldx, worldy, worldz); + frames.add(tabFrame); + } @Override public void update() { @@ -84,4 +84,4 @@ public class CosmeticGui extends MuseGui { public void drawScreen(int x, int y, float z) { super.drawScreen(x, y, z); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/EnergyMeter.java b/src/main/java/net/machinemuse/general/gui/EnergyMeter.java index 04cdc69..41f66ad 100644 --- a/src/main/java/net/machinemuse/general/gui/EnergyMeter.java +++ b/src/main/java/net/machinemuse/general/gui/EnergyMeter.java @@ -29,4 +29,4 @@ public class EnergyMeter extends HeatMeter { RenderState.off2D(); MuseTextureUtils.popTexture(); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/GuiFieldTinker.java b/src/main/java/net/machinemuse/general/gui/GuiFieldTinker.java index f45870e..bf50112 100644 --- a/src/main/java/net/machinemuse/general/gui/GuiFieldTinker.java +++ b/src/main/java/net/machinemuse/general/gui/GuiFieldTinker.java @@ -17,7 +17,7 @@ import net.minecraft.util.StatCollector; * @author MachineMuse */ public class GuiFieldTinker extends MuseGui { - protected final EntityClientPlayerMP player; + protected EntityClientPlayerMP player; protected ItemSelectionFrame itemSelectFrame; /** @@ -64,4 +64,4 @@ public class GuiFieldTinker extends MuseGui { MuseRenderer.drawCenteredString(StatCollector.translateToLocal("gui.noModulesFound.line2"), centerx, centery + 5); } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/GuiTinkerTable.java b/src/main/java/net/machinemuse/general/gui/GuiTinkerTable.java index 9726beb..8185880 100644 --- a/src/main/java/net/machinemuse/general/gui/GuiTinkerTable.java +++ b/src/main/java/net/machinemuse/general/gui/GuiTinkerTable.java @@ -14,7 +14,7 @@ import net.minecraft.util.StatCollector; * @author MachineMuse */ public class GuiTinkerTable extends MuseGui { - protected final EntityClientPlayerMP player; + protected EntityClientPlayerMP player; protected ItemSelectionFrame itemSelectFrame; protected int worldx; protected int worldy; @@ -79,4 +79,4 @@ public class GuiTinkerTable extends MuseGui { MuseRenderer.drawCenteredString(StatCollector.translateToLocal("gui.noModulesFound.line2"), centerx, centery + 5); } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/KeyConfigGui.java b/src/main/java/net/machinemuse/general/gui/KeyConfigGui.java index 574876b..36a3e65 100644 --- a/src/main/java/net/machinemuse/general/gui/KeyConfigGui.java +++ b/src/main/java/net/machinemuse/general/gui/KeyConfigGui.java @@ -7,11 +7,11 @@ import net.machinemuse.powersuits.control.KeybindManager; import net.minecraft.entity.player.EntityPlayer; public class KeyConfigGui extends MuseGui { - private final EntityPlayer player; + private EntityPlayer player; protected KeybindConfigFrame frame; - protected final int worldx; - protected final int worldy; - protected final int worldz; + protected int worldx; + protected int worldy; + protected int worldz; public KeyConfigGui(EntityPlayer player, int x, int y, int z) { super(); @@ -50,4 +50,4 @@ public class KeyConfigGui extends MuseGui { super.onGuiClosed(); KeybindManager.writeOutKeybinds(); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/MuseGui.java b/src/main/java/net/machinemuse/general/gui/MuseGui.java index e5c70d6..c13951b 100644 --- a/src/main/java/net/machinemuse/general/gui/MuseGui.java +++ b/src/main/java/net/machinemuse/general/gui/MuseGui.java @@ -28,7 +28,7 @@ public class MuseGui extends GuiScreen { protected DrawableMuseRect backgroundRect; protected DrawableMuseRect tooltipRect; - protected final List frames; + protected List frames; public MuseGui() { super(); @@ -292,4 +292,4 @@ public class MuseGui extends GuiScreen { */ public void refresh() { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/MuseIcon.java b/src/main/java/net/machinemuse/general/gui/MuseIcon.java index 0e1f8ac..3b5b8ac 100644 --- a/src/main/java/net/machinemuse/general/gui/MuseIcon.java +++ b/src/main/java/net/machinemuse/general/gui/MuseIcon.java @@ -98,7 +98,7 @@ public class MuseIcon { public static final MuseIcon ARCREACTOR = new MuseIcon("jetboots"); public static final MuseIcon PUNCHY = new MuseIcon("jetboots"); - protected final String texturename; + protected String texturename; protected IIcon icon; public MuseIcon(String texturename) { @@ -118,4 +118,4 @@ public class MuseIcon { public void register(IIconRegister iconRegister) { icon = iconRegister.registerIcon(ICON_PREFIX + texturename); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/PortableCraftingGui.java b/src/main/java/net/machinemuse/general/gui/PortableCraftingGui.java index 0413760..a1c86ff 100644 --- a/src/main/java/net/machinemuse/general/gui/PortableCraftingGui.java +++ b/src/main/java/net/machinemuse/general/gui/PortableCraftingGui.java @@ -44,4 +44,4 @@ public class PortableCraftingGui extends GuiContainer { } public static final ResourceLocation GUI_Loc = new ResourceLocation(Config.TEXTURE_PREFIX + "gui/crafting.png"); -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/WaterMeter.java b/src/main/java/net/machinemuse/general/gui/WaterMeter.java index 632467d..e1fcb46 100644 --- a/src/main/java/net/machinemuse/general/gui/WaterMeter.java +++ b/src/main/java/net/machinemuse/general/gui/WaterMeter.java @@ -22,4 +22,4 @@ public class WaterMeter extends HeatMeter { RenderState.blendingOff(); MuseTextureUtils.popTexture(); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/clickable/Clickable.java b/src/main/java/net/machinemuse/general/gui/clickable/Clickable.java index bf27cc3..515e429 100644 --- a/src/main/java/net/machinemuse/general/gui/clickable/Clickable.java +++ b/src/main/java/net/machinemuse/general/gui/clickable/Clickable.java @@ -39,4 +39,4 @@ public abstract class Clickable implements IClickable { public List getToolTip() { return null; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/clickable/ClickableButton.java b/src/main/java/net/machinemuse/general/gui/clickable/ClickableButton.java index db1d9dd..c0d0b1e 100644 --- a/src/main/java/net/machinemuse/general/gui/clickable/ClickableButton.java +++ b/src/main/java/net/machinemuse/general/gui/clickable/ClickableButton.java @@ -14,9 +14,9 @@ import java.util.List; * @author MachineMuse */ public class ClickableButton extends Clickable { - protected final String label; - protected final MusePoint2D radius; - protected final DrawableMuseRect rect; + protected String label; + protected MusePoint2D radius; + protected DrawableMuseRect rect; protected boolean enabled; public ClickableButton(String label, MusePoint2D position, boolean enabled) { @@ -96,4 +96,4 @@ public class ClickableButton extends Clickable { } public String getLabel() { return label; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/clickable/ClickableItem.java b/src/main/java/net/machinemuse/general/gui/clickable/ClickableItem.java index 3b30cec..bec43fd 100644 --- a/src/main/java/net/machinemuse/general/gui/clickable/ClickableItem.java +++ b/src/main/java/net/machinemuse/general/gui/clickable/ClickableItem.java @@ -19,8 +19,8 @@ public class ClickableItem extends Clickable { public static final int offsetx = 8; public static final int offsety = 8; public static RenderItem itemRenderer; - public final int inventorySlot; - protected final ItemStack item; + public int inventorySlot; + protected ItemStack item; public ClickableItem(ItemStack item, MusePoint2D pos, int inventorySlot) { super(pos); @@ -57,4 +57,4 @@ public class ClickableItem extends Clickable { MuseRenderer.drawString("e", getPosition().x() + 3, getPosition().y() + 1, Colour.DARKGREEN); } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/clickable/ClickableKeybinding.java b/src/main/java/net/machinemuse/general/gui/clickable/ClickableKeybinding.java index 6010119..41b47a6 100644 --- a/src/main/java/net/machinemuse/general/gui/clickable/ClickableKeybinding.java +++ b/src/main/java/net/machinemuse/general/gui/clickable/ClickableKeybinding.java @@ -1,7 +1,5 @@ package net.machinemuse.general.gui.clickable; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; import net.machinemuse.numina.geometry.Colour; import net.machinemuse.numina.geometry.MusePoint2D; import net.machinemuse.numina.network.PacketSender; @@ -25,22 +23,22 @@ import java.util.List; /** * Ported to Java by lehjr on 10/19/16. */ -public class ClickableKeybinding extends ClickableButton { - protected final List boundModules = new ArrayList<>(); +public class ClickableKeybinding extends ClickableButton{ + protected List boundModules = new ArrayList(); public boolean toggleval = false; - public boolean toggled = false; - public Boolean displayOnHUD; - public final KeyBinding keybind; + boolean toggled = false; + KeyBinding keybind; + public boolean displayOnHUD; public ClickableKeybinding(KeyBinding keybind, MusePoint2D position, boolean free, Boolean displayOnHUD) { - super((keybind.getKeyCode() < 0)? ("Mouse" + (keybind.getKeyCode() + 100)) : Keyboard.getKeyName(keybind.getKeyCode()), position, true); - this.displayOnHUD = (displayOnHUD != null) ? displayOnHUD : false; + super(ClickableKeybinding.parseName(keybind), position, true); this.keybind = keybind; + this.displayOnHUD = (displayOnHUD!= null) ? displayOnHUD : false; } - public String parseName(KeyBinding keybind) { + static String parseName(KeyBinding keybind) { if (keybind.getKeyCode() < 0) { return "Mouse" + (keybind.getKeyCode() + 100); } @@ -68,8 +66,8 @@ public class ClickableKeybinding extends ClickableButton { } for (ClickableModule module : boundModules) { - String valstring = (toggleval) ? " on" : " off"; - if ((FMLCommonHandler.instance().getEffectiveSide().equals(Side.CLIENT) && Config.toggleModuleSpam())) { + String valstring = (toggleval)? " on" : " off"; + if ((player.worldObj.isRemote) && Config.toggleModuleSpam()) { player.addChatMessage(new ChatComponentText("Toggled " + module.getModule().getDataName() + valstring)); } MuseItemUtils.toggleModuleForPlayer(player, module.getModule().getDataName(), toggleval); @@ -82,7 +80,6 @@ public class ClickableKeybinding extends ClickableButton { @Override public void draw() { super.draw(); - for (ClickableModule module : boundModules) { MuseRenderer.drawLineBetween(this, module, Colour.LIGHTBLUE); GL11.glPushMatrix(); @@ -116,7 +113,7 @@ public class ClickableKeybinding extends ClickableButton { public void unbindFarModules() { Iterator iterator = boundModules.iterator(); - ClickableModule module; + ClickableModule module = null; while (iterator.hasNext()) { module = iterator.next(); int maxDistance = getTargetDistance() * 2; @@ -147,7 +144,7 @@ public class ClickableKeybinding extends ClickableButton { return other.keybind.getKeyCode() == this.keybind.getKeyCode(); } - public void toggleHUDState (){ + public void toggleHUDState(){ displayOnHUD = !displayOnHUD; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/clickable/ClickableLabel.java b/src/main/java/net/machinemuse/general/gui/clickable/ClickableLabel.java index 1b427a1..832e4e6 100644 --- a/src/main/java/net/machinemuse/general/gui/clickable/ClickableLabel.java +++ b/src/main/java/net/machinemuse/general/gui/clickable/ClickableLabel.java @@ -6,8 +6,8 @@ import net.machinemuse.utils.render.MuseRenderer; import java.util.List; public class ClickableLabel implements IClickable { - protected final String label; - protected final MusePoint2D position; + protected String label; + protected MusePoint2D position; public ClickableLabel(String label, MusePoint2D position) { this.label = label; @@ -52,4 +52,5 @@ public class ClickableLabel implements IClickable { public MusePoint2D getPosition() { return position; } -} \ No newline at end of file + +} diff --git a/src/main/java/net/machinemuse/general/gui/clickable/ClickableModule.java b/src/main/java/net/machinemuse/general/gui/clickable/ClickableModule.java index c233ad2..63d2c1d 100644 --- a/src/main/java/net/machinemuse/general/gui/clickable/ClickableModule.java +++ b/src/main/java/net/machinemuse/general/gui/clickable/ClickableModule.java @@ -23,20 +23,19 @@ import java.util.List; * Ported to Java by lehjr on 10/19/16. */ public class ClickableModule extends Clickable { - private final IPowerModule module; + boolean allowed = true; + boolean installed = false; + final Colour checkmarkcolour = new Colour(0.0F, 0.667F, 0.0F, 1.0F); + IPowerModule module; - public ClickableModule(IPowerModule module , MusePoint2D position) { + public ClickableModule(IPowerModule module, MusePoint2D position){ super(position); this.module = module; } - private boolean allowed = true; - private boolean installed = false; - private final Colour checkmarkcolour = new Colour(0.0F, 0.667F, 0.0F, 1.0F); - @Override public List getToolTip() { - List toolTipText = new ArrayList<>(); + List toolTipText = new ArrayList(); toolTipText.add(getLocalizedName(getModule())); toolTipText.addAll(MuseStringUtils.wrapStringToLength(getLocalizedDescription(getModule()), 30)); return toolTipText; @@ -73,7 +72,7 @@ public class ClickableModule extends Clickable { MuseRenderer.drawString(string, getPosition().x() + 3, getPosition().y() + 1); } else if (installed) { - new GuiIcons.Checkmark(getPosition().x() - 8 + 1, getPosition().y() - 8 + 1, checkmarkcolour, null, null, null, null); + new GuiIcons.Checkmark(this.getPosition().x() - 8 + 1, this.getPosition().y() - 8 + 1, this.checkmarkcolour, null, null, null,null); } } @@ -88,7 +87,6 @@ public class ClickableModule extends Clickable { return module; } - // this is bad as there is already a keyword equals in Java public boolean equals(ClickableModule other) { return this.module == other.getModule(); } @@ -100,4 +98,4 @@ public class ClickableModule extends Clickable { public void setInstalled(boolean installed) { this.installed = installed; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/clickable/ClickableSlider.java b/src/main/java/net/machinemuse/general/gui/clickable/ClickableSlider.java index 635ab95..7245695 100644 --- a/src/main/java/net/machinemuse/general/gui/clickable/ClickableSlider.java +++ b/src/main/java/net/machinemuse/general/gui/clickable/ClickableSlider.java @@ -13,72 +13,52 @@ import net.machinemuse.utils.render.MuseRenderer; * Ported to Java by lehjr on 10/19/16. */ public class ClickableSlider extends Clickable { - private final MusePoint2D pos; - private final double width; - private final String name; - private final int cornersize; - private final DrawableMuseRect insideRect; - private final DrawableMuseRect outsideRect; - private double valueInternal; + double valueInternal = 0; + MusePoint2D pos; + double width; + String name; + DrawableMuseRect insideRect; + DrawableMuseRect outsideRect; + final int cornersize = 3; - public ClickableSlider(final MusePoint2D pos, final double width, final String name) { + public ClickableSlider(MusePoint2D pos, double width, String name) { this.pos = pos; this.width = width; this.name = name; - super.position = pos; - this.cornersize = 3; - this.insideRect = new DrawableMuseRect(this.position.x() - width / 2.0 - this.cornersize(), this.position.y() + 8, 0.0, this.position.y() + 16, Colour.LIGHTBLUE, Colour.ORANGE); - this.outsideRect = new DrawableMuseRect(this.position.x() - width / 2.0 - this.cornersize(), this.position.y() + 8, this.position.x() + width / 2.0 + this.cornersize(), this.position.y() + 16, Colour.LIGHTBLUE, Colour.DARKBLUE); - this.valueInternal = 0.0; - } - - public MusePoint2D pos() { - return this.pos; - } - - public double width() { - return this.width; + 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); } public String name() { return this.name; } - public int cornersize() { - return this.cornersize; - } - - public DrawableMuseRect insideRect() { - return this.insideRect; - } - - public DrawableMuseRect outsideRect() { - return this.outsideRect; - } @Override public void draw() { - MuseRenderer.drawCenteredString(this.name(), this.position.x(), this.position.y()); - this.insideRect().setRight(this.position.x() + this.width() * (this.value() - 0.5) + this.cornersize()); - this.outsideRect().draw(); - this.insideRect().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(final double x, final double y) { - return Math.abs(this.position.x() - x) < this.width() / 2 && Math.abs(this.position.y() + 12 - y) < 4; + 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 this.valueInternal; + return valueInternal; } - public void setValueByX(final double x) { - final double v = (x - this.pos().x()) / this.width() + 0.5; - this.valueInternal = (MuseMathUtils.clampDouble(v, 0.0, 1.0)); + public void setValueByX(double x) { + double v = (x - pos.x()) / width + 0.5; + valueInternal = MuseMathUtils.clampDouble(v, 0, 1); } - public void setValue(final double v) { - this.valueInternal = v; + public void setValue(double v) { + valueInternal = v; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/clickable/ClickableTinkerSlider.java b/src/main/java/net/machinemuse/general/gui/clickable/ClickableTinkerSlider.java index 20ac3a0..c37a943 100644 --- a/src/main/java/net/machinemuse/general/gui/clickable/ClickableTinkerSlider.java +++ b/src/main/java/net/machinemuse/general/gui/clickable/ClickableTinkerSlider.java @@ -8,25 +8,21 @@ import net.minecraft.nbt.NBTTagCompound; * Ported to Java by lehjr on 10/19/16. */ public class ClickableTinkerSlider extends ClickableSlider { - private final NBTTagCompound moduleTag; + NBTTagCompound moduleTag; - public ClickableTinkerSlider(final MusePoint2D topmiddle, final double width, final NBTTagCompound moduleTag, final String name) { + public ClickableTinkerSlider(MusePoint2D topmiddle, double width, NBTTagCompound moduleTag, String name) { super(topmiddle, width, name); this.moduleTag = moduleTag; } - public NBTTagCompound moduleTag() { - return this.moduleTag; - } - @Override public double value() { - return this.moduleTag().hasKey(super.name()) ? this.moduleTag().getDouble(super.name()) : 0.0; + return (moduleTag.hasKey(name)) ? moduleTag.getDouble(name) : 0; } - public void moveSlider(final double x, final double y) { - final double xval = this.position.x() - x; - final double xratio = MuseMathUtils.clampDouble(0.5 - xval / super.width(), 0.0, 1.0); - this.moduleTag().setDouble(super.name(), xratio); + public void moveSlider(double x, double y) { + double xval = position.x() - x; + double xratio = MuseMathUtils.clampDouble(0.5 - (xval / width), 0, 1); + moduleTag.setDouble(name, xratio); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/clickable/IClickable.java b/src/main/java/net/machinemuse/general/gui/clickable/IClickable.java index eebaaa1..fa4d3d8 100644 --- a/src/main/java/net/machinemuse/general/gui/clickable/IClickable.java +++ b/src/main/java/net/machinemuse/general/gui/clickable/IClickable.java @@ -15,4 +15,4 @@ public interface IClickable { boolean hitBox(double x, double y); List getToolTip(); -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/frame/DetailedSummaryFrame.java b/src/main/java/net/machinemuse/general/gui/frame/DetailedSummaryFrame.java index a93dfa8..396c10a 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/DetailedSummaryFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/DetailedSummaryFrame.java @@ -19,7 +19,7 @@ import java.util.List; public class DetailedSummaryFrame extends ScrollableFrame { public static final double SCALEFACTOR = 1; - protected final EntityPlayer player; + protected EntityPlayer player; protected double weight; protected double energy; protected double armor; @@ -71,8 +71,7 @@ public class DetailedSummaryFrame extends ScrollableFrame { valueWidth = MuseRenderer.getStringWidth(formattedValue); allowedNameWidth = border.width() - valueWidth - margin * 2; namesList = MuseStringUtils.wrapStringToVisualLength(name, allowedNameWidth); - assert namesList != null; - for(int i = 0; i getToolTip(int x, int y); -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/frame/InstallSalvageFrame.java b/src/main/java/net/machinemuse/general/gui/frame/InstallSalvageFrame.java index 901eac2..33dd82d 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/InstallSalvageFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/InstallSalvageFrame.java @@ -25,11 +25,11 @@ import java.util.List; @SideOnly(Side.CLIENT) public class InstallSalvageFrame extends ScrollableFrame { - protected final ItemSelectionFrame targetItem; - protected final ModuleSelectionFrame targetModule; - protected final ClickableButton installButton; - protected final ClickableButton salvageButton; - protected final EntityClientPlayerMP player; + protected ItemSelectionFrame targetItem; + protected ModuleSelectionFrame targetModule; + protected ClickableButton installButton; + protected ClickableButton salvageButton; + protected EntityClientPlayerMP player; public InstallSalvageFrame(EntityClientPlayerMP player, MusePoint2D topleft, MusePoint2D bottomright, @@ -176,4 +176,4 @@ public class InstallSalvageFrame extends ScrollableFrame { PacketSender.sendToServer(newpacket.getPacket131()); } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/frame/ItemInfoFrame.java b/src/main/java/net/machinemuse/general/gui/frame/ItemInfoFrame.java index 618e5c6..2ea7906 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/ItemInfoFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/ItemInfoFrame.java @@ -1,6 +1,6 @@ package net.machinemuse.general.gui.frame; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.general.gui.clickable.ClickableItem; import net.machinemuse.numina.geometry.Colour; import net.machinemuse.numina.geometry.MusePoint2D; @@ -14,8 +14,8 @@ import java.util.List; public class ItemInfoFrame extends ScrollableFrame { public static final double SCALEFACTOR = 1; - protected final ItemSelectionFrame target; - protected final EntityPlayer player; + protected ItemSelectionFrame target; + protected EntityPlayer player; protected List info; public ItemInfoFrame(EntityPlayer player, MusePoint2D topleft, @@ -77,4 +77,4 @@ public class ItemInfoFrame extends ScrollableFrame { // TODO Auto-generated method stub return null; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/frame/ItemModelViewFrame.java b/src/main/java/net/machinemuse/general/gui/frame/ItemModelViewFrame.java index df56caa..3e61eda 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/ItemModelViewFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/ItemModelViewFrame.java @@ -10,6 +10,7 @@ import net.machinemuse.powersuits.client.render.item.IArmorModel; import net.machinemuse.powersuits.item.ItemPowerArmor; import net.machinemuse.utils.MuseItemUtils; import net.minecraft.client.Minecraft; +import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import org.lwjgl.input.Mouse; @@ -24,110 +25,101 @@ import java.util.List; * Ported to Java by lehjr on 11/2/16. */ public class ItemModelViewFrame implements IGuiFrame { - private final ItemSelectionFrame itemSelector; - private final DrawableMuseRect border; - private double anchorx; - private double anchory; - private int dragging; - private double lastdWheel; - private double rotx; - private double roty; - private double offsetx; - private double offsety; - private double zoom; + ItemSelectionFrame itemSelector; + DrawableMuseRect border; - public ItemModelViewFrame(final ItemSelectionFrame itemSelector, final MusePoint2D topleft, final MusePoint2D bottomright, final Colour borderColour, final Colour insideColour) { + double anchorx = 0; + double anchory = 0; + int dragging = -1; + double lastdWheel = 0; + + double rotx = 0; + double roty = 0; + double offsetx = 0; + double offsety = 0; + double zoom = 64; + + public ItemModelViewFrame(ItemSelectionFrame itemSelector, MusePoint2D topleft, MusePoint2D bottomright, Colour borderColour, Colour insideColour) { this.itemSelector = itemSelector; this.border = new DrawableMuseRect(topleft, bottomright, borderColour, insideColour); - this.anchorx = 0.0; - this.anchory = 0.0; - this.dragging = -1; - this.lastdWheel = 0.0; - this.rotx = 0.0; - this.roty = 0.0; - this.offsetx = 0.0; - this.offsety = 0.0; - this.zoom = 64.0; } - public int getArmorSlot() { - return ((ItemPowerArmor)this.getSelectedItem().getItem().getItem()).armorType; + int getArmorSlot() { + return ((ItemPowerArmor)getSelectedItem().getItem().getItem()).armorType; } - public ClickableItem getSelectedItem() { - return this.itemSelector.getSelectedItem(); + ClickableItem getSelectedItem() { + return itemSelector.getSelectedItem(); } - public NBTTagCompound getRenderTag() { - return MuseItemUtils.getMuseRenderTag(this.getSelectedItem().getItem(), this.getArmorSlot()); + NBTTagCompound getRenderTag() { + return MuseItemUtils.getMuseRenderTag(getSelectedItem().getItem(), getArmorSlot()); } @Override - public void onMouseDown(final double x, final double y, final int button) { - if (this.border.containsPoint(x, y)) { - this.dragging = button; - this.anchorx = x; - this.anchory = y; + public void onMouseDown(double x, double y, int button) { + if (border.containsPoint(x, y)) { + dragging = button; + anchorx = x; + anchory = y; } } @Override - public void onMouseUp(final double x, final double y, final int button) { - this.dragging = -1; + public void onMouseUp(double x, double y, int button) { + dragging = -1; } @Override - public void update(final double mousex, final double mousey) { - if (this.border.containsPoint(mousex, mousey)) { - final double dscroll = (this.lastdWheel - Mouse.getDWheel()) / 120; - this.zoom = (this.zoom * Math.pow(1.1, dscroll)); - this.lastdWheel = Mouse.getDWheel(); + public void update(double mousex, double mousey) { + if (border.containsPoint(mousex, mousey)) { + double dscroll = (lastdWheel - Mouse.getDWheel()) / 120; + zoom = zoom * Math.pow(1.1, dscroll); + lastdWheel = Mouse.getDWheel(); } - final double dx = mousex - this.anchorx; - final double dy = mousey - this.anchory; - switch (this.dragging) { + double dx = mousex - anchorx; + double dy = mousey - anchory; + switch(dragging) { case 0: { - this.rotx = MuseMathUtils.clampDouble(this.rotx + dy, -90.0, 90.0); - this.roty = this.roty - dx; - this.anchorx = mousex; - this.anchory = mousey; + rotx = MuseMathUtils.clampDouble((rotx + dy), -90, 90); + roty = (roty - dx); + anchorx = mousex; + anchory = mousey; break; } case 1: { - this.offsetx = this.offsetx + dx; - this.offsety = this.offsety + dy; - this.anchorx = mousex; - this.anchory = mousey; + offsetx = (offsetx + dx); + offsety = (offsety + dy); + anchorx = mousex; + anchory = mousey; break; } - default: { + default: break; - } } } @Override public void draw() { - final Minecraft mc = Minecraft.getMinecraft(); - this.border.draw(); - if (this.itemSelector.getSelectedItem() != null && this.getSelectedItem().getItem().getItem() instanceof ItemPowerArmor) { - GL11.glPushMatrix(); - ((IArmorModel)ArmorModelInstance.getInstance()).setRenderSpec((MuseItemUtils.getMuseRenderTag(this.getSelectedItem().getItem(), this.getArmorSlot()))); - ((IArmorModel)ArmorModelInstance.getInstance()).setVisibleSection(this.getArmorSlot()); - GL11.glTranslated(this.border.centerx() + this.offsetx, this.border.centery() + this.offsety, 0.0); - GL11.glScaled(this.zoom, this.zoom, this.zoom); - GL11.glClear(256); - GL11.glDisable(2884); - GL11.glRotatef((float)this.rotx, 1.0f, 0.0f, 0.0f); - GL11.glRotatef((float)this.roty, 0.0f, 1.0f, 0.0f); - GL11.glTranslated(0.0, -this.getArmorSlot() / 2.0, 0.0); - ArmorModelInstance.getInstance().render((Entity)mc.thePlayer, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0625f); - GL11.glPopMatrix(); - } + Minecraft mc = Minecraft.getMinecraft(); + border.draw(); + if (itemSelector.getSelectedItem() == null || !(getSelectedItem().getItem().getItem() instanceof ItemPowerArmor)) return; + GL11.glPushMatrix(); + ((IArmorModel)ArmorModelInstance.getInstance()).setRenderSpec(MuseItemUtils.getMuseRenderTag(getSelectedItem().getItem(), getArmorSlot())); + ((IArmorModel)ArmorModelInstance.getInstance()).setVisibleSection(this.getArmorSlot()); + GL11.glTranslated(border.centerx() + offsetx, border.centery() + offsety, 0); + GL11.glScaled(zoom, zoom, zoom); + GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glRotatef((float) rotx, 1, 0, 0); + GL11.glRotatef((float) roty, 0, 1, 0); + GL11.glTranslated(0, -getArmorSlot() / 2.0, 0); + ((ModelBiped)ArmorModelInstance.getInstance()).render((Entity)mc.thePlayer, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0625f); + GL11.glPopMatrix(); } @Override - public List getToolTip(final int x, final int y) { + public List getToolTip(int x, int y) { return null; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/frame/ItemSelectionFrame.java b/src/main/java/net/machinemuse/general/gui/frame/ItemSelectionFrame.java index 143f7c4..314e1bb 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/ItemSelectionFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/ItemSelectionFrame.java @@ -18,7 +18,7 @@ import java.util.List; public class ItemSelectionFrame extends ScrollableFrame { protected List itemButtons; protected int selectedItemStack = -1; - protected final EntityPlayer player; + protected EntityPlayer player; protected List itemPoints; public ItemSelectionFrame(MusePoint2D topleft, MusePoint2D bottomright, @@ -48,7 +48,7 @@ public class ItemSelectionFrame extends ScrollableFrame { private void loadItems() { if (player != null) { - itemButtons = new ArrayList<>(); + itemButtons = new ArrayList(); double centerx = (border.left() + border.right()) / 2; double centery = (border.top() + border.bottom()) / 2; List slots = MuseItemUtils @@ -145,4 +145,4 @@ public class ItemSelectionFrame extends ScrollableFrame { return null; } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/frame/KeybindConfigFrame.java b/src/main/java/net/machinemuse/general/gui/frame/KeybindConfigFrame.java index 23ea67a..99615e6 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/KeybindConfigFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/KeybindConfigFrame.java @@ -28,16 +28,16 @@ import java.util.List; import java.util.Set; public class KeybindConfigFrame implements IGuiFrame { - protected final Set modules; + protected Set modules; protected IClickable selectedClickie; protected ClickableKeybinding closestKeybind; - protected final EntityPlayer player; - protected final MusePoint2D ul; - protected final MusePoint2D br; - protected final MuseGui gui; + protected EntityPlayer player; + protected MusePoint2D ul; + protected MusePoint2D br; + protected MuseGui gui; protected boolean selecting; - protected final ClickableButton newKeybindButton; - protected final ClickableButton trashKeybindButton; + protected ClickableButton newKeybindButton; + protected ClickableButton trashKeybindButton; protected long takenTime; public KeybindConfigFrame(MuseGui gui, MusePoint2D ul, MusePoint2D br, EntityPlayer player) { @@ -293,4 +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); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/frame/ModuleSelectionFrame.java b/src/main/java/net/machinemuse/general/gui/frame/ModuleSelectionFrame.java index 981ae64..dbf3ce0 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/ModuleSelectionFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/ModuleSelectionFrame.java @@ -16,7 +16,7 @@ import org.lwjgl.opengl.GL11; import java.util.*; public class ModuleSelectionFrame extends ScrollableFrame { - protected final ItemSelectionFrame target; + protected ItemSelectionFrame target; protected Map categories; protected List moduleButtons; protected int selectedModule = -1; @@ -29,8 +29,8 @@ public class ModuleSelectionFrame extends ScrollableFrame { super(topleft, bottomright, borderColour, insideColour); this.target = target; - moduleButtons = new ArrayList<>(); - categories = new HashMap<>(); + moduleButtons = new ArrayList(); + categories = new HashMap(); } @Override @@ -94,10 +94,10 @@ public class ModuleSelectionFrame extends ScrollableFrame { this.lastPosition = null; ClickableItem selectedItem = target.getSelectedItem(); if (selectedItem != null) { - moduleButtons = new ArrayList<>(); - categories = new HashMap<>(); + moduleButtons = new ArrayList(); + categories = new HashMap(); - List workingModules = ModuleManager.getValidModulesForItem(selectedItem.getItem()); + List workingModules = ModuleManager.getValidModulesForItem(null, selectedItem.getItem()); // Prune the list of disallowed modules, if not installed on this // item. @@ -198,4 +198,4 @@ public class ModuleSelectionFrame extends ScrollableFrame { } return null; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/frame/ModuleSelectionSubFrame.java b/src/main/java/net/machinemuse/general/gui/frame/ModuleSelectionSubFrame.java index 0cdc66a..3e309ba 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/ModuleSelectionSubFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/ModuleSelectionSubFrame.java @@ -11,14 +11,14 @@ import java.util.ArrayList; import java.util.List; public class ModuleSelectionSubFrame { - protected final List moduleButtons; - protected final MuseRelativeRect border; - protected final String category; + protected List moduleButtons; + protected MuseRelativeRect border; + protected String category; public ModuleSelectionSubFrame(String category, MuseRelativeRect border) { this.category = category; this.border = border; - this.moduleButtons = new ArrayList<>(); + this.moduleButtons = new ArrayList(); } // public void draw() { @@ -62,4 +62,4 @@ public class ModuleSelectionSubFrame { public MuseRect getBorder() { return border; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/frame/ModuleTweakFrame.java b/src/main/java/net/machinemuse/general/gui/frame/ModuleTweakFrame.java index 58333ff..803c5eb 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/ModuleTweakFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/ModuleTweakFrame.java @@ -63,6 +63,7 @@ public class ModuleTweakFrame extends ScrollableFrame { if (selectedSlider != null) { selectedSlider.moveSlider(mousex, mousey); } + } @Override @@ -98,7 +99,7 @@ public class ModuleTweakFrame extends ScrollableFrame { NBTTagCompound moduleTag = itemTag.getCompoundTag(module.getDataName()); propertyStrings = new HashMap(); - Set tweaks = new HashSet<>(); + Set tweaks = new HashSet(); Map> propertyModifiers = module.getPropertyModifiers(); for (Map.Entry> property : propertyModifiers.entrySet()) { @@ -110,6 +111,7 @@ public class ModuleTweakFrame extends ScrollableFrame { } } propertyStrings.put(property.getKey(), currValue); + } sliders = new LinkedList(); @@ -155,4 +157,4 @@ public class ModuleTweakFrame extends ScrollableFrame { selectedSlider = null; } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/frame/ScrollableFrame.java b/src/main/java/net/machinemuse/general/gui/frame/ScrollableFrame.java index 93ddd21..746889b 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/ScrollableFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/ScrollableFrame.java @@ -19,7 +19,7 @@ public class ScrollableFrame implements IGuiFrame { protected boolean scrollupPicked = false; protected int lastdWheel = Mouse.getDWheel(); - protected final DrawableMuseRect border; + protected DrawableMuseRect border; public ScrollableFrame(MusePoint2D topleft, MusePoint2D bottomright, Colour borderColour, Colour insideColour) { @@ -97,4 +97,4 @@ public class ScrollableFrame implements IGuiFrame { // TODO Auto-generated method stub return null; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/frame/StatsFrame.java b/src/main/java/net/machinemuse/general/gui/frame/StatsFrame.java index 39c1224..cbbb846 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/StatsFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/StatsFrame.java @@ -13,9 +13,9 @@ import java.util.List; import java.util.Set; public class StatsFrame extends ScrollableFrame { - protected final NBTTagCompound properties; - protected final ItemStack stack; - protected final Set propertiesToList; + protected NBTTagCompound properties; + protected ItemStack stack; + protected Set propertiesToList; public StatsFrame(MusePoint2D topleft, MusePoint2D bottomright, Colour borderColour, Colour insideColour, ItemStack stack) { @@ -58,4 +58,4 @@ public class StatsFrame extends ScrollableFrame { // TODO Auto-generated method stub return null; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/general/gui/frame/TabSelectFrame.java b/src/main/java/net/machinemuse/general/gui/frame/TabSelectFrame.java index d7ed5d9..dc19d11 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/TabSelectFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/TabSelectFrame.java @@ -17,14 +17,13 @@ import java.util.Map; * Ported to Java by lehjr on 10/19/16. */ public class TabSelectFrame implements IGuiFrame { - final EntityPlayer p; - final MusePoint2D topleft; - final MusePoint2D bottomright; - final int worldx; - final int worldy; - final int worldz; - - final Map buttons = new HashMap<>(); + EntityPlayer p; + MusePoint2D topleft; + MusePoint2D bottomright; + int worldx; + int worldy; + int worldz; + Map buttons = new HashMap<>(); public TabSelectFrame(EntityPlayer p, MusePoint2D topleft, MusePoint2D bottomright, int worldx, int worldy, int worldz) { this.p = p; @@ -68,4 +67,4 @@ public class TabSelectFrame implements IGuiFrame { public List getToolTip(int x, int y) { return null; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/client/render/block/RenderLuxCapacitorTESR.java b/src/main/java/net/machinemuse/powersuits/client/render/block/RenderLuxCapacitorTESR.java index 5a8a8fa..55227b9 100644 --- a/src/main/java/net/machinemuse/powersuits/client/render/block/RenderLuxCapacitorTESR.java +++ b/src/main/java/net/machinemuse/powersuits/client/render/block/RenderLuxCapacitorTESR.java @@ -20,7 +20,7 @@ import static org.lwjgl.opengl.GL11.*; public class RenderLuxCapacitorTESR extends MuseTESR implements ISimpleBlockRenderingHandler { protected static WavefrontObject lightmodel; protected static WavefrontObject framemodel; - protected final int renderId; + protected int renderId; public RenderLuxCapacitorTESR(int renderId) { this.renderId = renderId; diff --git a/src/main/java/net/machinemuse/powersuits/client/render/block/TinkerTableModel.java b/src/main/java/net/machinemuse/powersuits/client/render/block/TinkerTableModel.java index 536a114..55856c5 100644 --- a/src/main/java/net/machinemuse/powersuits/client/render/block/TinkerTableModel.java +++ b/src/main/java/net/machinemuse/powersuits/client/render/block/TinkerTableModel.java @@ -11,7 +11,7 @@ import java.util.Random; public class TinkerTableModel extends ModelBase { // public float onGround; // public boolean isRiding = false; - protected final ModelBase model = new ModelBase() { + protected ModelBase model = new ModelBase() { }; private static final Random random = new Random(); @@ -29,26 +29,26 @@ public class TinkerTableModel extends ModelBase { // public int textureWidth = 64; // public int textureHeight = 32; - final ModelRenderer cube; - final ModelRenderer screen3; - final ModelRenderer screen2; - final ModelRenderer screen1; - final ModelRenderer middletable; - final ModelRenderer uppertable; - final ModelRenderer particles; - final ModelRenderer footbase; - final ModelRenderer foot1; - final ModelRenderer fatfoot2; - final ModelRenderer fatfoot1; - final ModelRenderer backsupport; - final ModelRenderer tank3; - final ModelRenderer tank2; - final ModelRenderer tank1; - final ModelRenderer wireshort4; - final ModelRenderer wireshort3; - final ModelRenderer wireshort2; - final ModelRenderer Wireshort1; - final ModelRenderer Wirelong1; + ModelRenderer cube; + ModelRenderer screen3; + ModelRenderer screen2; + ModelRenderer screen1; + ModelRenderer middletable; + ModelRenderer uppertable; + ModelRenderer particles; + ModelRenderer footbase; + ModelRenderer foot1; + ModelRenderer fatfoot2; + ModelRenderer fatfoot1; + ModelRenderer backsupport; + ModelRenderer tank3; + ModelRenderer tank2; + ModelRenderer tank1; + ModelRenderer wireshort4; + ModelRenderer wireshort3; + ModelRenderer wireshort2; + ModelRenderer Wireshort1; + ModelRenderer Wirelong1; /** * @@ -175,8 +175,7 @@ public class TinkerTableModel extends ModelBase { setRotation(Wirelong1, 0F, 0F, 0F); } - public void doRender(Entity entity, double x, double y, double z, - float f1) { + public void doRender(Entity entity, double x, double y, double z, float f1) { float f = 0.0625f; RenderState.blendingOn(); int timestep = (int) ((System.currentTimeMillis()) % 10000); diff --git a/src/main/java/net/machinemuse/powersuits/client/render/block/TinkerTableRenderer.java b/src/main/java/net/machinemuse/powersuits/client/render/block/TinkerTableRenderer.java index 378a33f..e0310df 100644 --- a/src/main/java/net/machinemuse/powersuits/client/render/block/TinkerTableRenderer.java +++ b/src/main/java/net/machinemuse/powersuits/client/render/block/TinkerTableRenderer.java @@ -18,8 +18,8 @@ import org.lwjgl.opengl.GL11; * @author MachineMuse */ public class TinkerTableRenderer extends MuseTESR implements ISimpleBlockRenderingHandler { - protected final TinkerTableModel model; - protected final int renderId; + protected TinkerTableModel model; + protected int renderId; public TinkerTableRenderer(int renderId) { model = new TinkerTableModel(); @@ -71,4 +71,4 @@ public class TinkerTableRenderer extends MuseTESR implements ISimpleBlockRenderi public int getRenderId() { return renderId; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/client/render/entity/MuseRender.java b/src/main/java/net/machinemuse/powersuits/client/render/entity/MuseRender.java index fee16c7..85d68bf 100644 --- a/src/main/java/net/machinemuse/powersuits/client/render/entity/MuseRender.java +++ b/src/main/java/net/machinemuse/powersuits/client/render/entity/MuseRender.java @@ -13,4 +13,4 @@ public abstract class MuseRender extends Render { protected ResourceLocation getEntityTexture(Entity entity) { return null; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/client/render/entity/RenderPlasmaBolt.java b/src/main/java/net/machinemuse/powersuits/client/render/entity/RenderPlasmaBolt.java index 714c721..3c52d4b 100644 --- a/src/main/java/net/machinemuse/powersuits/client/render/entity/RenderPlasmaBolt.java +++ b/src/main/java/net/machinemuse/powersuits/client/render/entity/RenderPlasmaBolt.java @@ -74,4 +74,4 @@ public class RenderPlasmaBolt extends MuseRender { RenderState.glowOff(); GL11.glPopMatrix(); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/client/render/entity/RenderSpinningBlade.java b/src/main/java/net/machinemuse/powersuits/client/render/entity/RenderSpinningBlade.java index 44ffc03..7707825 100644 --- a/src/main/java/net/machinemuse/powersuits/client/render/entity/RenderSpinningBlade.java +++ b/src/main/java/net/machinemuse/powersuits/client/render/entity/RenderSpinningBlade.java @@ -38,4 +38,4 @@ public class RenderSpinningBlade extends MuseRender { glPopAttrib(); glPopMatrix(); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/client/render/item/SMovingArmorModel.java b/src/main/java/net/machinemuse/powersuits/client/render/item/SMovingArmorModel.java index 0763310..f2fd170 100644 --- a/src/main/java/net/machinemuse/powersuits/client/render/item/SMovingArmorModel.java +++ b/src/main/java/net/machinemuse/powersuits/client/render/item/SMovingArmorModel.java @@ -130,7 +130,7 @@ public class SMovingArmorModel extends ModelPlayer implements IArmorModel { aimedBow = true; } } - } catch (Exception e) { + } catch (Exception ignored) { } bipedHead.isHidden = false; diff --git a/src/main/java/net/machinemuse/powersuits/client/render/item/ToolModel.java b/src/main/java/net/machinemuse/powersuits/client/render/item/ToolModel.java index 94e2d52..c21c9c6 100644 --- a/src/main/java/net/machinemuse/powersuits/client/render/item/ToolModel.java +++ b/src/main/java/net/machinemuse/powersuits/client/render/item/ToolModel.java @@ -26,41 +26,41 @@ public class ToolModel extends ModelBase { public int boltSize; // fields - final ModelRenderer mainarm; - final ModelRenderer armorright; - final ModelRenderer armorleft; - final ModelRenderer wristtopright; - final ModelRenderer wristtopleft; - final ModelRenderer wristbottomright; - final ModelRenderer wristbottomleft; - final ModelRenderer index1; - final ModelRenderer index2; - final ModelRenderer middlefinger1; - final ModelRenderer middlefinger2; - final ModelRenderer ringfinger1; - final ModelRenderer ringfinger2; - final ModelRenderer pinky1; - final ModelRenderer pinky2; - final ModelRenderer thumb1; - final ModelRenderer thumb2; - final ModelRenderer fingerguard; - final ModelRenderer crystalholder; - final ModelRenderer crystal; - final ModelRenderer supportright1; - final ModelRenderer supportright2; - final ModelRenderer supportright3; - final ModelRenderer supportright4; - final ModelRenderer supportright5; - final ModelRenderer supportbaseright; - final ModelRenderer palm; - final ModelRenderer supportbaseleft; - final ModelRenderer supportleftfront; - final ModelRenderer supportrightfront; - final ModelRenderer supportleft1; - final ModelRenderer supportleft2; - final ModelRenderer supportleft3; - final ModelRenderer supportleft4; - final ModelRenderer supportleft5; + ModelRenderer mainarm; + ModelRenderer armorright; + ModelRenderer armorleft; + ModelRenderer wristtopright; + ModelRenderer wristtopleft; + ModelRenderer wristbottomright; + ModelRenderer wristbottomleft; + ModelRenderer index1; + ModelRenderer index2; + ModelRenderer middlefinger1; + ModelRenderer middlefinger2; + ModelRenderer ringfinger1; + ModelRenderer ringfinger2; + ModelRenderer pinky1; + ModelRenderer pinky2; + ModelRenderer thumb1; + ModelRenderer thumb2; + ModelRenderer fingerguard; + ModelRenderer crystalholder; + ModelRenderer crystal; + ModelRenderer supportright1; + ModelRenderer supportright2; + ModelRenderer supportright3; + ModelRenderer supportright4; + ModelRenderer supportright5; + ModelRenderer supportbaseright; + ModelRenderer palm; + ModelRenderer supportbaseleft; + ModelRenderer supportleftfront; + ModelRenderer supportrightfront; + ModelRenderer supportleft1; + ModelRenderer supportleft2; + ModelRenderer supportleft3; + ModelRenderer supportleft4; + ModelRenderer supportleft5; public ToolModel() { textureWidth = 64; @@ -502,4 +502,4 @@ public class ToolModel extends ModelBase { setPose(0.5f, -1, 0.5f, -1, 0.5f, -1); this.boltSize = 0; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/client/render/item/ToolRenderer.java b/src/main/java/net/machinemuse/powersuits/client/render/item/ToolRenderer.java index 075ca43..d1127ae 100644 --- a/src/main/java/net/machinemuse/powersuits/client/render/item/ToolRenderer.java +++ b/src/main/java/net/machinemuse/powersuits/client/render/item/ToolRenderer.java @@ -4,7 +4,6 @@ import net.machinemuse.numina.geometry.Colour; import net.machinemuse.numina.render.MuseIconUtils; import net.machinemuse.powersuits.client.render.entity.MuseRender; import net.machinemuse.powersuits.common.MPSItems; -import net.machinemuse.powersuits.item.IModularItemBase; import net.machinemuse.powersuits.item.ItemPowerFist; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; @@ -31,7 +30,7 @@ import org.lwjgl.opengl.GL12; * @author MachineMuse */ public class ToolRenderer extends MuseRender implements IItemRenderer { - public final ToolModel model = new ToolModel(); + public ToolModel model = new ToolModel(); /** * Forge checks this to see if our custom renderer will handle a certain type of rendering. @@ -59,9 +58,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); + Colour colour = item.getColorFromItemStack(itemStack); + Colour glow = item.getColorFromItemStack(itemStack); switch (type) { case ENTITY: RenderBlocks renderEntity = (RenderBlocks) data[0]; @@ -72,7 +71,7 @@ public class ToolRenderer extends MuseRender implements IItemRenderer { break; case INVENTORY: RenderBlocks renderInventory = (RenderBlocks) data[0]; - MuseIconUtils.drawIconAt(0, 0, MPSItems.INSTANCE.powerTool.getIconIndex(itemStack), colour); + MuseIconUtils.drawIconAt(0, 0, MPSItems.getInstance().powerTool.getIconIndex(itemStack), colour); break; case EQUIPPED: RenderBlocks renderEquipped = (RenderBlocks) data[0]; @@ -124,8 +123,7 @@ 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 doRender(Entity var1, double var2, double var4, double var6, float var8, float var9) {} public void renderFirstPersonArm(EntityClientPlayerMP entityclientplayermp, float par1) { Minecraft mc = Minecraft.getMinecraft(); @@ -158,4 +156,4 @@ public class ToolRenderer extends MuseRender implements IItemRenderer { renderplayer.renderFirstPersonArm(mc.thePlayer); GL11.glPopMatrix(); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/client/render/item/VanillaArmorModel.java b/src/main/java/net/machinemuse/powersuits/client/render/item/VanillaArmorModel.java index 5e28296..3045ec1 100644 --- a/src/main/java/net/machinemuse/powersuits/client/render/item/VanillaArmorModel.java +++ b/src/main/java/net/machinemuse/powersuits/client/render/item/VanillaArmorModel.java @@ -122,7 +122,7 @@ public class VanillaArmorModel extends ModelBiped implements IArmorModel { aimedBow = true; } } - } catch (Exception e) { + } catch (Exception ignored) { } bipedHead.isHidden = false; diff --git a/src/main/java/net/machinemuse/powersuits/common/Config.java b/src/main/java/net/machinemuse/powersuits/common/Config.java index 0a60fe1..e9b5708 100644 --- a/src/main/java/net/machinemuse/powersuits/common/Config.java +++ b/src/main/java/net/machinemuse/powersuits/common/Config.java @@ -6,7 +6,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import net.machinemuse.api.IPowerModule; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.numina.basemod.Numina; import net.machinemuse.numina.general.MuseLogger; import net.machinemuse.powersuits.common.proxy.CommonProxy; @@ -228,23 +228,23 @@ public class Config { */ public static void loadPowerModules() { List ARMORONLY = Arrays.asList( - (IModularItem)MPSItems.INSTANCE.powerArmorHead, - (IModularItem)MPSItems.INSTANCE.powerArmorTorso, - (IModularItem)MPSItems.INSTANCE.powerArmorLegs, - (IModularItem)MPSItems.INSTANCE.powerArmorFeet); + (IModularItem)MPSItems.getInstance().powerArmorHead, + (IModularItem)MPSItems.getInstance().powerArmorTorso, + (IModularItem)MPSItems.getInstance().powerArmorLegs, + (IModularItem)MPSItems.getInstance().powerArmorFeet); List ALLITEMS = Arrays.asList( - (IModularItem)MPSItems.INSTANCE.powerArmorHead, - (IModularItem)MPSItems.INSTANCE.powerArmorTorso, - (IModularItem)MPSItems.INSTANCE.powerArmorLegs, - (IModularItem)MPSItems.INSTANCE.powerArmorFeet, - (IModularItem)MPSItems.INSTANCE.powerTool); + (IModularItem)MPSItems.getInstance().powerArmorHead, + (IModularItem)MPSItems.getInstance().powerArmorTorso, + (IModularItem)MPSItems.getInstance().powerArmorLegs, + (IModularItem)MPSItems.getInstance().powerArmorFeet, + (IModularItem)MPSItems.getInstance().powerTool); - List HEADONLY = Collections.singletonList((IModularItem)MPSItems.INSTANCE.powerArmorHead); - List TORSOONLY = Collections.singletonList((IModularItem)MPSItems.INSTANCE.powerArmorTorso); - List LEGSONLY = Collections.singletonList((IModularItem)MPSItems.INSTANCE.powerArmorLegs); - List FEETONLY = Collections.singletonList((IModularItem)MPSItems.INSTANCE.powerArmorFeet); - List TOOLONLY = Collections.singletonList((IModularItem)MPSItems.INSTANCE.powerTool); + List HEADONLY = Collections.singletonList((IModularItem)MPSItems.getInstance().powerArmorHead); + List TORSOONLY = Collections.singletonList((IModularItem)MPSItems.getInstance().powerArmorTorso); + List LEGSONLY = Collections.singletonList((IModularItem)MPSItems.getInstance().powerArmorLegs); + List FEETONLY = Collections.singletonList((IModularItem)MPSItems.getInstance().powerArmorFeet); + List TOOLONLY = Collections.singletonList((IModularItem)MPSItems.getInstance().powerTool); addModule(new BasicPlatingModule(ARMORONLY)); addModule(new DiamondPlatingModule(ARMORONLY)); diff --git a/src/main/java/net/machinemuse/powersuits/common/InstallCost.java b/src/main/java/net/machinemuse/powersuits/common/InstallCost.java index f5a9daa..0df3624 100644 --- a/src/main/java/net/machinemuse/powersuits/common/InstallCost.java +++ b/src/main/java/net/machinemuse/powersuits/common/InstallCost.java @@ -9,4 +9,4 @@ public class InstallCost { public String modId; public Integer itemMetadata; public Integer itemQuantity; -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/common/MPSCreativeTab.java b/src/main/java/net/machinemuse/powersuits/common/MPSCreativeTab.java index a35e23b..a4839b6 100644 --- a/src/main/java/net/machinemuse/powersuits/common/MPSCreativeTab.java +++ b/src/main/java/net/machinemuse/powersuits/common/MPSCreativeTab.java @@ -13,6 +13,6 @@ public class MPSCreativeTab extends CreativeTabs { @Override public Item getTabIconItem() { - return MPSItems.INSTANCE.powerArmorHead; + return MPSItems.getInstance().powerArmorHead; } } \ No newline at end of file diff --git a/src/main/java/net/machinemuse/powersuits/common/MPSItems.java b/src/main/java/net/machinemuse/powersuits/common/MPSItems.java index 7b2ab4c..6c1bf6e 100644 --- a/src/main/java/net/machinemuse/powersuits/common/MPSItems.java +++ b/src/main/java/net/machinemuse/powersuits/common/MPSItems.java @@ -11,6 +11,11 @@ import net.machinemuse.powersuits.item.*; */ public final class MPSItems { + private static MPSItems ourInstance = new MPSItems(); + public static MPSItems getInstance() { + return ourInstance; + } + public final ItemPowerArmorHelmet powerArmorHead; public final ItemPowerArmorChestplate powerArmorTorso; public final ItemPowerArmorLeggings powerArmorLegs; @@ -20,8 +25,6 @@ public final class MPSItems { public final BlockLuxCapacitor luxCapacitor; public final ItemComponent components; - public static MPSItems INSTANCE = new MPSItems(); - private MPSItems() { this.powerArmorHead = new ItemPowerArmorHelmet(); GameRegistry.registerItem(this.powerArmorHead, this.powerArmorHead.getUnlocalizedName()); diff --git a/src/main/java/net/machinemuse/powersuits/common/ModCompatibility.java b/src/main/java/net/machinemuse/powersuits/common/ModCompatibility.java index 8d25d40..dbf24b1 100644 --- a/src/main/java/net/machinemuse/powersuits/common/ModCompatibility.java +++ b/src/main/java/net/machinemuse/powersuits/common/ModCompatibility.java @@ -2,8 +2,8 @@ package net.machinemuse.powersuits.common; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModAPIManager; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.numina.general.MuseLogger; import net.machinemuse.powersuits.powermodule.armor.ApiaristArmorModule; import net.machinemuse.powersuits.powermodule.armor.HazmatModule; @@ -120,37 +120,37 @@ public class ModCompatibility { // CoFH Lib - CoFHLib is included in CoFHCore if (isCOFHLibLoaded()|| isCOFHCoreLoaded()) { - ModuleManager.addModule(new OmniWrenchModule(Collections.singletonList((IModularItem) MPSItems.INSTANCE.powerTool))); + ModuleManager.addModule(new OmniWrenchModule(Collections.singletonList((IModularItem) MPSItems.getInstance().powerTool))); } // Thaumcraft if (isThaumCraftLoaded() && enableThaumGogglesModule()) { - ModuleManager.addModule(new ThaumGogglesModule(Collections.singletonList((IModularItem) MPSItems.INSTANCE.powerArmorHead))); + ModuleManager.addModule(new ThaumGogglesModule(Collections.singletonList((IModularItem) MPSItems.getInstance().powerArmorHead))); } //IPowerModule module = new MultimeterModule(Collections.singletonList((IModularItem) MPSItems.powerTool())); // Hazmat if (isIndustrialCraftLoaded()) { - ModuleManager.addModule(new HazmatModule(Arrays.asList(MPSItems.INSTANCE.powerArmorHead, MPSItems.INSTANCE.powerArmorTorso, MPSItems.INSTANCE.powerArmorLegs, MPSItems.INSTANCE.powerArmorFeet))); + ModuleManager.addModule(new HazmatModule(Arrays.asList(MPSItems.getInstance().powerArmorHead, MPSItems.getInstance().powerArmorTorso, MPSItems.getInstance().powerArmorLegs, MPSItems.getInstance().powerArmorFeet))); } // Galacticraft if (isGalacticraftLoaded()) { - ModuleManager.addModule(new AirtightSealModule(Collections.singletonList((IModularItem) MPSItems.INSTANCE.powerArmorHead))); + ModuleManager.addModule(new AirtightSealModule(Collections.singletonList((IModularItem) MPSItems.getInstance().powerArmorHead))); } // Forestry if (isForestryLoaded()) { - ModuleManager.addModule(new GrafterModule(Collections.singletonList((IModularItem) MPSItems.INSTANCE.powerTool))); - ModuleManager.addModule(new ScoopModule(Collections.singletonList((IModularItem) MPSItems.INSTANCE.powerTool))); - ModuleManager.addModule(new ApiaristArmorModule(Arrays.asList(MPSItems.INSTANCE.powerArmorHead, MPSItems.INSTANCE.powerArmorTorso, MPSItems.INSTANCE.powerArmorLegs, MPSItems.INSTANCE.powerArmorFeet))); + ModuleManager.addModule(new GrafterModule(Collections.singletonList((IModularItem) MPSItems.getInstance().powerTool))); + ModuleManager.addModule(new ScoopModule(Collections.singletonList((IModularItem) MPSItems.getInstance().powerTool))); + ModuleManager.addModule(new ApiaristArmorModule(Arrays.asList(MPSItems.getInstance().powerArmorHead, MPSItems.getInstance().powerArmorTorso, MPSItems.getInstance().powerArmorLegs, MPSItems.getInstance().powerArmorFeet))); } // Chisel if(isChiselLoaded()) { try { - ModuleManager.addModule(new ChiselModule(Collections.singletonList((IModularItem) MPSItems.INSTANCE.powerTool))); + ModuleManager.addModule(new ChiselModule(Collections.singletonList((IModularItem) MPSItems.getInstance().powerTool))); } catch(Exception e) { MuseLogger.logException("Couldn't add Chisel module", e); } @@ -158,21 +158,21 @@ public class ModCompatibility { // Applied Energistics if (isAppengLoaded()) { - ModuleManager.addModule(new AppEngWirelessModule(Collections.singletonList((IModularItem) MPSItems.INSTANCE.powerTool))); + ModuleManager.addModule(new AppEngWirelessModule(Collections.singletonList((IModularItem) MPSItems.getInstance().powerTool))); // Extra Cells 2 if (isExtraCellsLoaded()) - ModuleManager.addModule(new AppEngWirelessFluidModule(Collections.singletonList((IModularItem) MPSItems.INSTANCE.powerTool))); + ModuleManager.addModule(new AppEngWirelessFluidModule(Collections.singletonList((IModularItem) MPSItems.getInstance().powerTool))); } // Multi-Mod Compatible OmniProbe if (isEnderIOLoaded() || isMFRLoaded() || isRailcraftLoaded()) { - ModuleManager.addModule(new OmniProbeModule(Collections.singletonList((IModularItem) MPSItems.INSTANCE.powerTool))); + ModuleManager.addModule(new OmniProbeModule(Collections.singletonList((IModularItem) MPSItems.getInstance().powerTool))); } // Compact Machines Personal Shrinking Device if (isCompactMachinesLoaded()) { - ModuleManager.addModule(new PersonalShrinkingModule(Collections.singletonList((IModularItem) MPSItems.INSTANCE.powerTool))); + ModuleManager.addModule(new PersonalShrinkingModule(Collections.singletonList((IModularItem) MPSItems.getInstance().powerTool))); } } } \ No newline at end of file diff --git a/src/main/java/net/machinemuse/powersuits/common/proxy/ClientProxy.java b/src/main/java/net/machinemuse/powersuits/common/proxy/ClientProxy.java index c719bd5..5311545 100644 --- a/src/main/java/net/machinemuse/powersuits/common/proxy/ClientProxy.java +++ b/src/main/java/net/machinemuse/powersuits/common/proxy/ClientProxy.java @@ -52,7 +52,7 @@ public class ClientProxy implements CommonProxy { */ @Override public void registerRenderers() { - MinecraftForgeClient.registerItemRenderer(MPSItems.INSTANCE.powerTool, new ToolRenderer()); + MinecraftForgeClient.registerItemRenderer(MPSItems.getInstance().powerTool, new ToolRenderer()); int tinkTableRenderID = RenderingRegistry.getNextAvailableRenderId(); TinkerTableRenderer tinkTableRenderer = new TinkerTableRenderer(tinkTableRenderID); BlockTinkerTable.setRenderType(tinkTableRenderID); @@ -60,7 +60,7 @@ public class ClientProxy implements CommonProxy { RenderingRegistry.registerBlockHandler(tinkTableRenderer); int luxCapacitorRenderID = RenderingRegistry.getNextAvailableRenderId(); RenderLuxCapacitorTESR luxCapacitorRenderer = new RenderLuxCapacitorTESR(luxCapacitorRenderID); - MPSItems.INSTANCE.luxCapacitor.setRenderType(luxCapacitorRenderID); + MPSItems.getInstance().luxCapacitor.setRenderType(luxCapacitorRenderID); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLuxCapacitor.class, luxCapacitorRenderer); RenderingRegistry.registerBlockHandler(luxCapacitorRenderer); RenderingRegistry.registerEntityRenderingHandler(EntityPlasmaBolt.class, new RenderPlasmaBolt()); diff --git a/src/main/java/net/machinemuse/powersuits/control/KeybindKeyHandler.java b/src/main/java/net/machinemuse/powersuits/control/KeybindKeyHandler.java index 543242f..e63fd74 100644 --- a/src/main/java/net/machinemuse/powersuits/control/KeybindKeyHandler.java +++ b/src/main/java/net/machinemuse/powersuits/control/KeybindKeyHandler.java @@ -5,24 +5,26 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.machinemuse.numina.item.ModeChangingItem; import net.machinemuse.powersuits.common.ModularPowersuits; +import net.machinemuse.powersuits.item.IModeChangingModularItem; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.settings.KeyBinding; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; import org.lwjgl.input.Keyboard; @SideOnly(Side.CLIENT) public class KeybindKeyHandler { public static final String mps = "Modular Powersuits"; - public static final KeyBinding openKeybindGUI = new KeyBinding("Open MPS Keybind GUI", -1, mps); - public static final KeyBinding goDownKey = new KeyBinding("Go Down (MPS Flight Control)", Keyboard.KEY_Z, mps); - public static final KeyBinding cycleToolBackward = new KeyBinding("Cycle Tool Backward (MPS)", -1, mps); - public static final KeyBinding cycleToolForward = new KeyBinding("Cycle Tool Forward (MPS)", -1, mps); - public static final KeyBinding zoom = new KeyBinding("Zoom (MPS)", Keyboard.KEY_Y, mps); - public static final KeyBinding openCosmeticGUI = new KeyBinding("Cosmetic (MPS)", -1, mps); - public static final KeyBinding[] keybindArray = new KeyBinding[]{openKeybindGUI, goDownKey, cycleToolBackward, cycleToolForward, zoom, openCosmeticGUI}; + public static KeyBinding openKeybindGUI = new KeyBinding("Open MPS Keybind GUI", -1, mps); + public static KeyBinding goDownKey = new KeyBinding("Go Down (MPS Flight Control)", Keyboard.KEY_Z, mps); + public static KeyBinding cycleToolBackward = new KeyBinding("Cycle Tool Backward (MPS)", -1, mps); + public static KeyBinding cycleToolForward = new KeyBinding("Cycle Tool Forward (MPS)", -1, mps); + public static KeyBinding zoom = new KeyBinding("Zoom (MPS)", Keyboard.KEY_Y, mps); + public static KeyBinding openCosmeticGUI = new KeyBinding("Cosmetic (MPS)", -1, mps); + public static KeyBinding[] keybindArray = new KeyBinding[]{openKeybindGUI, goDownKey, cycleToolBackward, cycleToolForward, zoom, openCosmeticGUI}; public static boolean[] repeats = new boolean[keybindArray.length]; public KeybindKeyHandler() { @@ -36,13 +38,16 @@ public class KeybindKeyHandler { int key = Keyboard.getEventKey(); boolean pressed = Keyboard.getEventKeyState(); EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + ItemStack stack = player.getCurrentEquippedItem(); + IModeChangingModularItem modeChangingModularItem = null; + if (stack != null && stack.getItem() instanceof IModeChangingModularItem) + modeChangingModularItem = (IModeChangingModularItem)stack.getItem(); // Only activate if there is a player to work with if (player == null) { return; } if (pressed) { - ModeChangingItem mci = new ModeChangingItem(player.inventory.getCurrentItem()); if (key == openKeybindGUI.getKeyCode()) { World world = Minecraft.getMinecraft().theWorld; if (Minecraft.getMinecraft().inGameHasFocus) { @@ -58,16 +63,13 @@ public class KeybindKeyHandler { if (key == goDownKey.getKeyCode()) { PlayerInputMap.getInputMapFor(player.getCommandSenderName()).downKey = true; } - - /* cycleToolBackward/cycleToolForward only seem to be used if actual keys are assinged instead of mousewheel */ - if (key == cycleToolBackward.getKeyCode()) { + if (key == cycleToolBackward.getKeyCode() && modeChangingModularItem != null) { Minecraft.getMinecraft().playerController.updateController(); - mci.cycleMode(player.inventory.getStackInSlot(player.inventory.currentItem), player, 1); - + ((IModeChangingModularItem)modeChangingModularItem).cycleModeForItem(player.inventory.getStackInSlot(player.inventory.currentItem), player, 1); } if (key == cycleToolForward.getKeyCode()) { Minecraft.getMinecraft().playerController.updateController(); - mci.cycleMode(player.inventory.getStackInSlot(player.inventory.currentItem), player, -1); + ((IModeChangingModularItem)modeChangingModularItem).cycleModeForItem(player.inventory.getStackInSlot(player.inventory.currentItem), player, -1); } } else { if (Minecraft.getMinecraft().thePlayer != null && key == goDownKey.getKeyCode()) { @@ -75,4 +77,4 @@ public class KeybindKeyHandler { } } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/control/KeybindManager.java b/src/main/java/net/machinemuse/powersuits/control/KeybindManager.java index ac9fc77..3b4835d 100644 --- a/src/main/java/net/machinemuse/powersuits/control/KeybindManager.java +++ b/src/main/java/net/machinemuse/powersuits/control/KeybindManager.java @@ -19,7 +19,7 @@ import java.util.Set; public class KeybindManager { // only stores keybindings relevant to us!! - protected final Set keybindings; + protected Set keybindings; protected static KeybindManager instance; protected KeybindManager() { @@ -127,4 +127,4 @@ public class KeybindManager { e.printStackTrace(); } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/control/PlayerInputMap.java b/src/main/java/net/machinemuse/powersuits/control/PlayerInputMap.java index aa40509..5156983 100644 --- a/src/main/java/net/machinemuse/powersuits/control/PlayerInputMap.java +++ b/src/main/java/net/machinemuse/powersuits/control/PlayerInputMap.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Map; public class PlayerInputMap { - protected static final Map playerInputs = new HashMap(); + protected static Map playerInputs = new HashMap(); public static PlayerInputMap getInputMapFor(String playerName) { PlayerInputMap map = playerInputs.get(playerName); @@ -106,4 +106,4 @@ public class PlayerInputMap { public void refresh() { this.lastSentMap.setTo(this); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/entity/EntityLuxCapacitor.java b/src/main/java/net/machinemuse/powersuits/entity/EntityLuxCapacitor.java index 266c647..b05baf6 100644 --- a/src/main/java/net/machinemuse/powersuits/entity/EntityLuxCapacitor.java +++ b/src/main/java/net/machinemuse/powersuits/entity/EntityLuxCapacitor.java @@ -75,7 +75,7 @@ public class EntityLuxCapacitor extends EntityThrowable { if (block == null || block.isAir(worldObj, x, y, z)) { Block blockToStickTo = worldObj.getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); if (blockToStickTo.isNormalCube(worldObj, x, y, z)) { - worldObj.setBlock(x, y, z, MPSItems.INSTANCE.luxCapacitor, 0, 7); + worldObj.setBlock(x, y, z, MPSItems.getInstance().luxCapacitor, 0, 7); worldObj.setTileEntity(x, y, z, new TileEntityLuxCapacitor(dir, red, green, blue)); } else { for (ForgeDirection d : ForgeDirection.values()) { @@ -84,7 +84,7 @@ public class EntityLuxCapacitor extends EntityThrowable { int zo = z + d.offsetZ; blockToStickTo = worldObj.getBlock(xo, yo, zo); if (blockToStickTo.isNormalCube(worldObj, x, y, z)) { - worldObj.setBlock(x, y, z, MPSItems.INSTANCE.luxCapacitor, 0, 7); + worldObj.setBlock(x, y, z, MPSItems.getInstance().luxCapacitor, 0, 7); worldObj.setTileEntity(x, y, z, new TileEntityLuxCapacitor(d, red, green, blue)); } } @@ -94,4 +94,4 @@ public class EntityLuxCapacitor extends EntityThrowable { this.setDead(); } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/entity/EntityPlasmaBolt.java b/src/main/java/net/machinemuse/powersuits/entity/EntityPlasmaBolt.java index 1d09379..43d265e 100644 --- a/src/main/java/net/machinemuse/powersuits/entity/EntityPlasmaBolt.java +++ b/src/main/java/net/machinemuse/powersuits/entity/EntityPlasmaBolt.java @@ -152,4 +152,4 @@ public class EntityPlasmaBolt extends EntityThrowable { this.setDead(); } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/entity/EntitySpinningBlade.java b/src/main/java/net/machinemuse/powersuits/entity/EntitySpinningBlade.java index 06701a6..8cffef9 100644 --- a/src/main/java/net/machinemuse/powersuits/entity/EntitySpinningBlade.java +++ b/src/main/java/net/machinemuse/powersuits/entity/EntitySpinningBlade.java @@ -134,4 +134,4 @@ public class EntitySpinningBlade extends EntityThrowable { } } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/entity/TileEntityPortal.java b/src/main/java/net/machinemuse/powersuits/entity/TileEntityPortal.java index 3b7aef5..b613b90 100644 --- a/src/main/java/net/machinemuse/powersuits/entity/TileEntityPortal.java +++ b/src/main/java/net/machinemuse/powersuits/entity/TileEntityPortal.java @@ -8,4 +8,4 @@ import net.minecraft.tileentity.TileEntity; public class TileEntityPortal extends TileEntity { public TileEntityPortal() { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/event/HarvestEventHandler.java b/src/main/java/net/machinemuse/powersuits/event/HarvestEventHandler.java index 97bf711..469033d 100644 --- a/src/main/java/net/machinemuse/powersuits/event/HarvestEventHandler.java +++ b/src/main/java/net/machinemuse/powersuits/event/HarvestEventHandler.java @@ -1,8 +1,8 @@ package net.machinemuse.powersuits.event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.powersuits.item.ItemPowerFist; import net.minecraft.block.Block; @@ -40,4 +40,4 @@ public class HarvestEventHandler { } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/event/MovementManager.java b/src/main/java/net/machinemuse/powersuits/event/MovementManager.java index bfeb39f..68ddee5 100644 --- a/src/main/java/net/machinemuse/powersuits/event/MovementManager.java +++ b/src/main/java/net/machinemuse/powersuits/event/MovementManager.java @@ -20,10 +20,9 @@ import java.util.HashMap; import java.util.Map; public class MovementManager { - public static final Map playerJumpMultipliers = new HashMap(); + public static Map playerJumpMultipliers = new HashMap(); public static double getPlayerJumpMultiplier(EntityPlayer player) { - if (playerJumpMultipliers.containsKey(player.getCommandSenderName())) { return playerJumpMultipliers.get(player.getCommandSenderName()); } else { @@ -46,7 +45,7 @@ public class MovementManager { double drain = ModuleManager.computeModularProperty(stack, JumpAssistModule.JUMP_ENERGY_CONSUMPTION); double avail = ElectricItemUtils.getPlayerEnergy(player); if ((FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) && NuminaConfig.useSounds()) { - Musique.playerSound(player, SoundDictionary.SOUND_JUMP_ASSIST, (float) (jumpAssist / 8.0), (float)1, false); + Musique.playerSound(player, SoundDictionary.SOUND_JUMP_ASSIST, (float) (jumpAssist / 8.0), 1f, false); } if (drain < avail) { ElectricItemUtils.drainPlayerEnergy(player, drain); @@ -57,10 +56,8 @@ public class MovementManager { } else { player.getFoodStats().addExhaustion((float) (-0.2 * jumpCompensationRatio)); } - } } - } } @@ -73,7 +70,7 @@ public class MovementManager { if (ModuleManager.itemHasActiveModule(boots, ShockAbsorberModule.MODULE_SHOCK_ABSORBER) && event.distance > 3) { double distanceAbsorb = event.distance * ModuleManager.computeModularProperty(boots, ShockAbsorberModule.SHOCK_ABSORB_MULTIPLIER); if ((FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) && NuminaConfig.useSounds()) { - Musique.playerSound(player, SoundDictionary.SOUND_GUI_INSTALL, (float) (distanceAbsorb), (float)1, false); + Musique.playerSound(player, SoundDictionary.SOUND_GUI_INSTALL, (float) (distanceAbsorb), 1f, false); } double drain = distanceAbsorb * ModuleManager.computeModularProperty(boots, ShockAbsorberModule.SHOCK_ABSORB_ENERGY_CONSUMPTION); @@ -96,4 +93,4 @@ public class MovementManager { double ticks = velocity / DEFAULT_GRAVITY; return -0.5 * DEFAULT_GRAVITY * ticks * ticks; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/event/PlayerUpdateHandler.java b/src/main/java/net/machinemuse/powersuits/event/PlayerUpdateHandler.java index 72b5dad..fa365bf 100644 --- a/src/main/java/net/machinemuse/powersuits/event/PlayerUpdateHandler.java +++ b/src/main/java/net/machinemuse/powersuits/event/PlayerUpdateHandler.java @@ -1,8 +1,6 @@ package net.machinemuse.powersuits.event; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; import net.machinemuse.api.ModuleManager; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.general.sound.SoundDictionary; @@ -76,7 +74,8 @@ public class PlayerUpdateHandler { player.extinguish(); } double velsq2 = MuseMathUtils.sumsq(player.motionX, player.motionY, player.motionZ) - 0.5; - if ((FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) && NuminaConfig.useSounds()) { + + if ((player.worldObj.isRemote) && NuminaConfig.useSounds()) { if (player.isAirBorne && velsq2 > 0) { Musique.playerSound(player, SoundDictionary.SOUND_GLIDER, (float)(velsq2 / 3), 1.0f, true); } diff --git a/src/main/java/net/machinemuse/powersuits/item/IModeChangingModularItem.java b/src/main/java/net/machinemuse/powersuits/item/IModeChangingModularItem.java index ee5cbb1..d286b04 100644 --- a/src/main/java/net/machinemuse/powersuits/item/IModeChangingModularItem.java +++ b/src/main/java/net/machinemuse/powersuits/item/IModeChangingModularItem.java @@ -1,32 +1,24 @@ -//package net.machinemuse.powersuits.item; -// -//import net.machinemuse.numina.item.IModeChangingItem; -//import net.minecraft.entity.player.EntityPlayer; -//import net.minecraft.item.ItemStack; -//import net.minecraft.util.IIcon; -// -//import javax.annotation.Nullable; -//import java.util.List; -// -///** -// * Author: MachineMuse (Claire Semple) -// * Created: 4:52 PM, 9/5/13 -// * -// * Ported to Java by lehjr on 11/1/16. -// */ -//public interface IModeChangingModularItem extends IModeChangingItem { -// @Nullable -// IIcon getModeIcon(String mode, ItemStack stack, EntityPlayer player); -// -// List getValidModes(ItemStack stack); -// -// String getActiveMode(ItemStack stack); -// -// void setActiveMode(ItemStack stack, String newMode) ; -// -// void cycleMode(ItemStack stack, EntityPlayer player, int dMode); -// -// String nextMode(ItemStack stack, EntityPlayer player); -// -// String prevMode(ItemStack stack, EntityPlayer player); -//} \ No newline at end of file +package net.machinemuse.powersuits.item; + +import net.machinemuse.numina.item.IModeChangingItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import java.util.List; + +/** + * Author: MachineMuse (Claire Semple) + * Created: 4:52 PM, 9/5/13 + * + * Ported to Java by lehjr on 12/12/16. + */ +public interface IModeChangingModularItem extends IModeChangingItem { + void cycleModeForItem(ItemStack itemStack, EntityPlayer player, int dMode); + + IIcon getModeIcon(String mode, ItemStack itemStack, EntityPlayer player); + + List getValidModes(ItemStack itemStack); + + String getActiveMode(ItemStack itemStack); +} diff --git a/src/main/java/net/machinemuse/powersuits/item/IModularItemBase.java b/src/main/java/net/machinemuse/powersuits/item/IModularItemBase.java index 552ada9..1d7386a 100644 --- a/src/main/java/net/machinemuse/powersuits/item/IModularItemBase.java +++ b/src/main/java/net/machinemuse/powersuits/item/IModularItemBase.java @@ -2,7 +2,7 @@ package net.machinemuse.powersuits.item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.electricity.IMuseElectricItem; import net.machinemuse.numina.geometry.Colour; import net.minecraft.entity.player.EntityPlayer; @@ -18,27 +18,39 @@ import java.util.List; */ public interface IModularItemBase extends IModularItem, IMuseElectricItem { @SideOnly(Side.CLIENT) - int getColorFromItemStack(final ItemStack stack, final int p1); + int getColorFromItemStack(ItemStack stack, int par2); - Colour getGlowFromItemStack(final ItemStack stack); + Colour getGlowFromItemStack(ItemStack stack); - Colour getColorFromItemStack(final ItemStack stack); + Colour getColorFromItemStack(ItemStack stack); @SideOnly(Side.CLIENT) boolean requiresMultipleRenderPasses(); + /** + * Adds information to the item's tooltip when 'getting' it. + * + * @param stack The itemstack to get the tooltip for + * @param player The player (client) viewing the tooltip + * @param currentTipList A list of strings containing the existing tooltip. When + * passed, it will just contain the name of the item; + * enchantments and lore are + * appended afterwards. + * @param advancedToolTips Whether or not the player has 'advanced tooltips' turned on in + * their settings. + */ @SideOnly(Side.CLIENT) - void addInformation(final ItemStack stack, final EntityPlayer player, final List currentTipList, final boolean advancedToolTips); + void addInformation(ItemStack stack, EntityPlayer player, List currentTipList, boolean advancedToolTips); - String formatInfo(final String string, final double value); + String formatInfo(String string, double value); - List getLongInfo(final EntityPlayer player, final ItemStack stack); + List getLongInfo(EntityPlayer player, ItemStack stack); - double getArmorDouble(final EntityPlayer player, final ItemStack stack); + double getArmorDouble(EntityPlayer player, ItemStack stack); - double getPlayerEnergy(final EntityPlayer player); + double getPlayerEnergy(EntityPlayer player); - void drainPlayerEnergy(final EntityPlayer player, final double drainEnergy); + void drainPlayerEnergy(EntityPlayer player, double drainEnergy); - void givePlayerEnergy(final EntityPlayer player, final double joulesToGive); -} \ No newline at end of file + void givePlayerEnergy(EntityPlayer player, double joulesToGive); +} diff --git a/src/main/java/net/machinemuse/powersuits/item/ItemComponent.java b/src/main/java/net/machinemuse/powersuits/item/ItemComponent.java index 65094c4..8dae13f 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ItemComponent.java +++ b/src/main/java/net/machinemuse/powersuits/item/ItemComponent.java @@ -58,10 +58,10 @@ public class ItemComponent extends Item { this.setHasSubtypes(true); this.setMaxDamage(0); this.setCreativeTab(Config.getCreativeTab()); - icons = new ArrayList<>(); - iconNames = new ArrayList<>(); - names = new ArrayList<>(); - descriptions = new ArrayList<>(); + icons = new ArrayList(); + iconNames = new ArrayList(); + names = new ArrayList(); + descriptions = new ArrayList(); } public ItemStack addComponent(String oredictName, String description, String iconName) { diff --git a/src/main/java/net/machinemuse/powersuits/item/ItemElectricArmor.java b/src/main/java/net/machinemuse/powersuits/item/ItemElectricArmor.java index 96c3c09..b7bfbc1 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ItemElectricArmor.java +++ b/src/main/java/net/machinemuse/powersuits/item/ItemElectricArmor.java @@ -17,8 +17,7 @@ import java.util.List; /** * Ported to Java by lehjr on 10/26/16. */ -public abstract class ItemElectricArmor extends ItemArmor implements IModularItemBase -{ +public abstract class ItemElectricArmor extends ItemArmor implements IModularItemBase, IMuseElectricItem { public ItemElectricArmor(final ItemArmor.ArmorMaterial material, final int index1, final int index2) { super(material, index1, index2); } @@ -97,7 +96,7 @@ public abstract class ItemElectricArmor extends ItemArmor implements IModularIte } public IMuseElectricItem getManager(final ItemStack itemStack) { - return MuseElectricItem.getInstance().getManager(itemStack); + return (IMuseElectricItem) MuseElectricItem.getInstance().getManager(itemStack); } public void chargeFromArmor(final ItemStack itemStack, final EntityLivingBase entity) { @@ -188,4 +187,4 @@ public abstract class ItemElectricArmor extends ItemArmor implements IModularIte public AccessRestriction getPowerFlow(final ItemStack stack) { return MuseElectricItem.getInstance().getPowerFlow(stack); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmor.java b/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmor.java index 3ad5498..6f021d2 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmor.java +++ b/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmor.java @@ -4,14 +4,18 @@ import com.google.common.collect.Multimap; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.machinemuse.api.ApiaristArmor; -import net.machinemuse.api.IArmorTraits; +import net.machinemuse.api.IApiaristArmor; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; import net.machinemuse.numina.geometry.Colour; import net.machinemuse.powersuits.client.render.item.ArmorModelInstance; import net.machinemuse.powersuits.client.render.item.IArmorModel; import net.machinemuse.powersuits.common.Config; +import net.machinemuse.powersuits.powermodule.armor.ApiaristArmorModule; +import net.machinemuse.powersuits.powermodule.armor.HazmatModule; import net.machinemuse.powersuits.powermodule.misc.InvisibilityModule; +import net.machinemuse.powersuits.powermodule.misc.TintModule; +import net.machinemuse.powersuits.powermodule.misc.TransparentArmorModule; import net.machinemuse.utils.ElectricItemUtils; import net.machinemuse.utils.MuseCommonStrings; import net.machinemuse.utils.MuseHeatUtils; @@ -36,107 +40,72 @@ import java.util.UUID; * * Ported to Java by lehjr on 11/4/16. */ -public abstract class ItemPowerArmor extends ItemElectricArmor implements ISpecialArmor, IArmorTraits { +public abstract class ItemPowerArmor extends ItemElectricArmor implements ISpecialArmor, IApiaristArmor { public ItemPowerArmor(int renderIndex, int armorType) { super(ItemArmor.ArmorMaterial.IRON, renderIndex, armorType); - this.setMaxStackSize(1); - this.setCreativeTab(Config.getCreativeTab()); + setMaxStackSize(1); + setCreativeTab(Config.getCreativeTab()); } - public ISpecialArmor.ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { - int priority = 0; - Label_0057: { - if (source.isFireDamage()) { - DamageSource overheatDamage = MuseHeatUtils.overheatDamage; - if (source == null) { - if (overheatDamage == null) { - break Label_0057; - } - } - else if (source.equals(overheatDamage)) { - break Label_0057; - } - return new ISpecialArmor.ArmorProperties(priority, 0.25, (int)(25 * damage)); - } - } - if (ModuleManager.itemHasModule(armor, "Radiation Shielding") && (source.damageType.equals("electricity") || source.damageType.equals("radiation"))) { - return new ISpecialArmor.ArmorProperties(priority, 0.25, (int)(25 * damage)); - } - double armorDouble2; - if (player instanceof EntityPlayer) { - armorDouble2 = this.getArmorDouble((EntityPlayer)player, armor); - } - else { - armorDouble2 = 2.0; - } - double armorDouble = armorDouble2; - double absorbRatio = 0.04 * armorDouble; - int absorbMax = (int)armorDouble * 75; - if (source.isUnblockable()) { - absorbMax = 0; - absorbRatio = 0.0; - } - return new ISpecialArmor.ArmorProperties(priority, absorbRatio, absorbMax); - } - - public String getArmorTexture(ItemStack itemstack, Entity entity, int slot, int layer) { + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return Config.BLANK_ARMOR_MODEL_PATH; } + @Override public int getColor(ItemStack stack) { - Colour c = this.getColorFromItemStack(stack); - return c.getInt(); + return getColorFromItemStack(stack).getInt(); } @SideOnly(Side.CLIENT) - public ModelBiped getArmorModel(EntityLivingBase entity, ItemStack itemstack, int armorSlot) { + @Override + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { ModelBiped model = ArmorModelInstance.getInstance(); ((IArmorModel)model).setVisibleSection(armorSlot); - if (itemstack != null) { - if (entity instanceof EntityPlayer) { - ItemStack armorChest = ((EntityPlayer)entity).getCurrentArmor(2); - - if (armorChest != null) { - if (armorChest.getItem() instanceof ItemPowerArmor) - if (ModuleManager.itemHasActiveModule(armorChest, InvisibilityModule.MODULE_ACTIVE_CAMOUFLAGE)) ((IArmorModel)model).setVisibleSection(99); - } - + if (itemStack != null) { + if (entityLiving instanceof EntityPlayer) { + ItemStack chest = ((EntityPlayer) entityLiving).getCurrentArmor(2); + if (itemStack != null) + if (ModuleManager.itemHasActiveModule(chest, InvisibilityModule.MODULE_ACTIVE_CAMOUFLAGE)) + ((IArmorModel) model).setVisibleSection(99); } - - if (ModuleManager.itemHasActiveModule(itemstack, "Transparent Armor")) { - ((IArmorModel)model).setVisibleSection(99); - } - ((IArmorModel)model).setRenderSpec(MuseItemUtils.getMuseRenderTag(itemstack, armorSlot)); } - return (ModelBiped)model; + + if (ModuleManager.itemHasActiveModule(itemStack, TransparentArmorModule.MODULE_TRANSPARENT_ARMOR)) { + ((IArmorModel)model).setVisibleSection(99); + } + ((IArmorModel)model).setRenderSpec(MuseItemUtils.getMuseRenderTag(itemStack, armorSlot)); + return model; } - public Multimap getAttributeModifiers(ItemStack stack) { - Multimap parent = super.getAttributeModifiers(stack); - parent.put((Object)"generic.knockbackResistance", (Object)new AttributeModifier(UUID.fromString("448ef0e9-9b7c-4e56-bf3a-6b52aeabff8d"), "generic.knockbackResistance", 0.25, 0)); - return (Multimap)parent; + @Override + public Multimap getAttributeModifiers(ItemStack stack) { + Multimap parent = super.getAttributeModifiers(stack);//.asInstanceOf[Multimap[String, AttributeModifier]] + parent.put("generic.knockbackResistance", new AttributeModifier(UUID.fromString("448ef0e9-9b7c-4e56-bf3a-6b52aeabff8d"), "generic.knockbackResistance", 0.25, 0)); + return parent; } + @Override public int getItemEnchantability() { return 0; } + /** + * Return whether the specified armor has a color. + */ + @Override public boolean hasColor(ItemStack stack) { NBTTagCompound itemTag = MuseItemUtils.getMuseItemTag(stack); - return ModuleManager.tagHasModule(itemTag, "Red Tint") || ModuleManager.tagHasModule(itemTag, "Green Tint") || ModuleManager.tagHasModule(itemTag, "Blue Tint"); + return ModuleManager.tagHasModule(itemTag, TintModule.RED_TINT) || ModuleManager.tagHasModule(itemTag, TintModule.GREEN_TINT) || ModuleManager.tagHasModule(itemTag, TintModule.BLUE_TINT); } - public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { - return (int)this.getArmorDouble(player, armor); - } - - public double getHeatResistance(EntityPlayer player, ItemStack stack) { + double getHeatResistance(EntityPlayer player, ItemStack stack) { return MuseHeatUtils.getMaxHeat(stack); } @Override public double getArmorDouble(EntityPlayer player, ItemStack stack) { - double totalArmor = 0.0; + double totalArmor = 0; NBTTagCompound props = MuseItemUtils.getMuseItemTag(stack); double energy = ElectricItemUtils.getPlayerEnergy(player); double physArmor = ModuleManager.computeModularProperty(stack, MuseCommonStrings.ARMOR_VALUE_PHYSICAL); @@ -150,24 +119,54 @@ public abstract class ItemPowerArmor extends ItemElectricArmor implements ISpeci return totalArmor; } + /* ISpecialArmor ------------------------------------------------------------------------------*/ + + /** + * Inherited from ISpecialArmor, allows significant customization of damage + * calculations. + */ + @Override + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + int priority = 0; + + if (source.isFireDamage() && !(source == MuseHeatUtils.overheatDamage)) { + return new ISpecialArmor.ArmorProperties(priority, 0.25, (int)(25 * damage)); + } + if(ModuleManager.itemHasModule(armor, HazmatModule.MODULE_HAZMAT)) { + if(source.damageType.equals("electricity") || source.damageType.equals("radiation")) { + return new ISpecialArmor.ArmorProperties(priority, 0.25, (int)(25 * damage)); + } + } + double armorDouble = (player instanceof EntityPlayer) ? getArmorDouble((EntityPlayer) player, armor) : 2.0; + double absorbRatio = 0.04 * armorDouble; + int absorbMax = (int)armorDouble * 75; + if (source.isUnblockable()) { + absorbMax = 0; + absorbRatio = 0; + } + return new ISpecialArmor.ArmorProperties(priority, absorbRatio, absorbMax); + } + + /** + * Inherited from ISpecialArmor, allows us to customize the calculations for + * how much armor will display on the player's HUD. + */ + @Override + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + return (int) getArmorDouble(player, armor); + } + /** * Inherited from ISpecialArmor, allows us to customize how the armor * handles being damaged. */ + @Override public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { NBTTagCompound itemProperties = MuseItemUtils.getMuseItemTag(stack); if (entity instanceof EntityPlayer) { - DamageSource overheatDamage = MuseHeatUtils.overheatDamage; - if (source == null) { - if (overheatDamage == null) { - return; - } - } - else if (source.equals(overheatDamage)) { - return; - } - if (source.isFireDamage()) { - EntityPlayer player = (EntityPlayer)entity; + if (source == MuseHeatUtils.overheatDamage) { + } else if (source.isFireDamage()) { + EntityPlayer player = (EntityPlayer) entity; if (!source.equals(DamageSource.onFire) || MuseHeatUtils.getPlayerHeat(player) < MuseHeatUtils.getMaxHeat(player)) { MuseHeatUtils.heatPlayer(player, damage); } @@ -176,22 +175,33 @@ public abstract class ItemPowerArmor extends ItemElectricArmor implements ISpeci double enerConsum = ModuleManager.computeModularProperty(stack, MuseCommonStrings.ARMOR_ENERGY_CONSUMPTION); double drain = enerConsum * damage; if (entity instanceof EntityPlayer) { - ElectricItemUtils.drainPlayerEnergy((EntityPlayer)entity, drain); + ElectricItemUtils.drainPlayerEnergy((EntityPlayer) entity, drain); } else { - this.drainEnergyFrom(stack, drain); + drainEnergyFrom(stack, drain); } } } } + /* IApiaristArmor ----------------------------------------------------------------------------- */ @Optional.Method(modid = "Forestry") + @Override public boolean protectPlayer(EntityPlayer player, ItemStack armor, String cause, boolean doProtect) { - return ApiaristArmor.getInstance().protectPlayer(player, armor, cause, doProtect); +// if (ModuleManager.itemHasActiveModule(armor, ApiaristArmorModule.MODULE_APIARIST_ARMOR)) { +// ElectricItemUtils.drainPlayerEnergy(player, ModuleManager.computeModularProperty(armor, ApiaristArmorModule.APIARIST_ARMOR_ENERGY_CONSUMPTION)); +// return true; +// } + return false; } @Optional.Method(modid = "Forestry") + @Override public boolean protectEntity(EntityLivingBase player, ItemStack armor, String cause, boolean doProtect) { - return ApiaristArmor.getInstance().protectEntity(player, armor, cause, doProtect); + if (ModuleManager.itemHasActiveModule(armor, ApiaristArmorModule.MODULE_APIARIST_ARMOR)) { + ElectricItemUtils.drainPlayerEnergy((EntityPlayer) player, ModuleManager.computeModularProperty(armor, ApiaristArmorModule.APIARIST_ARMOR_ENERGY_CONSUMPTION)); + return true; + } + return false; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorBoots.java b/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorBoots.java index 8b241dc..468b286 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorBoots.java +++ b/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorBoots.java @@ -12,21 +12,25 @@ import net.minecraft.item.ItemStack; /** * Ported to Java by lehjr on 10/26/16. */ -@Optional.InterfaceList({ @Optional.Interface(iface = "ic2.api.item.IMetalArmor", modid = "IC2", striprefs = true) }) -public class ItemPowerArmorBoots extends ItemPowerArmor implements IMetalArmor -{ +@Optional.InterfaceList ({ + @Optional.Interface (iface = "ic2.api.item.IMetalArmor", modid = "IC2", striprefs = true) +}) +public class ItemPowerArmorBoots extends ItemPowerArmor implements IMetalArmor{ + public final String iconpath = MuseRenderer.ICON_PREFIX + "armorfeet"; + public ItemPowerArmorBoots() { super(0, 3); - this.setUnlocalizedName("powerArmorBoots"); + setUnlocalizedName("powerArmorBoots"); } @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister iconRegister) { - String iconpath = MuseRenderer.ICON_PREFIX + "armorfeet"; - this.itemIcon = iconRegister.registerIcon(iconpath); + @Override + public void registerIcons(IIconRegister iconRegister) { + itemIcon = iconRegister.registerIcon(iconpath); } - public boolean isMetalArmor(final ItemStack itemStack, final EntityPlayer entityPlayer) { + @Override + public boolean isMetalArmor(ItemStack itemStack, EntityPlayer entityPlayer) { return true; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorChestplate.java b/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorChestplate.java index 3db2ff4..d616e46 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorChestplate.java +++ b/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorChestplate.java @@ -9,18 +9,16 @@ import net.minecraft.client.renderer.texture.IIconRegister; * Ported to Java by lehjr on 10/26/16. */ public class ItemPowerArmorChestplate extends ItemPowerArmor { + final String iconpath = MuseRenderer.ICON_PREFIX + "armortorso"; public ItemPowerArmorChestplate() { super(0, 1); - this.setUnlocalizedName("powerArmorChestplate"); - } - - public String iconpath() { - return MuseRenderer.ICON_PREFIX + "armortorso"; + setUnlocalizedName("powerArmorChestplate"); } @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(this.iconpath()); + @Override + public void registerIcons(IIconRegister iconRegister) { + itemIcon = iconRegister.registerIcon(iconpath); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorHelmet.java b/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorHelmet.java index 526f628..5a93a9f 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorHelmet.java +++ b/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorHelmet.java @@ -21,44 +21,54 @@ import thaumcraft.api.nodes.IRevealer; * Ported to Java by lehjr on 10/26/16. */ @Optional.InterfaceList({ - @Optional.Interface(iface = "forestry.api.core.IArmorNaturalist", modid = "Forestry", striprefs = true), - @Optional.Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft", striprefs = true), - @Optional.Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft", striprefs = true), - @Optional.Interface(iface = "micdoodle8.mods.galacticraft.api.item.IBreathableArmor", modid = "GalacticraftCore", striprefs = true) }) -public class ItemPowerArmorHelmet extends ItemPowerArmor implements IArmorNaturalist, IBreathableArmor, IGoggles, IRevealer -{ - private final String iconpath; + @Optional.Interface (iface = "forestry.api.core.IArmorNaturalist", modid = "Forestry", striprefs = true), + @Optional.Interface (iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft", striprefs = true), + @Optional.Interface (iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft", striprefs = true), + @Optional.Interface (iface = "micdoodle8.mods.galacticraft.api.item.IBreathableArmor", modid = "GalacticraftCore", striprefs = true) + }) +public class ItemPowerArmorHelmet extends ItemPowerArmor implements + IArmorNaturalist, + IBreathableArmor, + IGoggles, + IRevealer { + static final String iconpath = MuseRenderer.ICON_PREFIX + "armorhead"; + public ItemPowerArmorHelmet() { super(0, 0); - this.iconpath = MuseRenderer.ICON_PREFIX + "armorhead"; - this.setUnlocalizedName("powerArmorHelmet"); + setUnlocalizedName("powerArmorHelmet"); } @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(this.iconpath); + @Override + public void registerIcons(IIconRegister iconRegister) { + itemIcon = iconRegister.registerIcon(iconpath); } - public boolean showIngamePopups(final ItemStack itemstack, final EntityLivingBase player) { - return ModuleManager.itemHasActiveModule(itemstack, ThaumGogglesModule.MODULE_THAUM_GOGGLES); + @Override + public boolean showIngamePopups(ItemStack itemStack, EntityLivingBase entityLivingBase) { + return ModuleManager.itemHasActiveModule(itemStack, ThaumGogglesModule.MODULE_THAUM_GOGGLES); } - public boolean showNodes(final ItemStack itemstack, final EntityLivingBase player) { - return ModuleManager.itemHasActiveModule(itemstack, ThaumGogglesModule.MODULE_THAUM_GOGGLES); + @Override + public boolean showNodes(ItemStack itemStack, EntityLivingBase entityLivingBase) { + return ModuleManager.itemHasActiveModule(itemStack, ThaumGogglesModule.MODULE_THAUM_GOGGLES); } @Optional.Method(modid = "Forestry") - public boolean canSeePollination(final EntityPlayer player, final ItemStack helm, final boolean doSee) { - return ModuleManager.itemHasActiveModule(helm, ApiaristArmorModule.MODULE_APIARIST_ARMOR); + @Override + public boolean canSeePollination(EntityPlayer entityPlayer, ItemStack itemStack, boolean b) { + return ModuleManager.itemHasActiveModule(itemStack, ApiaristArmorModule.MODULE_APIARIST_ARMOR); } @Optional.Method(modid = "GalacticraftCore") - public boolean handleGearType(final IBreathableArmor.EnumGearType geartype) { - return geartype == EnumGearType.HELMET; + @Override + public boolean handleGearType(EnumGearType gearType) { + return gearType == EnumGearType.HELMET; } @Optional.Method(modid = "GalacticraftCore") - public boolean canBreathe(final ItemStack helm, final EntityPlayer player, final IBreathableArmor.EnumGearType geartype) { - return ModuleManager.itemHasActiveModule(helm, AirtightSealModule.AIRTIGHT_SEAL_MODULE); + @Override + public boolean canBreathe(ItemStack itemStack, EntityPlayer entityPlayer, EnumGearType enumGearType) { + return ModuleManager.itemHasActiveModule(itemStack, AirtightSealModule.AIRTIGHT_SEAL_MODULE); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorLeggings.java b/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorLeggings.java index af97d63..683041f 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorLeggings.java +++ b/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmorLeggings.java @@ -9,15 +9,16 @@ import net.minecraft.client.renderer.texture.IIconRegister; * Ported to Java by lehjr on 10/26/16. */ public class ItemPowerArmorLeggings extends ItemPowerArmor { + final String iconpath = MuseRenderer.ICON_PREFIX + "armorlegs"; public ItemPowerArmorLeggings() { super(0, 2); - this.setUnlocalizedName("powerArmorLeggings"); + setUnlocalizedName("powerArmorLeggings"); } @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister iconRegister) { - String iconpath = MuseRenderer.ICON_PREFIX + "armorlegs"; - this.itemIcon = iconRegister.registerIcon(iconpath); + @Override + public void registerIcons(IIconRegister iconRegister) { + itemIcon = iconRegister.registerIcon(iconpath); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/item/ItemPowerFist.java b/src/main/java/net/machinemuse/powersuits/item/ItemPowerFist.java index 7cd8f0e..d7d3856 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ItemPowerFist.java +++ b/src/main/java/net/machinemuse/powersuits/item/ItemPowerFist.java @@ -11,20 +11,21 @@ import crazypants.enderio.api.tool.ITool; import forestry.api.arboriculture.IToolGrafter; import mekanism.api.IMekWrench; import mods.railcraft.api.core.items.IToolCrowbar; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.IPowerModule; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.general.gui.MuseIcon; import net.machinemuse.numina.item.IModeChangingItem; -import net.machinemuse.numina.item.ModeChangingItem; +import net.machinemuse.numina.item.NuminaItemUtils; +import net.machinemuse.numina.network.MusePacketModeChangeRequest; +import net.machinemuse.numina.network.PacketSender; import net.machinemuse.powersuits.common.Config; import net.machinemuse.powersuits.powermodule.tool.GrafterModule; import net.machinemuse.powersuits.powermodule.tool.OmniWrenchModule; import net.machinemuse.powersuits.powermodule.weapon.MeleeAssistModule; import net.machinemuse.utils.ElectricItemUtils; -import net.machinemuse.utils.MuseCommonStrings; import net.machinemuse.utils.MuseHeatUtils; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; @@ -33,7 +34,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.IIcon; @@ -45,7 +45,6 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; - /** * Describes the modular power tool. * @@ -53,7 +52,6 @@ import java.util.List; * * Ported to Java by lehjr on 10/26/16. */ - @Optional.InterfaceList({ @Optional.Interface(iface = "mekanism.api.IMekWrench", modid = "Mekanism", striprefs = true), @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO", striprefs = true), @@ -65,55 +63,58 @@ import java.util.List; @Optional.Interface(iface = "cofh.api.item.IToolHammer", modid = "CoFHCore", striprefs = true), @Optional.Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft|Core", striprefs = true), @Optional.Interface(iface = "appeng.api.implementations.items.IAEWrench", modid = "appliedenergistics2", striprefs = true) }) -public class ItemPowerFist extends MPSItemElectricTool - implements +public class ItemPowerFist extends MPSItemElectricTool implements + IModularItem, IToolGrafter, IToolHammer, IMFRHammer, IToolCrowbar, IAEWrench, IToolWrench, - IScrewdriver, + com.bluepowermod.api.misc.IScrewdriver, mrtjp.projectred.api.IScrewdriver, ITool, IMekWrench, - IModularItem, - IModeChangingItem + IModeChangingModularItem { - private static ModeChangingItem modeChangingItem; + public final String iconpath = MuseIcon.ICON_PREFIX + "handitem"; public ItemPowerFist() { - super(0.0f, Item.ToolMaterial.EMERALD); - this.setMaxStackSize(1); - this.setMaxDamage(0); - this.setCreativeTab(Config.getCreativeTab()); - this.setUnlocalizedName("powerFist"); + super(0, ToolMaterial.EMERALD); + setMaxStackSize(1); + setMaxDamage(0); + setCreativeTab(Config.getCreativeTab()); + setUnlocalizedName("powerFist"); } - private ModeChangingItem getModeChangingItem() { - if (this.modeChangingItem == null) - this.modeChangingItem = new ModeChangingItem(this); - return this.modeChangingItem; - } + // FIXME: CHECKME!! these 2 were not overridden in 1.7.10 but should have been according to the comments. /** * Returns the strength of the stack against a given block. 1.0F base, * (Quality+1)*2 if correct blocktype, 1.5F if sword + * this is actually "getStrVsBlock" */ - public float getStrVsBlock( ItemStack stack, Block block) { - return this.getStrVsBlock(stack, block, 0); + @Override + public float func_150893_a( ItemStack stack, Block block) { + return 1.0F; } /** * FORGE: Overridden to allow custom tool effectiveness + * + * This is actually getStrVsBlock */ - public float getStrVsBlock(ItemStack stack, Block block, int meta) { - return 1.0f; + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) { + return this.func_150893_a(stack, block); } + // END CHECKME!! =================================================================== + + @SideOnly(Side.CLIENT) + @Override public void registerIcons(IIconRegister iconRegister) { - String iconpath = MuseIcon.ICON_PREFIX + "handitem"; - this.itemIcon = iconRegister.registerIcon(iconpath); + itemIcon = iconRegister.registerIcon(iconpath); } /** @@ -134,7 +135,7 @@ public class ItemPowerFist extends MPSItemElectricTool double damage = ModuleManager.computeModularProperty(stack, MeleeAssistModule.PUNCH_DAMAGE); double knockback = ModuleManager.computeModularProperty(stack, MeleeAssistModule.PUNCH_KNOCKBACK); DamageSource damageSource = DamageSource.causePlayerDamage(player); - if (entityBeingHit.attackEntityFrom(damageSource, (float)(int)damage)) { + if (entityBeingHit.attackEntityFrom(damageSource, (int)damage)) { Vec3 lookVec = player.getLookVec(); entityBeingHit.addVelocity(lookVec.xCoord * knockback, Math.abs(lookVec.yCoord + 0.2f) * knockback, lookVec.zCoord * knockback); } @@ -167,16 +168,17 @@ public class ItemPowerFist extends MPSItemElectricTool * handle damage based on * itemstack data, like tags. Falls back to getDamageVsEntity. * - * @param par1Entity The entity being attacked (or the attacking mob, if it's a mob + * @param entity The entity being attacked (or the attacking mob, if it's a mob * - vanilla bug?) * @param itemStack The itemstack * @return the damage */ - public float getDamageVsEntity(Entity par1Entity, ItemStack itemStack) { - return (float)ModuleManager.computeModularProperty(itemStack, MeleeAssistModule.PUNCH_DAMAGE); + public float getDamageVsEntity(Entity entity, ItemStack itemStack){ + return (float) ModuleManager.computeModularProperty(itemStack, MeleeAssistModule.PUNCH_DAMAGE); } @SideOnly(Side.CLIENT) + @Override public boolean isFull3D() { return true; } @@ -185,6 +187,7 @@ public class ItemPowerFist extends MPSItemElectricTool * Return the enchantability factor of the item. In this case, 0. Might add * an enchantability module later :P */ + @Override public int getItemEnchantability() { return 0; } @@ -201,7 +204,7 @@ public class ItemPowerFist extends MPSItemElectricTool * Return whether this item is repairable in an anvil. */ @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1stack, ItemStack par2stack) { return false; } @@ -209,7 +212,7 @@ public class ItemPowerFist extends MPSItemElectricTool * How long it takes to use or consume an item */ @Override - public int getMaxItemUseDuration(ItemStack par1ItemStack) { + public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 72000; } @@ -218,19 +221,11 @@ public class ItemPowerFist extends MPSItemElectricTool */ @Override public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) { - // Only one right click module should be active at a time. - IPowerModule iPowerModulemodule = ModuleManager.getModule(getActiveMode(itemStack)); - if (iPowerModulemodule instanceof IRightClickModule) { - ((IRightClickModule) iPowerModulemodule).onRightClick(player, world, itemStack); + for (IRightClickModule module : ModuleManager.getRightClickModules()) { + if (module.isValidForItem(itemStack) && ModuleManager.itemHasActiveModule(itemStack, module.getDataName())) { + module.onRightClick(player, world, itemStack); + } } - -/* Trying to simplify with new code above */ -// for (IRightClickModule module : ModuleManager.getRightClickModules()) { -// if (module.isValidForItem(itemStack) && ModuleManager.itemHasActiveModule(itemStack, module.getDataName())) { -// module.onRightClick(player, world, itemStack); -// return itemStack; -// } -// } return itemStack; } @@ -248,7 +243,7 @@ public class ItemPowerFist extends MPSItemElectricTool */ @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { - String mode = this.getActiveMode(itemStack); + String mode = getActiveMode(itemStack, player); IPowerModule module = ModuleManager.getModule(mode); if (module != null) ((IRightClickModule)module).onPlayerStoppedUsing(itemStack, world, player, par4); @@ -259,35 +254,22 @@ public class ItemPowerFist extends MPSItemElectricTool } @Override - public boolean onItemUseFirst( ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - String mode = this.getActiveMode(itemStack); + public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { + String mode = getActiveMode(itemStack, player); IPowerModule module = ModuleManager.getModule(mode); return module instanceof IRightClickModule && ((IRightClickModule)module).onItemUseFirst(itemStack, player, world, x, y, z, side, hitX, hitY, hitZ); } @Override - public boolean onItemUse( ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - String mode = this.getActiveMode(itemStack); - IPowerModule module2; - IPowerModule module = module2 = ModuleManager.getModule(mode); - if (module2 instanceof IRightClickModule) { - return ((IRightClickModule)module2).onItemUse(itemStack, player, world, x, y, z, side, hitX, hitY, hitZ); - } + public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { + String mode = getActiveMode(itemStack, player); + IPowerModule module = ModuleManager.getModule(mode); + if (module instanceof IRightClickModule) + return ((IRightClickModule) module).onItemUse(itemStack, player, world, x, y, z, side, hitX, hitY, hitZ); return false; } - @Optional.Method(modid = "Forestry") - public float getSaplingModifier(ItemStack stack, World world, EntityPlayer player, int x, int y, int z) { - if (ModuleManager.itemHasActiveModule(stack, GrafterModule.MODULE_GRAFTER)) { - ElectricItemUtils.drainPlayerEnergy(player, ModuleManager.computeModularProperty(stack, GrafterModule.GRAFTER_ENERGY_CONSUMPTION)); - MuseHeatUtils.heatPlayer(player, ModuleManager.computeModularProperty(stack, GrafterModule.GRAFTER_HEAT_GENERATION)); - return 100.0f; - } - return 0.0f; - } - public boolean canHarvestBlock(ItemStack stack, Block block, int meta, EntityPlayer player) { - Object o = new Object(); if (block.getMaterial().isToolNotRequired()) return true; @@ -299,6 +281,17 @@ public class ItemPowerFist extends MPSItemElectricTool return false; } + @Optional.Method(modid = "Forestry") + @Override + public float getSaplingModifier(ItemStack itemStack, World world, EntityPlayer entityPlayer, int x, int y, int z) { + if (ModuleManager.itemHasActiveModule(itemStack, GrafterModule.MODULE_GRAFTER)) { + ElectricItemUtils.drainPlayerEnergy(entityPlayer, ModuleManager.computeModularProperty(itemStack, GrafterModule.GRAFTER_ENERGY_CONSUMPTION)); + MuseHeatUtils.heatPlayer(entityPlayer, ModuleManager.computeModularProperty(itemStack, GrafterModule.GRAFTER_HEAT_GENERATION)); + return 100.0f; + } + return 0.0f; + } + /* TE Crescent Hammer */ @Override public boolean isUsable(ItemStack itemStack, EntityLivingBase entityLivingBase, int i, int i1, int i2) { @@ -307,169 +300,181 @@ public class ItemPowerFist extends MPSItemElectricTool /* TE Crescent Hammer */ @Override - public void toolUsed(ItemStack itemStack, EntityLivingBase entityLivingBase, int i, int i1, int i2) { + public void toolUsed(ItemStack itemStack, EntityLivingBase entityLivingBase, int i, int i1, int i2) {} + + /* Railcraft Crowbar */ + @Override + public boolean canWhack(EntityPlayer entityPlayer, ItemStack itemStack, int i, int i1, int i2) { + return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* Railcraft Crowbar */ @Override - public boolean canWhack(EntityPlayer player, ItemStack itemStack, int i, int i1, int i2) { - return this.getActiveMode(itemStack).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); + public boolean canLink(EntityPlayer entityPlayer, ItemStack itemStack, EntityMinecart entityMinecart) { + return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* Railcraft Crowbar */ @Override - public boolean canLink(EntityPlayer player, ItemStack itemStack, EntityMinecart entityMinecart) { - return this.getActiveMode(itemStack).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); + public boolean canBoost(EntityPlayer entityPlayer, ItemStack itemStack, EntityMinecart entityMinecart) { + return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* Railcraft Crowbar */ @Override - public boolean canBoost(EntityPlayer player, ItemStack itemStack, EntityMinecart entityMinecart) { - return this.getActiveMode(itemStack).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); - } + public void onLink(EntityPlayer entityPlayer, ItemStack itemStack, EntityMinecart entityMinecart) {} /* Railcraft Crowbar */ @Override - public void onLink(EntityPlayer player, ItemStack itemStack, EntityMinecart entityMinecart) { - } + public void onWhack(EntityPlayer entityPlayer, ItemStack itemStack, int i, int i1, int i2) {} /* Railcraft Crowbar */ @Override - public void onWhack(EntityPlayer player, ItemStack itemStack, int i, int i1, int i2) { - } - - /* Railcraft Crowbar */ - @Override - public void onBoost(EntityPlayer player, ItemStack itemStack, EntityMinecart entityMinecart) { - } + public void onBoost(EntityPlayer entityPlayer, ItemStack itemStack, EntityMinecart entityMinecart) {} /* AE wrench */ @Override - public boolean canWrench(ItemStack itemStack, EntityPlayer player, int i, int i1, int i2) { - return this.getActiveMode(itemStack).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); + public boolean canWrench(ItemStack itemStack, EntityPlayer entityPlayer, int i, int i1, int i2) { + return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* Buildcraft Wrench */ @Override - public void wrenchUsed(EntityPlayer player, int i, int i1, int i2) { - } + public void wrenchUsed(EntityPlayer entityPlayer, int i, int i1, int i2) {} /* Buildcraft Wrench */ @Override - public boolean canWrench(EntityPlayer player, int i, int i1, int i2) { - return this.getActiveMode(player.getHeldItem()).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); + public boolean canWrench(EntityPlayer entityPlayer, int i, int i1, int i2) { + return getActiveMode(entityPlayer.getHeldItem(), entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* Bluepower Screwdriver */ @Override public boolean damage(ItemStack itemStack, int i, EntityPlayer entityPlayer, boolean b) { - return this.getActiveMode(itemStack).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); + return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* ProjectRed Screwdriver */ @Override - public void damageScrewdriver(EntityPlayer entityPlayer, ItemStack itemStack) { - } + public void damageScrewdriver(EntityPlayer entityPlayer, ItemStack itemStack) {} /* ProjectRed Screwdriver */ @Override public boolean canUse(EntityPlayer entityPlayer, ItemStack itemStack) { - return this.getActiveMode(itemStack).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); + return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* EnderIO Tool */ @Override - public void used(ItemStack itemStack, EntityPlayer entityPlayer, int i, int i1, int i2) { - } + public void used(ItemStack itemStack, EntityPlayer entityPlayer, int i, int i1, int i2) {} /* EnderIO Tool */ @Override public boolean canUse(ItemStack itemStack, EntityPlayer entityPlayer, int i, int i1, int i2) { - return this.getActiveMode(itemStack).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); + return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* EnderIO Tool */ @Override public boolean shouldHideFacades(ItemStack itemStack, EntityPlayer entityPlayer) { - return this.getActiveMode(itemStack).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); + return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* Mekanism Wrench */ @Override public boolean canUseWrench(EntityPlayer entityPlayer, int i, int i1, int i2) { - return this.getActiveMode(entityPlayer.getHeldItem()).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); + return getActiveMode(entityPlayer.getHeldItem(), entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* IModeChangingItem -------------------------------------------------------------------------- */ - - @Nullable @Override - public IIcon getModeIcon(String mode, ItemStack stack, EntityPlayer player) { - IPowerModule module = ModuleManager.getModule(mode); - if (module != null) - return module.getIcon(stack); + public void setActiveMode(ItemStack itemStack, String newMode) { + NuminaItemUtils.getTagCompound(itemStack).setString("mode", newMode); + } + + @Override + public String getActiveMode(ItemStack itemStack, EntityPlayer player) { + return getActiveMode(itemStack); + } + + @Override + public void cycleMode(ItemStack itemStack, EntityPlayer player, int dMode) { + List modes = getValidModes(itemStack, player); + if (!modes.isEmpty()) { + int newindex = clampMode(modes.indexOf(getActiveMode(itemStack, player)) + dMode, modes.size()); + String newmode = modes.get(newindex); + setActiveMode(itemStack, newmode); + PacketSender.sendToServer(new MusePacketModeChangeRequest(player,newmode, player.inventory.currentItem)); + } + } + + @Override + public String nextMode(ItemStack itemStack, EntityPlayer player) { + List modes = getValidModes(itemStack, player); + if (!modes.isEmpty()) { + int newindex = clampMode(modes.indexOf(getActiveMode(itemStack, player)) + 1, modes.size()); + return modes.get(newindex); + } else { + return ""; + } + } + + @Override + public String prevMode(ItemStack itemStack, EntityPlayer player) { + List modes = getValidModes(itemStack, player); + if (!modes.isEmpty()) { + int newindex = clampMode(modes.indexOf(getActiveMode(itemStack, player)) - 1, modes.size()); + return modes.get(newindex); + } else { + return ""; + } + } + + @Override + public List getValidModes(ItemStack itemStack, EntityPlayer player) { + return getValidModes(itemStack); + } + + private int clampMode(int selection, int modesSize) { + if (selection > 0) { + return selection % modesSize; + } else { + return (selection + modesSize * (-selection)) % modesSize; + } + } + + /* IModeChangingModularItem ------------------------------------------------------------------- */ + @Override + public void cycleModeForItem(ItemStack itemStack, EntityPlayer player, int dMode) { + if (itemStack != null) { + this.cycleMode(itemStack, player, dMode); + } + } + + @Override + public IIcon getModeIcon(String mode, ItemStack itemStack, EntityPlayer player) { + if (!mode.isEmpty()) + return ModuleManager.getModule(mode).getIcon(itemStack); return null; } @Override - public List getValidModes(ItemStack stack) { - List modes = new ArrayList<>(); - for (IRightClickModule module : ModuleManager.getRightClickModules()) { - if (module.isValidForItem(stack)) - if (ModuleManager.itemHasModule(stack, module.getDataName())) - modes.add(module.getDataName()); + public List getValidModes(ItemStack itemStack) { + return ModuleManager.getValidModes(itemStack); + } + + @Override + public String getActiveMode(ItemStack itemStack) { + String modeFromNBT = NuminaItemUtils.getTagCompound(itemStack).getString("mode"); + if (!modeFromNBT.isEmpty()) { + return modeFromNBT; + } else { + List validModes = getValidModes(itemStack); + if (!validModes.isEmpty()) { + return validModes.get(0); + } else { + return ""; + } } - return modes; } - - @Override - public String getActiveMode(ItemStack stack) { - return this.getModeChangingItem().getActiveMode(stack); - } - - @Override - public void setActiveMode(ItemStack stack, String newMode) { - this.getModeChangingItem().setActiveMode(stack, newMode); - } - - @Override - public void cycleMode(ItemStack stack, EntityPlayer player, int dMode) { - this.getModeChangingItem().cycleMode(stack, player, dMode); - } - - @Override - public String nextMode(ItemStack stack, EntityPlayer player) { - return this.getModeChangingItem().nextMode(stack, player); - } - - @Override - public String prevMode(ItemStack stack, EntityPlayer player) { - return this.getModeChangingItem().prevMode(stack, player); - } - - /* IModularItem ------------------------------------------------------------------------------- */ - @Override // FIXME: check to see if this is needed or not. - public List getLongInfo(EntityPlayer player, ItemStack stack) { - List info = new ArrayList<>(); - info.add("Detailed Summary"); - info.add(formatInfo("Armor", getArmorDouble(player, stack))); - info.add(formatInfo("Energy Storage", getCurrentEnergy(stack)) + 'J'); - info.add(formatInfo("Weight", MuseCommonStrings.getTotalWeight(stack)) + 'g'); - return info; - } - - @Override - public double getPlayerEnergy(EntityPlayer player) { - return ElectricItemUtils.getPlayerEnergy(player); - } - - @Override - public void drainPlayerEnergy(EntityPlayer player, double drainAmount) { - ElectricItemUtils.drainPlayerEnergy(player, drainAmount); - } - - @Override - public void givePlayerEnergy(EntityPlayer player, double joulesToGive) { - ElectricItemUtils.givePlayerEnergy(player, joulesToGive); - } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/item/MPSItemElectricTool.java b/src/main/java/net/machinemuse/powersuits/item/MPSItemElectricTool.java index 8a6ae65..0b52cba 100644 --- a/src/main/java/net/machinemuse/powersuits/item/MPSItemElectricTool.java +++ b/src/main/java/net/machinemuse/powersuits/item/MPSItemElectricTool.java @@ -4,6 +4,7 @@ import appeng.api.config.AccessRestriction; import com.google.common.collect.Sets; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import ic2.api.item.IElectricItemManager; import net.machinemuse.api.electricity.IMuseElectricItem; import net.machinemuse.api.electricity.MuseElectricItem; import net.machinemuse.numina.geometry.Colour; @@ -28,7 +29,7 @@ public class MPSItemElectricTool extends ItemTool implements IModularItemBase, I Blocks.lit_redstone_ore, Blocks.rail, Blocks.detector_rail, Blocks.golden_rail, Blocks.activator_rail); - protected MPSItemElectricTool(float damageBonus, ToolMaterial material) { + protected MPSItemElectricTool(float damageBonus, Item.ToolMaterial material) { super(damageBonus, material, blocksEffectiveOn); } @@ -71,7 +72,7 @@ public class MPSItemElectricTool extends ItemTool implements IModularItemBase, I /* Industrialcraft 2 -------------------------------------------------------------------------- */ @Override - public IMuseElectricItem getManager(ItemStack stack) { + public IElectricItemManager getManager(ItemStack stack) { return MuseElectricItem.getInstance().getManager(stack); } diff --git a/src/main/java/net/machinemuse/powersuits/item/ModeChangingModularItem.java b/src/main/java/net/machinemuse/powersuits/item/ModeChangingModularItem.java index b352a20..79eeba3 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ModeChangingModularItem.java +++ b/src/main/java/net/machinemuse/powersuits/item/ModeChangingModularItem.java @@ -1,9 +1,7 @@ //package net.machinemuse.powersuits.item; // -//import net.machinemuse.api.IPowerModule; //import net.machinemuse.api.ModuleManager; //import net.machinemuse.api.moduletrigger.IRightClickModule; -//import net.machinemuse.numina.item.IModeChangingItem; //import net.machinemuse.numina.item.NuminaItemUtils; //import net.machinemuse.numina.network.MusePacketModeChangeRequest; //import net.machinemuse.numina.network.PacketSender; @@ -11,7 +9,6 @@ //import net.minecraft.item.ItemStack; //import net.minecraft.util.IIcon; // -//import javax.annotation.Nullable; //import java.util.ArrayList; //import java.util.List; // @@ -19,91 +16,115 @@ // * Author: MachineMuse (Claire Semple) // * Created: 4:52 PM, 9/5/13 // * -// * Ported to Java by lehjr on 11/1/16. +// * Ported to Java by lehjr on 12/12/16. // */ -//public class ModeChangingModularItem implements IModeChangingItem { -// private static ModeChangingModularItem INSTANCE; +//public class ModeChangingModularItem implements IModeChangingModularItem { +// private static ModeChangingModularItem ourInstance = new ModeChangingModularItem(); // // public static ModeChangingModularItem getInstance() { -// if (INSTANCE == null) { -// INSTANCE = new ModeChangingModularItem(); -// } -// return INSTANCE; +// return ourInstance; +// } +// +// private ModeChangingModularItem() { // } // -// @Nullable // @Override -// public IIcon getModeIcon(String mode, ItemStack stack, EntityPlayer player) { -// IPowerModule module = ModuleManager.getModule(mode); -// if (module != null) -// return module.getIcon(stack); +// public void setActiveMode(ItemStack itemStack, String newMode) { +// NuminaItemUtils.getTagCompound(itemStack).setString("mode", newMode); +// } +// +// @Override +// public String getActiveMode(ItemStack itemStack, EntityPlayer player) { +// return getActiveMode(itemStack); +// } +// +// @Override +// public void cycleMode(ItemStack itemStack, EntityPlayer player, int dMode) { +// List modes = getValidModes(itemStack, player); +// if (!modes.isEmpty()) { +// int newindex = clampMode(modes.indexOf(getActiveMode(itemStack, player)) + dMode, modes.size()); +// String newmode = modes.get(newindex); +// setActiveMode(itemStack, newmode); +// PacketSender.sendToServer(new MusePacketModeChangeRequest(player,newmode, player.inventory.currentItem)); +// } +// } +// +// @Override +// public String nextMode(ItemStack itemStack, EntityPlayer player) { +// List modes = getValidModes(itemStack, player); +// if (!modes.isEmpty()) { +// int newindex = clampMode(modes.indexOf(getActiveMode(itemStack, player)) + 1, modes.size()); +// return modes.get(newindex); +// } else { +// return ""; +// } +// } +// +// @Override +// public String prevMode(ItemStack itemStack, EntityPlayer player) { +// List modes = getValidModes(itemStack, player); +// if (!modes.isEmpty()) { +// int newindex = clampMode(modes.indexOf(getActiveMode(itemStack, player)) - 1, modes.size()); +// return modes.get(newindex); +// } else { +// return ""; +// } +// } +// +// @Override +// public void cycleModeForItem(ItemStack itemStack, EntityPlayer player, int dMode) { +// if (itemStack != null) { +// this.cycleMode(itemStack, player, dMode); +// } +// } +// +// @Override +// public IIcon getModeIcon(String mode, ItemStack itemStack, EntityPlayer player) { +// if (!mode.isEmpty()) +// return ModuleManager.getModule(mode).getIcon(itemStack); // return null; // } // -// @Override -// public List getValidModes(ItemStack stack) { -// List modes = new ArrayList<>(); -// for (IRightClickModule module : ModuleManager.getRightClickModules()) { -// if (module.isValidForItem(stack)) -// if (ModuleManager.itemHasModule(stack, module.getDataName())) -// modes.add(module.getDataName()); +// +// private int clampMode(int selection, int modesSize) { +// if (selection > 0) { +// return selection % modesSize; +// } else { +// return (selection + modesSize * (-selection)) % modesSize; // } -// return modes; +// } +////------------- +// +// +// @Override +// public List getValidModes(ItemStack stack, EntityPlayer player) { +// return getValidModes(stack); // } // // @Override -// public String getActiveMode(ItemStack stack) { -// List validModes; -// String modeFromNBT = NuminaItemUtils.getTagCompound(stack).getString("mode"); -// if (!modeFromNBT.isEmpty()) +// public List getValidModes(ItemStack itemStack) { +//// List validModes = new ArrayList<>(); +//// +//// for (IRightClickModule module : ModuleManager.getRightClickModules()) { +//// if (module.isValidForItem(itemStack)) +//// if (ModuleManager.itemHasActiveModule(itemStack, module.getDataName())) +//// validModes.add(module.getDataName()); +//// } +// return ModuleManager.getValidModes(itemStack); +// } +// +// @Override +// public String getActiveMode(ItemStack itemStack) { +// String modeFromNBT = NuminaItemUtils.getTagCompound(itemStack).getString("mode"); +// if (!modeFromNBT.isEmpty()) { // return modeFromNBT; -// else { -// validModes = getValidModes(stack); -// return (!validModes.isEmpty()) ? validModes.get(0) : ""; +// } else { +// List validModes = getValidModes(itemStack); +// if (!validModes.isEmpty()) { +// return validModes.get(0); +// } else { +// return ""; +// } // } // } -// -// @Override -// public void setActiveMode(ItemStack stack, String newMode) { -// NuminaItemUtils.getTagCompound(stack).setString("mode", newMode); -// } -// -// @Override -// public void cycleMode(ItemStack stack, EntityPlayer player, int dMode) { -// List modes = this.getValidModes(stack); -// if (modes.size() > 0) { -// int newindex = clampMode(modes.indexOf(this.getActiveMode(stack)) + dMode, modes.size()); -// String newmode = (String)modes.get(newindex); -// this.setActiveMode(stack, newmode); -// PacketSender.sendToServer(new MusePacketModeChangeRequest(player, newmode, player.inventory.currentItem)); -// } -// } -// -// @Override -// public String nextMode(ItemStack stack, EntityPlayer player) { -// List modes = getValidModes(stack); -// if (modes.size() > 0) { -// int newindex = clampMode(modes.indexOf(getActiveMode(stack)) + 1, modes.size()); -// return (String)modes.get(newindex); -// } -// else { -// return ""; -// } -// } -// -// @Override -// public String prevMode(ItemStack stack, EntityPlayer player) { -// List modes = this.getValidModes(stack); -// if (modes.size() > 0) { -// int newindex = clampMode(modes.indexOf(getActiveMode(stack)) - 1, modes.size()); -// return (String)modes.get(newindex); -// } -// else { -// return ""; -// } -// } -// -// private static int clampMode(int selection, int modesSize) { -// return (selection > 0) ? (selection % modesSize) : ((selection + modesSize * -selection) % modesSize); -// } //} \ No newline at end of file diff --git a/src/main/java/net/machinemuse/powersuits/item/ModularItemBase.java b/src/main/java/net/machinemuse/powersuits/item/ModularItemBase.java index d705cf1..fccd65e 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ModularItemBase.java +++ b/src/main/java/net/machinemuse/powersuits/item/ModularItemBase.java @@ -3,8 +3,8 @@ package net.machinemuse.powersuits.item; import appeng.api.config.AccessRestriction; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import ic2.api.item.IElectricItemManager; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IMuseElectricItem; import net.machinemuse.api.electricity.MuseElectricItem; import net.machinemuse.numina.geometry.Colour; import net.machinemuse.powersuits.powermodule.misc.CosmeticGlowModule; @@ -41,35 +41,40 @@ public class ModularItemBase extends Item implements IModularItemBase { @SideOnly(Side.CLIENT) @Override - public int getColorFromItemStack(ItemStack stack, int par2) { - return getColorFromItemStack(stack).getInt(); + public int getColorFromItemStack(ItemStack itemStack, int par2) { + return getColorFromItemStack(itemStack).getInt(); } @Override - public Colour getGlowFromItemStack(ItemStack stack) { - if (!ModuleManager.itemHasActiveModule(stack, CosmeticGlowModule.MODULE_GLOW)) { + public Colour getGlowFromItemStack(ItemStack itemStack) { + if (!ModuleManager.itemHasActiveModule(itemStack, CosmeticGlowModule.MODULE_GLOW)) { return Colour.LIGHTBLUE; } - double computedred = ModuleManager.computeModularProperty(stack, CosmeticGlowModule.RED_GLOW); - double computedgreen = ModuleManager.computeModularProperty(stack, CosmeticGlowModule.GREEN_GLOW); - double computedblue = ModuleManager.computeModularProperty(stack, CosmeticGlowModule.BLUE_GLOW); + double computedred = ModuleManager.computeModularProperty(itemStack, CosmeticGlowModule.RED_GLOW); + double computedgreen = ModuleManager.computeModularProperty(itemStack, CosmeticGlowModule.GREEN_GLOW); + double computedblue = ModuleManager.computeModularProperty(itemStack, CosmeticGlowModule.BLUE_GLOW); return new Colour(clampDouble(computedred, 0, 1), clampDouble(computedgreen, 0, 1), clampDouble(computedblue, 0, 1), 0.8); } @Override - public Colour getColorFromItemStack(ItemStack stack) { - if (!ModuleManager.itemHasActiveModule(stack, TintModule.MODULE_TINT)) { + public Colour getColorFromItemStack(ItemStack itemStack) { + if (!ModuleManager.itemHasActiveModule(itemStack, TintModule.MODULE_TINT)) { return Colour.WHITE; } - double computedred = ModuleManager.computeModularProperty(stack, TintModule.RED_TINT); - double computedgreen = ModuleManager.computeModularProperty(stack, TintModule.GREEN_TINT); - double computedblue = ModuleManager.computeModularProperty(stack, TintModule.BLUE_TINT); + double computedred = ModuleManager.computeModularProperty(itemStack, TintModule.RED_TINT); + double computedgreen = ModuleManager.computeModularProperty(itemStack, TintModule.GREEN_TINT); + double computedblue = ModuleManager.computeModularProperty(itemStack, TintModule.BLUE_TINT); return new Colour(clampDouble(computedred, 0, 1), clampDouble(computedgreen, 0, 1), clampDouble(computedblue, 0, 1), 1.0F); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List currentTipList, boolean advancedToolTips) { - MuseCommonStrings.addInformation(stack, player, currentTipList, advancedToolTips); + public boolean requiresMultipleRenderPasses() { + return false; + } + + @Override + public void addInformation(ItemStack itemStack, EntityPlayer player, List currentTipList, boolean advancedToolTips) { + MuseCommonStrings.addInformation(itemStack, player, currentTipList, advancedToolTips); } @Override @@ -81,18 +86,18 @@ public class ModularItemBase extends Item implements IModularItemBase { /* IModularItem ------------------------------------------------------------------------------- */ @SideOnly(Side.CLIENT) @Override - public List getLongInfo(EntityPlayer player, ItemStack stack) { + public List getLongInfo(EntityPlayer player, ItemStack itemStack) { List info = new ArrayList<>(); info.add("Detailed Summary"); - info.add(formatInfo("Armor", getArmorDouble(player, stack))); - info.add(formatInfo("Energy Storage", getCurrentEnergy(stack)) + 'J'); - info.add(formatInfo("Weight", MuseCommonStrings.getTotalWeight(stack)) + 'g'); + info.add(formatInfo("Armor", getArmorDouble(player, itemStack))); + info.add(formatInfo("Energy Storage", getCurrentEnergy(itemStack)) + 'J'); + info.add(formatInfo("Weight", MuseCommonStrings.getTotalWeight(itemStack)) + 'g'); return info; } @Override - public double getArmorDouble(EntityPlayer player, ItemStack stack) { + public double getArmorDouble(EntityPlayer player, ItemStack itemStack) { return 0; } @@ -114,28 +119,33 @@ public class ModularItemBase extends Item implements IModularItemBase { /* MuseElectricItem --------------------------------------------------------------------------- */ @Override - public double getCurrentEnergy(ItemStack stack) { - return MuseElectricItem.getInstance().getCurrentEnergy(stack); + public double getCurrentEnergy(ItemStack itemStack) { + return MuseElectricItem.getInstance().getCurrentEnergy(itemStack); } @Override - public double getMaxEnergy(ItemStack stack) { - return MuseElectricItem.getInstance().getCurrentEnergy(stack); + public double getMaxEnergy(ItemStack itemStack) { + return MuseElectricItem.getInstance().getCurrentEnergy(itemStack); } @Override - public void setCurrentEnergy(ItemStack stack, double energy) { - MuseElectricItem.getInstance().setCurrentEnergy(stack, energy); + public void setCurrentEnergy(ItemStack itemStack, double energy) { + MuseElectricItem.getInstance().setCurrentEnergy(itemStack, energy); } @Override - public double drainEnergyFrom(ItemStack stack, double requested) { - return MuseElectricItem.getInstance().drainEnergyFrom(stack, requested); + public double drainEnergyFrom(ItemStack itemStack, double requested) { + return MuseElectricItem.getInstance().drainEnergyFrom(itemStack, requested); } @Override - public double giveEnergyTo(ItemStack stack, double provided) { - return MuseElectricItem.getInstance().giveEnergyTo(stack, provided); + public double giveEnergyTo(ItemStack itemStack, double provided) { + return MuseElectricItem.getInstance().giveEnergyTo(itemStack, provided); + } + + @Override + public int getMaxDamage(ItemStack itemStack) { + return 0; } @SideOnly(Side.CLIENT) @@ -144,30 +154,21 @@ public class ModularItemBase extends Item implements IModularItemBase { return itemStack.getTooltip(Minecraft.getMinecraft().thePlayer, false).toString(); } + /* Industrialcraft 2 -------------------------------------------------------------------------- */ - @Override - public IMuseElectricItem getManager(ItemStack stack) { - return MuseElectricItem.getInstance().getManager(stack); - } - - @Override - public void chargeFromArmor(ItemStack itemStack, EntityLivingBase entity) { - MuseElectricItem.getInstance().chargeFromArmor(itemStack, entity); - } - - @Override - public boolean use(ItemStack itemStack, double amount, EntityLivingBase entity) { - return MuseElectricItem.getInstance().use(itemStack, amount, entity); - } - @Override public boolean canProvideEnergy(ItemStack itemStack) { return MuseElectricItem.getInstance().canProvideEnergy(itemStack); } @Override - public double getCharge(ItemStack itemStack) { - return MuseElectricItem.getInstance().getCharge(itemStack); + public Item getChargedItem(ItemStack itemStack) { + return MuseElectricItem.getInstance().getChargedItem(itemStack); + } + + @Override + public Item getEmptyItem(ItemStack itemStack) { + return MuseElectricItem.getInstance().getEmptyItem(itemStack); } @Override @@ -195,67 +196,78 @@ public class ModularItemBase extends Item implements IModularItemBase { return MuseElectricItem.getInstance().discharge(itemStack, amount, tier, ignoreTransferLimit, externally, simulate); } + @Override + public double getCharge(ItemStack itemStack) { + return MuseElectricItem.getInstance().getCharge(itemStack); + } + @Override public boolean canUse(ItemStack itemStack, double amount) { return MuseElectricItem.getInstance().canUse(itemStack, amount); } @Override - public Item getChargedItem(ItemStack itemStack) { - return MuseElectricItem.getInstance().getChargedItem(itemStack); + public boolean use(ItemStack itemStack, double amount, EntityLivingBase entity) { + return MuseElectricItem.getInstance().use(itemStack, amount, entity); } @Override - public Item getEmptyItem(ItemStack itemStack) { - return MuseElectricItem.getInstance().getEmptyItem(itemStack); + public void chargeFromArmor(ItemStack itemStack, EntityLivingBase entity) { + MuseElectricItem.getInstance().chargeFromArmor(itemStack, entity); + } + + + @Override + public IElectricItemManager getManager(ItemStack itemStack) { + return MuseElectricItem.getInstance().getManager(itemStack); } /* Thermal Expansion -------------------------------------------------------------------------- */ @Override - public int receiveEnergy(ItemStack stack, int energy, boolean simulate) { - return MuseElectricItem.getInstance().receiveEnergy(stack, energy, simulate); + public int receiveEnergy(ItemStack itemStack, int energy, boolean simulate) { + return MuseElectricItem.getInstance().receiveEnergy(itemStack, energy, simulate); } @Override - public int extractEnergy(ItemStack stack, int energy, boolean simulate) { - return MuseElectricItem.getInstance().extractEnergy(stack, energy, simulate); + public int extractEnergy(ItemStack itemStack, int energy, boolean simulate) { + return MuseElectricItem.getInstance().extractEnergy(itemStack, energy, simulate); } @Override - public int getEnergyStored(ItemStack theItem) { - return MuseElectricItem.getInstance().getEnergyStored(theItem); + public int getEnergyStored(ItemStack itemStack) { + return MuseElectricItem.getInstance().getEnergyStored(itemStack); } @Override - public int getMaxEnergyStored(ItemStack theItem) { - return MuseElectricItem.getInstance().getMaxEnergyStored(theItem); + public int getMaxEnergyStored(ItemStack itemStack) { + return MuseElectricItem.getInstance().getMaxEnergyStored(itemStack); } /* Applied Energistics 2 ---------------------------------------------------------------------- */ @Override - public double injectAEPower(ItemStack stack, double ae) { - return MuseElectricItem.getInstance().injectAEPower(stack, ae); + public double injectAEPower(ItemStack itemStack, double ae) { + return MuseElectricItem.getInstance().injectAEPower(itemStack, ae); } @Override - public double extractAEPower(ItemStack stack, double ae) { - return MuseElectricItem.getInstance().extractAEPower(stack, ae); + public double extractAEPower(ItemStack itemStack, double ae) { + return MuseElectricItem.getInstance().extractAEPower(itemStack, ae); } @Override - public double getAEMaxPower(ItemStack stack) { - return MuseElectricItem.getInstance().getAEMaxPower(stack); + public double getAEMaxPower(ItemStack itemStack) { + return MuseElectricItem.getInstance().getAEMaxPower(itemStack); } @Override - public double getAECurrentPower(ItemStack stack) { - return MuseElectricItem.getInstance().getAECurrentPower(stack); + public double getAECurrentPower(ItemStack itemStack) { + return MuseElectricItem.getInstance().getAECurrentPower(itemStack); } @Override - public AccessRestriction getPowerFlow(ItemStack stack) { - return MuseElectricItem.getInstance().getPowerFlow(stack); + public AccessRestriction getPowerFlow(ItemStack itemStack) { + return MuseElectricItem.getInstance().getPowerFlow(itemStack); } } diff --git a/src/main/java/net/machinemuse/powersuits/network/packets/MPSPacketList.java b/src/main/java/net/machinemuse/powersuits/network/packets/MPSPacketList.java index a3c5835..74b23e7 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MPSPacketList.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MPSPacketList.java @@ -25,4 +25,4 @@ public class MPSPacketList { MusePacketHandler.packagers.put(10, MusePacketColourInfo.getPackagerInstance()); MusePacketHandler.packagers.put(11, MusePacketPropertyModifierConfig.getPackagerInstance()); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketColourInfo.java b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketColourInfo.java index 5ddedd4..7a91b22 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketColourInfo.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketColourInfo.java @@ -1,10 +1,11 @@ package net.machinemuse.powersuits.network.packets; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.numina.network.MusePackager; import net.machinemuse.numina.network.MusePacket; import net.machinemuse.utils.MuseItemUtils; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -39,7 +40,7 @@ public class MusePacketColourInfo extends MusePacket { } @Override - public void handleServer(EntityPlayer player) { + public void handleServer(EntityPlayerMP player) { ItemStack stack = player.inventory.getStackInSlot(itemSlot); if (stack != null && stack.getItem() instanceof IModularItem) { NBTTagCompound renderTag = MuseItemUtils.getMuseRenderTag(stack); diff --git a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketCosmeticInfo.java b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketCosmeticInfo.java index ba79828..cd60d93 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketCosmeticInfo.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketCosmeticInfo.java @@ -1,11 +1,12 @@ package net.machinemuse.powersuits.network.packets; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.numina.general.MuseLogger; import net.machinemuse.numina.network.MusePackager; import net.machinemuse.numina.network.MusePacket; import net.machinemuse.utils.MuseItemUtils; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -43,7 +44,7 @@ public class MusePacketCosmeticInfo extends MusePacket { } @Override - public void handleServer(EntityPlayer player) { + public void handleServer(EntityPlayerMP player) { ItemStack stack = player.inventory.getStackInSlot(itemSlot); if (tagName != null && stack != null && stack.getItem() instanceof IModularItem) { NBTTagCompound itemTag = MuseItemUtils.getMuseItemTag(stack); diff --git a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketInstallModuleRequest.java b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketInstallModuleRequest.java index 375dc20..321b5dd 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketInstallModuleRequest.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketInstallModuleRequest.java @@ -49,7 +49,7 @@ public class MusePacketInstallModuleRequest extends MusePacket { } @Override - public void handleServer(EntityPlayer player) { + public void handleServer(EntityPlayerMP player) { ItemStack stack = player.inventory.getStackInSlot(itemSlot); if (moduleName != null) { InventoryPlayer inventory = player.inventory; diff --git a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPlasmaBolt.java b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPlasmaBolt.java index 3f91d4f..e4cdcb3 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPlasmaBolt.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPlasmaBolt.java @@ -46,7 +46,7 @@ public class MusePacketPlasmaBolt extends MusePacket { EntityPlasmaBolt entity = (EntityPlasmaBolt) Minecraft.getMinecraft().theWorld.getEntityByID(entityID); entity.size = this.size; } - catch (Exception e){ + catch (Exception ignored){ } } diff --git a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPlayerUpdate.java b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPlayerUpdate.java index c14c780..dd4394b 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPlayerUpdate.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPlayerUpdate.java @@ -5,6 +5,7 @@ import net.machinemuse.numina.network.MusePacket; import net.machinemuse.numina.network.PacketSender; import net.machinemuse.powersuits.control.PlayerInputMap; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import java.io.DataInputStream; @@ -35,7 +36,7 @@ public class MusePacketPlayerUpdate extends MusePacket { } @Override - public void handleServer(EntityPlayer player) { + public void handleServer(EntityPlayerMP player) { MusePacketPlayerUpdate updatePacket = new MusePacketPlayerUpdate(player, inputMap); player.motionX = inputMap.motionX; player.motionY = inputMap.motionY; diff --git a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPropertyModifierConfig.java b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPropertyModifierConfig.java index 9e67ab5..b236fd9 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPropertyModifierConfig.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPropertyModifierConfig.java @@ -9,7 +9,6 @@ import net.machinemuse.numina.network.MusePackager; import net.machinemuse.numina.network.MusePacket; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.powersuits.powermodule.PropertyModifierFlatAdditive; -import net.machinemuse.powersuits.powermodule.PropertyModifierIntLinearAdditive; import net.machinemuse.powersuits.powermodule.PropertyModifierLinearAdditive; import net.minecraft.entity.player.EntityPlayer; @@ -44,20 +43,16 @@ public class MusePacketPropertyModifierConfig extends MusePacket { writeString(module.getDataName()); writeBoolean(module.isAllowed()); writeInt(module.getPropertyModifiers().size()); - Map> propertyMap = module.getPropertyModifiers(); - - for (String propname : propertyMap.keySet()) { - List propmodlist = propertyMap.get(propname); - writeString(propname); + for (Map.Entry> entry: module.getPropertyModifiers().entrySet()) { + writeString(entry.getKey()); // propertyName + List propmodlist = entry.getValue(); writeInt(propmodlist.size()); - for (IPropertyModifier propmod : propmodlist) { if (propmod instanceof PropertyModifierFlatAdditive) writeDouble(((PropertyModifierFlatAdditive) propmod).valueAdded); - else if (propmod instanceof PropertyModifierIntLinearAdditive) - writeDouble(((PropertyModifierIntLinearAdditive) propmod).multiplier); - else - writeDouble(0); + else if (propmod instanceof PropertyModifierLinearAdditive) + writeDouble(((PropertyModifierLinearAdditive) propmod).multiplier); + else writeDouble(0); } } } @@ -79,21 +74,18 @@ public class MusePacketPropertyModifierConfig extends MusePacket { IPowerModule module = ModuleManager.getModule(moduleName); if (module instanceof PowerModuleBase) ((PowerModuleBase) module).setIsAllowed(allowed); - int numProps = d.readInt(data); for (int j = 0; j < numProps; j++ ) { String propName = d.readString(data); int numModifiers = d.readInt(data); List proplist = module.getPropertyModifiers().get(propName); - for (int m = 0; m < numModifiers; m++) { IPropertyModifier propMod = proplist.get(m); if (propMod instanceof PropertyModifierFlatAdditive) ((PropertyModifierFlatAdditive) propMod).valueAdded = d.readDouble(data); else if (propMod instanceof PropertyModifierLinearAdditive) ((PropertyModifierLinearAdditive) propMod).multiplier = d.readDouble(data); - else - d.readDouble(data); + else d.readDouble(data); } } } diff --git a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketSalvageModuleRequest.java b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketSalvageModuleRequest.java index dcd680a..fc6c78e 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketSalvageModuleRequest.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketSalvageModuleRequest.java @@ -50,7 +50,7 @@ public class MusePacketSalvageModuleRequest extends MusePacket { } @Override - public void handleServer(EntityPlayer player) { + public void handleServer(EntityPlayerMP player) { if (moduleName != null) { InventoryPlayer inventory = player.inventory; ItemStack stack = player.inventory.getStackInSlot(itemSlot); diff --git a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketToggleRequest.java b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketToggleRequest.java index 906999a..af9568d 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketToggleRequest.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketToggleRequest.java @@ -4,6 +4,7 @@ import net.machinemuse.numina.network.MusePackager; import net.machinemuse.numina.network.MusePacket; import net.machinemuse.utils.MuseItemUtils; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import java.io.DataInputStream; @@ -35,7 +36,7 @@ public class MusePacketToggleRequest extends MusePacket{ } @Override - public void handleServer(EntityPlayer player) { + public void handleServer(EntityPlayerMP player) { MuseItemUtils.toggleModuleForPlayer(player, module, active); } diff --git a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketTweakRequest.java b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketTweakRequest.java index ccc145c..6d1adce 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketTweakRequest.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketTweakRequest.java @@ -6,6 +6,7 @@ import net.machinemuse.numina.network.MusePackager; import net.machinemuse.numina.network.MusePacket; import net.machinemuse.utils.MuseItemUtils; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -50,7 +51,7 @@ public class MusePacketTweakRequest extends MusePacket { } @Override - public void handleServer(EntityPlayer player) { + public void handleServer(EntityPlayerMP player) { if (moduleName != null && tweakName != null) { ItemStack stack = player.inventory.getStackInSlot(itemSlot); NBTTagCompound itemTag = MuseItemUtils.getMuseItemTag(stack); @@ -78,4 +79,4 @@ public class MusePacketTweakRequest extends MusePacket { return new MusePacketTweakRequest(player, itemSlot, moduleName, tweakName, tweakValue); } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/PowerModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/PowerModule.java index d9ddc5d..cbc5a15 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/PowerModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/PowerModule.java @@ -1,14 +1,14 @@ package net.machinemuse.powersuits.powermodule; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import java.util.List; public class PowerModule extends PowerModuleBase { - protected final String name; + protected String name; protected String description; protected String category; - protected final String textureFile; + protected String textureFile; public PowerModule(String name, List validItems, String textureFile, String category) { super(name, validItems); diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/PowerModuleBase.java b/src/main/java/net/machinemuse/powersuits/powermodule/PowerModuleBase.java index c60b9bf..eed8c68 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/PowerModuleBase.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/PowerModuleBase.java @@ -4,7 +4,7 @@ import net.machinemuse.api.ILocalizeableModule; import net.machinemuse.api.IPowerModule; import net.machinemuse.api.IPropertyModifier; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.general.gui.MuseIcon; import net.machinemuse.numina.render.MuseTextureUtils; import net.machinemuse.powersuits.common.Config; @@ -22,7 +22,7 @@ public abstract class PowerModuleBase implements ILocalizeableModule { protected List defaultInstallCost; protected List validItems; protected Map> propertyModifiers; - protected static Map units = new HashMap<>(); + protected static Map units = new HashMap(); protected NBTTagCompound defaultTag; protected boolean isAllowed; protected IIcon icon; @@ -180,4 +180,4 @@ public abstract class PowerModuleBase implements ILocalizeableModule { public String getUnlocalizedName() { return "Unknown Module"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/PropertyModifierLinearAdditive.java b/src/main/java/net/machinemuse/powersuits/powermodule/PropertyModifierLinearAdditive.java index 6f6f6cb..fcdfa29 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/PropertyModifierLinearAdditive.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/PropertyModifierLinearAdditive.java @@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound; public class PropertyModifierLinearAdditive implements IPropertyModifier { public double multiplier; - public final String tradeoffName; + public String tradeoffName; public PropertyModifierLinearAdditive(String tradeoffName, double multiplier) { this.multiplier = multiplier; @@ -21,4 +21,4 @@ public class PropertyModifierLinearAdditive implements IPropertyModifier { public String getTradeoffName() { return tradeoffName; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/RightClickPowerModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/RightClickPowerModule.java index f81d3eb..dd52a42 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/RightClickPowerModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/RightClickPowerModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -30,4 +30,4 @@ public class RightClickPowerModule extends PowerModule implements IRightClickMod @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/ToggleablePowerModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/ToggleablePowerModule.java index e9b4008..523d702 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/ToggleablePowerModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/ToggleablePowerModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IToggleableModule; import java.util.List; @@ -9,4 +9,4 @@ public class ToggleablePowerModule extends PowerModule implements IToggleableMod public ToggleablePowerModule(String name, List validItems, String textureFile, String category) { super(name, validItems, textureFile, category); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/armor/ApiaristArmorModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/armor/ApiaristArmorModule.java index 187aadc..f976a99 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/armor/ApiaristArmorModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/armor/ApiaristArmorModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.armor; import cpw.mods.fml.common.registry.GameRegistry; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; import net.minecraft.item.ItemStack; @@ -48,4 +48,4 @@ public class ApiaristArmorModule extends PowerModuleBase { public String getTextureFile() { return "silkWisp"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/armor/BasicPlatingModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/armor/BasicPlatingModule.java index f607ca3..61bf509 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/armor/BasicPlatingModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/armor/BasicPlatingModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.armor; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; @@ -41,4 +41,4 @@ public class BasicPlatingModule extends PowerModuleBase { public String getDescription() { return "Basic plating is heavy but protective."; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/armor/DiamondPlatingModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/armor/DiamondPlatingModule.java index 8f3e3e6..ea62448 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/armor/DiamondPlatingModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/armor/DiamondPlatingModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.armor; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; @@ -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."; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/armor/EnergyShieldModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/armor/EnergyShieldModule.java index 398511d..52af6f0 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/armor/EnergyShieldModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/armor/EnergyShieldModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.armor; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; @@ -41,4 +41,4 @@ public class EnergyShieldModule extends PowerModuleBase { public String getDescription() { return "Energy shields are much lighter than plating, but consume energy."; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/armor/HazmatModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/armor/HazmatModule.java index 58c0d18..a733f2f 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/armor/HazmatModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/armor/HazmatModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.armor; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; @@ -39,4 +39,4 @@ public class HazmatModule extends PowerModuleBase { public String getTextureFile() { return "greenstar"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/armor/HeatSinkModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/armor/HeatSinkModule.java index 701cdfb..56fac1b 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/armor/HeatSinkModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/armor/HeatSinkModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.armor; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; @@ -43,4 +43,4 @@ public class HeatSinkModule extends PowerModuleBase { public String getTextureFile() { return "heatresistantplating2"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/armor/MechanicalAssistance.java b/src/main/java/net/machinemuse/powersuits/powermodule/armor/MechanicalAssistance.java index 5d9c1a2..986e865 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/armor/MechanicalAssistance.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/armor/MechanicalAssistance.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.armor; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -66,4 +66,4 @@ public class MechanicalAssistance extends PowerModuleBase implements IPlayerTick @Override public void onPlayerTickInactive(EntityPlayer player, ItemStack item) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/armor/NitrogenCoolingSystem.java b/src/main/java/net/machinemuse/powersuits/powermodule/armor/NitrogenCoolingSystem.java index ff94889..eedff2c 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/armor/NitrogenCoolingSystem.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/armor/NitrogenCoolingSystem.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.armor; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -71,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."; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/armor/WaterTankModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/armor/WaterTankModule.java index 1d3187f..383d1b6 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/armor/WaterTankModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/armor/WaterTankModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.armor; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -26,7 +26,7 @@ public class WaterTankModule extends PowerModuleBase implements IPlayerTickModul public static final String MODULE_WATER_TANK = "Water Tank"; public static final String WATER_TANK_SIZE = "Tank Size"; public static final String ACTIVATION_PERCENT = "Heat Activation Percent"; - final ItemStack bucketWater = new ItemStack(Items.water_bucket); + ItemStack bucketWater = new ItemStack(Items.water_bucket); public WaterTankModule(List validItems) { super(validItems); @@ -103,4 +103,4 @@ public class WaterTankModule extends PowerModuleBase implements IPlayerTickModul @Override public void onPlayerTickInactive(EntityPlayer player, ItemStack item) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/energy/AdvancedBatteryModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/energy/AdvancedBatteryModule.java index 79849cc..96f3e58 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/energy/AdvancedBatteryModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/energy/AdvancedBatteryModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.energy; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.electricity.ElectricConversions; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.ElectricItemUtils; @@ -47,4 +47,4 @@ public class AdvancedBatteryModule extends PowerModuleBase { public String getDescription() { return "Integrate a more advanced battery to store more energy."; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/energy/AdvancedSolarGenerator.java b/src/main/java/net/machinemuse/powersuits/powermodule/energy/AdvancedSolarGenerator.java index e37e401..49d5812 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/energy/AdvancedSolarGenerator.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/energy/AdvancedSolarGenerator.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.energy; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -93,4 +93,4 @@ public class AdvancedSolarGenerator extends PowerModuleBase implements IPlayerTi @Override public void onPlayerTickInactive(EntityPlayer player, ItemStack item) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/energy/BasicBatteryModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/energy/BasicBatteryModule.java index dddca35..dcfe74a 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/energy/BasicBatteryModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/energy/BasicBatteryModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.energy; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.electricity.ElectricConversions; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.ElectricItemUtils; @@ -47,4 +47,4 @@ public class BasicBatteryModule extends PowerModuleBase { public String getDescription() { return "Integrate a battery to allow the item to store energy."; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/energy/CoalGenerator.java b/src/main/java/net/machinemuse/powersuits/powermodule/energy/CoalGenerator.java index e7109f1..d7260e5 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/energy/CoalGenerator.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/energy/CoalGenerator.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.energy; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -89,4 +89,4 @@ public class CoalGenerator extends PowerModuleBase implements IPlayerTickModule, public String getDescription() { return "Generate power with solid fuels"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/energy/EliteBatteryModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/energy/EliteBatteryModule.java index 86e83ed..49ab4fd 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/energy/EliteBatteryModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/energy/EliteBatteryModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.energy; import net.machinemuse.api.electricity.ElectricConversions; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.ElectricItemUtils; @@ -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."; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/energy/KineticGeneratorModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/energy/KineticGeneratorModule.java index d77b588..43a642e 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/energy/KineticGeneratorModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/energy/KineticGeneratorModule.java @@ -2,7 +2,7 @@ package net.machinemuse.powersuits.powermodule.energy; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -85,4 +85,4 @@ public class KineticGeneratorModule extends PowerModuleBase implements IPlayerTi @Override public void onPlayerTickInactive(EntityPlayer player, ItemStack item) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/energy/SolarGeneratorModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/energy/SolarGeneratorModule.java index 5a2c370..504c65f 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/energy/SolarGeneratorModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/energy/SolarGeneratorModule.java @@ -1,8 +1,8 @@ package net.machinemuse.powersuits.powermodule.energy; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -82,4 +82,4 @@ public class SolarGeneratorModule extends PowerModuleBase implements IPlayerTick @Override public void onPlayerTickInactive(EntityPlayer player, ItemStack item) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/energy/ThermalGeneratorModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/energy/ThermalGeneratorModule.java index e9ef515..91cded4 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/energy/ThermalGeneratorModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/energy/ThermalGeneratorModule.java @@ -1,8 +1,8 @@ package net.machinemuse.powersuits.powermodule.energy; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/AirtightSealModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/AirtightSealModule.java index 1ce7adc..d0edb68 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/AirtightSealModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/AirtightSealModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.misc; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; import net.minecraft.init.Blocks; @@ -40,4 +40,4 @@ public class AirtightSealModule extends PowerModuleBase { public String getTextureFile() { return "glasspane"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/AutoFeederModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/AutoFeederModule.java index c9e0cb4..bb68e70 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/AutoFeederModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/AutoFeederModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.misc; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.common.Config; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/BinocularsModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/BinocularsModule.java index 15cf872..1b2a771 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/BinocularsModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/BinocularsModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.misc; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/CitizenJoeStyle.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/CitizenJoeStyle.java index e0f9f66..c78e624 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/CitizenJoeStyle.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/CitizenJoeStyle.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.misc; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; @@ -36,4 +36,4 @@ public class CitizenJoeStyle extends PowerModuleBase { public String getDescription() { return "An alternative armor texture, c/o CitizenJoe of IC2 forums."; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/ClockModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/ClockModule.java index 6ddaa1d..4ec1677 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/ClockModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/ClockModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.misc; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -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."; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/CompassModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/CompassModule.java index 5c1945b..d3b2d65 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/CompassModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/CompassModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.misc; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -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."; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/CoolingSystemModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/CoolingSystemModule.java index 6f36ebb..bd0ab97 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/CoolingSystemModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/CoolingSystemModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.misc; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -64,4 +64,4 @@ public class CoolingSystemModule extends PowerModuleBase implements IPlayerTickM @Override public void onPlayerTickInactive(EntityPlayer player, ItemStack item) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/CosmeticGlowModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/CosmeticGlowModule.java index 0c87e8c..4ad4866 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/CosmeticGlowModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/CosmeticGlowModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.misc; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; @@ -47,4 +47,4 @@ public class CosmeticGlowModule extends PowerModuleBase { public String getTextureFile() { return "netherstar"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/InPlaceAssemblerModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/InPlaceAssemblerModule.java index 8b800d6..22b3be3 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/InPlaceAssemblerModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/InPlaceAssemblerModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.misc; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.common.ModularPowersuits; import net.machinemuse.powersuits.item.ItemComponent; @@ -67,4 +67,4 @@ public class InPlaceAssemblerModule extends PowerModuleBase implements IRightCli @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/InvisibilityModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/InvisibilityModule.java index cdf6149..b2f055c 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/InvisibilityModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/InvisibilityModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.misc; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -80,4 +80,4 @@ public class InvisibilityModule extends PowerModuleBase implements IPlayerTickMo public String getTextureFile() { return "bluedrone"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/MagnetModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/MagnetModule.java index 1297556..14513d3 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/MagnetModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/MagnetModule.java @@ -3,8 +3,8 @@ package net.machinemuse.powersuits.powermodule.misc; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/MobRepulsorModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/MobRepulsorModule.java index 9fdd0f5..aaed913 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/MobRepulsorModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/MobRepulsorModule.java @@ -1,8 +1,8 @@ package net.machinemuse.powersuits.powermodule.misc; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -133,4 +133,4 @@ public class MobRepulsorModule extends PowerModuleBase implements IPlayerTickMod } } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/NightVisionModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/NightVisionModule.java index 15baa21..c484349 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/NightVisionModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/NightVisionModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.misc; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -79,4 +79,4 @@ public class NightVisionModule extends PowerModuleBase implements IPlayerTickMod public String getTextureFile() { return "nightvision"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/ThaumGogglesModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/ThaumGogglesModule.java index 5c1b8c9..1d04291 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/ThaumGogglesModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/ThaumGogglesModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.misc; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -50,4 +50,4 @@ public class ThaumGogglesModule extends PowerModuleBase implements IToggleableMo public String getTextureFile() { return "bluestar"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/TintModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/TintModule.java index 4fdc6d1..64942fb 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/TintModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/TintModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.misc; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; @@ -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."; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/TransparentArmorModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/TransparentArmorModule.java index 3cc305a..62af9c2 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/TransparentArmorModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/TransparentArmorModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.misc; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; @@ -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."; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/WaterElectrolyzerModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/WaterElectrolyzerModule.java index 8b899c8..10b1513 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/WaterElectrolyzerModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/WaterElectrolyzerModule.java @@ -2,8 +2,8 @@ package net.machinemuse.powersuits.powermodule.misc; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.general.sound.SoundDictionary; @@ -71,4 +71,4 @@ public class WaterElectrolyzerModule extends PowerModuleBase implements IPlayerT public String getTextureFile() { return "waterelectrolyzer"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/BlinkDriveModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/BlinkDriveModule.java index b6a537d..b27869e 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/BlinkDriveModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/BlinkDriveModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.movement; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.numina.player.NuminaPlayerUtils; import net.machinemuse.powersuits.item.ItemComponent; @@ -85,4 +85,4 @@ public class BlinkDriveModule extends PowerModuleBase implements IRightClickModu @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/ClimbAssistModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/ClimbAssistModule.java index e996d2f..f30df30 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/ClimbAssistModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/ClimbAssistModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.movement; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -56,4 +56,4 @@ public class ClimbAssistModule extends PowerModuleBase implements IToggleableMod // TODO Auto-generated method stub return "climbassist"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/FlightControlModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/FlightControlModule.java index 3e0a11a..6d4d2a8 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/FlightControlModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/FlightControlModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.movement; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/GliderModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/GliderModule.java index b1c8576..6b6d7c6 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/GliderModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/GliderModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.movement; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.numina.player.NuminaPlayerUtils; @@ -79,4 +79,4 @@ public class GliderModule extends PowerModuleBase implements IToggleableModule, @Override public void onPlayerTickInactive(EntityPlayer player, ItemStack item) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetBootsModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetBootsModule.java index 3788c34..8efc082 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetBootsModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetBootsModule.java @@ -2,8 +2,8 @@ package net.machinemuse.powersuits.powermodule.movement; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.general.sound.SoundDictionary; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetPackModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetPackModule.java index d15d1b4..a5be879 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetPackModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/JetPackModule.java @@ -2,8 +2,8 @@ package net.machinemuse.powersuits.powermodule.movement; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.general.sound.SoundDictionary; @@ -106,4 +106,4 @@ public class JetPackModule extends PowerModuleBase implements IToggleableModule, public String getTextureFile() { return "jetpack"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/JumpAssistModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/JumpAssistModule.java index e79f0a4..b1dadd1 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/JumpAssistModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/JumpAssistModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.movement; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.numina.player.NuminaPlayerUtils; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/ParachuteModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/ParachuteModule.java index 67b3f8d..02f287b 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/ParachuteModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/ParachuteModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.movement; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.numina.player.NuminaPlayerUtils; @@ -73,4 +73,4 @@ public class ParachuteModule extends PowerModuleBase implements IToggleableModul public String getTextureFile() { return "parachute"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/ShockAbsorberModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/ShockAbsorberModule.java index 26067d3..d62acb7 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/ShockAbsorberModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/ShockAbsorberModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.movement; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -46,4 +46,4 @@ public class ShockAbsorberModule extends PowerModuleBase implements IToggleableM public String getTextureFile() { return "shockabsorber"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/SprintAssistModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/SprintAssistModule.java index 43e3508..e11bb5d 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/SprintAssistModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/SprintAssistModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.movement; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/SwimAssistModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/SwimAssistModule.java index 5c5d796..ccfbfb5 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/SwimAssistModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/SwimAssistModule.java @@ -2,8 +2,8 @@ package net.machinemuse.powersuits.powermodule.movement; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.general.sound.SoundDictionary; @@ -107,4 +107,4 @@ public class SwimAssistModule extends PowerModuleBase implements IToggleableModu public String getTextureFile() { return "swimboost"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AOEPickUpgradeModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AOEPickUpgradeModule.java index d6a6208..acd5850 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AOEPickUpgradeModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AOEPickUpgradeModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.tool; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -22,6 +22,7 @@ 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 validItems) { super(validItems); addInstallCost(MuseItemUtils.copyAndResize(ItemComponent.solenoid, 1)); @@ -67,4 +68,4 @@ public class AOEPickUpgradeModule extends PowerModuleBase implements IBlockBreak @Override public void handleBreakSpeed(PlayerEvent.BreakSpeed breakSpeed) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessFluidModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessFluidModule.java index 40252ab..0cb0956 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessFluidModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessFluidModule.java @@ -2,7 +2,7 @@ package net.machinemuse.powersuits.powermodule.tool; import com.google.common.base.Optional; import extracells.api.ECApi; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -79,4 +79,4 @@ public class AppEngWirelessFluidModule extends PowerModuleBase implements IRight @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessModule.java index ad5007f..1509a83 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessModule.java @@ -2,7 +2,7 @@ package net.machinemuse.powersuits.powermodule.tool; import appeng.api.AEApi; import com.google.common.base.Optional; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -73,4 +73,4 @@ public class AppEngWirelessModule extends PowerModuleBase implements IRightClick @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AquaAffinityModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AquaAffinityModule.java index 5ec0889..d9f76fc 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AquaAffinityModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AquaAffinityModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.tool; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -80,4 +80,4 @@ public class AquaAffinityModule extends PowerModuleBase implements IBlockBreakin public String getTextureFile() { return "aquaaffinity"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AxeModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AxeModule.java index 29bce66..4f7d19b 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AxeModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AxeModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.tool; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -109,4 +109,4 @@ public class AxeModule extends PowerModuleBase implements IBlockBreakingModule, public void handleBreakSpeed(BreakSpeed event) { event.newSpeed *= ModuleManager.computeModularProperty(event.entityPlayer.getCurrentEquippedItem(), AXE_HARVEST_SPEED); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselGetter1.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselGetter1.java deleted file mode 100644 index aa4366f..0000000 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselGetter1.java +++ /dev/null @@ -1,12 +0,0 @@ -//package net.machinemuse.powersuits.powermodule.tool; -// -//import net.minecraft.item.Item; -// -///** -// * Created by Claire on 8/29/2015. -// */ -//public class ChiselGetter1 { -// public static Item getChisel() { -// return com.cricketcraft.chisel.init.ChiselItems.obsidianChisel; -// } -//} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselGetter2.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselGetter2.java index 464d442..da72883 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselGetter2.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselGetter2.java @@ -9,4 +9,4 @@ public class ChiselGetter2 { public static Item getChisel() { return team.chisel.init.ChiselItems.obsidianChisel; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselModule.java index d9b21e5..290dcef 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselModule.java @@ -1,8 +1,8 @@ package net.machinemuse.powersuits.powermodule.tool; import cpw.mods.fml.common.registry.GameRegistry; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.numina.general.MuseLogger; @@ -37,15 +37,11 @@ public class ChiselModule extends PowerModuleBase implements IBlockBreakingModul addTradeoffProperty("Overclock", CHISEL_ENERGY_CONSUMPTION, 950); addTradeoffProperty("Overclock", CHISEL_HARVEST_SPEED, 22); -// try { -// ITEM_CHISEL = ChiselGetter1.getChisel(); -// } catch (NoClassDefFoundError e) { - try { - ITEM_CHISEL = ChiselGetter2.getChisel(); - } catch (NoClassDefFoundError f) { - MuseLogger.logException("Couldn't get Chisel reference item", f); - } -// } + try { + ITEM_CHISEL = ChiselGetter2.getChisel(); + } catch (NoClassDefFoundError f) { + MuseLogger.logException("Couldn't get Chisel reference item", f); + } } @Override @@ -99,4 +95,4 @@ public class ChiselModule extends PowerModuleBase implements IBlockBreakingModul public void handleBreakSpeed(BreakSpeed event) { event.newSpeed *= ModuleManager.computeModularProperty(event.entityPlayer.getCurrentEquippedItem(), CHISEL_HARVEST_SPEED); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/DiamondPickUpgradeModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/DiamondPickUpgradeModule.java index 65c7e7a..a0a6ddd 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/DiamondPickUpgradeModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/DiamondPickUpgradeModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.tool; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/DimensionalRiftModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/DimensionalRiftModule.java index 72d298c..f4f2a60 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/DimensionalRiftModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/DimensionalRiftModule.java @@ -1,8 +1,8 @@ package net.machinemuse.powersuits.powermodule.tool; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -100,4 +100,4 @@ public class DimensionalRiftModule extends PowerModuleBase implements IRightClic @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/FieldTinkerModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/FieldTinkerModule.java index 92dd627..89648f5 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/FieldTinkerModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/FieldTinkerModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.tool; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.common.ModularPowersuits; import net.machinemuse.powersuits.item.ItemComponent; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/FlintAndSteelModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/FlintAndSteelModule.java index 94839a2..4691f61 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/FlintAndSteelModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/FlintAndSteelModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.tool; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -27,8 +27,8 @@ public class FlintAndSteelModule extends PowerModuleBase implements IRightClickM public static final String MODULE_FLINT_AND_STEEL = "Flint and Steel"; public static final String IGNITION_ENERGY_CONSUMPTION = "Ignition Energy Consumption"; - public final ItemStack fas = new ItemStack(Items.flint_and_steel); - final Random ran = new Random(); + public ItemStack fas = new ItemStack(Items.flint_and_steel); + Random ran = new Random(); public FlintAndSteelModule(List validItems) { super(validItems); @@ -101,4 +101,4 @@ public class FlintAndSteelModule extends PowerModuleBase implements IRightClickM @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/GrafterModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/GrafterModule.java index 7e01557..8eb71be 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/GrafterModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/GrafterModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.tool; import cpw.mods.fml.common.registry.GameRegistry; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; import net.minecraft.item.ItemStack; @@ -49,4 +49,4 @@ public class GrafterModule extends PowerModuleBase { public String getTextureFile() { return "grafter"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/HoeModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/HoeModule.java index b2afded..da95656 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/HoeModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/HoeModule.java @@ -1,9 +1,9 @@ package net.machinemuse.powersuits.powermodule.tool; import cpw.mods.fml.common.eventhandler.Event; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.IPowerModule; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -45,7 +45,6 @@ public class HoeModule extends PowerModuleBase implements IPowerModule, IRightCl double energyConsumed = ModuleManager.computeModularProperty(itemStack, HOE_ENERGY_CONSUMPTION); if (player.canPlayerEdit(x, y, z, side, itemStack) && ElectricItemUtils.getPlayerEnergy(player) > energyConsumed) { UseHoeEvent event = new UseHoeEvent(player, itemStack, world, x, y, z); - if (MinecraftForge.EVENT_BUS.post(event)) { return false; } @@ -124,4 +123,4 @@ public class HoeModule extends PowerModuleBase implements IPowerModule, IRightCl public IIcon getIcon(ItemStack item) { return ((Item) Item.itemRegistry.getObject("golden_hoe")).getIconFromDamage(0); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/LeafBlowerModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/LeafBlowerModule.java index 7528249..7804383 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/LeafBlowerModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/LeafBlowerModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.tool; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -146,4 +146,4 @@ public class LeafBlowerModule extends PowerModuleBase implements IRightClickModu @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/LuxCapacitor.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/LuxCapacitor.java index 623a553..1eea5e2 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/LuxCapacitor.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/LuxCapacitor.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.tool; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.entity.EntityLuxCapacitor; import net.machinemuse.powersuits.powermodule.PowerModuleBase; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/MFFSFieldTeleporterModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/MFFSFieldTeleporterModule.java index 61d503a..4626d61 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/MFFSFieldTeleporterModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/MFFSFieldTeleporterModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.tool; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; @@ -45,4 +45,4 @@ public class MFFSFieldTeleporterModule extends PowerModuleBase { public String getTextureFile() { return "fieldteleporter"; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/OCTerminalModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/OCTerminalModule.java index 1eb8f74..6f1342a 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/OCTerminalModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/OCTerminalModule.java @@ -3,7 +3,7 @@ package net.machinemuse.powersuits.powermodule.tool;// package andrew.powersuits // import cpw.mods.fml.common.registry.GameRegistry; // import cpw.mods.fml.common.network.NetworkRegistry; // import cpw.mods.fml.common.Loader; -// import net.machinemuse.api.electricity.IModularItem; +// import net.machinemuse.api.IModularItem; // import net.machinemuse.api.moduletrigger.IRightClickModule; // import net.machinemuse.powersuits.item.ItemComponent; // import net.machinemuse.powersuits.powermodule.PowerModuleBase; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/OmniProbeModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/OmniProbeModule.java index 8566605..852376d 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/OmniProbeModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/OmniProbeModule.java @@ -2,7 +2,7 @@ package net.machinemuse.powersuits.powermodule.tool; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.common.ModCompatibility; @@ -140,6 +140,7 @@ public class OmniProbeModule extends PowerModuleBase implements IRightClickModul } return false; } + @Override public void onPlayerTickActive(EntityPlayer player, ItemStack item) { if (!MuseItemUtils.getEIOFacadeTransparency(item)) { @@ -171,4 +172,4 @@ public class OmniProbeModule extends PowerModuleBase implements IRightClickModul @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/OmniWrenchModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/OmniWrenchModule.java index 9d1ae48..fdc5f87 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/OmniWrenchModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/OmniWrenchModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.tool; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/OreScannerModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/OreScannerModule.java index ff875ce..549fc03 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/OreScannerModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/OreScannerModule.java @@ -1,8 +1,8 @@ package net.machinemuse.powersuits.powermodule.tool; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.common.Config; import net.machinemuse.powersuits.item.ItemComponent; @@ -34,10 +34,10 @@ public class OreScannerModule extends PowerModuleBase implements IRightClickModu public static final String ORE_SCANNER_RADIUS_Y = "Y Radius"; public static final String ORE_SCANNER_RADIUS_Z = "Z Radius"; - private static final String[] oreNames = {"oreCopper", "oreTin", "oreSilver", "oreLead", "oreNickel", "orePlatinum", "oreZinc", "oreApatite", "oreUranium"}; - private static final ArrayList> ores = new ArrayList<>(); - private static final HashMap oreMap = new HashMap(); - private static final HashMap valueMap = new HashMap(); + private static String[] oreNames = {"oreCopper", "oreTin", "oreSilver", "oreLead", "oreNickel", "orePlatinum", "oreZinc", "oreApatite", "oreUranium"}; + private static ArrayList> ores = new ArrayList>(); + private static HashMap oreMap = new HashMap(); + private static HashMap valueMap = new HashMap(); public OreScannerModule(List validItems) { super(validItems); @@ -188,4 +188,4 @@ public class OreScannerModule extends PowerModuleBase implements IRightClickModu @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/PersonalShrinkingModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/PersonalShrinkingModule.java index 0e5866a..3e1ec08 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/PersonalShrinkingModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/PersonalShrinkingModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.tool; import cpw.mods.fml.common.registry.GameRegistry; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -23,7 +23,7 @@ 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; + private ItemStack cpmPSD; public PersonalShrinkingModule(List validItems) { super(validItems); @@ -101,4 +101,4 @@ public class PersonalShrinkingModule extends PowerModuleBase implements IRightCl @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/PickaxeModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/PickaxeModule.java index ded79b9..ee03c4a 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/PickaxeModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/PickaxeModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.tool; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -106,4 +106,4 @@ public class PickaxeModule extends PowerModuleBase implements IBlockBreakingModu } return false; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/RedstoneLaser.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/RedstoneLaser.java new file mode 100644 index 0000000..1f04fc2 --- /dev/null +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/RedstoneLaser.java @@ -0,0 +1,103 @@ +//package net.machinemuse.powersuits.powermodule.tool; +// +//import net.machinemuse.api.IModularItem; +//import net.machinemuse.api.moduletrigger.IRightClickModule; +//import net.machinemuse.powersuits.common.ModularPowersuits; +//import net.machinemuse.powersuits.item.ItemComponent; +//import net.machinemuse.powersuits.powermodule.PowerModuleBase; +//import net.machinemuse.utils.MuseCommonStrings; +//import net.machinemuse.utils.MuseItemUtils; +//import net.minecraft.entity.player.EntityPlayer; +//import net.minecraft.item.ItemStack; +//import net.minecraft.world.World; +//import net.minecraftforge.common.util.ForgeDirection; +// +//import java.util.List; +// +///** +// * Author: MachineMuse (Claire Semple) +// * Created: 2:27 PM, 5/8/13 +// * +// * Ported to Java by lehjr on 12/12/16. +// */ +//public class RedstoneLaser extends PowerModuleBase implements IRightClickModule { +// public RedstoneLaser(String name, List validItems) { +// super(name, validItems); +// addInstallCost(MuseItemUtils.copyAndResize(ItemComponent.controlCircuit, 1)); +// addInstallCost(MuseItemUtils.copyAndResize(ItemComponent.servoMotor, 2)); +// } +// +// @Override +// public void onRightClick(EntityPlayer playerClicking, World world, ItemStack item) { +// +// } +// +// @Override +// public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { +// return false; +// } +// +// @Override +// public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int sideIndex, float hitX, float hitY, float hitZ) { +// ForgeDirection side = ForgeDirection.getOrientation(sideIndex); +// int xo = x + side.offsetX; +// int yo = y + side.offsetY; +// int zo = z + side.offsetZ; +// val redlaserid = RedstoneLaser; +// switch (world.getBlock(xo, yo, zo)) { +// case 0: +// world.setBlock(xo, yo, zo, redlaserid); +// break; +// case`redlaserid`: world.setBlockMetadataWithNotify(xo, yo, zo, redlaserid, world.getBlockMetadata(xo, yo, zo) + 1); +// break; +// default: +// break; +// +// } +// +// +// +// return true; +// } +// +// @Override +// public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { +// player.openGui(ModularPowersuits.INSTANCE(), 2, world, (int)player.posX, (int)player.posY, (int)player.posZ); +// } +// +// @Override +// public String getCategory() { +// return MuseCommonStrings.CATEGORY_SPECIAL; +// } +// +// @Override +// public String getDataName() { +// return "Redstone Laser"; +// } +// +// @Override +// public String getTextureFile() { +// return null; +// } +//} +// +//// +////class RedstoneLaser(list: java.util.List[IModularItem]) extends PowerModuleBase(list) with IRightClickModule { +// +//// override def getUnlocalizedName = "redstoneLaser" +//// +//// def getTextureFile: String = "laser" +//// +//// def onItemUse(itemStack: ItemStack, player: EntityPlayer, world: World, x: Int, y: Int, z: Int, side: Int, hitX: Float, hitY: Float, hitZ: Float): Boolean = { +//// false +//// } +//// +//// def onItemUseFirst(itemStack: ItemStack, player: EntityPlayer, world: World, x: Int, y: Int, z: Int, sideIndex: Int, hitX: Float, hitY: Float, hitZ: Float): Boolean = { +// +//// } +//// +//// def onPlayerStoppedUsing(itemStack: ItemStack, world: World, player: EntityPlayer, par4: Int) {} +//// +// +//// +//// } diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ScoopModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ScoopModule.java index 0f0d8aa..344c298 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ScoopModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ScoopModule.java @@ -1,8 +1,8 @@ package net.machinemuse.powersuits.powermodule.tool; import cpw.mods.fml.common.registry.GameRegistry; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -88,4 +88,4 @@ public class ScoopModule extends PowerModuleBase implements IBlockBreakingModule public void handleBreakSpeed(BreakSpeed event) { event.newSpeed *= ModuleManager.computeModularProperty(event.entityPlayer.getCurrentEquippedItem(), SCOOP_HARVEST_SPEED); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShearsModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShearsModule.java index 8186fbe..a284e99 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShearsModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShearsModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.tool; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -165,4 +165,4 @@ public class ShearsModule extends PowerModuleBase implements IBlockBreakingModul public String getTextureFile() { return null; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShovelModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShovelModule.java index 4bec0f1..751c052 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShovelModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShovelModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.tool; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -79,7 +79,6 @@ public class ShovelModule extends PowerModuleBase implements IBlockBreakingModul @Override public boolean canHarvestBlock(ItemStack stack, Block block, int meta, EntityPlayer player) { if (istEffectiveHarvestTool(block, meta)) { - if (ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, SHOVEL_ENERGY_CONSUMPTION)) { return true; } @@ -93,13 +92,12 @@ public class ShovelModule extends PowerModuleBase implements IBlockBreakingModul if (canHarvestBlock(stack, block, meta, player)) { ElectricItemUtils.drainPlayerEnergy(player, ModuleManager.computeModularProperty(stack, SHOVEL_ENERGY_CONSUMPTION)); return true; - } else { - return false; } + return false; } @Override public void handleBreakSpeed(BreakSpeed event) { event.newSpeed *= ModuleManager.computeModularProperty(event.entityPlayer.getCurrentEquippedItem(), SHOVEL_HARVEST_SPEED); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/StolenWrenchCode.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/StolenWrenchCode.java index b609bc3..546e08d 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/StolenWrenchCode.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/StolenWrenchCode.java @@ -116,4 +116,4 @@ public class StolenWrenchCode { } return false; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/TerminalHandler.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/TerminalHandler.java index 8410198..b92c66e 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/TerminalHandler.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/TerminalHandler.java @@ -29,208 +29,217 @@ import java.util.Set; @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) { - 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) { - boolean ret = false; - if (( v * ModCompatibility.getAE2Ratio() ) < ( ElectricItemUtils.getPlayerEnergy( entityPlayer ) * ModCompatibility.getAE2Ratio() )) - { - ElectricItemUtils.drainPlayerEnergy(entityPlayer, ( v * ModCompatibility.getAE2Ratio() ) ); - ret = true; - } - - return ret; - } - - @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) { - IConfigManager config = new WirelessConfig(itemStack); - config.registerSetting( Settings.SORT_BY, SortOrder.NAME ); - config.registerSetting( Settings.VIEW_MODE, ViewItems.ALL ); - config.registerSetting( Settings.SORT_DIRECTION, SortDir.ASCENDING ); - - config.readFromNBT(itemStack.getTagCompound()); - return config; - } - - @Optional.Method(modid = "appliedenergistics2") - @Override - public String getEncryptionKey(ItemStack item) { - { - if (item == null) { - return null; - } - NBTTagCompound tag = openNbtData(item); - if (tag != null) { - return tag.getString("encKey"); - } - return null; - } - } - - @Optional.Method(modid = "appliedenergistics2") - @Override - public void setEncryptionKey(ItemStack item, String encKey, String name) { - { - if (item == null) { - return; - } - NBTTagCompound tag = openNbtData(item); - if (tag != null) { - tag.setString("encKey", encKey); - } - } - } - - @Optional.Method(modid = "extracells") - @Override - public boolean isItemNormalWirelessTermToo(ItemStack is) { - return true; - } - - @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){ - ECApi.instance().registerWirelessFluidTermHandler(handler); - } - - 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) { - 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 { - - private final Map> enums = new EnumMap<>(Settings.class); - - final ItemStack stack; - - public WirelessConfig(ItemStack itemStack) { - stack = itemStack; + @Optional.Method(modid = "appliedenergistics2") + @Override + public boolean canHandle(ItemStack is) { + if(is == null) + return false; + if(is.getUnlocalizedName() == null) + return false; + if(is.getUnlocalizedName().equals("item.powerFist")) + return true; + return false; } @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 getSettings() { - return enums.keySet(); - } - - @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) { - if(!enums.containsKey(arg0)) { - putSetting(arg0, arg1); - } - - } - - @Optional.Method(modid = "appliedenergistics2") - @Override - public void readFromNBT(NBTTagCompound tagCompound) - { - NBTTagCompound tag = null; - if(tagCompound.hasKey("configWirelessTerminal")) { - tag = tagCompound.getCompoundTag("configWirelessTerminal"); - } - - if(tag == null) - return; - - for (Settings key : enums.keySet()) - { - try + public boolean usePower(EntityPlayer entityPlayer, double v, ItemStack itemStack) { + boolean ret = false; + if (( v * ModCompatibility.getAE2Ratio() ) < ( ElectricItemUtils.getPlayerEnergy( entityPlayer ) * ModCompatibility.getAE2Ratio() )) { - if ( tag.hasKey( key.name() ) ) - { - String value = tag.getString( key.name() ); + ElectricItemUtils.drainPlayerEnergy(entityPlayer, ( v * ModCompatibility.getAE2Ratio() ) ); + ret = true; + } - // Provides an upgrade path for the rename of this value in the API between rv1 and rv2 - //TODO implement on rv2 update + return ret; + } + + @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) { + IConfigManager config = new WirelessConfig(itemStack); + config.registerSetting( Settings.SORT_BY, SortOrder.NAME ); + config.registerSetting( Settings.VIEW_MODE, ViewItems.ALL ); + config.registerSetting( Settings.SORT_DIRECTION, SortDir.ASCENDING ); + + config.readFromNBT(itemStack.getTagCompound()); + return config; + } + + @Optional.Method(modid = "appliedenergistics2") + @Override + public String getEncryptionKey(ItemStack item) { + { + if (item == null) { + return null; + } + NBTTagCompound tag = openNbtData(item); + if (tag != null) { + return tag.getString("encKey"); + } + return null; + } + } + + @Optional.Method(modid = "appliedenergistics2") + @Override + public void setEncryptionKey(ItemStack item, String encKey, String name) { + { + if (item == null) { + return; + } + NBTTagCompound tag = openNbtData(item); + if (tag != null) { + tag.setString("encKey", encKey); + } + } + } + + @Optional.Method(modid = "extracells") + @Override + public boolean isItemNormalWirelessTermToo(ItemStack is) { + return true; + } + + @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){ + ECApi.instance().registerWirelessFluidTermHandler(handler); + } + + 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) { + 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 { + + private final Map> enums = new EnumMap>( Settings.class ); + + final ItemStack stack; + + public WirelessConfig(ItemStack itemStack) { + stack = itemStack; + } + + @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 getSettings() { + return enums.keySet(); + } + + @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) { + if(!enums.containsKey(arg0)) { + putSetting(arg0, arg1); + } + + } + + @Optional.Method(modid = "appliedenergistics2") + @Override + public void readFromNBT(NBTTagCompound tagCompound) + { + NBTTagCompound tag = null; + if(tagCompound.hasKey("configWirelessTerminal")) { + tag = tagCompound.getCompoundTag("configWirelessTerminal"); + } + + if(tag == null) + return; + + for (Settings key : enums.keySet()) + { + try + { + if ( tag.hasKey( key.name() ) ) + { + String value = tag.getString( key.name() ); + + // Provides an upgrade path for the rename of this value in the API between rv1 and rv2 + //TODO implement on rv2 update /*if( value.equals( "EXTACTABLE_ONLY" ) ){ value = StorageFilter.EXTRACTABLE_ONLY.toString(); } else if( value.equals( "STOREABLE_AMOUNT" ) ) { value = LevelEmitterMode.STORABLE_AMOUNT.toString(); }*/ - Enum oldValue = enums.get( key ); + Enum oldValue = enums.get( key ); - Enum newValue = Enum.valueOf( oldValue.getClass(), value ); + Enum newValue = Enum.valueOf( oldValue.getClass(), value ); - putSetting( key, newValue ); - } + putSetting( key, newValue ); + } + } + catch (IllegalArgumentException e) + { + + } + } } - catch (IllegalArgumentException ignored) + + @Optional.Method(modid = "appliedenergistics2") + @Override + public void writeToNBT(NBTTagCompound tagCompound) { + NBTTagCompound tag = new NBTTagCompound(); + if(tagCompound.hasKey("configWirelessTerminal")) { + tag = tagCompound.getCompoundTag("configWirelessTerminal"); + } + + for (Enum e : enums.keySet()) + { + tag.setString( e.name(), enums.get( e ).toString() ); + } + tagCompound.setTag("configWirelessTerminal", tag); + } - } + } - @Optional.Method(modid = "appliedenergistics2") - @Override - public void writeToNBT(NBTTagCompound tagCompound) - { - NBTTagCompound tag = new NBTTagCompound(); - if(tagCompound.hasKey("configWirelessTerminal")) { - tag = tagCompound.getCompoundTag("configWirelessTerminal"); - } - - for (Enum e : enums.keySet()) - { - tag.setString( e.name(), enums.get( e ).toString() ); - } - tagCompound.setTag("configWirelessTerminal", tag); - } - } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/weapon/BladeLauncherModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/weapon/BladeLauncherModule.java index 037fd66..8bc0208 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/weapon/BladeLauncherModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/weapon/BladeLauncherModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.weapon; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.entity.EntitySpinningBlade; import net.machinemuse.powersuits.item.ItemComponent; @@ -81,4 +81,4 @@ public class BladeLauncherModule extends PowerModuleBase implements IRightClickM } } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/weapon/LightningModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/weapon/LightningModule.java index 0a43a65..f3d1621 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/weapon/LightningModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/weapon/LightningModule.java @@ -1,8 +1,8 @@ package net.machinemuse.powersuits.powermodule.weapon; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; @@ -97,4 +97,4 @@ public class LightningModule extends PowerModuleBase implements IRightClickModul @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/weapon/MeleeAssistModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/weapon/MeleeAssistModule.java index fee0e6b..da70db5 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/weapon/MeleeAssistModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/weapon/MeleeAssistModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.weapon; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; @@ -50,4 +50,4 @@ public class MeleeAssistModule extends PowerModuleBase { public String getDescription() { return "A much simpler addon, makes your powertool punches hit harder."; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/weapon/PlasmaCannonModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/weapon/PlasmaCannonModule.java index 7be892a..8cf2558 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/weapon/PlasmaCannonModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/weapon/PlasmaCannonModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.weapon; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.numina.general.MuseMathUtils; import net.machinemuse.numina.network.PacketSender; @@ -98,4 +98,4 @@ public class PlasmaCannonModule extends PowerModuleBase implements IRightClickMo } } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/weapon/RailgunModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/weapon/RailgunModule.java index 4f5613b..4aaa212 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/weapon/RailgunModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/weapon/RailgunModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.weapon; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.item.ItemComponent; @@ -156,4 +156,4 @@ public class RailgunModule extends PowerModuleBase implements IRightClickModule, @Override public void onPlayerTickInactive(EntityPlayer player, ItemStack item) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/weapon/SonicWeaponModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/weapon/SonicWeaponModule.java index 0def3ce..e655773 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/weapon/SonicWeaponModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/weapon/SonicWeaponModule.java @@ -1,6 +1,6 @@ package net.machinemuse.powersuits.powermodule.weapon; -import net.machinemuse.api.electricity.IModularItem; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.MuseCommonStrings; @@ -43,8 +43,7 @@ public class SonicWeaponModule extends PowerModuleBase implements IRightClickMod } @Override - public void onRightClick(EntityPlayer playerClicking, World world, ItemStack item) { - } + public void onRightClick(EntityPlayer playerClicking, World world, ItemStack item) {} @Override public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { @@ -59,4 +58,4 @@ public class SonicWeaponModule extends PowerModuleBase implements IRightClickMod @Override public void onPlayerStoppedUsing(ItemStack itemStack, World world, EntityPlayer player, int par4) { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/utils/AddonWaterUtils.java b/src/main/java/net/machinemuse/utils/AddonWaterUtils.java index e0f5bee..2c8371c 100644 --- a/src/main/java/net/machinemuse/utils/AddonWaterUtils.java +++ b/src/main/java/net/machinemuse/utils/AddonWaterUtils.java @@ -31,4 +31,4 @@ public class AddonWaterUtils { } return water; } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/utils/MPSTeleporter.java b/src/main/java/net/machinemuse/utils/MPSTeleporter.java index c31991a..1f4ece4 100644 --- a/src/main/java/net/machinemuse/utils/MPSTeleporter.java +++ b/src/main/java/net/machinemuse/utils/MPSTeleporter.java @@ -105,12 +105,12 @@ public class MPSTeleporter extends Teleporter { long j = par1 - 600L; while (iterator.hasNext()) { Long olong = (Long) iterator.next(); - PortalPosition portalposition = (PortalPosition) this.destinationCoordinateCache.getValueByKey(olong); + PortalPosition portalposition = (PortalPosition) this.destinationCoordinateCache.getValueByKey(olong.longValue()); if ((portalposition == null) || (portalposition.lastUpdateTime < j)) { iterator.remove(); - this.destinationCoordinateCache.remove(olong); + this.destinationCoordinateCache.remove(olong.longValue()); } } } } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/utils/MuseCommonStrings.java b/src/main/java/net/machinemuse/utils/MuseCommonStrings.java index 0a9166b..99fbc60 100644 --- a/src/main/java/net/machinemuse/utils/MuseCommonStrings.java +++ b/src/main/java/net/machinemuse/utils/MuseCommonStrings.java @@ -99,7 +99,7 @@ public abstract class MuseCommonStrings { public static List getItemInstalledModules(EntityPlayer player, ItemStack stack) { NBTTagCompound itemTag = MuseItemUtils.getMuseItemTag(stack); List modules = new LinkedList(); - for (IPowerModule module : ModuleManager.getValidModulesForItem(stack)) { + for (IPowerModule module : ModuleManager.getValidModulesForItem(player, stack)) { if (ModuleManager.tagHasModule(itemTag, module.getDataName())) { modules.add(module.getDataName()); } diff --git a/src/main/java/net/machinemuse/utils/MuseFileUtils.java b/src/main/java/net/machinemuse/utils/MuseFileUtils.java deleted file mode 100644 index b4e56b3..0000000 --- a/src/main/java/net/machinemuse/utils/MuseFileUtils.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.machinemuse.utils; - -import net.machinemuse.numina.general.MuseLogger; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; - -/** - * Author: MachineMuse (Claire Semple) - * Created: 11:07 PM, 6/28/13 - * - * Ported to Java by lehjr on 10/11/16. - */ -public class MuseFileUtils { - public void copyFile(File oldFile, File newFile) throws IOException { - if (!newFile.exists()) { - newFile.createNewFile(); - } - new FileOutputStream(newFile).getChannel().transferFrom(new FileInputStream(oldFile).getChannel(), 0, Long.MAX_VALUE); - MuseLogger.logDebug("Successfully moved MPS config to new location. :D"); - } -} - - diff --git a/src/main/java/net/machinemuse/utils/MuseItemUtils.java b/src/main/java/net/machinemuse/utils/MuseItemUtils.java index 5ef753d..311681d 100644 --- a/src/main/java/net/machinemuse/utils/MuseItemUtils.java +++ b/src/main/java/net/machinemuse/utils/MuseItemUtils.java @@ -2,10 +2,10 @@ package net.machinemuse.utils; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.IPowerModule; import net.machinemuse.api.ModuleManager; import net.machinemuse.api.MuseItemTag; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.numina.general.MuseLogger; import net.machinemuse.numina.general.MuseMathUtils; import net.machinemuse.powersuits.client.render.modelspec.DefaultModelSpec; @@ -61,7 +61,7 @@ public class MuseItemUtils { * IModularItem */ public static List getModularItemsInInventory(IInventory inv) { - ArrayList stacks = new ArrayList<>(); + ArrayList stacks = new ArrayList(); for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); @@ -83,7 +83,7 @@ public class MuseItemUtils { * @return A List of inventory slots containing an IModularItem */ public static List getModularItemSlotsInInventory(IInventory inv) { - ArrayList slots = new ArrayList<>(); + ArrayList slots = new ArrayList(); for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); @@ -130,7 +130,7 @@ public class MuseItemUtils { } public static List deleteFromInventory(List cost, InventoryPlayer inventory) { - List slots = new LinkedList<>(); + List slots = new LinkedList(); for (ItemStack stackInCost : cost) { int remaining = stackInCost.stackSize; for (int i = 0; i < inventory.getSizeInventory() && remaining > 0; i++) { @@ -150,7 +150,7 @@ public class MuseItemUtils { } public static List findInInventoryForCost(List workingUpgradeCost, InventoryPlayer inventory) { - List slots = new LinkedList<>(); + List slots = new LinkedList(); for (ItemStack stackInCost : workingUpgradeCost) { int found = 0; for (int i = 0; i < inventory.getSizeInventory() && found < stackInCost.stackSize; i++) { @@ -302,7 +302,7 @@ public class MuseItemUtils { } public static Set giveOrDropItemWithChance(ItemStack itemsToGive, EntityPlayer player, double chanceOfSuccess) { - Set slots = new HashSet<>(); + Set slots = new HashSet(); // First try to add the items to existing stacks for (int i = 0; i < player.inventory.getSizeInventory() && itemsToGive.stackSize > 0; i++) { @@ -349,7 +349,7 @@ public class MuseItemUtils { List installedModules = new ArrayList(); for (ItemStack stack : MuseItemUtils.modularItemsEquipped(player)) { NBTTagCompound itemTag = MuseItemUtils.getMuseItemTag(stack); - for (IPowerModule module : ModuleManager.getValidModulesForItem(stack)) { + for (IPowerModule module : ModuleManager.getValidModulesForItem(player, stack)) { if (ModuleManager.tagHasModule(itemTag, module.getDataName())) { installedModules.add(module); } @@ -402,7 +402,10 @@ public class MuseItemUtils { public static double getFoodLevel(ItemStack stack) { if (stack != null && stack.getItem() instanceof IModularItem) { NBTTagCompound itemTag = MuseItemUtils.getMuseItemTag(stack); - return itemTag.getDouble("Food"); + Double foodLevel = itemTag.getDouble("Food"); + if (foodLevel != null) { + return foodLevel; + } } return 0.0; } diff --git a/src/main/java/net/machinemuse/utils/MusePlayerUtils.java b/src/main/java/net/machinemuse/utils/MusePlayerUtils.java index b26010f..d81756a 100644 --- a/src/main/java/net/machinemuse/utils/MusePlayerUtils.java +++ b/src/main/java/net/machinemuse/utils/MusePlayerUtils.java @@ -1,7 +1,7 @@ package net.machinemuse.utils; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.electricity.IModularItem; import net.machinemuse.numina.general.MuseLogger; import net.machinemuse.numina.general.MuseMathUtils; import net.machinemuse.numina.player.NuminaPlayerUtils; @@ -379,4 +379,4 @@ public class MusePlayerUtils { public static double computePlayerVelocity(EntityPlayer entityPlayer) { return MuseMathUtils.pythag(entityPlayer.motionX, entityPlayer.motionY, entityPlayer.motionZ); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/utils/MuseStringUtils.java b/src/main/java/net/machinemuse/utils/MuseStringUtils.java index 49d91f6..8ce8ce7 100644 --- a/src/main/java/net/machinemuse/utils/MuseStringUtils.java +++ b/src/main/java/net/machinemuse/utils/MuseStringUtils.java @@ -193,7 +193,7 @@ public abstract class MuseStringUtils { * */ public static List wrapStringToVisualLength(String str, double length) { - List strlist = new ArrayList<>(); + List strlist = new ArrayList(); String[] words = str.split(" "); if(words.length == 0) { @@ -233,7 +233,7 @@ public abstract class MuseStringUtils { * * @author MachineMuse */ - public enum FormatCodes { + public static enum FormatCodes { Black('0'), DarkBlue('1'), DarkGreen('2'), @@ -257,9 +257,9 @@ public abstract class MuseStringUtils { Italic('o'), Reset('r'); - public final char character; + public char character; - FormatCodes(char character) { + private FormatCodes(char character) { this.character = character; } } diff --git a/src/main/java/net/machinemuse/utils/ScalaNBT.java b/src/main/java/net/machinemuse/utils/ScalaNBT.java deleted file mode 100644 index d9ab286..0000000 --- a/src/main/java/net/machinemuse/utils/ScalaNBT.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.machinemuse.utils; - -import net.minecraft.nbt.NBTTagCompound; - -/** - * Author: MachineMuse (Claire Semple) - * Created: 5:47 AM, 29/04/13 - * - * Ported to Java by lehjr on 10/21/16. - */ -public class ScalaNBT extends NBTTagCompound { - private final NBTTagCompound nbt; - - public NBTTagCompound nbt() { - return this.nbt; - } - - public ScalaNBT wrap(final NBTTagCompound nbt) { - return new ScalaNBT(nbt); - } - - public ScalaNBT(final NBTTagCompound nbt) { - this.nbt = nbt; - } -} \ No newline at end of file diff --git a/src/main/java/net/machinemuse/utils/render/MuseRenderer.java b/src/main/java/net/machinemuse/utils/render/MuseRenderer.java index 7ac1518..96b829e 100644 --- a/src/main/java/net/machinemuse/utils/render/MuseRenderer.java +++ b/src/main/java/net/machinemuse/utils/render/MuseRenderer.java @@ -291,7 +291,7 @@ public abstract class MuseRenderer { by = y1 + cy; bz = z1 + cz; - int index = (int) (Math.random() * 50); // FIXME: Math.random() cast to int is always rounded down to 0 + int index = (int) (Math.random() * 50); drawLightningBetweenPointsFast(ax, ay, az, bx, by, bz, index); } @@ -366,4 +366,4 @@ public abstract class MuseRenderer { public static void unRotate() { BillboardHelper.unRotate(); } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/utils/render/MuseStencilManager.java b/src/main/java/net/machinemuse/utils/render/MuseStencilManager.java index 2538c41..e1a28d9 100644 --- a/src/main/java/net/machinemuse/utils/render/MuseStencilManager.java +++ b/src/main/java/net/machinemuse/utils/render/MuseStencilManager.java @@ -18,4 +18,4 @@ public class MuseStencilManager { public void stencilOff() { } -} \ No newline at end of file +} diff --git a/src/main/java/net/machinemuse/utils/render/MuseTexture.java b/src/main/java/net/machinemuse/utils/render/MuseTexture.java deleted file mode 100644 index 4fa8002..0000000 --- a/src/main/java/net/machinemuse/utils/render/MuseTexture.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.machinemuse.utils.render; - -/** - * Author: MachineMuse (Claire Semple) - * Created: 6:28 PM, 5/15/13 - * - * Ported to Java by lehjr on 10/19/16. - * This one took a lot of work :-P - */ -public class MuseTexture { -} \ No newline at end of file diff --git a/src/main/java/net/machinemuse/utils/render/TextureBuffer.java b/src/main/java/net/machinemuse/utils/render/TextureBuffer.java index ffc34fe..8ec30b5 100644 --- a/src/main/java/net/machinemuse/utils/render/TextureBuffer.java +++ b/src/main/java/net/machinemuse/utils/render/TextureBuffer.java @@ -1,26 +1,21 @@ package net.machinemuse.utils.render; +import org.lwjgl.opengl.EXTFramebufferObject; import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL14; import org.lwjgl.opengl.GLContext; import java.nio.ByteBuffer; -import static org.lwjgl.opengl.EXTFramebufferObject.*; -import static org.lwjgl.opengl.GL11.*; -import static org.lwjgl.opengl.GL14.GL_DEPTH_COMPONENT24; - /** - * Author: MachineMuse (Claire Semple) - * Created: 8:18 PM, 5/15/13 - * - * Ported to Java by lehjr on 10/19/16. + * Ported to Java by lehjr on 12/10/16. */ public class TextureBuffer { // Allocate IDs for a FBO, colour buffer, and depth buffer - final int framebufferID = glGenFramebuffersEXT(); - final int colorTextureID = GL11.glGenTextures(); - final int depthRenderBufferID = GL11.glGenTextures(); - final int texDimension; + int framebufferID = EXTFramebufferObject.glGenFramebuffersEXT(); + int colorTextureID = GL11.glGenTextures(); + int depthRenderBufferID = GL11.glGenTextures(); + int texDimension; public TextureBuffer(int texDimension) { this.texDimension = texDimension; @@ -30,69 +25,70 @@ public class TextureBuffer { throw new RuntimeException("Framebuffers not supported!"); } - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebufferID); + EXTFramebufferObject.glBindFramebufferEXT(EXTFramebufferObject.GL_FRAMEBUFFER_EXT, framebufferID); - glBindTexture(GL_TEXTURE_2D, colorTextureID); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, texDimension, texDimension, 0, GL_RGBA, GL_INT, (ByteBuffer)null); - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, colorTextureID, 0); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, colorTextureID); + GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR); + GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR); - glBindTexture(GL_TEXTURE_2D, depthRenderBufferID); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, texDimension, texDimension, 0, GL_DEPTH_COMPONENT, GL_INT, (ByteBuffer) null); - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, depthRenderBufferID, 0); + GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGBA8, texDimension, texDimension, 0, GL11.GL_RGBA, GL11.GL_INT, (ByteBuffer)null); + EXTFramebufferObject.glFramebufferTexture2DEXT(EXTFramebufferObject.GL_FRAMEBUFFER_EXT, EXTFramebufferObject.GL_COLOR_ATTACHMENT0_EXT, GL11.GL_TEXTURE_2D, colorTextureID, 0); + + GL11.glBindTexture(GL11.GL_TEXTURE_2D, depthRenderBufferID); + GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR); + GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR); + GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL14.GL_DEPTH_COMPONENT24, texDimension, texDimension, 0, GL11.GL_DEPTH_COMPONENT, GL11.GL_INT, (ByteBuffer)null); + EXTFramebufferObject.glFramebufferTexture2DEXT(EXTFramebufferObject.GL_FRAMEBUFFER_EXT, EXTFramebufferObject.GL_DEPTH_ATTACHMENT_EXT, GL11.GL_TEXTURE_2D, depthRenderBufferID, 0); // Check the status and throw an exception if it didn't initialize properly - switch(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)) { - case GL_FRAMEBUFFER_COMPLETE_EXT: + switch(EXTFramebufferObject.glCheckFramebufferStatusEXT(EXTFramebufferObject.GL_FRAMEBUFFER_EXT)){ + case EXTFramebufferObject.GL_FRAMEBUFFER_COMPLETE_EXT: break; - case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT: + case EXTFramebufferObject.GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT: throw new RuntimeException("FrameBuffer: " + framebufferID + ", has caused a GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT exception"); - case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT: + case EXTFramebufferObject.GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT: throw new RuntimeException("FrameBuffer: " + framebufferID + ", has caused a GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT exception"); - case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT: + case EXTFramebufferObject.GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT: throw new RuntimeException("FrameBuffer: " + framebufferID + ", has caused a GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT exception"); - case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT: - throw new RuntimeException("FrameBuffer: " + framebufferID + ", has caused a GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT exception"); - case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT: + case EXTFramebufferObject.GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT: throw new RuntimeException("FrameBuffer: " + framebufferID + ", has caused a GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT exception"); - case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT: + case EXTFramebufferObject.GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT: + throw new RuntimeException("FrameBuffer: " + framebufferID + ", has caused a GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT exception"); + case EXTFramebufferObject.GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT: throw new RuntimeException("FrameBuffer: " + framebufferID + ", has caused a GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT exception"); - case GL_FRAMEBUFFER_UNSUPPORTED_EXT: + case EXTFramebufferObject.GL_FRAMEBUFFER_UNSUPPORTED_EXT: throw new RuntimeException("FrameBuffer: " + framebufferID + ", has caused a GL_FRAMEBUFFER_UNSUPPORTED_EXT exception"); default: throw new RuntimeException("Unexpected reply from glCheckFramebufferStatusEXT: " + ""); } // Bind the display buffer - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); + EXTFramebufferObject.glBindFramebufferEXT(EXTFramebufferObject.GL_FRAMEBUFFER_EXT, 0); } public void bindRead() { - glPushAttrib(GL_TEXTURE_BIT); - glBindTexture(GL_TEXTURE_2D, colorTextureID); + GL11.glPushAttrib(GL11.GL_TEXTURE_BIT); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, colorTextureID); } public void unbindRead() { - glPopAttrib(); + GL11.glPopAttrib(); } public void bindWrite() { - glPushAttrib(GL_VIEWPORT_BIT); - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebufferID); - glViewport(0, 0, texDimension, texDimension); + GL11.glPushAttrib(GL11.GL_VIEWPORT_BIT); + EXTFramebufferObject.glBindFramebufferEXT(EXTFramebufferObject.GL_FRAMEBUFFER_EXT, framebufferID); + GL11.glViewport(0, 0, texDimension, texDimension); } public void unbindWrite() { - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); - glPopAttrib(); + EXTFramebufferObject.glBindFramebufferEXT(EXTFramebufferObject.GL_FRAMEBUFFER_EXT, 0); + GL11.glPopAttrib(); } public void clear() { bindWrite(); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT); unbindWrite(); } } \ No newline at end of file diff --git a/src/main/resources/assets/powersuits/lang/en_US.lang b/src/main/resources/assets/powersuits/lang/en_US.lang index f427dc5..82409cf 100644 --- a/src/main/resources/assets/powersuits/lang/en_US.lang +++ b/src/main/resources/assets/powersuits/lang/en_US.lang @@ -123,7 +123,7 @@ module.shears.desc=Cuts through leaves, wool, and creepers alike. module.hoe.desc=An automated tilling addon to make it easy to till large swaths of land at once. module.luxCapacitor.desc=Launch a virtually infinite number of attractive light sources at the wall. module.omniwrench.desc=A wrench which can interact with almost every mod. -module.fieldTinkerer.desc=Maybe you can't memorize the blueprints, but you should at least be able to fine tune your modules without Inspiration™ Inc. LLC. +module.fieldTinkerer.desc=Maybe you can't memorize the blueprints, but you should at least be able to fine tune your modules without Inspiration™ Inc. LLC. module.meleeAssist.desc=A much simpler addon, makes your powertool punches hit harder. module.plasmaCannon.desc=Use electrical arcs in a containment field to superheat air to a plasma and launch it at enemies. module.railgun.desc=An assembly which accelerates a projectile to supersonic speeds using magnetic force. Heavy recoil. @@ -159,7 +159,7 @@ module.grafter.desc=A Forestry grafter integrated into your power tool. module.scoop.desc=A Forestry Scoop integrated into your power tool. module.apiaristArmor.desc=A set of Forestry apiarist armor integrated into your armor. module.chisel.desc=This won't let you chisel blocks, but it will at least let you harvest them. - +module.lightningSummoner.desc=Allows you to summon lightning for a large energy cost. module.portableCraftingTable.desc=A larger crafting grid, on the go. module.kineticGenerator.desc=Generate power with your movement. module.solarGenerator.desc=Let the sun power your adventures. @@ -171,7 +171,7 @@ module.leafBlower.desc=Create a torrent of air to knock plants out of the ground module.mobRepulsor.desc=Pushes mobs away from you when activated, but constantly drains power. It is highly recommended that you set this module to a keybind because of the high energy draw. module.flintAndSteel.desc=A portable igniter that creates fire through the power of energy. module.clock.desc=A clock on the run that shows you the time, no matter where you are. Toggleable by keybinds. -module.compass.desc=A compass on the run that shows you your direction, no matter where you are. Toggleable by keybinds.lows you to summon lightning for a large energy cost. +module.compass.desc=A compass on the run that shows you your direction, no matter where you are. Toggleable by keybinds. module.waterTank.desc=Store water which can later be used to cool yourself in emergency situations. module.teMultimeter.desc=A prototype multi-use probe integrated into your power tool. module.appengWireless.desc=An Applied Energistics wireless terminal integrated into your power tool. @@ -219,4 +219,4 @@ tooltip.changeModes=Change modes: Sneak+mousewheel. tooltip.energy=Energy: tooltip.noModules=No installed modules! This item is useless until you add some modules at a Tinker Table. tooltip.installedModules=Installed Modules: -tooltip.mode=Mode: \ No newline at end of file +tooltip.mode=Mode: diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 23235fe..eaee244 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -31,4 +31,4 @@ ], "useDependencyInformation": true -}] \ No newline at end of file +}]