diff --git a/build.gradle b/build.gradle index 0a82246..8a4d935 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ def travisbuildnumber = (System.getenv("TRAVIS_BUILD_NUMBER") ?: -111).toInteger version = "${config.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.100") +def numina_version = (System.getenv("NUMINA_VERSION") ?:"0.4.1.101") minecraft { version = "${config.minecraft_version}-${config.forge_version}" 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 3c9b9e6..6c4a6fe 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketColourInfo.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketColourInfo.java @@ -40,7 +40,7 @@ public class MusePacketColourInfo extends MusePacket { } @Override - public void handleServer(EntityPlayerMP player) { + public void handleServer(EntityPlayer 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 3df06de..7f3600d 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketCosmeticInfo.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketCosmeticInfo.java @@ -44,7 +44,7 @@ public class MusePacketCosmeticInfo extends MusePacket { } @Override - public void handleServer(EntityPlayerMP player) { + public void handleServer(EntityPlayer 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 c5f4f5a..375dc20 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(EntityPlayerMP player) { + public void handleServer(EntityPlayer player) { ItemStack stack = player.inventory.getStackInSlot(itemSlot); if (moduleName != null) { InventoryPlayer inventory = player.inventory; @@ -71,7 +71,7 @@ public class MusePacketInstallModuleRequest extends MusePacket { slotsToUpdate.add(itemSlot); for (Integer slotiter : slotsToUpdate) { MusePacket reply = new MusePacketInventoryRefresh(player, slotiter, inventory.getStackInSlot(slotiter)); - PacketSender.sendTo(reply, player); + PacketSender.sendTo(reply, (EntityPlayerMP) player); } } } diff --git a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketInventoryRefresh.java b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketInventoryRefresh.java index 2060778..e68deec 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketInventoryRefresh.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketInventoryRefresh.java @@ -43,7 +43,7 @@ public class MusePacketInventoryRefresh extends MusePacket { @SideOnly(Side.CLIENT) @Override - public void handleClient(EntityClientPlayerMP player) { + public void handleClient(EntityPlayer player) { IInventory inventory = player.inventory; inventory.setInventorySlotContents(slot, stack); ((MuseGui)(Minecraft.getMinecraft().currentScreen)).refresh(); 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 8206e9e..bdb280a 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPlasmaBolt.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPlasmaBolt.java @@ -42,7 +42,7 @@ public class MusePacketPlasmaBolt extends MusePacket { @SideOnly(Side.CLIENT) @Override - public void handleClient(EntityClientPlayerMP player) { + public void handleClient(EntityPlayer player) { try { EntityPlasmaBolt entity = (EntityPlasmaBolt) Minecraft.getMinecraft().theWorld.getEntityByID(entityID); entity.size = this.size; 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 dd4394b..db91892 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPlayerUpdate.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPlayerUpdate.java @@ -36,7 +36,7 @@ public class MusePacketPlayerUpdate extends MusePacket { } @Override - public void handleServer(EntityPlayerMP player) { + public void handleServer(EntityPlayer 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 ba59057..33d786d 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPropertyModifierConfig.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketPropertyModifierConfig.java @@ -71,7 +71,7 @@ public class MusePacketPropertyModifierConfig extends MusePacket { */ @SideOnly(Side.CLIENT) @Override - public void handleClient(EntityClientPlayerMP player) { + public void handleClient(EntityPlayer player) { MusePackager d = MusePacketPropertyModifierConfigPackager.getInstance(); int numModules = d.readInt(data); for (int i = 0; i < numModules; i++) { 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 f5b5728..dcd680a 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(EntityPlayerMP player) { + public void handleServer(EntityPlayer player) { if (moduleName != null) { InventoryPlayer inventory = player.inventory; ItemStack stack = player.inventory.getStackInSlot(itemSlot); @@ -66,7 +66,7 @@ public class MusePacketSalvageModuleRequest extends MusePacket { for (Integer slotiter : slots) { MusePacket reply = new MusePacketInventoryRefresh(player, slotiter, inventory.getStackInSlot(slotiter)); - PacketSender.sendTo(reply, player); + PacketSender.sendTo(reply, (EntityPlayerMP) player); } } } 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 af9568d..2ec1394 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketToggleRequest.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketToggleRequest.java @@ -36,7 +36,7 @@ public class MusePacketToggleRequest extends MusePacket{ } @Override - public void handleServer(EntityPlayerMP player) { + public void handleServer(EntityPlayer 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 468e3ad..b52d72b 100644 --- a/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketTweakRequest.java +++ b/src/main/java/net/machinemuse/powersuits/network/packets/MusePacketTweakRequest.java @@ -51,7 +51,7 @@ public class MusePacketTweakRequest extends MusePacket { } @Override - public void handleServer(EntityPlayerMP player) { + public void handleServer(EntityPlayer player) { if (moduleName != null && tweakName != null) { ItemStack stack = player.inventory.getStackInSlot(itemSlot); NBTTagCompound itemTag = MuseItemUtils.getMuseItemTag(stack);