AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-19 12:17:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

Browse Source 
Conflicts:
	src/main/java/li/cil/oc/api/event/RobotRenderEvent.java
This commit is contained in:
Florian Nücke 2015-04-23 18:55:23 +02:00
commit 83bd1bee7e
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/li/cil/oc/api/event/RobotRenderEvent.java
View File

@ -1,10 +1,15 @@
package li.cil.oc.api.event;
import li.cil.oc.api.driver.item.UpgradeRenderer;
import li.cil.oc.api.internal.Agent;
import li.cil.oc.api.internal.Robot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
import org.lwjgl.util.vector.Vector3f;
import org.lwjgl.util.vector.Vector4f;
import java.util.Set;
/**
* Fired directly before the robot's chassis is rendered.
* <p/>
@ -57,5 +62,20 @@ public class RobotRenderEvent extends RobotEvent {
* Note that the rotation is applied <em>before</em> the translation.
*/
public final Vector4f rotation = new Vector4f(0, 0, 0, 0);
/**
* The mount point's reference name.
* <p/>
* This is what's used in {@link UpgradeRenderer#computePreferredMountPoint(ItemStack, Robot, Set)}.
*/
public final String name;
public MountPoint() {
name = null;
}
public MountPoint(String name) {
this.name = name;
}
}
}

6
src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
View File

@ -35,7 +35,7 @@ import scala.collection.mutable
object RobotRenderer extends TileEntitySpecialRenderer {
private val displayList = GLAllocation.generateDisplayLists(2)
private val mountPoints = Array.fill(7)(new RobotRenderEvent.MountPoint())
private val mountPoints = new Array[RobotRenderEvent.MountPoint](7)
private val slotNameMapping = Map(
UpgradeRenderer.MountPointName.TopLeft -> 0,
@ -47,6 +47,10 @@ object RobotRenderer extends TileEntitySpecialRenderer {
UpgradeRenderer.MountPointName.BottomFront -> 6
)
for ((name, index) <- slotNameMapping) {
mountPoints(index) = new RobotRenderEvent.MountPoint(name)
}
private val gap = 1.0f / 28.0f
private val gt = 0.5f + gap
private val gb = 0.5f - gap

2
src/main/scala/li/cil/oc/common/template/AssemblerTemplates.scala
View File

@ -64,7 +64,7 @@ object AssemblerTemplates {
}
def assemble(inventory: IInventory) = IMC.tryInvokeStatic(assembler, inventory)(null: Array[AnyRef]) match {
case Array(stack: ItemStack, energy: java.lang.Double) => (stack, energy: Double)
case Array(stack: ItemStack, energy: java.lang.Number) => (stack, energy.doubleValue(): Double)
case Array(stack: ItemStack) => (stack, 0.0)
case _ => (null, 0.0)
}