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

added numina AT and fixed load-time crashes

Browse source
This commit is contained in:
MachineMuse 2014-09-09 07:47:42 -06:00
parent 0b277d73dc
commit d8fc447f2e
6 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/resources/assets/powersuits/models/armor2.xml
View file

@ -1,5 +1,5 @@
<models>
<model file="/assets/powersuits/models/armor2.obj"
<model file="powersuits:models/armor2.obj"
textures="powersuits:textures/models/armor2diffuse.png">
<binding slot="2" target="LeftLeg">
<part defaultcolor="FFFFFF" defaultglow="false" polygroup="leggray" name="Left Leg Base"/>

12
src/main/resources/assets/powersuits/models/modelspec.xml
View file

@ -1,5 +1,5 @@
<models>
<model file="/assets/powersuits/models/mps_pantaloons.obj" textures="powersuits:textures/models/diffuse.png">
<model file="powersuits:models/mps_pantaloons.obj" textures="powersuits:textures/models/diffuse.png">
<binding slot="2" target="LeftLeg">
<part defaultcolor="FFFFFF" defaultglow="false" polygroup="leg2" name="Left Leg"/>
</binding>
@ -7,7 +7,7 @@
<part defaultcolor="FFFFFF" defaultglow="false" polygroup="leg1" name="Right Leg"/>
</binding>
</model>
<model file="/assets/powersuits/models/mps_boots.obj" textures="powersuits:textures/models/diffuse.png">
<model file="powersuits:models/mps_boots.obj" textures="powersuits:textures/models/diffuse.png">
<binding slot="3" target="RightLeg">
<part defaultcolor="FFFFFF" defaultglow="false" polygroup="boots1" name="Right Boot"/>
</binding>
@ -15,7 +15,7 @@
<part defaultcolor="FFFFFF" defaultglow="false" polygroup="boots2" name="Left Boot"/>
</binding>
</model>
<model file="/assets/powersuits/models/mps_chest.obj" textures="powersuits:textures/models/diffuse.png">
<model file="powersuits:models/mps_chest.obj" textures="powersuits:textures/models/diffuse.png">
<binding slot="1" target="Body">
<part defaultcolor="FFFFFF" defaultglow="false" polygroup="backpack" name="Backpack"/>
<part defaultcolor="FFFFFF" defaultglow="false" polygroup="polySurface36" name="Accessory"/>
@ -25,7 +25,7 @@
<part defaultcolor="FFFFFF" defaultglow="false" polygroup="chest_main" name="Chest Plating"/>
</binding>
</model>
<model file="/assets/powersuits/models/mps_arms.obj" textures="powersuits:textures/models/diffuse.png">
<model file="powersuits:models/mps_arms.obj" textures="powersuits:textures/models/diffuse.png">
<binding slot="1" target="RightArm">
<part defaultcolor="114EFF" defaultglow="true" polygroup="crystal_shoulder_2"
name="Right Shoulder Crystal"/>
@ -36,7 +36,7 @@
<part defaultcolor="FFFFFF" defaultglow="false" polygroup="arms2" name="Left Arm"/>
</binding>
</model>
<model file="/assets/powersuits/models/mps_helm.obj" textures="powersuits:textures/models/diffuse.png">
<model file="powersuits:models/mps_helm.obj" textures="powersuits:textures/models/diffuse.png">
<binding slot="0" target="Head">
<part defaultcolor="FFFFFF" defaultglow="false" polygroup="helm_main" name="Helmet"/>
<part defaultcolor="114EFF" defaultglow="true" polygroup="visor" name="Visor"/>
@ -45,7 +45,7 @@
<part defaultcolor="FFFFFF" defaultglow="false" polygroup="helm_tube_entry1" name="Left Tube Entry"/>
</binding>
</model>
<model file="/assets/powersuits/models/jetpack.obj" textures="powersuits:textures/models/jetpack.png">
<model file="powersuits:models/jetpack.obj" textures="powersuits:textures/models/jetpack.png">
<binding slot="1" target="Body">
<part defaultcolor="FFFFFF" defaultglow="false" polygroup="default" name="Main"/>
<part defaultcolor="114EFF" defaultglow="false" polygroup="jetpack5" name="Secondary"/>

