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.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
This commit is contained in:
Florian Nücke 2016-05-27 16:17:08 +02:00
commit 474795dd41
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,15 +3,11 @@ package li.cil.oc.integration.mcmp
import li.cil.oc.Constants
import li.cil.oc.Settings
import li.cil.oc.api
import li.cil.oc.client.renderer.block.ModelInitialization
import li.cil.oc.client.renderer.block.PrintModel
import mcmultipart.item.PartPlacementWrapper
import mcmultipart.multipart.MultipartRegistry
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
import net.minecraftforge.fml.common.FMLCommonHandler
import net.minecraftforge.fml.relauncher.Side
object MCMultiPart {
final val CableMultipartRawLocation = Settings.resourceDomain + ":" + Constants.BlockName.Cable
@ -29,17 +25,8 @@ object MCMultiPart {
new PartPlacementWrapper(api.Items.get(Constants.BlockName.Cable).createItemStack(1), PartFactory).register(PartFactory.PartTypeCable.toString)
new PartPlacementWrapper(api.Items.get(Constants.BlockName.Print).createItemStack(1), PartFactory).register(PartFactory.PartTypePrint.toString)
MinecraftForge.EVENT_BUS.register(this)
}
@SubscribeEvent(priority = EventPriority.LOW)
def onModelBake(e: ModelBakeEvent): Unit = {
val registry = e.getModelRegistry
// Replace default cable model with part model to properly handle connection
// rendering to multipart cables.
registry.putObject(ModelInitialization.CableBlockLocation, PartCableModel)
registry.putObject(CableMultipartLocation, PartCableModel)
registry.putObject(PrintMultipartLocation, PrintModel)
if (FMLCommonHandler.instance.getSide == Side.CLIENT) {
MCMultiPartClient.init()
}
}
}

25
src/main/scala/li/cil/oc/integration/mcmp/MCMultiPartClient.scala Normal file
View File

@ -0,0 +1,25 @@
package li.cil.oc.integration.mcmp
import li.cil.oc.client.renderer.block.ModelInitialization
import li.cil.oc.client.renderer.block.PrintModel
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 {
def init(): Unit = {
MinecraftForge.EVENT_BUS.register(this)
}
@SubscribeEvent(priority = EventPriority.LOW)
def onModelBake(e: ModelBakeEvent): Unit = {
val registry = e.getModelRegistry
// 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)
}
}