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

some update from months ago that I can't remember.

Browse source
This commit is contained in:
lehjr 2019-08-19 21:13:58 -04:00
parent b6daf58058
commit d786d41d11
7 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,6 +67,10 @@ public class SMovingArmorModel extends ModelPlayer implements IArmorModel {
visibleSection = value;
}
/**
* Sets the models various rotation angles then renders the model.
*/

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

@ -16,12 +16,12 @@ import net.machinemuse.utils.ElectricItemUtils;
import net.machinemuse.utils.MuseCommonStrings;
import net.machinemuse.utils.MuseItemUtils;
import net.machinemuse.utils.MuseStringUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.util.WeightedRandom;
import java.util.ArrayList;
import java.util.List;
@ -45,6 +45,10 @@ public abstract class ItemElectricArmor extends ItemArmor implements IModularIte
@SideOnly(Side.CLIENT)
@Override
public int getColorFromItemStack(ItemStack itemStack, int par2) {
WeightedRandom.Item test;
return getColorFromItemStack(itemStack).getInt();
}

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

@ -97,14 +97,9 @@ public abstract class ItemPowerArmor extends ItemElectricArmor implements ISpeci
return ModuleManager.tagHasModule(itemTag, TintModule.RED_TINT) || ModuleManager.tagHasModule(itemTag, TintModule.GREEN_TINT) || ModuleManager.tagHasModule(itemTag, TintModule.BLUE_TINT);
}
double getHeatResistance(EntityPlayer player, ItemStack stack) {
return MuseHeatUtils.getMaxHeat(stack);
}
@Override
public double getArmorDouble(EntityPlayer player, ItemStack stack) {
double totalArmor = 0;
NBTTagCompound props = MuseItemUtils.getMuseItemTag(stack);
double energy = ElectricItemUtils.getPlayerEnergy(player);
double physArmor = ModuleManager.computeModularProperty(stack, MuseCommonStrings.ARMOR_VALUE_PHYSICAL);
double enerArmor = ModuleManager.computeModularProperty(stack, MuseCommonStrings.ARMOR_VALUE_ENERGY);
@ -160,7 +155,6 @@ public abstract class ItemPowerArmor extends ItemElectricArmor implements ISpeci
*/
@Override
public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
NBTTagCompound itemProperties = MuseItemUtils.getMuseItemTag(stack);
if (entity instanceof EntityPlayer) {
if (source == MuseHeatUtils.overheatDamage) {
} else if (source.isFireDamage()) {

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

@ -18,7 +18,6 @@ import net.machinemuse.utils.MuseCommonStrings;
import net.machinemuse.utils.MuseItemUtils;
import net.machinemuse.utils.MuseStringUtils;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;

6
src/main/java/net/machinemuse/powersuits/powermodule/movement/SprintAssistModule.java
View file

@ -39,10 +39,8 @@ public class SprintAssistModule extends PowerModuleBase implements IToggleableMo
@Override
public void onPlayerTickActive(EntityPlayer player, ItemStack item) {
double motionX = player.posX - player.lastTickPosX;
double motionY = player.posY - player.lastTickPosY;
double motionZ = player.posZ - player.lastTickPosZ;
double horzMovement = Math.sqrt(motionX * motionX + motionZ * motionZ);
double horzMovement = player.distanceWalkedModified - player.prevDistanceWalkedModified;
double totalEnergy = ElectricItemUtils.getPlayerEnergy(player);
if (player.isSprinting()) {
double exhaustion = Math.round(horzMovement * 100.0F) * 0.01;

2
src/main/java/net/machinemuse/utils/ElectricItemUtils.java
View file

@ -41,6 +41,8 @@ public class ElectricItemUtils {
}
public static void drainPlayerEnergy(EntityPlayer player, double drainAmount) {
if (player.capabilities.isCreativeMode)
return;
double drainleft = drainAmount;
for (ElectricAdapter adapter: electricItemsEquipped(player))
if (drainleft > 0)

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

@ -55,6 +55,9 @@ public class MuseHeatUtils {
}
public static void heatPlayer(EntityPlayer player, double heatDegrees) {
if (player.capabilities.isCreativeMode)
return;
List<ItemStack> items = MuseItemUtils.getModularItemsInInventory(player);
if (player.isUsingItem()) {
items.remove(player.getCurrentEquippedItem());