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

Some final fixes for 1.7.10.

Browse source
This commit is contained in:
Leon 2017-03-26 10:51:59 -04:00
parent 0d88ca125a
commit d8ac715066
7 changed files with 42 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build.gradle
View file

@ -40,7 +40,7 @@ configFile.withReader {
def buildnumber = System.getenv("BUILD_NUMBER")
def travisbuildnumber = (System.getenv("TRAVIS_BUILD_NUMBER") ?: -111).toInteger() + 111
version = "${config.mod_version}." + (buildnumber ?: travisbuildnumber)
version = "${minecraft_version}-${mod_version}.${buildnumber ?: travisbuildnumber}"
group= "${config.group_id}" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "${config.mod_id}"
def numina_version = (System.getenv("NUMINA_VERSION") ?:"0.4.1.104")
@ -48,6 +48,7 @@ def numina_version = (System.getenv("NUMINA_VERSION") ?:"0.4.1.104")
minecraft {
version = "${config.minecraft_version}-${config.forge_version}"
replace "@numina_version@", numina_version
replace "@VERSION@", project.version
runDir = "run"
}

2
src/main/java/net/machinemuse/api/electricity/ElectricAdapter.java
View file

@ -15,7 +15,7 @@ public abstract class ElectricAdapter {
if (stack == null)
return null;
Item i = stack.getItem();
if (i instanceof MuseElectricItem) {
if (i instanceof IMuseElectricItem) {
return new MuseElectricAdapter(stack);
} else if (ModCompatibility.isRFAPILoaded() && i instanceof IEnergyContainerItem) {
return new TEElectricAdapter(stack);

4
src/main/java/net/machinemuse/api/electricity/MuseElectricAdapter.java
View file

@ -7,11 +7,11 @@ import net.minecraft.item.ItemStack;
*/
public class MuseElectricAdapter extends ElectricAdapter {
ItemStack stack;
MuseElectricItem item;
IMuseElectricItem item;
public MuseElectricAdapter(ItemStack stack) {
this.stack = stack;
this.item = (MuseElectricItem)stack.getItem();
this.item = (IMuseElectricItem)stack.getItem();
}
@Override

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

@ -83,7 +83,8 @@ public class PlayerUpdateHandler {
Musique.stopPlayerSound(player, SoundDictionary.SOUND_GLIDER);
}
}
}
} // kinda hacky fix for item that gets unequipped when the sound is playing, like when player dies or takes it off
else Musique.stopPlayerSound(player, SoundDictionary.SOUND_GLIDER);
}
}
}

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

@ -113,7 +113,7 @@ public class ModularItemBase extends Item implements IModularItemBase {
@Override
public void givePlayerEnergy(EntityPlayer player, double joulesToGive) {
ElectricItemUtils.drainPlayerEnergy(player, joulesToGive);
ElectricItemUtils.givePlayerEnergy(player, joulesToGive);
}