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

attempt to fix smartmoving dep

Browse source
This commit is contained in:
MachineMuse 2013-07-11 21:29:18 -06:00
parent 9753e6bfd7
commit 03599bfded
5 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.xml
View file

@ -318,11 +318,11 @@
<!-- Reobf. Can't use SRG names due to smart moving support -->
<exec dir="${mcp.dir}" executable="cmd" osfamily="windows">
<arg line="/c reobfuscate.bat"/>
<arg line="/c reobfuscate_srg.bat"/>
</exec>
<exec dir="${mcp.dir}" executable="sh" osfamily="unix">
<arg value="reobfuscate.sh"/>
<arg value="reobfuscate_srg.sh"/>
</exec>
<copy todir="${classes.dir}">

9
src/minecraft/net/machinemuse/powersuits/client/render/item/ArmorModel.scala
View file

@ -9,20 +9,15 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraftforge.client.model.obj.WavefrontObject
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.src.ModelPlayer
object ArmorModel {
val instance:ArmorModel = try {
val instance: ArmorModel = try {
new SMovingArmorModel
} catch {
case _:Throwable => new VanillaArmorModel
case _: Throwable => new VanillaArmorModel
}
}
class SMovingArmorModel extends ModelPlayer(0) with ArmorModel
class VanillaArmorModel extends ModelBiped(0) with ArmorModel
trait ArmorModel extends ModelBiped {
var renderSpec: NBTTagCompound = null
var visible: Int = 0

9
src/minecraft/net/machinemuse/powersuits/client/render/item/SMovingArmorModel.scala Normal file
View file

@ -0,0 +1,9 @@
package net.machinemuse.powersuits.client.render.item
import net.minecraft.src.ModelPlayer
/**
* Author: MachineMuse (Claire Semple)
* Created: 9:23 PM, 11/07/13
*/
class SMovingArmorModel extends ModelPlayer(0) with ArmorModel

9
src/minecraft/net/machinemuse/powersuits/client/render/item/VanillaArmorModel.scala Normal file
View file

@ -0,0 +1,9 @@
package net.machinemuse.powersuits.client.render.item
import net.minecraft.client.model.ModelBiped
/**
* Author: MachineMuse (Claire Semple)
* Created: 9:24 PM, 11/07/13
*/
class VanillaArmorModel extends ModelBiped(0) with ArmorModel

7
src/minecraft/net/minecraft/src/ModelPlayer.java
View file

@ -2,12 +2,11 @@ package net.minecraft.src;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBiped;
@SideOnly(Side.CLIENT)
public class ModelPlayer extends net.minecraft.client.model.ModelBiped
{
public ModelPlayer(float var1)
{
public class ModelPlayer extends ModelBiped {
public ModelPlayer(float var1) {
super(var1);
}
}