3
src/main/resources/numina_at.cfg Normal file
View file

@ -0,0 +1,3 @@
public net.minecraft.network.NetHandlerPlayServer field_147365_f #floatingtickCount
public net.minecraft.client.settings.KeyBinding field_74514_b #hash
public net.minecraft.client.settings.KeyBinding field_74516_a #keybindArray

14
src/main/scala/net/machinemuse/powersuits/common/CommonProxy.scala
View file

@ -29,12 +29,6 @@ import net.minecraftforge.common.MinecraftForge
*
* @author MachineMuse
*/
object CommonProxy {
def getResource(url: String): URL = {
return classOf[CommonProxy].getResource(url)
}
}
trait CommonProxy {
def registerEvents() {}
@ -47,10 +41,6 @@ trait CommonProxy {
def sendModeChange(dMode: Int, newMode: String) {}
}
object ClientProxy {
private var toolRenderer: ToolRenderer = null
var keybindHandler: KeybindKeyHandler = null
}
class ClientProxy extends CommonProxy {
override def registerEvents {
@ -76,9 +66,9 @@ class ClientProxy extends CommonProxy {
RenderingRegistry.registerEntityRenderingHandler(classOf[EntitySpinningBlade], new RenderSpinningBlade)
RenderingRegistry.registerEntityRenderingHandler(classOf[EntityLuxCapacitor], new RenderLuxCapacitorEntity)
MinecraftForge.EVENT_BUS.register(new RenderEventHandler)
val resource: URL = classOf[ClientProxy].getResource(Config.RESOURCE_PREFIX + "models/modelspec.xml")
val resource: URL = classOf[ClientProxy].getResource("/assets/powersuits/models/modelspec.xml")
ModelSpecXMLReader.parseFile(resource)
val otherResource: URL = classOf[ClientProxy].getResource(Config.RESOURCE_PREFIX + "models/armor2.xml")
val otherResource: URL = classOf[ClientProxy].getResource("/assets/powersuits/models/armor2.xml")
ModelSpecXMLReader.parseFile(otherResource)
try {
val x = MuseShaders.hBlurProgram.program // want this to initialize :s

4
src/main/scala/net/machinemuse/powersuits/common/ModularPowersuits.scala
View file

@ -18,9 +18,9 @@ import net.minecraftforge.common.config.Configuration
*
* @author MachineMuse
*/
@Mod(modid = "powersuits", name = "MachineMuse's Modular Powersuits")
@Mod(modid = "powersuits", modLanguage = "scala")
object ModularPowersuits {
@SidedProxy(clientSide = "net.machinemuse.powersuits.client.ClientProxy", serverSide = "net.machinemuse.powersuits.common.ServerProxy")
@SidedProxy(clientSide = "net.machinemuse.powersuits.common.ClientProxy", serverSide = "net.machinemuse.powersuits.common.ServerProxy")
var proxy: CommonProxy = null
var config: Configuration = null

6
src/main/scala/net/machinemuse/utils/render/ShaderProgram.scala
View file

@ -75,8 +75,12 @@ class ShaderProgram(vertSource: String, fragSource: String) {
glGetInfoLogARB(obj, glGetObjectParameteriARB(obj, GL_OBJECT_INFO_LOG_LENGTH_ARB))
}
def getResource(url: String): URL = {
classOf[CommonProxy].getResource(url)
}
def mk(filename: String, shaderType: Int): Int = {
val resource: URL = CommonProxy.getResource(filename)
val resource: URL = getResource(filename)
val shader = glCreateShaderObjectARB(shaderType)
val shaderProg = Source.fromURL(resource).mkString
// MuseLogger.logDebug("Created shader object with ID " + shader + " and text: \n" + shaderProg)