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

Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4

Browse Source 
# Conflicts:
#	src/main/scala/li/cil/oc/integration/mcmp/MCMultiPart.scala
#	src/main/scala/li/cil/oc/integration/mcmp/MCMultiPartClient.scala
#	src/main/scala/li/cil/oc/integration/mcmp/PartCable.scala
#	src/main/scala/li/cil/oc/integration/mcmp/PartPrint.scala
This commit is contained in:
Florian Nücke 2016-06-15 22:15:42 +02:00
commit 0b5e74b31e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/integration/mcmp/MCMultiPart.scala
View File

@ -12,8 +12,6 @@ import net.minecraftforge.fml.relauncher.Side
object MCMultiPart {
final val CableMultipartRawLocation = Settings.resourceDomain + ":" + Constants.BlockName.Cable
final val PrintMultipartRawLocation = Settings.resourceDomain + ":" + Constants.BlockName.Print
final val CableMultipartLocation = new ModelResourceLocation(CableMultipartRawLocation, "multipart")
final val PrintMultipartLocation = new ModelResourceLocation(PrintMultipartRawLocation, "multipart")
def init(): Unit = {
MultipartRegistry.registerPart(classOf[PartCable], PartFactory.PartTypeCable.toString)

8
src/main/scala/li/cil/oc/integration/mcmp/MCMultiPartClient.scala
View File

@ -2,12 +2,16 @@ package li.cil.oc.integration.mcmp
import li.cil.oc.client.renderer.block.ModelInitialization
import li.cil.oc.client.renderer.block.PrintModel
import net.minecraft.client.renderer.block.model.ModelResourceLocation
import net.minecraftforge.client.event.ModelBakeEvent
import net.minecraftforge.common.MinecraftForge
import net.minecraftforge.fml.common.eventhandler.EventPriority
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
object MCMultiPartClient {
final val CableMultipartLocation = new ModelResourceLocation(MCMultiPart.CableMultipartRawLocation, "multipart")
final val PrintMultipartLocation = new ModelResourceLocation(MCMultiPart.PrintMultipartRawLocation, "multipart")
def init(): Unit = {
MinecraftForge.EVENT_BUS.register(this)
}
@ -19,7 +23,7 @@ object MCMultiPartClient {
// Replace default cable model with part model to properly handle connection
// rendering to multipart cables.
registry.putObject(ModelInitialization.CableBlockLocation, PartCableModel)
registry.putObject(MCMultiPart.CableMultipartLocation, PartCableModel)
registry.putObject(MCMultiPart.PrintMultipartLocation, PrintModel)
registry.putObject(CableMultipartLocation, PartCableModel)
registry.putObject(PrintMultipartLocation, PrintModel)
}
}