mirror of
https://github.com/GTNewHorizons/ForgeMultipart.git
synced 2026-11-18 19:39:19 +00:00
CodeChickenCore -> CodeChickenLib refactoring.
This commit is contained in:
1 parent
6d55eeed2b
commit
e7b307763f
54 files changed
+230
-232
No files matched your search
@@ -88,7 +88,7 @@ vt 1.000000 0.953125
|
||||
vn 0.999969 0.000000 0.000000
|
||||
s 1
|
||||
f 18/24/19 17/25/2 20/26/19 19/27/2
|
||||
g BaldeSupport
|
||||
g BladeSupport
|
||||
v -0.025100 0.713937 -0.081525
|
||||
v 0.025100 0.719137 0.036975
|
||||
v 0.025100 0.167037 0.036975
|
||||
|
||||
@@ -3,23 +3,23 @@ package codechicken.microblock
|
||||
import net.minecraft.block.Block
|
||||
import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial
|
||||
import net.minecraft.util.Icon
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.core.lighting.LC
|
||||
import codechicken.core.lighting.LightMatrix
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import codechicken.lib.lighting.LC
|
||||
import codechicken.lib.lighting.LightMatrix
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import codechicken.core.render.MultiIconTransformation
|
||||
import codechicken.core.render.IUVTransformation
|
||||
import codechicken.lib.render.MultiIconTransformation
|
||||
import codechicken.lib.render.IUVTransformation
|
||||
import codechicken.microblock.MicroblockClassRegistry._
|
||||
import net.minecraft.item.Item
|
||||
import net.minecraft.item.ItemStack
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.lib.vec.Vector3
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
import codechicken.core.render.Vertex5
|
||||
import codechicken.core.render.UV
|
||||
import codechicken.lib.render.Vertex5
|
||||
import codechicken.lib.render.UV
|
||||
import net.minecraft.client.renderer.Tessellator
|
||||
import codechicken.core.render.CCRenderState
|
||||
import codechicken.core.vec.Rotation
|
||||
import codechicken.lib.render.CCRenderState
|
||||
import codechicken.lib.vec.Rotation
|
||||
import net.minecraft.tileentity.TileEntity
|
||||
import net.minecraftforge.common.MinecraftForge
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
package codechicken.microblock
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound
|
||||
import codechicken.core.lighting.LightMatrix
|
||||
import codechicken.core.packet.PacketCustom
|
||||
import codechicken.lib.lighting.LightMatrix
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import codechicken.microblock.MicroMaterialRegistry._
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import org.lwjgl.opengl.GL11
|
||||
import codechicken.core.render.CCRenderState
|
||||
import codechicken.lib.render.CCRenderState
|
||||
import net.minecraft.world.World
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.core.lighting.LazyLightMatrix
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import codechicken.lib.vec.Vector3
|
||||
import codechicken.lib.lighting.LazyLightMatrix
|
||||
import codechicken.multipart.TIconHitEffects
|
||||
import net.minecraft.util.Icon
|
||||
import net.minecraft.block.Block
|
||||
@@ -18,19 +18,19 @@ import codechicken.multipart.TCuboidPart
|
||||
import net.minecraft.util.MovingObjectPosition
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
import codechicken.multipart.JPartialOcclusion
|
||||
import codechicken.core.vec.Rotation
|
||||
import codechicken.lib.vec.Rotation
|
||||
import codechicken.multipart.TileMultipart
|
||||
import codechicken.core.render.Vertex5
|
||||
import codechicken.lib.render.Vertex5
|
||||
import net.minecraft.item.ItemStack
|
||||
import scala.collection.mutable.ListBuffer
|
||||
import codechicken.multipart.TMultiPart
|
||||
import codechicken.core.data.MCDataOutput
|
||||
import codechicken.core.data.MCDataInput
|
||||
import codechicken.core.render.RenderUtils
|
||||
import codechicken.core.render.IFaceRenderer
|
||||
import codechicken.lib.data.MCDataOutput
|
||||
import codechicken.lib.data.MCDataInput
|
||||
import codechicken.lib.render.RenderUtils
|
||||
import codechicken.lib.render.IFaceRenderer
|
||||
import codechicken.multipart.TSlottedPart
|
||||
import scala.collection.JavaConversions._
|
||||
import codechicken.core.render.TextureUtils
|
||||
import codechicken.lib.render.TextureUtils
|
||||
|
||||
object CommonMicroblock
|
||||
{
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package codechicken.microblock
|
||||
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.core.vec.Scale
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import codechicken.lib.vec.Scale
|
||||
import codechicken.lib.vec.Vector3
|
||||
import Vector3._
|
||||
|
||||
object CornerPlacement extends PlacementProperties
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package codechicken.microblock
|
||||
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.core.vec.Scale
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.core.vec.TransformationList
|
||||
import codechicken.core.vec.AxisCycle
|
||||
import codechicken.core.vec.Rotation
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import codechicken.lib.vec.Scale
|
||||
import codechicken.lib.vec.Vector3
|
||||
import codechicken.lib.vec.TransformationList
|
||||
import codechicken.lib.vec.AxisCycle
|
||||
import codechicken.lib.vec.Rotation
|
||||
import Vector3._
|
||||
import Rotation._
|
||||
import codechicken.multipart.TMultiPart
|
||||
@@ -14,11 +14,11 @@ import codechicken.multipart.JPartialOcclusion
|
||||
import codechicken.multipart.NormalOcclusionTest
|
||||
import codechicken.multipart.TileMultipart
|
||||
import codechicken.multipart.MultiPartRegistry
|
||||
import codechicken.core.lighting.LazyLightMatrix
|
||||
import codechicken.lib.lighting.LazyLightMatrix
|
||||
import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import codechicken.core.raytracer.ExtendedMOP
|
||||
import codechicken.lib.raytracer.ExtendedMOP
|
||||
import codechicken.multipart.TEdgePart
|
||||
import scala.collection.JavaConversions._
|
||||
|
||||
|
||||
@@ -1,30 +1,30 @@
|
||||
package codechicken.microblock
|
||||
|
||||
import codechicken.core.packet.PacketCustom
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import net.minecraft.nbt.NBTTagCompound
|
||||
import net.minecraft.util.MovingObjectPosition
|
||||
import net.minecraft.item.ItemStack
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
import codechicken.multipart.TCuboidPart
|
||||
import codechicken.multipart.TFacePart
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.core.vec.Rotation
|
||||
import codechicken.lib.vec.Vector3
|
||||
import codechicken.lib.vec.Rotation
|
||||
import codechicken.multipart.PartMap
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import codechicken.core.lighting.CCRBModel
|
||||
import codechicken.lib.lighting.CCRBModel
|
||||
import net.minecraft.world.World
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import codechicken.multipart.MultipartRenderer
|
||||
import codechicken.core.render.CCModel
|
||||
import codechicken.lib.render.CCModel
|
||||
import codechicken.multipart.TileMultipart
|
||||
import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial
|
||||
import net.minecraft.block.Block
|
||||
import scala.collection.immutable.Vector
|
||||
import scala.collection.mutable.ListBuffer
|
||||
import codechicken.multipart.BlockMultipart
|
||||
import codechicken.core.lighting.LazyLightMatrix
|
||||
import codechicken.lib.lighting.LazyLightMatrix
|
||||
import Rotation._
|
||||
import Vector3._
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
package codechicken.microblock
|
||||
|
||||
import net.minecraft.util.Icon
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.lib.vec.Vector3
|
||||
import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
import net.minecraft.block.Block
|
||||
import codechicken.core.render.Vertex5
|
||||
import codechicken.core.render.IconTransformation
|
||||
import codechicken.lib.render.Vertex5
|
||||
import codechicken.lib.render.IconTransformation
|
||||
import net.minecraft.block.BlockGrass
|
||||
import codechicken.core.render.IUVTransformation
|
||||
import codechicken.core.render.UV
|
||||
import codechicken.core.lighting.LightMatrix
|
||||
import codechicken.lib.render.IUVTransformation
|
||||
import codechicken.lib.render.UV
|
||||
import codechicken.lib.lighting.LightMatrix
|
||||
|
||||
class TopIconTransformation(h:Double, uvt:IUVTransformation) extends IUVTransformation
|
||||
{
|
||||
|
||||
@@ -4,17 +4,17 @@ import net.minecraft.world.World
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
import net.minecraft.util.MovingObjectPosition
|
||||
import codechicken.multipart.TFacePart
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.core.vec.Rotation
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import codechicken.lib.vec.Rotation
|
||||
import codechicken.lib.vec.Vector3
|
||||
import codechicken.multipart.TNormalOcclusion
|
||||
import codechicken.core.lighting.LazyLightMatrix
|
||||
import codechicken.lib.lighting.LazyLightMatrix
|
||||
import codechicken.microblock.MicroMaterialRegistry.IMicroMaterial
|
||||
import net.minecraft.client.renderer.RenderBlocks
|
||||
import codechicken.core.render.IconTransformation
|
||||
import codechicken.core.render.RenderUtils
|
||||
import codechicken.core.render.CCRenderState
|
||||
import codechicken.lib.render.IconTransformation
|
||||
import codechicken.lib.render.RenderUtils
|
||||
import codechicken.lib.render.CCRenderState
|
||||
import scala.collection.JavaConversions._
|
||||
import Rotation._
|
||||
import Vector3._
|
||||
|
||||
@@ -13,16 +13,16 @@ import net.minecraft.util.StatCollector
|
||||
import java.util.List
|
||||
import net.minecraft.creativetab.CreativeTabs
|
||||
import codechicken.microblock.MicroblockClassRegistry._
|
||||
import codechicken.core.render.CCRenderState
|
||||
import codechicken.lib.render.CCRenderState
|
||||
import net.minecraft.client.renderer.texture.IconRegister
|
||||
import codechicken.microblock.handler.MicroblockProxy
|
||||
import net.minecraft.util.MovingObjectPosition
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
import net.minecraft.world.World
|
||||
import codechicken.core.raytracer.RayTracer
|
||||
import codechicken.lib.raytracer.RayTracer
|
||||
import net.minecraft.util.EnumMovingObjectType
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.core.render.TextureUtils
|
||||
import codechicken.lib.vec.Vector3
|
||||
import codechicken.lib.render.TextureUtils
|
||||
|
||||
class ItemMicroPart(id:Int) extends Item(id)
|
||||
{
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
package codechicken.microblock
|
||||
|
||||
import net.minecraft.item.Item
|
||||
import codechicken.core.config.ConfigTag
|
||||
import codechicken.lib.config.ConfigTag
|
||||
import codechicken.microblock.handler.MicroblockProxy._
|
||||
import net.minecraft.item.ItemStack
|
||||
import net.minecraftforge.client.IItemRenderer
|
||||
import codechicken.core.render.CCModel
|
||||
import codechicken.lib.render.CCModel
|
||||
import net.minecraftforge.client.IItemRenderer.ItemRenderType
|
||||
import net.minecraftforge.client.IItemRenderer.ItemRendererHelper
|
||||
import codechicken.core.vec.SwapYZ
|
||||
import codechicken.core.render.CCRenderState
|
||||
import codechicken.core.vec.Transformation
|
||||
import codechicken.core.vec.TransformationList
|
||||
import codechicken.core.vec.Translation
|
||||
import codechicken.core.vec.Scale
|
||||
import codechicken.core.vec.Rotation
|
||||
import codechicken.lib.vec.SwapYZ
|
||||
import codechicken.lib.render.CCRenderState
|
||||
import codechicken.lib.vec.Transformation
|
||||
import codechicken.lib.vec.TransformationList
|
||||
import codechicken.lib.vec.Translation
|
||||
import codechicken.lib.vec.Scale
|
||||
import codechicken.lib.vec.Rotation
|
||||
import org.lwjgl.opengl.GL11
|
||||
import codechicken.core.render.UVTranslation
|
||||
import codechicken.lib.render.UVTranslation
|
||||
import ItemRenderType._
|
||||
import codechicken.core.alg.MathHelper._
|
||||
import codechicken.lib.math.MathHelper._
|
||||
import net.minecraft.util.ResourceLocation
|
||||
import net.minecraft.client.renderer.texture.IconRegister
|
||||
|
||||
@@ -54,7 +54,7 @@ object ItemSawRenderer extends IItemRenderer
|
||||
{
|
||||
val models = CCModel.parseObjModels(new ResourceLocation("microblock", "models/saw.obj"), 7, new SwapYZ())
|
||||
val handle = models.get("Handle");
|
||||
val holder = models.get("BaldeSupport")
|
||||
val holder = models.get("BladeSupport")
|
||||
val blade = models.get("Blade")
|
||||
|
||||
def handleRenderType(item:ItemStack, renderType:ItemRenderType) = true
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package codechicken.microblock
|
||||
|
||||
import codechicken.core.lighting.CCRBModel
|
||||
import codechicken.lib.lighting.CCRBModel
|
||||
import net.minecraft.util.MovingObjectPosition
|
||||
import net.minecraft.world.World
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.core.render.CCModel
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import codechicken.lib.vec.Vector3
|
||||
import codechicken.lib.render.CCModel
|
||||
import codechicken.multipart.TMultiPart
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
import codechicken.multipart.TileMultipart
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
package codechicken.microblock
|
||||
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import codechicken.multipart.IDWriter
|
||||
import codechicken.core.lighting.LightMatrix
|
||||
import codechicken.core.packet.PacketCustom
|
||||
import codechicken.lib.lighting.LightMatrix
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import scala.collection.mutable.HashMap
|
||||
import codechicken.core.data.MCDataOutput
|
||||
import codechicken.core.data.MCDataInput
|
||||
import codechicken.lib.data.MCDataOutput
|
||||
import codechicken.lib.data.MCDataInput
|
||||
import codechicken.multipart.MultiPartRegistry
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import codechicken.microblock.handler.MicroblockProxy
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.lib.vec.Vector3
|
||||
import net.minecraft.util.Icon
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
import codechicken.core.render.Vertex5
|
||||
import codechicken.lib.render.Vertex5
|
||||
import net.minecraft.item.ItemStack
|
||||
|
||||
object MicroMaterialRegistry
|
||||
|
||||
@@ -3,16 +3,16 @@ package codechicken.microblock
|
||||
import net.minecraft.world.World
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
import net.minecraft.util.MovingObjectPosition
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.lib.vec.Vector3
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import codechicken.multipart.TileMultipart
|
||||
import codechicken.core.vec.Rotation
|
||||
import codechicken.lib.vec.Rotation
|
||||
import codechicken.multipart.ControlKeyModifer._
|
||||
import net.minecraft.item.ItemStack
|
||||
import codechicken.microblock.handler.MicroblockProxy
|
||||
import codechicken.multipart.TMultiPart
|
||||
import codechicken.multipart.TileMultipart
|
||||
import codechicken.core.raytracer.ExtendedMOP
|
||||
import codechicken.lib.raytracer.ExtendedMOP
|
||||
|
||||
abstract class ExecutablePlacement(val pos:BlockCoord, val part:Microblock)
|
||||
{
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package codechicken.microblock
|
||||
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.lib.vec.Vector3
|
||||
import org.lwjgl.opengl.GL11
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.core.vec.Rotation
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import codechicken.lib.vec.Rotation
|
||||
import Rotation._
|
||||
|
||||
trait PlacementGrid
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package codechicken.microblock
|
||||
|
||||
import codechicken.multipart.TMultiPart
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import codechicken.multipart.TileMultipart
|
||||
|
||||
@@ -10,7 +10,7 @@ import net.minecraft.util.EnumMovingObjectType
|
||||
import codechicken.microblock.ItemMicroPart
|
||||
import codechicken.microblock.ItemMicroPartRenderer
|
||||
import org.lwjgl.opengl.GL11
|
||||
import codechicken.core.render.RenderUtils
|
||||
import codechicken.lib.render.RenderUtils
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
|
||||
|
||||
@@ -19,13 +19,15 @@ import codechicken.microblock.ItemSaw
|
||||
import net.minecraft.item.crafting.IRecipe
|
||||
import java.util.{List => JList}
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry
|
||||
import codechicken.core.config.ConfigTag
|
||||
import codechicken.core.config.ConfigFile
|
||||
import codechicken.lib.config.ConfigTag
|
||||
import codechicken.lib.config.ConfigFile
|
||||
import net.minecraftforge.oredict.OreDictionary
|
||||
import codechicken.microblock.ItemSawRenderer
|
||||
import net.minecraft.item.ItemStack
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe
|
||||
import net.minecraft.block.Block
|
||||
import codechicken.lib.lang.LangUtil
|
||||
import net.minecraft.util.ResourceLocation
|
||||
|
||||
class MicroblockProxy_serverImpl
|
||||
{
|
||||
@@ -42,23 +44,19 @@ class MicroblockProxy_serverImpl
|
||||
def preInit()
|
||||
{
|
||||
itemMicro = new ItemMicroPart(config.getTag("itemMicro.id").getIntValue(nextItemID))
|
||||
sawStone = createSaw(config, "sawStone", 1, "Stone Handsaw")
|
||||
sawIron = createSaw(config, "sawIron", 2, "Iron Handsaw")
|
||||
sawDiamond = createSaw(config, "sawDiamond", 3, "Diamond Handsaw")
|
||||
sawStone = createSaw(config, "sawStone", 1)
|
||||
sawIron = createSaw(config, "sawIron", 2)
|
||||
sawDiamond = createSaw(config, "sawDiamond", 3)
|
||||
stoneRod = new Item(config.getTag("stoneRod.id").getIntValue(nextItemID))
|
||||
.setUnlocalizedName("microblock:stoneRod").func_111206_d("microblock:stoneRod")
|
||||
LanguageRegistry.addName(stoneRod, "Stone Rod")
|
||||
OreDictionary.registerOre("stoneRod", stoneRod)
|
||||
|
||||
OreDictionary.registerOre("stoneRod", stoneRod)
|
||||
LangUtil.instance.addLangDir(new ResourceLocation("microblock:lang"))
|
||||
MinecraftForge.EVENT_BUS.register(MicroblockEventHandler)
|
||||
}
|
||||
|
||||
def createSaw(config:ConfigFile, name:String, strength:Int, localized:String) =
|
||||
{
|
||||
val saw = new ItemSaw(config.getTag(name).useBraces(), strength).setUnlocalizedName("microblock:"+name)
|
||||
LanguageRegistry.addName(saw, localized)
|
||||
saw
|
||||
}
|
||||
def createSaw(config:ConfigFile, name:String, strength:Int) =
|
||||
new ItemSaw(config.getTag(name).useBraces(), strength).setUnlocalizedName("microblock:"+name)
|
||||
|
||||
def addSawRecipe(saw:Item, blade:Item)
|
||||
{
|
||||
@@ -94,9 +92,9 @@ class MicroblockProxy_clientImpl extends MicroblockProxy_serverImpl
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
override def createSaw(config:ConfigFile, name:String, strength:Int, localized:String) =
|
||||
override def createSaw(config:ConfigFile, name:String, strength:Int) =
|
||||
{
|
||||
val saw = super.createSaw(config, name, strength, localized)
|
||||
val saw = super.createSaw(config, name, strength)
|
||||
MinecraftForgeClient.registerItemRenderer(saw.itemID, ItemSawRenderer)
|
||||
saw
|
||||
}
|
||||
|
||||
@@ -10,11 +10,11 @@ import net.minecraftforge.common.ForgeDirection
|
||||
import net.minecraft.util.Vec3
|
||||
import net.minecraft.util.MovingObjectPosition
|
||||
import java.util.LinkedList
|
||||
import codechicken.core.raytracer.IndexedCuboid6
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.core.raytracer.RayTracer
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.lib.raytracer.IndexedCuboid6
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import codechicken.lib.raytracer.RayTracer
|
||||
import codechicken.lib.vec.Vector3
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
import java.util.Random
|
||||
import java.util.ArrayList
|
||||
@@ -23,10 +23,10 @@ import net.minecraft.client.particle.EffectRenderer
|
||||
import net.minecraft.client.Minecraft
|
||||
import net.minecraft.util.Icon
|
||||
import net.minecraft.client.renderer.texture.IconRegister
|
||||
import codechicken.core.render.TextureSpecial
|
||||
import codechicken.core.render.TextureUtils
|
||||
import codechicken.lib.render.TextureSpecial
|
||||
import codechicken.lib.render.TextureUtils
|
||||
import net.minecraft.world.IBlockAccess
|
||||
import codechicken.core.raytracer.ExtendedMOP
|
||||
import codechicken.lib.raytracer.ExtendedMOP
|
||||
import scala.collection.JavaConversions._
|
||||
|
||||
object BlockMultipart
|
||||
@@ -185,7 +185,7 @@ trait BlockMultipart extends Block
|
||||
{
|
||||
val n = getUnlocalizedName();
|
||||
val icon = TextureUtils.getBlankIcon(16, register);
|
||||
setTextureName(icon.getIconName)
|
||||
func_111022_d(icon.getIconName)
|
||||
super.registerIcons(register)
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry
|
||||
import java.util.EnumSet
|
||||
import cpw.mods.fml.common.TickType
|
||||
import net.minecraft.client.Minecraft
|
||||
import codechicken.core.packet.PacketCustom
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import codechicken.multipart.handler.MultipartCPH
|
||||
import scala.collection.mutable.HashMap
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package codechicken.multipart
|
||||
|
||||
import codechicken.core.data.MCDataOutput
|
||||
import codechicken.core.data.MCDataInput
|
||||
import codechicken.lib.data.MCDataOutput
|
||||
import codechicken.lib.data.MCDataInput
|
||||
|
||||
trait IDWriter
|
||||
{
|
||||
@@ -19,12 +19,12 @@ trait IDWriter
|
||||
else if(l > 0xFF)
|
||||
{
|
||||
write = (data, i) => data.writeShort(i)
|
||||
read = (data) => data.readUnsignedShort()
|
||||
read = (data) => data.readUShort()
|
||||
}
|
||||
else
|
||||
{
|
||||
write = (data, i) => data.writeByte(i)
|
||||
read = (data) => data.readUnsignedByte()
|
||||
read = (data) => data.readUByte()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ import net.minecraft.block.BlockRedstoneWire
|
||||
import net.minecraft.world.IBlockAccess
|
||||
import net.minecraft.util.Direction
|
||||
import PartMap._
|
||||
import codechicken.core.vec.Rotation._
|
||||
import codechicken.lib.vec.Rotation._
|
||||
|
||||
trait IRedstonePart
|
||||
{
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package codechicken.multipart
|
||||
|
||||
import net.minecraft.item.Item
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.core.vec.Rotation
|
||||
import codechicken.lib.vec.Vector3
|
||||
import codechicken.lib.vec.Rotation
|
||||
import net.minecraft.item.ItemStack
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
import net.minecraft.world.World
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
|
||||
abstract class JItemMultiPart(id:Int) extends Item(id) with TItemMultiPart
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package codechicken.multipart;
|
||||
|
||||
import scala.collection.mutable.HashMap
|
||||
import codechicken.core.packet.PacketCustom
|
||||
import codechicken.core.data.MCDataOutput
|
||||
import codechicken.core.data.MCDataInput
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import codechicken.lib.data.MCDataOutput
|
||||
import codechicken.lib.data.MCDataInput
|
||||
import net.minecraft.world.World
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import scala.collection.mutable.ListBuffer
|
||||
|
||||
object MultiPartRegistry
|
||||
|
||||
@@ -3,11 +3,11 @@ package codechicken.multipart
|
||||
import net.minecraft.tileentity.TileEntity
|
||||
import scala.collection.immutable.Map
|
||||
import net.minecraft.world.World
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import codechicken.multipart.handler.MultipartProxy
|
||||
import cpw.mods.fml.common.FMLCommonHandler
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import codechicken.core.packet.PacketCustom
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import net.minecraft.network.packet.Packet53BlockChange
|
||||
import scala.collection.mutable.ListBuffer
|
||||
import scala.collection.mutable.ListBuffer
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package codechicken.multipart
|
||||
|
||||
import codechicken.core.lighting.LightMatrix
|
||||
import codechicken.core.render.CCRenderState
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.lib.lighting.LightMatrix
|
||||
import codechicken.lib.render.CCRenderState
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import codechicken.lib.vec.Vector3
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry
|
||||
import net.minecraft.block.Block
|
||||
@@ -11,14 +11,14 @@ import net.minecraft.client.renderer.RenderBlocks
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer
|
||||
import net.minecraft.tileentity.TileEntity
|
||||
import net.minecraft.world.IBlockAccess
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import net.minecraft.world.IWorldAccess
|
||||
import net.minecraft.util.MovingObjectPosition
|
||||
import net.minecraft.client.Minecraft
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import codechicken.core.raytracer.ExtendedMOP
|
||||
import codechicken.core.lighting.LazyLightMatrix
|
||||
import codechicken.lib.raytracer.ExtendedMOP
|
||||
import codechicken.lib.lighting.LazyLightMatrix
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
object MultipartRenderer extends TileEntitySpecialRenderer with ISimpleBlockRenderingHandler
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
package codechicken.multipart
|
||||
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.core.raytracer.IndexedCuboid6
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import codechicken.lib.raytracer.IndexedCuboid6
|
||||
import net.minecraft.client.renderer.RenderBlocks
|
||||
import codechicken.core.render.CCRenderState
|
||||
import codechicken.core.render.RenderUtils
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.core.render.IconTransformation
|
||||
import codechicken.lib.render.CCRenderState
|
||||
import codechicken.lib.render.RenderUtils
|
||||
import codechicken.lib.vec.Vector3
|
||||
import codechicken.lib.render.IconTransformation
|
||||
import scala.collection.JavaConversions._
|
||||
import java.lang.Iterable
|
||||
import codechicken.core.vec.Translation
|
||||
import codechicken.lib.vec.Translation
|
||||
|
||||
abstract class JCuboidPart extends TCuboidPart
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
package codechicken.multipart
|
||||
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import net.minecraft.util.Icon
|
||||
import net.minecraft.util.MovingObjectPosition
|
||||
import net.minecraft.client.particle.EffectRenderer
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.core.raytracer.ExtendedMOP
|
||||
import codechicken.core.render.EntityDigIconFX
|
||||
import codechicken.lib.vec.Vector3
|
||||
import codechicken.lib.raytracer.ExtendedMOP
|
||||
import codechicken.lib.render.EntityDigIconFX
|
||||
|
||||
object IconHitEffects
|
||||
{
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
package codechicken.multipart
|
||||
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import codechicken.lib.vec.Vector3
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
import net.minecraft.item.ItemStack
|
||||
import net.minecraft.nbt.NBTTagCompound
|
||||
import net.minecraft.util.MovingObjectPosition
|
||||
import codechicken.core.raytracer.IndexedCuboid6
|
||||
import codechicken.lib.raytracer.IndexedCuboid6
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import net.minecraft.client.particle.EffectRenderer
|
||||
import net.minecraft.util.Icon
|
||||
import net.minecraft.client.renderer.RenderBlocks
|
||||
import codechicken.core.render.RenderUtils
|
||||
import codechicken.core.render.IconTransformation
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.lib.render.RenderUtils
|
||||
import codechicken.lib.render.IconTransformation
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import net.minecraft.world.World
|
||||
import net.minecraft.tileentity.TileEntity
|
||||
import codechicken.core.render.CCRenderState
|
||||
import codechicken.core.lighting.LazyLightMatrix
|
||||
import codechicken.core.data.MCDataOutput
|
||||
import codechicken.core.data.MCDataInput
|
||||
import codechicken.lib.render.CCRenderState
|
||||
import codechicken.lib.lighting.LazyLightMatrix
|
||||
import codechicken.lib.data.MCDataOutput
|
||||
import codechicken.lib.data.MCDataInput
|
||||
import net.minecraft.entity.Entity
|
||||
import java.lang.Iterable
|
||||
import scala.collection.JavaConversions._
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package codechicken.multipart
|
||||
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import scala.collection.JavaConversions._
|
||||
import java.lang.Iterable
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package codechicken.multipart
|
||||
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import scala.collection.JavaConversions._
|
||||
import java.lang.Iterable
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
package codechicken.multipart
|
||||
|
||||
import codechicken.core.world.WorldExtensionInstantiator
|
||||
import codechicken.core.world.WorldExtension
|
||||
import codechicken.core.world.ChunkExtension
|
||||
import codechicken.lib.world.WorldExtensionInstantiator
|
||||
import codechicken.lib.world.WorldExtension
|
||||
import codechicken.lib.world.ChunkExtension
|
||||
import net.minecraft.world.chunk.Chunk
|
||||
import net.minecraft.world.World
|
||||
import net.minecraft.nbt.NBTTagCompound
|
||||
import scala.collection.mutable.ListBuffer
|
||||
import net.minecraft.nbt.NBTTagList
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import net.minecraft.world.ChunkCoordIntPair
|
||||
import net.minecraft.world.ChunkPosition
|
||||
import scala.collection.mutable.HashSet
|
||||
|
||||
@@ -3,9 +3,9 @@ package codechicken.multipart
|
||||
import net.minecraft.tileentity.TileEntity
|
||||
import scala.collection.mutable.ListBuffer
|
||||
import net.minecraft.network.packet.Packet
|
||||
import codechicken.core.packet.PacketCustom
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import codechicken.multipart.handler.MultipartCPH
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import net.minecraft.world.World
|
||||
import java.util.List
|
||||
import scala.collection.JavaConverters._
|
||||
@@ -13,16 +13,16 @@ import net.minecraft.nbt.NBTTagCompound
|
||||
import java.io.ByteArrayOutputStream
|
||||
import java.io.DataOutputStream
|
||||
import java.io.DataInputStream
|
||||
import codechicken.core.data.MCDataInputStream
|
||||
import codechicken.core.data.MCDataOutput
|
||||
import codechicken.core.data.MCDataOutputStream
|
||||
import codechicken.lib.data.MCDataInputStream
|
||||
import codechicken.lib.data.MCDataOutput
|
||||
import codechicken.lib.data.MCDataOutputStream
|
||||
import net.minecraft.client.multiplayer.NetClientHandler
|
||||
import codechicken.core.vec.Cuboid6
|
||||
import codechicken.lib.vec.Cuboid6
|
||||
import scala.collection.mutable.HashSet
|
||||
import codechicken.multipart.handler.MultipartProxy
|
||||
import net.minecraft.block.Block
|
||||
import net.minecraft.item.ItemStack
|
||||
import codechicken.core.vec.Vector3
|
||||
import codechicken.lib.vec.Vector3
|
||||
import net.minecraft.nbt.NBTTagList
|
||||
import net.minecraft.client.particle.EffectRenderer
|
||||
import net.minecraft.util.MovingObjectPosition
|
||||
@@ -32,7 +32,7 @@ import cpw.mods.fml.relauncher.SideOnly
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import scala.collection.mutable.Queue
|
||||
import codechicken.multipart.handler.MultipartSPH
|
||||
import codechicken.core.lighting.LazyLightMatrix
|
||||
import codechicken.lib.lighting.LazyLightMatrix
|
||||
import net.minecraft.world.ChunkCoordIntPair
|
||||
import net.minecraft.entity.item.EntityItem
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
@@ -581,7 +581,7 @@ object TileMultipart
|
||||
|
||||
def handleDescPacket(world:World, pos:BlockCoord, packet:PacketCustom)
|
||||
{
|
||||
val nparts = packet.readUnsignedByte
|
||||
val nparts = packet.readUByte
|
||||
val parts = new ListBuffer[TMultiPart]()
|
||||
for(i <- 0 until nparts)
|
||||
{
|
||||
@@ -614,7 +614,7 @@ object TileMultipart
|
||||
MultipartGenerator.addPart(world, pos, part)
|
||||
}
|
||||
case 254 => if(tilemp != null) {
|
||||
tilemp.remPart_impl(tilemp.partList(packet.readUnsignedByte))
|
||||
tilemp.remPart_impl(tilemp.partList(packet.readUByte))
|
||||
}
|
||||
case _ => if(tilemp != null) {
|
||||
tilemp.partList(i).read(packet)
|
||||
|
||||
@@ -11,8 +11,8 @@ import org.objectweb.asm.util.Textifier
|
||||
import org.objectweb.asm.Type
|
||||
import org.objectweb.asm.MethodVisitor
|
||||
import Type._
|
||||
import codechicken.core.asm.ASMHelper._
|
||||
import codechicken.core.asm.ObfMapping
|
||||
import codechicken.lib.asm.ASMHelper._
|
||||
import codechicken.lib.asm.ObfMapping
|
||||
import java.io.File
|
||||
import java.io.PrintWriter
|
||||
import ScalaSignature._
|
||||
@@ -537,7 +537,7 @@ object ASMMixinCompiler
|
||||
val csym:ClassSymbol = sig.evalT(0)
|
||||
for(i <- 0 until sig.table.length)
|
||||
{
|
||||
import ScalaSignature._
|
||||
import ScalaSignature._
|
||||
|
||||
val e = sig.table(i)
|
||||
if(e.id == 8)//method
|
||||
|
||||
@@ -7,7 +7,7 @@ import scala.collection.JavaConversions._
|
||||
import scala.collection.JavaConverters._
|
||||
import org.objectweb.asm.Opcodes._
|
||||
import org.objectweb.asm.ClassWriter
|
||||
import codechicken.core.asm.CC_ClassWriter
|
||||
import codechicken.lib.asm.CC_ClassWriter
|
||||
import org.objectweb.asm.MethodVisitor
|
||||
import org.objectweb.asm.FieldVisitor
|
||||
import org.objectweb.asm.Label
|
||||
@@ -19,8 +19,8 @@ import org.objectweb.asm.tree._
|
||||
import org.objectweb.asm.Type
|
||||
import Type._
|
||||
import scala.collection.immutable.Range
|
||||
import codechicken.core.asm.ASMHelper._
|
||||
import codechicken.core.asm.ObfMapping
|
||||
import codechicken.lib.asm.ASMHelper._
|
||||
import codechicken.lib.asm.ObfMapping
|
||||
import codechicken.multipart.MultipartGenerator
|
||||
import ASMMixinCompiler._
|
||||
|
||||
@@ -53,7 +53,7 @@ object ASMMixinFactory extends IMultipartFactory
|
||||
|
||||
class SuperSet(types:Seq[String], client:Boolean)
|
||||
{
|
||||
import SuperSet._
|
||||
import SuperSet._
|
||||
val set = baseType+:types.sorted
|
||||
|
||||
def baseType = if(client) TileMultipartClientType else TileMultipartType
|
||||
|
||||
@@ -10,7 +10,7 @@ import net.minecraft.network.packet.Packet1Login
|
||||
import cpw.mods.fml.common.network.Player
|
||||
import net.minecraft.network.NetLoginHandler
|
||||
import net.minecraft.server.MinecraftServer
|
||||
import codechicken.core.packet.PacketCustom
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import codechicken.multipart.MultiPartRegistry
|
||||
import net.minecraftforge.event.world._
|
||||
import cpw.mods.fml.common.ITickHandler
|
||||
|
||||
@@ -10,7 +10,7 @@ import cpw.mods.fml.common.Mod.ServerAboutToStart
|
||||
import cpw.mods.fml.common.event.FMLServerAboutToStartEvent
|
||||
import codechicken.multipart.MultiPartRegistry
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import codechicken.core.packet.PacketCustom.CustomTinyPacketHandler
|
||||
import codechicken.lib.packet.PacketCustom.CustomTinyPacketHandler
|
||||
|
||||
@Mod(name="Multipart API", version="b.0.0.0", useMetadata = false, modid = "ForgeMultipart", acceptedMinecraftVersions = "[1.6.2]",
|
||||
modLanguage="scala")
|
||||
|
||||
@@ -6,7 +6,7 @@ import java.util.Map
|
||||
import net.minecraft.world.chunk.Chunk
|
||||
import net.minecraft.world.ChunkPosition
|
||||
import codechicken.multipart.TileMultipart
|
||||
import codechicken.core.asm.ObfMapping
|
||||
import codechicken.lib.asm.ObfMapping
|
||||
|
||||
/**
|
||||
* Hack due to lack of TileEntityLoadEvent in forge
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package codechicken.multipart.handler
|
||||
|
||||
import codechicken.core.packet.PacketCustom.IClientPacketHandler
|
||||
import codechicken.core.packet.PacketCustom.IServerPacketHandler
|
||||
import codechicken.core.packet.PacketCustom
|
||||
import codechicken.lib.packet.PacketCustom.IClientPacketHandler
|
||||
import codechicken.lib.packet.PacketCustom.IServerPacketHandler
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import net.minecraft.client.multiplayer.NetClientHandler
|
||||
import net.minecraft.client.Minecraft
|
||||
import codechicken.multipart.MultiPartRegistry
|
||||
@@ -20,8 +20,8 @@ import net.minecraft.tileentity.TileEntity
|
||||
import codechicken.multipart.TileMultipart
|
||||
import net.minecraft.entity.player.EntityPlayer
|
||||
import scala.collection._
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.core.data.MCOutputStreamWrapper
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import codechicken.lib.data.MCOutputStreamWrapper
|
||||
import java.io.DataOutputStream
|
||||
import java.io.ByteArrayOutputStream
|
||||
import net.minecraft.world.WorldServer
|
||||
@@ -56,7 +56,7 @@ object MultipartCPH extends MultipartPH with IClientPacketHandler
|
||||
def handleCompressedTileDesc(packet:PacketCustom, world:World)
|
||||
{
|
||||
val cc = new ChunkCoordIntPair(packet.readInt, packet.readInt)
|
||||
val num = packet.readUnsignedShort
|
||||
val num = packet.readUShort
|
||||
for(i <- 0 until num)
|
||||
TileMultipart.handleDescPacket(world, indexInChunk(cc, packet.readShort), packet)
|
||||
}
|
||||
@@ -67,11 +67,11 @@ object MultipartCPH extends MultipartPH with IClientPacketHandler
|
||||
while(x != Int.MaxValue)
|
||||
{
|
||||
val pos = new BlockCoord(x, packet.readInt, packet.readInt)
|
||||
var i = packet.readUnsignedByte
|
||||
var i = packet.readUByte
|
||||
while(i < 255)
|
||||
{
|
||||
TileMultipart.handlePacket(pos, world, i, packet)
|
||||
i = packet.readUnsignedByte
|
||||
i = packet.readUByte
|
||||
}
|
||||
x = packet.readInt
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ import cpw.mods.fml.common.network.PacketDispatcher
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry
|
||||
import cpw.mods.fml.client.registry.ClientRegistry
|
||||
import net.minecraft.tileentity.TileEntity
|
||||
import codechicken.core.config.ConfigFile
|
||||
import codechicken.lib.config.ConfigFile
|
||||
import cpw.mods.fml.common.registry.GameRegistry
|
||||
import java.io.File
|
||||
import codechicken.multipart.handler.MultipartProxy._
|
||||
@@ -16,7 +16,7 @@ import net.minecraftforge.common.MinecraftForge
|
||||
import codechicken.multipart.MultipartGenerator
|
||||
import cpw.mods.fml.relauncher.SideOnly
|
||||
import cpw.mods.fml.relauncher.Side
|
||||
import codechicken.core.packet.PacketCustom
|
||||
import codechicken.lib.packet.PacketCustom
|
||||
import codechicken.multipart.TileMultipart
|
||||
import cpw.mods.fml.client.registry.KeyBindingRegistry
|
||||
import codechicken.multipart.ControlKeyHandler
|
||||
@@ -24,8 +24,8 @@ import cpw.mods.fml.common.network.NetworkRegistry
|
||||
import cpw.mods.fml.common.registry.TickRegistry
|
||||
import net.minecraft.block.Block
|
||||
import net.minecraft.world.ChunkCoordIntPair
|
||||
import codechicken.core.vec.BlockCoord
|
||||
import codechicken.core.world.WorldExtensionManager
|
||||
import codechicken.lib.vec.BlockCoord
|
||||
import codechicken.lib.world.WorldExtensionManager
|
||||
import codechicken.multipart.TickScheduler
|
||||
|
||||
class MultipartProxy_serverImpl
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package codechicken.multipart.minecraft;
|
||||
|
||||
import codechicken.core.vec.BlockCoord;
|
||||
import codechicken.core.vec.Cuboid6;
|
||||
import codechicken.core.vec.Vector3;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.lib.vec.Cuboid6;
|
||||
import codechicken.lib.vec.Vector3;
|
||||
import codechicken.multipart.IRedstonePart;
|
||||
import codechicken.multipart.TickScheduler;
|
||||
import net.minecraft.block.Block;
|
||||
|
||||
@@ -2,7 +2,7 @@ package codechicken.multipart.minecraft;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.world.World;
|
||||
import codechicken.core.vec.BlockCoord;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.multipart.MultiPartRegistry.IPartConverter;
|
||||
import codechicken.multipart.MultiPartRegistry.IPartFactory;
|
||||
import codechicken.multipart.MultiPartRegistry;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package codechicken.multipart.minecraft;
|
||||
|
||||
import codechicken.core.packet.PacketCustom;
|
||||
import codechicken.core.raytracer.RayTracer;
|
||||
import codechicken.core.vec.BlockCoord;
|
||||
import codechicken.core.vec.Vector3;
|
||||
import codechicken.lib.packet.PacketCustom;
|
||||
import codechicken.lib.raytracer.RayTracer;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.lib.vec.Vector3;
|
||||
import codechicken.multipart.TileMultipart;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package codechicken.multipart.minecraft;
|
||||
|
||||
import codechicken.core.vec.BlockCoord;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public interface IPartMeta
|
||||
|
||||
@@ -9,8 +9,8 @@ import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import codechicken.core.vec.BlockCoord;
|
||||
import codechicken.core.vec.Cuboid6;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.lib.vec.Cuboid6;
|
||||
import codechicken.multipart.IRedstonePart;
|
||||
|
||||
public class LeverPart extends McSidedMetaPart implements IRedstonePart
|
||||
|
||||
@@ -9,7 +9,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import codechicken.core.vec.Cuboid6;
|
||||
import codechicken.lib.vec.Cuboid6;
|
||||
import codechicken.multipart.IconHitEffects;
|
||||
import codechicken.multipart.JCuboidPart;
|
||||
import codechicken.multipart.JIconHitEffects;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package codechicken.multipart.minecraft;
|
||||
|
||||
import codechicken.core.data.MCDataInput;
|
||||
import codechicken.core.data.MCDataOutput;
|
||||
import codechicken.core.lighting.LazyLightMatrix;
|
||||
import codechicken.core.vec.BlockCoord;
|
||||
import codechicken.core.vec.Vector3;
|
||||
import codechicken.lib.data.MCDataInput;
|
||||
import codechicken.lib.data.MCDataOutput;
|
||||
import codechicken.lib.lighting.LazyLightMatrix;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.lib.vec.Vector3;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
@@ -3,9 +3,9 @@ package codechicken.multipart.minecraft;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.multiplayer.NetClientHandler;
|
||||
import net.minecraft.client.multiplayer.WorldClient;
|
||||
import codechicken.core.packet.PacketCustom;
|
||||
import codechicken.core.packet.PacketCustom.IClientPacketHandler;
|
||||
import codechicken.core.vec.BlockCoord;
|
||||
import codechicken.lib.packet.PacketCustom;
|
||||
import codechicken.lib.packet.PacketCustom.IClientPacketHandler;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
|
||||
public class McMultipartCPH implements IClientPacketHandler
|
||||
{
|
||||
|
||||
@@ -3,8 +3,8 @@ package codechicken.multipart.minecraft;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.network.NetServerHandler;
|
||||
import net.minecraft.world.World;
|
||||
import codechicken.core.packet.PacketCustom;
|
||||
import codechicken.core.packet.PacketCustom.IServerPacketHandler;
|
||||
import codechicken.lib.packet.PacketCustom;
|
||||
import codechicken.lib.packet.PacketCustom.IServerPacketHandler;
|
||||
|
||||
public class McMultipartSPH implements IServerPacketHandler
|
||||
{
|
||||
|
||||
@@ -2,8 +2,8 @@ package codechicken.multipart.minecraft;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import codechicken.core.vec.BlockCoord;
|
||||
import codechicken.core.vec.Vector3;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.lib.vec.Vector3;
|
||||
import codechicken.multipart.TileMultipart;
|
||||
|
||||
public abstract class McSidedMetaPart extends McMetaPart
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package codechicken.multipart.minecraft;
|
||||
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import codechicken.core.packet.PacketCustom;
|
||||
import codechicken.core.packet.PacketCustom.CustomTinyPacketHandler;
|
||||
import codechicken.lib.packet.PacketCustom;
|
||||
import codechicken.lib.packet.PacketCustom.CustomTinyPacketHandler;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.Mod.Instance;
|
||||
@@ -23,7 +23,7 @@ public class MinecraftMultipartMod
|
||||
new Content().init();
|
||||
MinecraftForge.EVENT_BUS.register(new EventHandler());
|
||||
PacketCustom.assignHandler(this, new McMultipartSPH());
|
||||
if(FMLCommonHandler.instance().getSide() == Side.CLIENT)
|
||||
if(FMLCommonHandler.instance().getSide().isClient())
|
||||
PacketCustom.assignHandler(this, new McMultipartCPH());
|
||||
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package codechicken.multipart.minecraft;
|
||||
|
||||
import codechicken.core.vec.BlockCoord;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.Block;
|
||||
|
||||
@@ -8,8 +8,8 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import codechicken.core.vec.BlockCoord;
|
||||
import codechicken.core.vec.Cuboid6;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.lib.vec.Cuboid6;
|
||||
import codechicken.multipart.IRandomUpdateTick;
|
||||
import codechicken.multipart.IRedstonePart;
|
||||
import codechicken.multipart.RedstoneInteractions;
|
||||
|
||||
@@ -7,8 +7,8 @@ import net.minecraft.block.BlockTorch;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import codechicken.multipart.IRandomDisplayTick;
|
||||
import codechicken.core.vec.BlockCoord;
|
||||
import codechicken.core.vec.Cuboid6;
|
||||
import codechicken.lib.vec.BlockCoord;
|
||||
import codechicken.lib.vec.Cuboid6;
|
||||
|
||||
public class TorchPart extends McSidedMetaPart implements IRandomDisplayTick
|
||||
{
|
||||
|
||||
@@ -5,7 +5,7 @@ import codechicken.multipart.TileMultipart
|
||||
import codechicken.multipart.IRedstonePart
|
||||
import codechicken.multipart.RedstoneInteractions._
|
||||
import codechicken.multipart.PartMap._
|
||||
import codechicken.core.vec.Rotation._
|
||||
import codechicken.lib.vec.Rotation._
|
||||
import codechicken.multipart.IRedstoneTile
|
||||
import codechicken.multipart.TFacePart
|
||||
import codechicken.multipart.TEdgePart
|
||||
|
||||
Reference in new issue
Block a user