From e7b307763f20721891ee0afd21bf5dcb52074390 Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Wed, 24 Jul 2013 15:32:46 +1000 Subject: [PATCH] CodeChickenCore -> CodeChickenLib refactoring. --- assets/microblock/models/saw.obj | 2 +- .../microblock/BlockMicroMaterial.scala | 20 ++++++------- codechicken/microblock/CommonMicroblock.scala | 28 +++++++++---------- codechicken/microblock/CornerMicroblock.scala | 6 ++-- codechicken/microblock/EdgeMicroblock.scala | 16 +++++------ codechicken/microblock/FaceMicroblock.scala | 16 +++++------ .../microblock/GrassMicroMaterial.scala | 12 ++++---- codechicken/microblock/HolloMicroblock.scala | 16 +++++------ codechicken/microblock/ItemMicroPart.scala | 8 +++--- codechicken/microblock/ItemSaw.scala | 24 ++++++++-------- codechicken/microblock/MicroClass.scala | 8 +++--- .../microblock/MicroMaterialRegistry.scala | 14 +++++----- .../microblock/MicroblockPlacement.scala | 8 +++--- codechicken/microblock/PlacementGrids.scala | 6 ++-- codechicken/microblock/TMicroOcclusion.scala | 2 +- .../microblock/handler/EventHandler.scala | 2 +- codechicken/microblock/handler/Proxies.scala | 28 +++++++++---------- codechicken/multipart/BlockMultipart.scala | 18 ++++++------ .../multipart/ControlKeyModifier.scala | 2 +- codechicken/multipart/IDWriter.scala | 8 +++--- codechicken/multipart/IRedstonePart.scala | 2 +- codechicken/multipart/ItemMultiPart.scala | 6 ++-- codechicken/multipart/MultiPartRegistry.scala | 8 +++--- .../multipart/MultipartGenerator.scala | 4 +-- codechicken/multipart/MultipartRenderer.scala | 14 +++++----- codechicken/multipart/TCuboidPart.scala | 14 +++++----- codechicken/multipart/TIconHitEffects.scala | 8 +++--- codechicken/multipart/TMultiPart.scala | 20 ++++++------- codechicken/multipart/TNormalOcclusion.scala | 2 +- codechicken/multipart/TPartialOcclusion.scala | 2 +- codechicken/multipart/TickScheduler.scala | 8 +++--- codechicken/multipart/TileMultipart.scala | 20 ++++++------- .../multipart/asm/ASMMixinCompiler.scala | 6 ++-- .../multipart/asm/ASMMixinFactory.scala | 8 +++--- .../multipart/handler/EventHandler.scala | 2 +- .../multipart/handler/ModContainer.scala | 2 +- .../multipart/handler/MultipartSaveLoad.scala | 2 +- .../multipart/handler/PacketHandlers.scala | 16 +++++------ codechicken/multipart/handler/Proxies.scala | 8 +++--- .../multipart/minecraft/ButtonPart.java | 6 ++-- codechicken/multipart/minecraft/Content.java | 2 +- .../multipart/minecraft/EventHandler.java | 8 +++--- .../multipart/minecraft/IPartMeta.java | 2 +- .../multipart/minecraft/LeverPart.java | 4 +-- .../multipart/minecraft/McBlockPart.java | 2 +- .../multipart/minecraft/McMetaPart.java | 10 +++---- .../multipart/minecraft/McMultipartCPH.java | 6 ++-- .../multipart/minecraft/McMultipartSPH.java | 4 +-- .../multipart/minecraft/McSidedMetaPart.java | 4 +-- .../minecraft/MinecraftMultipartMod.java | 6 ++-- .../multipart/minecraft/PartMetaAccess.java | 2 +- .../minecraft/RedstoneTorchPart.java | 4 +-- .../multipart/minecraft/TorchPart.java | 4 +-- .../multipart/scalatraits/TRedstone.scala | 2 +- 54 files changed, 230 insertions(+), 232 deletions(-) diff --git a/assets/microblock/models/saw.obj b/assets/microblock/models/saw.obj index 0579f00..716f19b 100644 --- a/assets/microblock/models/saw.obj +++ b/assets/microblock/models/saw.obj @@ -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 diff --git a/codechicken/microblock/BlockMicroMaterial.scala b/codechicken/microblock/BlockMicroMaterial.scala index 0ce81f0..896ad6a 100644 --- a/codechicken/microblock/BlockMicroMaterial.scala +++ b/codechicken/microblock/BlockMicroMaterial.scala @@ -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 diff --git a/codechicken/microblock/CommonMicroblock.scala b/codechicken/microblock/CommonMicroblock.scala index 513ed8e..c1e6f01 100644 --- a/codechicken/microblock/CommonMicroblock.scala +++ b/codechicken/microblock/CommonMicroblock.scala @@ -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 { diff --git a/codechicken/microblock/CornerMicroblock.scala b/codechicken/microblock/CornerMicroblock.scala index fe1ec29..3e4ee45 100644 --- a/codechicken/microblock/CornerMicroblock.scala +++ b/codechicken/microblock/CornerMicroblock.scala @@ -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 diff --git a/codechicken/microblock/EdgeMicroblock.scala b/codechicken/microblock/EdgeMicroblock.scala index 6d686b0..f16660c 100644 --- a/codechicken/microblock/EdgeMicroblock.scala +++ b/codechicken/microblock/EdgeMicroblock.scala @@ -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._ diff --git a/codechicken/microblock/FaceMicroblock.scala b/codechicken/microblock/FaceMicroblock.scala index 6b26cf6..01bb0b8 100644 --- a/codechicken/microblock/FaceMicroblock.scala +++ b/codechicken/microblock/FaceMicroblock.scala @@ -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._ diff --git a/codechicken/microblock/GrassMicroMaterial.scala b/codechicken/microblock/GrassMicroMaterial.scala index 85feec5..2424191 100644 --- a/codechicken/microblock/GrassMicroMaterial.scala +++ b/codechicken/microblock/GrassMicroMaterial.scala @@ -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 { diff --git a/codechicken/microblock/HolloMicroblock.scala b/codechicken/microblock/HolloMicroblock.scala index 5e535a2..e2792f3 100644 --- a/codechicken/microblock/HolloMicroblock.scala +++ b/codechicken/microblock/HolloMicroblock.scala @@ -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._ diff --git a/codechicken/microblock/ItemMicroPart.scala b/codechicken/microblock/ItemMicroPart.scala index b55ee7e..1383b9a 100644 --- a/codechicken/microblock/ItemMicroPart.scala +++ b/codechicken/microblock/ItemMicroPart.scala @@ -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) { diff --git a/codechicken/microblock/ItemSaw.scala b/codechicken/microblock/ItemSaw.scala index 4a059c8..50eb4d3 100644 --- a/codechicken/microblock/ItemSaw.scala +++ b/codechicken/microblock/ItemSaw.scala @@ -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 diff --git a/codechicken/microblock/MicroClass.scala b/codechicken/microblock/MicroClass.scala index b477441..edb9e08 100644 --- a/codechicken/microblock/MicroClass.scala +++ b/codechicken/microblock/MicroClass.scala @@ -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 diff --git a/codechicken/microblock/MicroMaterialRegistry.scala b/codechicken/microblock/MicroMaterialRegistry.scala index bc1c649..1d175b7 100644 --- a/codechicken/microblock/MicroMaterialRegistry.scala +++ b/codechicken/microblock/MicroMaterialRegistry.scala @@ -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 diff --git a/codechicken/microblock/MicroblockPlacement.scala b/codechicken/microblock/MicroblockPlacement.scala index daf5fbd..bcd3e2d 100644 --- a/codechicken/microblock/MicroblockPlacement.scala +++ b/codechicken/microblock/MicroblockPlacement.scala @@ -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) { diff --git a/codechicken/microblock/PlacementGrids.scala b/codechicken/microblock/PlacementGrids.scala index 834b378..d3f33c0 100644 --- a/codechicken/microblock/PlacementGrids.scala +++ b/codechicken/microblock/PlacementGrids.scala @@ -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 diff --git a/codechicken/microblock/TMicroOcclusion.scala b/codechicken/microblock/TMicroOcclusion.scala index d36c398..8b00349 100644 --- a/codechicken/microblock/TMicroOcclusion.scala +++ b/codechicken/microblock/TMicroOcclusion.scala @@ -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 diff --git a/codechicken/microblock/handler/EventHandler.scala b/codechicken/microblock/handler/EventHandler.scala index c0e92c5..5848874 100644 --- a/codechicken/microblock/handler/EventHandler.scala +++ b/codechicken/microblock/handler/EventHandler.scala @@ -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 diff --git a/codechicken/microblock/handler/Proxies.scala b/codechicken/microblock/handler/Proxies.scala index f6e76e0..588d65e 100644 --- a/codechicken/microblock/handler/Proxies.scala +++ b/codechicken/microblock/handler/Proxies.scala @@ -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 } diff --git a/codechicken/multipart/BlockMultipart.scala b/codechicken/multipart/BlockMultipart.scala index 6ac535e..4452460 100644 --- a/codechicken/multipart/BlockMultipart.scala +++ b/codechicken/multipart/BlockMultipart.scala @@ -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) } diff --git a/codechicken/multipart/ControlKeyModifier.scala b/codechicken/multipart/ControlKeyModifier.scala index 7e9cec5..1ba4dcc 100644 --- a/codechicken/multipart/ControlKeyModifier.scala +++ b/codechicken/multipart/ControlKeyModifier.scala @@ -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 diff --git a/codechicken/multipart/IDWriter.scala b/codechicken/multipart/IDWriter.scala index 03a4e01..ce184ca 100644 --- a/codechicken/multipart/IDWriter.scala +++ b/codechicken/multipart/IDWriter.scala @@ -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() } } } diff --git a/codechicken/multipart/IRedstonePart.scala b/codechicken/multipart/IRedstonePart.scala index 53f08be..9a9c26a 100644 --- a/codechicken/multipart/IRedstonePart.scala +++ b/codechicken/multipart/IRedstonePart.scala @@ -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 { diff --git a/codechicken/multipart/ItemMultiPart.scala b/codechicken/multipart/ItemMultiPart.scala index 0687129..4f19fbd 100644 --- a/codechicken/multipart/ItemMultiPart.scala +++ b/codechicken/multipart/ItemMultiPart.scala @@ -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 diff --git a/codechicken/multipart/MultiPartRegistry.scala b/codechicken/multipart/MultiPartRegistry.scala index 3511abd..3f225db 100644 --- a/codechicken/multipart/MultiPartRegistry.scala +++ b/codechicken/multipart/MultiPartRegistry.scala @@ -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 diff --git a/codechicken/multipart/MultipartGenerator.scala b/codechicken/multipart/MultipartGenerator.scala index 0d15e43..c970b0e 100644 --- a/codechicken/multipart/MultipartGenerator.scala +++ b/codechicken/multipart/MultipartGenerator.scala @@ -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 diff --git a/codechicken/multipart/MultipartRenderer.scala b/codechicken/multipart/MultipartRenderer.scala index f5c1a24..7e8f6cf 100644 --- a/codechicken/multipart/MultipartRenderer.scala +++ b/codechicken/multipart/MultipartRenderer.scala @@ -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 diff --git a/codechicken/multipart/TCuboidPart.scala b/codechicken/multipart/TCuboidPart.scala index 56d89c1..222af84 100644 --- a/codechicken/multipart/TCuboidPart.scala +++ b/codechicken/multipart/TCuboidPart.scala @@ -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 diff --git a/codechicken/multipart/TIconHitEffects.scala b/codechicken/multipart/TIconHitEffects.scala index f5362cc..7ae99a2 100644 --- a/codechicken/multipart/TIconHitEffects.scala +++ b/codechicken/multipart/TIconHitEffects.scala @@ -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 { diff --git a/codechicken/multipart/TMultiPart.scala b/codechicken/multipart/TMultiPart.scala index a324678..8f1c442 100644 --- a/codechicken/multipart/TMultiPart.scala +++ b/codechicken/multipart/TMultiPart.scala @@ -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._ diff --git a/codechicken/multipart/TNormalOcclusion.scala b/codechicken/multipart/TNormalOcclusion.scala index f9d98cc..ef4dde0 100644 --- a/codechicken/multipart/TNormalOcclusion.scala +++ b/codechicken/multipart/TNormalOcclusion.scala @@ -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 diff --git a/codechicken/multipart/TPartialOcclusion.scala b/codechicken/multipart/TPartialOcclusion.scala index 77ee0d4..8e75cb2 100644 --- a/codechicken/multipart/TPartialOcclusion.scala +++ b/codechicken/multipart/TPartialOcclusion.scala @@ -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 diff --git a/codechicken/multipart/TickScheduler.scala b/codechicken/multipart/TickScheduler.scala index 1061368..d6bfdd2 100644 --- a/codechicken/multipart/TickScheduler.scala +++ b/codechicken/multipart/TickScheduler.scala @@ -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 diff --git a/codechicken/multipart/TileMultipart.scala b/codechicken/multipart/TileMultipart.scala index 60b06a4..0c5cd63 100644 --- a/codechicken/multipart/TileMultipart.scala +++ b/codechicken/multipart/TileMultipart.scala @@ -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) diff --git a/codechicken/multipart/asm/ASMMixinCompiler.scala b/codechicken/multipart/asm/ASMMixinCompiler.scala index 080169d..e60b8b5 100644 --- a/codechicken/multipart/asm/ASMMixinCompiler.scala +++ b/codechicken/multipart/asm/ASMMixinCompiler.scala @@ -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 diff --git a/codechicken/multipart/asm/ASMMixinFactory.scala b/codechicken/multipart/asm/ASMMixinFactory.scala index 1e608ee..9268ef7 100644 --- a/codechicken/multipart/asm/ASMMixinFactory.scala +++ b/codechicken/multipart/asm/ASMMixinFactory.scala @@ -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 diff --git a/codechicken/multipart/handler/EventHandler.scala b/codechicken/multipart/handler/EventHandler.scala index 342fded..8ee4aa8 100644 --- a/codechicken/multipart/handler/EventHandler.scala +++ b/codechicken/multipart/handler/EventHandler.scala @@ -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 diff --git a/codechicken/multipart/handler/ModContainer.scala b/codechicken/multipart/handler/ModContainer.scala index 648f7da..8cf6c91 100644 --- a/codechicken/multipart/handler/ModContainer.scala +++ b/codechicken/multipart/handler/ModContainer.scala @@ -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") diff --git a/codechicken/multipart/handler/MultipartSaveLoad.scala b/codechicken/multipart/handler/MultipartSaveLoad.scala index 9a43b46..bff5fd5 100644 --- a/codechicken/multipart/handler/MultipartSaveLoad.scala +++ b/codechicken/multipart/handler/MultipartSaveLoad.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 diff --git a/codechicken/multipart/handler/PacketHandlers.scala b/codechicken/multipart/handler/PacketHandlers.scala index 2490b47..3755f26 100644 --- a/codechicken/multipart/handler/PacketHandlers.scala +++ b/codechicken/multipart/handler/PacketHandlers.scala @@ -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 } diff --git a/codechicken/multipart/handler/Proxies.scala b/codechicken/multipart/handler/Proxies.scala index 344b7e2..6a81239 100644 --- a/codechicken/multipart/handler/Proxies.scala +++ b/codechicken/multipart/handler/Proxies.scala @@ -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 diff --git a/codechicken/multipart/minecraft/ButtonPart.java b/codechicken/multipart/minecraft/ButtonPart.java index 96100a2..180e48b 100644 --- a/codechicken/multipart/minecraft/ButtonPart.java +++ b/codechicken/multipart/minecraft/ButtonPart.java @@ -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; diff --git a/codechicken/multipart/minecraft/Content.java b/codechicken/multipart/minecraft/Content.java index 170fd91..23b1747 100644 --- a/codechicken/multipart/minecraft/Content.java +++ b/codechicken/multipart/minecraft/Content.java @@ -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; diff --git a/codechicken/multipart/minecraft/EventHandler.java b/codechicken/multipart/minecraft/EventHandler.java index 7b6e836..af23f04 100644 --- a/codechicken/multipart/minecraft/EventHandler.java +++ b/codechicken/multipart/minecraft/EventHandler.java @@ -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; diff --git a/codechicken/multipart/minecraft/IPartMeta.java b/codechicken/multipart/minecraft/IPartMeta.java index d571790..a4c2cb4 100644 --- a/codechicken/multipart/minecraft/IPartMeta.java +++ b/codechicken/multipart/minecraft/IPartMeta.java @@ -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 diff --git a/codechicken/multipart/minecraft/LeverPart.java b/codechicken/multipart/minecraft/LeverPart.java index 74ae9b4..7608abc 100644 --- a/codechicken/multipart/minecraft/LeverPart.java +++ b/codechicken/multipart/minecraft/LeverPart.java @@ -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 diff --git a/codechicken/multipart/minecraft/McBlockPart.java b/codechicken/multipart/minecraft/McBlockPart.java index 09980fa..9ea1cbb 100644 --- a/codechicken/multipart/minecraft/McBlockPart.java +++ b/codechicken/multipart/minecraft/McBlockPart.java @@ -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; diff --git a/codechicken/multipart/minecraft/McMetaPart.java b/codechicken/multipart/minecraft/McMetaPart.java index cff2b46..e0e9545 100644 --- a/codechicken/multipart/minecraft/McMetaPart.java +++ b/codechicken/multipart/minecraft/McMetaPart.java @@ -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; diff --git a/codechicken/multipart/minecraft/McMultipartCPH.java b/codechicken/multipart/minecraft/McMultipartCPH.java index 636f52d..42b5736 100644 --- a/codechicken/multipart/minecraft/McMultipartCPH.java +++ b/codechicken/multipart/minecraft/McMultipartCPH.java @@ -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 { diff --git a/codechicken/multipart/minecraft/McMultipartSPH.java b/codechicken/multipart/minecraft/McMultipartSPH.java index 2a97198..85222c6 100644 --- a/codechicken/multipart/minecraft/McMultipartSPH.java +++ b/codechicken/multipart/minecraft/McMultipartSPH.java @@ -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 { diff --git a/codechicken/multipart/minecraft/McSidedMetaPart.java b/codechicken/multipart/minecraft/McSidedMetaPart.java index 06ac201..185fa2f 100644 --- a/codechicken/multipart/minecraft/McSidedMetaPart.java +++ b/codechicken/multipart/minecraft/McSidedMetaPart.java @@ -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 diff --git a/codechicken/multipart/minecraft/MinecraftMultipartMod.java b/codechicken/multipart/minecraft/MinecraftMultipartMod.java index 0daec70..b7c8af9 100644 --- a/codechicken/multipart/minecraft/MinecraftMultipartMod.java +++ b/codechicken/multipart/minecraft/MinecraftMultipartMod.java @@ -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()); } diff --git a/codechicken/multipart/minecraft/PartMetaAccess.java b/codechicken/multipart/minecraft/PartMetaAccess.java index cbf0402..6c4b7ac 100644 --- a/codechicken/multipart/minecraft/PartMetaAccess.java +++ b/codechicken/multipart/minecraft/PartMetaAccess.java @@ -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; diff --git a/codechicken/multipart/minecraft/RedstoneTorchPart.java b/codechicken/multipart/minecraft/RedstoneTorchPart.java index 93202b8..750e936 100644 --- a/codechicken/multipart/minecraft/RedstoneTorchPart.java +++ b/codechicken/multipart/minecraft/RedstoneTorchPart.java @@ -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; diff --git a/codechicken/multipart/minecraft/TorchPart.java b/codechicken/multipart/minecraft/TorchPart.java index 0a9be25..facff82 100644 --- a/codechicken/multipart/minecraft/TorchPart.java +++ b/codechicken/multipart/minecraft/TorchPart.java @@ -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 { diff --git a/codechicken/multipart/scalatraits/TRedstone.scala b/codechicken/multipart/scalatraits/TRedstone.scala index 6d92015..bec4c97 100644 --- a/codechicken/multipart/scalatraits/TRedstone.scala +++ b/codechicken/multipart/scalatraits/TRedstone.scala @@ -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