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

Initial MC 1.10 port.

Browse Source
This commit is contained in:
Florian Nücke 2016-06-25 21:25:16 +02:00
parent c92e30442a
commit aa996ca28f
7 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.properties
View File

@ -1,6 +1,6 @@
minecraft.version=1.9.4
minecraft.version=1.10
minecraft.mappings=snapshot_20160518
forge.version=12.17.0.1909-1.9.4
forge.version=12.18.0.1995-1.10.0
oc.version=1.6.0
oc.subversion=dev

5
src/main/scala/li/cil/oc/client/renderer/HighlightRenderer.scala
View File

@ -9,6 +9,7 @@ import li.cil.oc.util.BlockPosition
import li.cil.oc.util.ExtendedAABB._
import li.cil.oc.util.ExtendedWorld._
import li.cil.oc.util.RenderState
import net.minecraft.client.Minecraft
import net.minecraft.client.renderer.GlStateManager
import net.minecraft.client.renderer.OpenGlHelper
import net.minecraft.client.renderer.RenderGlobal
@ -123,9 +124,9 @@ object HighlightRenderer {
for (shape <- print.shapes) {
val bounds = shape.bounds.rotateTowards(print.facing)
RenderGlobal.drawOutlinedBoundingBox(bounds.expand(expansion, expansion, expansion)
RenderGlobal.func_189697_a(bounds.expand(expansion, expansion, expansion)
.offset(blockPos.x, blockPos.y, blockPos.z)
.offset(-pos.xCoord, -pos.yCoord, -pos.zCoord), 0, 0, 0, 0x66)
.offset(-pos.xCoord, -pos.yCoord, -pos.zCoord), 0, 0, 0, 0x66/0xFFf.toFloat)
}
GlStateManager.depthMask(true)

3
src/main/scala/li/cil/oc/common/inventory/SimpleInventory.scala
View File

@ -4,11 +4,12 @@ import li.cil.oc.Localization
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.inventory.IInventory
import net.minecraft.item.ItemStack
import net.minecraft.util.text.ITextComponent
trait SimpleInventory extends IInventory {
override def hasCustomName = false
override def getDisplayName = Localization.localizeLater(getName)
override def getDisplayName: ITextComponent = Localization.localizeLater(getName)
override def getInventoryStackLimit = 64

2
src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala
View File

@ -8,7 +8,7 @@ import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.MCVersion
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions
@TransformerExclusions(Array("li.cil.oc.common.asm"))
@MCVersion("1.9.4")
@MCVersion("1.10")
class TransformerLoader extends IFMLLoadingPlugin {
val instance = this

3
src/main/scala/li/cil/oc/common/tileentity/traits/Inventory.scala
View File

@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.EnumFacing
import net.minecraft.util.text.ITextComponent
trait Inventory extends TileEntity with inventory.Inventory {
private lazy val inventory = Array.fill[Option[ItemStack]](getSizeInventory)(None)
@ -15,6 +16,8 @@ trait Inventory extends TileEntity with inventory.Inventory {
// ----------------------------------------------------------------------- //
override def getDisplayName: ITextComponent = super[Inventory].getDisplayName
override def readFromNBTForServer(nbt: NBTTagCompound) {
super.readFromNBTForServer(nbt)
load(nbt)

1
src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
View File

@ -10,7 +10,6 @@ import net.minecraft.block.state.IBlockState
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.network.NetworkManager
import net.minecraft.network.play.server.SPacketUpdateTileEntity
import net.minecraft.util.ITickable
import net.minecraft.util.math.BlockPos
import net.minecraft.world.World
import net.minecraftforge.fml.relauncher.Side

2
src/main/scala/li/cil/oc/server/component/DebugCard.scala
View File

@ -34,9 +34,9 @@ import net.minecraft.util.SoundCategory
import net.minecraft.util.SoundEvent
import net.minecraft.util.math.BlockPos
import net.minecraft.util.text.ITextComponent
import net.minecraft.world.GameType
import net.minecraft.world.World
import net.minecraft.world.WorldServer
import net.minecraft.world.WorldSettings.GameType
import net.minecraftforge.common.DimensionManager
import net.minecraftforge.common.util.FakePlayer
import net.minecraftforge.common.util.FakePlayerFactory