diff --git a/src/net/bdew/lib/BdLib.scala b/src/net/bdew/lib/BdLib.scala index b1a9dd0..5aeb254 100644 --- a/src/net/bdew/lib/BdLib.scala +++ b/src/net/bdew/lib/BdLib.scala @@ -10,10 +10,10 @@ package net.bdew.lib import cpw.mods.fml.common.Mod -import cpw.mods.fml.common.event.{FMLServerStartingEvent, FMLPreInitializationEvent} -import org.apache.logging.log4j.Logger import cpw.mods.fml.common.Mod.EventHandler +import cpw.mods.fml.common.event.{FMLPreInitializationEvent, FMLServerStartingEvent} import net.minecraft.command.CommandHandler +import org.apache.logging.log4j.Logger @Mod(modid = "bdlib", name = "BD lib", version = "BDLIB_VER", modLanguage = "scala") object BdLib { diff --git a/src/net/bdew/lib/Client.scala b/src/net/bdew/lib/Client.scala index d22e1e9..a944a46 100644 --- a/src/net/bdew/lib/Client.scala +++ b/src/net/bdew/lib/Client.scala @@ -9,8 +9,8 @@ package net.bdew.lib -import org.lwjgl.input.Keyboard import net.minecraft.client.Minecraft +import org.lwjgl.input.Keyboard /** * Misc functions and shortcuts for clientside code diff --git a/src/net/bdew/lib/CommandDumpRegistry.scala b/src/net/bdew/lib/CommandDumpRegistry.scala index b58fdb4..808d2f9 100644 --- a/src/net/bdew/lib/CommandDumpRegistry.scala +++ b/src/net/bdew/lib/CommandDumpRegistry.scala @@ -9,14 +9,15 @@ package net.bdew.lib -import net.minecraft.command.{CommandBase, ICommandSender} -import cpw.mods.fml.relauncher.FMLInjectionData -import java.io.{FileWriter, BufferedWriter, File} -import cpw.mods.fml.common.registry.GameData +import java.io.{BufferedWriter, File, FileWriter} + import com.google.common.collect.Table +import cpw.mods.fml.common.registry.GameData +import cpw.mods.fml.relauncher.FMLInjectionData +import net.minecraft.command.{CommandBase, ICommandSender} import net.minecraft.item.ItemStack -import net.minecraftforge.oredict.OreDictionary import net.minecraftforge.fluids.FluidRegistry +import net.minecraftforge.oredict.OreDictionary class CommandDumpRegistry extends CommandBase { def getCommandName = "dumpregistry" diff --git a/src/net/bdew/lib/Misc.scala b/src/net/bdew/lib/Misc.scala index 29886d5..4d04d80 100644 --- a/src/net/bdew/lib/Misc.scala +++ b/src/net/bdew/lib/Misc.scala @@ -9,16 +9,16 @@ package net.bdew.lib -import cpw.mods.fml.common.registry.GameRegistry -import net.minecraft.nbt.NBTTagCompound -import net.minecraft.util.StatCollector -import net.minecraft.item.ItemStack -import cpw.mods.fml.common.versioning.{ArtifactVersion, VersionParser} import cpw.mods.fml.common.Loader -import net.minecraftforge.oredict.ShapedOreRecipe -import net.minecraft.world.biome.BiomeGenBase +import cpw.mods.fml.common.registry.GameRegistry +import cpw.mods.fml.common.versioning.{ArtifactVersion, VersionParser} +import net.minecraft.item.ItemStack +import net.minecraft.nbt.NBTTagCompound import net.minecraft.tileentity.TileEntity +import net.minecraft.util.StatCollector +import net.minecraft.world.biome.BiomeGenBase import net.minecraftforge.common.util.ForgeDirection +import net.minecraftforge.oredict.ShapedOreRecipe object Misc { def iterNbtCompoundList(parent: NBTTagCompound, name: String): Iterable[NBTTagCompound] = { @@ -26,6 +26,11 @@ object Misc { for (i <- 0 until list.tagCount()) yield list.getCompoundTagAt(i) } + def iterNbtIntArray(parent: NBTTagCompound, name: String): Iterable[Array[Int]] = { + val list = parent.getTagList(name, 11) + for (i <- 0 until list.tagCount()) yield list.func_150306_c(i) + } + def getActiveModId = Loader.instance().activeModContainer().getModId def toLocal(s: String) = StatCollector.translateToLocal(s) diff --git a/src/net/bdew/lib/block/HasTE.scala b/src/net/bdew/lib/block/HasTE.scala index 89ca24c..ded52d9 100644 --- a/src/net/bdew/lib/block/HasTE.scala +++ b/src/net/bdew/lib/block/HasTE.scala @@ -9,10 +9,10 @@ package net.bdew.lib.block -import net.minecraft.block.{ITileEntityProvider, Block} -import net.minecraft.world.{IBlockAccess, World} -import net.minecraft.tileentity.TileEntity import net.bdew.lib.BdLib +import net.minecraft.block.{Block, ITileEntityProvider} +import net.minecraft.tileentity.TileEntity +import net.minecraft.world.{IBlockAccess, World} trait HasTE[T] extends Block with ITileEntityProvider { val TEClass: Class[_ <: TileEntity] diff --git a/src/net/bdew/lib/config/BlockManager.scala b/src/net/bdew/lib/config/BlockManager.scala index 4eaf558..9224a37 100644 --- a/src/net/bdew/lib/config/BlockManager.scala +++ b/src/net/bdew/lib/config/BlockManager.scala @@ -9,11 +9,11 @@ package net.bdew.lib.config -import net.minecraft.item.ItemStack -import net.minecraft.block.Block import cpw.mods.fml.common.registry.GameRegistry -import net.bdew.lib.block.HasTE import net.bdew.lib.Misc +import net.bdew.lib.block.HasTE +import net.minecraft.block.Block +import net.minecraft.item.ItemStack class BlockManager() { diff --git a/src/net/bdew/lib/config/FluidManager.scala b/src/net/bdew/lib/config/FluidManager.scala index 7a6d671..2eb91a5 100644 --- a/src/net/bdew/lib/config/FluidManager.scala +++ b/src/net/bdew/lib/config/FluidManager.scala @@ -9,7 +9,7 @@ package net.bdew.lib.config -import net.minecraftforge.fluids.{FluidRegistry, Fluid} +import net.minecraftforge.fluids.{Fluid, FluidRegistry} class FluidManager() { def regFluid[T <: Fluid](fluid: T): T = { diff --git a/src/net/bdew/lib/config/ItemManager.scala b/src/net/bdew/lib/config/ItemManager.scala index d0b7e10..40cc96a 100644 --- a/src/net/bdew/lib/config/ItemManager.scala +++ b/src/net/bdew/lib/config/ItemManager.scala @@ -9,9 +9,9 @@ package net.bdew.lib.config -import net.minecraft.item.{ItemStack, Item} import cpw.mods.fml.common.registry.GameRegistry import net.bdew.lib.items.{NamedItem, SimpleItem} +import net.minecraft.item.{Item, ItemStack} class ItemManager() { def regSimpleItem(name: String): SimpleItem = regItem(new SimpleItem(name), name) diff --git a/src/net/bdew/lib/config/MachineManager.scala b/src/net/bdew/lib/config/MachineManager.scala index 1bad32d..007729e 100644 --- a/src/net/bdew/lib/config/MachineManager.scala +++ b/src/net/bdew/lib/config/MachineManager.scala @@ -9,9 +9,9 @@ package net.bdew.lib.config -import net.bdew.lib.recipes.gencfg.ConfigSection +import net.bdew.lib.gui.{GuiHandler, GuiProvider} import net.bdew.lib.machine.Machine -import net.bdew.lib.gui.{GuiProvider, GuiHandler} +import net.bdew.lib.recipes.gencfg.ConfigSection class MachineManager(val tuning: ConfigSection, guiHandler: GuiHandler) { def registerMachine[R <: Machine[_]](machine: R): R = { diff --git a/src/net/bdew/lib/covers/BlockCoverable.scala b/src/net/bdew/lib/covers/BlockCoverable.scala index 347b6ba..a1bd365 100644 --- a/src/net/bdew/lib/covers/BlockCoverable.scala +++ b/src/net/bdew/lib/covers/BlockCoverable.scala @@ -9,12 +9,12 @@ package net.bdew.lib.covers -import net.bdew.lib.block.HasTE -import net.minecraft.world.{IBlockAccess, World} -import net.minecraft.entity.player.EntityPlayer import net.bdew.lib.Misc +import net.bdew.lib.block.HasTE import net.bdew.lib.items.ItemUtils import net.minecraft.block.Block +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.world.{IBlockAccess, World} trait BlockCoverable[T <: TileCoverable] extends HasTE[T] { override def onBlockActivated(world: World, x: Int, y: Int, z: Int, player: EntityPlayer, face: Int, xoffs: Float, yoffs: Float, zoffs: Float): Boolean = { diff --git a/src/net/bdew/lib/covers/ItemCover.scala b/src/net/bdew/lib/covers/ItemCover.scala index edbd036..80fdeff 100644 --- a/src/net/bdew/lib/covers/ItemCover.scala +++ b/src/net/bdew/lib/covers/ItemCover.scala @@ -9,7 +9,7 @@ package net.bdew.lib.covers -import net.minecraft.item.{ItemStack, Item} +import net.minecraft.item.{Item, ItemStack} import net.minecraft.util.IIcon import net.minecraftforge.common.util.ForgeDirection diff --git a/src/net/bdew/lib/covers/TileCoverable.scala b/src/net/bdew/lib/covers/TileCoverable.scala index a1f4d5f..5ec1abf 100644 --- a/src/net/bdew/lib/covers/TileCoverable.scala +++ b/src/net/bdew/lib/covers/TileCoverable.scala @@ -9,9 +9,9 @@ package net.bdew.lib.covers -import net.bdew.lib.data.base.{UpdateKind, TileDataSlots} -import net.bdew.lib.data.DataSlotItemStack import net.bdew.lib.Misc +import net.bdew.lib.data.DataSlotItemStack +import net.bdew.lib.data.base.{TileDataSlots, UpdateKind} import net.minecraft.item.ItemStack import net.minecraftforge.common.util.ForgeDirection diff --git a/src/net/bdew/lib/data/DataSlotBoolean.scala b/src/net/bdew/lib/data/DataSlotBoolean.scala index a18b6b4..5a5d496 100644 --- a/src/net/bdew/lib/data/DataSlotBoolean.scala +++ b/src/net/bdew/lib/data/DataSlotBoolean.scala @@ -9,8 +9,8 @@ package net.bdew.lib.data +import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind} import net.minecraft.nbt.NBTTagCompound -import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlotVal} case class DataSlotBoolean(name: String, parent: TileDataSlots, default: Boolean = false) extends DataSlotVal[Boolean] { var cval = default diff --git a/src/net/bdew/lib/data/DataSlotDirection.scala b/src/net/bdew/lib/data/DataSlotDirection.scala index 5c7bb2e..9d41f80 100644 --- a/src/net/bdew/lib/data/DataSlotDirection.scala +++ b/src/net/bdew/lib/data/DataSlotDirection.scala @@ -9,7 +9,7 @@ package net.bdew.lib.data -import net.bdew.lib.data.base.{TileDataSlots, UpdateKind, DataSlotVal} +import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind} import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection diff --git a/src/net/bdew/lib/data/DataSlotFloat.scala b/src/net/bdew/lib/data/DataSlotFloat.scala index 145c03c..712faa6 100644 --- a/src/net/bdew/lib/data/DataSlotFloat.scala +++ b/src/net/bdew/lib/data/DataSlotFloat.scala @@ -9,8 +9,8 @@ package net.bdew.lib.data +import net.bdew.lib.data.base.{DataSlotNumeric, TileDataSlots, UpdateKind} import net.minecraft.nbt.NBTTagCompound -import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlotNumeric} case class DataSlotFloat(name: String, parent: TileDataSlots, default: Float = 0) extends DataSlotNumeric[Float](default) { def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setFloat(name, cval) diff --git a/src/net/bdew/lib/data/DataSlotInt.scala b/src/net/bdew/lib/data/DataSlotInt.scala index 4e4dc3b..f462321 100644 --- a/src/net/bdew/lib/data/DataSlotInt.scala +++ b/src/net/bdew/lib/data/DataSlotInt.scala @@ -9,8 +9,8 @@ package net.bdew.lib.data +import net.bdew.lib.data.base.{DataSlotNumeric, TileDataSlots, UpdateKind} import net.minecraft.nbt.NBTTagCompound -import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlotNumeric} case class DataSlotInt(name: String, parent: TileDataSlots, default: Int = 0) extends DataSlotNumeric[Int](default) { def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setInteger(name, cval) diff --git a/src/net/bdew/lib/data/DataSlotItemStack.scala b/src/net/bdew/lib/data/DataSlotItemStack.scala index da61284..5153c28 100644 --- a/src/net/bdew/lib/data/DataSlotItemStack.scala +++ b/src/net/bdew/lib/data/DataSlotItemStack.scala @@ -9,9 +9,9 @@ package net.bdew.lib.data -import net.bdew.lib.data.base.{TileDataSlots, UpdateKind, DataSlotVal} -import net.minecraft.nbt.NBTTagCompound +import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind} import net.minecraft.item.ItemStack +import net.minecraft.nbt.NBTTagCompound case class DataSlotItemStack(name: String, parent: TileDataSlots) extends DataSlotVal[ItemStack] { var cval: ItemStack = null diff --git a/src/net/bdew/lib/data/DataSlotString.scala b/src/net/bdew/lib/data/DataSlotString.scala index 4fd2dc8..942577e 100644 --- a/src/net/bdew/lib/data/DataSlotString.scala +++ b/src/net/bdew/lib/data/DataSlotString.scala @@ -9,8 +9,8 @@ package net.bdew.lib.data +import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind} import net.minecraft.nbt.NBTTagCompound -import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlotVal} case class DataSlotString(name: String, parent: TileDataSlots, default: String = null) extends DataSlotVal[String] { var cval: String = default diff --git a/src/net/bdew/lib/data/DataSlotTank.scala b/src/net/bdew/lib/data/DataSlotTank.scala index 048247d..374c69e 100644 --- a/src/net/bdew/lib/data/DataSlotTank.scala +++ b/src/net/bdew/lib/data/DataSlotTank.scala @@ -9,9 +9,9 @@ package net.bdew.lib.data -import net.minecraftforge.fluids.{IFluidTank, FluidTank, FluidStack} +import net.bdew.lib.data.base.{DataSlot, TileDataSlots, UpdateKind} import net.minecraft.nbt.NBTTagCompound -import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlot} +import net.minecraftforge.fluids.{FluidStack, FluidTank, IFluidTank} abstract class DataSlotTankBase(sz: Int) extends FluidTank(sz) with IFluidTank with DataSlot { var oldStack: FluidStack = null diff --git a/src/net/bdew/lib/data/base/ContainerDataSlots.scala b/src/net/bdew/lib/data/base/ContainerDataSlots.scala index 6ea2aef..124dd8a 100644 --- a/src/net/bdew/lib/data/base/ContainerDataSlots.scala +++ b/src/net/bdew/lib/data/base/ContainerDataSlots.scala @@ -9,8 +9,8 @@ package net.bdew.lib.data.base -import net.minecraft.entity.player.EntityPlayerMP import net.bdew.lib.gui.NoInvContainer +import net.minecraft.entity.player.EntityPlayerMP import net.minecraft.inventory.ICrafting trait ContainerDataSlots extends NoInvContainer { diff --git a/src/net/bdew/lib/data/base/DataSlotVal.scala b/src/net/bdew/lib/data/base/DataSlotVal.scala index a817939..75af3bd 100644 --- a/src/net/bdew/lib/data/base/DataSlotVal.scala +++ b/src/net/bdew/lib/data/base/DataSlotVal.scala @@ -9,7 +9,7 @@ package net.bdew.lib.data.base -import language.implicitConversions +import scala.language.implicitConversions /** * Base trait for data slots that hold primitive values diff --git a/src/net/bdew/lib/data/base/TileDataSlots.scala b/src/net/bdew/lib/data/base/TileDataSlots.scala index 21e923e..ba08ecc 100644 --- a/src/net/bdew/lib/data/base/TileDataSlots.scala +++ b/src/net/bdew/lib/data/base/TileDataSlots.scala @@ -9,11 +9,12 @@ package net.bdew.lib.data.base -import scala.collection.mutable -import net.minecraft.nbt.NBTTagCompound import net.bdew.lib.tile.TileExtended -import net.minecraft.network.play.server.S35PacketUpdateTileEntity +import net.minecraft.nbt.NBTTagCompound import net.minecraft.network.Packet +import net.minecraft.network.play.server.S35PacketUpdateTileEntity + +import scala.collection.mutable trait TileDataSlots extends TileExtended { val dataSlots = mutable.HashMap.empty[String, DataSlot] diff --git a/src/net/bdew/lib/gui/BaseContainer.scala b/src/net/bdew/lib/gui/BaseContainer.scala index 4b9d8b1..dc79b87 100644 --- a/src/net/bdew/lib/gui/BaseContainer.scala +++ b/src/net/bdew/lib/gui/BaseContainer.scala @@ -9,10 +9,10 @@ package net.bdew.lib.gui -import net.minecraft.inventory.IInventory -import net.minecraft.entity.player.EntityPlayer -import net.minecraft.item.ItemStack import net.bdew.lib.items.ItemUtils +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.inventory.IInventory +import net.minecraft.item.ItemStack abstract class BaseContainer(te: IInventory) extends NoInvContainer { override def transferStackInSlot(player: EntityPlayer, slot: Int): ItemStack = { diff --git a/src/net/bdew/lib/gui/BaseScreen.scala b/src/net/bdew/lib/gui/BaseScreen.scala index b5c38a1..8550791 100644 --- a/src/net/bdew/lib/gui/BaseScreen.scala +++ b/src/net/bdew/lib/gui/BaseScreen.scala @@ -9,12 +9,13 @@ package net.bdew.lib.gui +import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiContainer import net.minecraft.inventory.Container -import scala.collection.mutable -import net.minecraft.client.Minecraft import org.lwjgl.opengl.GL11 +import scala.collection.mutable + abstract class BaseScreen(cont: Container, xSz: Int, ySz: Int) extends GuiContainer(cont) { xSize = xSz ySize = ySz @@ -53,7 +54,7 @@ abstract class BaseScreen(cont: Container, xSz: Int, ySz: Int) extends GuiContai widgets.handleTooltip(Point(x, y) - rect.origin, tip) - import collection.JavaConversions._ + import scala.collection.JavaConversions._ if (tip.size > 0) drawHoveringText(tip, x, y, getFontRenderer) diff --git a/src/net/bdew/lib/gui/Color.scala b/src/net/bdew/lib/gui/Color.scala index 845bcd2..41b1a1c 100644 --- a/src/net/bdew/lib/gui/Color.scala +++ b/src/net/bdew/lib/gui/Color.scala @@ -9,8 +9,8 @@ package net.bdew.lib.gui -import org.lwjgl.opengl.GL11 import net.bdew.lib.Misc +import org.lwjgl.opengl.GL11 case class Color(r: Float, g: Float, b: Float, a: Float = 1) { def this(c: (Float, Float, Float)) = this(c._1, c._2, c._3) diff --git a/src/net/bdew/lib/gui/DrawTarget.scala b/src/net/bdew/lib/gui/DrawTarget.scala index 01427fa..60ac1ba 100644 --- a/src/net/bdew/lib/gui/DrawTarget.scala +++ b/src/net/bdew/lib/gui/DrawTarget.scala @@ -9,8 +9,8 @@ package net.bdew.lib.gui -import net.minecraft.client.renderer.Tessellator import net.minecraft.client.gui.FontRenderer +import net.minecraft.client.renderer.Tessellator trait DrawTarget { def getZLevel: Float diff --git a/src/net/bdew/lib/gui/GuiHandler.scala b/src/net/bdew/lib/gui/GuiHandler.scala index c6b8326..5f0335b 100644 --- a/src/net/bdew/lib/gui/GuiHandler.scala +++ b/src/net/bdew/lib/gui/GuiHandler.scala @@ -10,10 +10,11 @@ package net.bdew.lib.gui import cpw.mods.fml.common.network.IGuiHandler -import scala.collection.mutable import net.minecraft.entity.player.EntityPlayer import net.minecraft.world.World +import scala.collection.mutable + class GuiHandler extends IGuiHandler { val guis = mutable.Map.empty[Int, GuiProvider] diff --git a/src/net/bdew/lib/gui/GuiProvider.scala b/src/net/bdew/lib/gui/GuiProvider.scala index 59919fb..b09ce84 100644 --- a/src/net/bdew/lib/gui/GuiProvider.scala +++ b/src/net/bdew/lib/gui/GuiProvider.scala @@ -9,9 +9,9 @@ package net.bdew.lib.gui -import net.minecraft.tileentity.TileEntity -import net.minecraft.entity.player.EntityPlayer import cpw.mods.fml.relauncher.{Side, SideOnly} +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.tileentity.TileEntity trait GuiProvider { def guiId: Int diff --git a/src/net/bdew/lib/gui/NoInvContainer.scala b/src/net/bdew/lib/gui/NoInvContainer.scala index bddb1fc..d61db47 100644 --- a/src/net/bdew/lib/gui/NoInvContainer.scala +++ b/src/net/bdew/lib/gui/NoInvContainer.scala @@ -9,9 +9,9 @@ package net.bdew.lib.gui -import net.minecraft.inventory.{Slot, Container} import net.bdew.lib.Misc -import net.minecraft.entity.player.{EntityPlayer, InventoryPlayer, EntityPlayerMP} +import net.minecraft.entity.player.{EntityPlayer, EntityPlayerMP, InventoryPlayer} +import net.minecraft.inventory.{Container, Slot} import net.minecraft.item.ItemStack abstract class NoInvContainer extends Container { diff --git a/src/net/bdew/lib/gui/SlotClickable.scala b/src/net/bdew/lib/gui/SlotClickable.scala index 17eec40..0eacb17 100644 --- a/src/net/bdew/lib/gui/SlotClickable.scala +++ b/src/net/bdew/lib/gui/SlotClickable.scala @@ -9,9 +9,9 @@ package net.bdew.lib.gui -import net.minecraft.item.ItemStack -import net.minecraft.inventory.Slot import net.minecraft.entity.player.EntityPlayer +import net.minecraft.inventory.Slot +import net.minecraft.item.ItemStack trait SlotClickable extends Slot { def onClick(button: Int, mods: Int, player: EntityPlayer): ItemStack diff --git a/src/net/bdew/lib/gui/Texture.scala b/src/net/bdew/lib/gui/Texture.scala index 75737ab..ba0120f 100644 --- a/src/net/bdew/lib/gui/Texture.scala +++ b/src/net/bdew/lib/gui/Texture.scala @@ -9,9 +9,9 @@ package net.bdew.lib.gui -import net.minecraft.util.{IIcon, ResourceLocation} import net.minecraft.client.Minecraft import net.minecraft.client.renderer.texture.TextureMap +import net.minecraft.util.{IIcon, ResourceLocation} trait Texture { def u1: Float diff --git a/src/net/bdew/lib/gui/WidgetContainer.scala b/src/net/bdew/lib/gui/WidgetContainer.scala index e8b8ea7..8d258b0 100644 --- a/src/net/bdew/lib/gui/WidgetContainer.scala +++ b/src/net/bdew/lib/gui/WidgetContainer.scala @@ -9,11 +9,12 @@ package net.bdew.lib.gui -import scala.collection.mutable import net.bdew.lib.gui.widgets.BaseWidget import net.minecraft.client.gui.FontRenderer import org.lwjgl.opengl.GL11 +import scala.collection.mutable + trait WidgetContainer extends DrawTarget { val rect: Rect val widgets = mutable.MutableList.empty[BaseWidget] diff --git a/src/net/bdew/lib/gui/package.scala b/src/net/bdew/lib/gui/package.scala index 888fc24..225a28b 100644 --- a/src/net/bdew/lib/gui/package.scala +++ b/src/net/bdew/lib/gui/package.scala @@ -13,7 +13,7 @@ package object gui { type Rect = BaseRect[Float] type Point = BasePoint[Float] - import language.implicitConversions + import scala.language.implicitConversions implicit def awt2point(p: java.awt.Point) = BasePoint(p.x, p.y) implicit def point2awt(p: BasePoint[Int]): java.awt.Point = new java.awt.Point(p.x, p.y) diff --git a/src/net/bdew/lib/gui/widgets/Widget.scala b/src/net/bdew/lib/gui/widgets/Widget.scala index fbb5af1..02d8d2d 100644 --- a/src/net/bdew/lib/gui/widgets/Widget.scala +++ b/src/net/bdew/lib/gui/widgets/Widget.scala @@ -9,8 +9,9 @@ package net.bdew.lib.gui.widgets +import net.bdew.lib.gui.{Point, Rect, WidgetContainer} + import scala.collection.mutable -import net.bdew.lib.gui.{WidgetContainer, Point, Rect} trait BaseWidget { val rect: Rect diff --git a/src/net/bdew/lib/gui/widgets/WidgetButton.scala b/src/net/bdew/lib/gui/widgets/WidgetButton.scala index eb8227e..fac0dbb 100644 --- a/src/net/bdew/lib/gui/widgets/WidgetButton.scala +++ b/src/net/bdew/lib/gui/widgets/WidgetButton.scala @@ -9,10 +9,10 @@ package net.bdew.lib.gui.widgets -import net.minecraft.client.gui.GuiButton import net.bdew.lib.gui.{Point, Rect} import net.minecraft.client.Minecraft import net.minecraft.client.audio.PositionedSoundRecord +import net.minecraft.client.gui.GuiButton import net.minecraft.util.ResourceLocation class WidgetButton(val rect: Rect, text: String, clicked: WidgetButton => Unit) diff --git a/src/net/bdew/lib/gui/widgets/WidgetFillDataslot.scala b/src/net/bdew/lib/gui/widgets/WidgetFillDataslot.scala index d2e7968..f12e91a 100644 --- a/src/net/bdew/lib/gui/widgets/WidgetFillDataslot.scala +++ b/src/net/bdew/lib/gui/widgets/WidgetFillDataslot.scala @@ -9,8 +9,8 @@ package net.bdew.lib.gui.widgets -import net.bdew.lib.gui._ import net.bdew.lib.data.base.DataSlotNumeric +import net.bdew.lib.gui._ class WidgetFillDataslot[T](val rect: Rect, val texture: Texture, dir: Direction.Direction, dslot: DataSlotNumeric[T], maxval: T)(implicit num: Numeric[T]) extends Widget { diff --git a/src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala b/src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala index 4650261..c25c992 100644 --- a/src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala +++ b/src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala @@ -9,13 +9,15 @@ package net.bdew.lib.gui.widgets -import net.bdew.lib.gui.{Texture, Point, Rect} -import net.bdew.lib.data.DataSlotTankBase -import scala.collection.mutable import java.text.DecimalFormat + import net.bdew.lib.Misc +import net.bdew.lib.data.DataSlotTankBase +import net.bdew.lib.gui.{Point, Rect, Texture} import org.lwjgl.opengl.GL11 +import scala.collection.mutable + class WidgetFluidGauge(val rect: Rect, overlay: Texture, dslot: DataSlotTankBase) extends Widget { val formater = new DecimalFormat("#,###") diff --git a/src/net/bdew/lib/gui/widgets/WidgetProgressBar.scala b/src/net/bdew/lib/gui/widgets/WidgetProgressBar.scala index e4dce45..c4a9122 100644 --- a/src/net/bdew/lib/gui/widgets/WidgetProgressBar.scala +++ b/src/net/bdew/lib/gui/widgets/WidgetProgressBar.scala @@ -9,9 +9,10 @@ package net.bdew.lib.gui.widgets -import net.bdew.lib.gui._ -import scala.collection.mutable import net.bdew.lib.data.DataSlotFloat +import net.bdew.lib.gui._ + +import scala.collection.mutable class WidgetProgressBar(rect: Rect, texture: Texture, dslot: DataSlotFloat) extends WidgetFillDataslot[Float](rect, texture, Direction.RIGHT, dslot, 1) { override def handleTooltip(p: Point, tip: mutable.MutableList[String]) = tip += "%.0f".format(dslot.cval * 100) + "%" diff --git a/src/net/bdew/lib/gui/widgets/WidgetSubcontainer.scala b/src/net/bdew/lib/gui/widgets/WidgetSubcontainer.scala index 9e8e920..7bc3b25 100644 --- a/src/net/bdew/lib/gui/widgets/WidgetSubcontainer.scala +++ b/src/net/bdew/lib/gui/widgets/WidgetSubcontainer.scala @@ -9,8 +9,7 @@ package net.bdew.lib.gui.widgets -import net.bdew.lib.gui._ -import net.bdew.lib.gui.Rect +import net.bdew.lib.gui.{Rect, _} class WidgetSubcontainer(val rect: Rect) extends BaseWidget with WidgetContainer with SimpleDrawTarget { def getZLevel = parent.getZLevel diff --git a/src/net/bdew/lib/gui/widgets/WidgetTextEdit.scala b/src/net/bdew/lib/gui/widgets/WidgetTextEdit.scala index 1e650b4..5adfcdc 100644 --- a/src/net/bdew/lib/gui/widgets/WidgetTextEdit.scala +++ b/src/net/bdew/lib/gui/widgets/WidgetTextEdit.scala @@ -9,8 +9,8 @@ package net.bdew.lib.gui.widgets -import net.minecraft.client.gui.{FontRenderer, GuiTextField} import net.bdew.lib.gui.{Point, Rect} +import net.minecraft.client.gui.{FontRenderer, GuiTextField} class WidgetTextEdit(val rect: Rect, fr: FontRenderer) extends GuiTextField(fr, rect.x.round, rect.y.round, rect.w.round, rect.h.round) with Widget { diff --git a/src/net/bdew/lib/items/IStack.scala b/src/net/bdew/lib/items/IStack.scala index cefcff1..f4fa326 100644 --- a/src/net/bdew/lib/items/IStack.scala +++ b/src/net/bdew/lib/items/IStack.scala @@ -9,8 +9,8 @@ package net.bdew.lib.items -import net.minecraft.item.{ItemBlock, Item, ItemStack} import net.minecraft.block.Block +import net.minecraft.item.{Item, ItemBlock, ItemStack} /** * Allows matching Items in ItemStacks in scala pattern matches diff --git a/src/net/bdew/lib/items/ItemUtils.scala b/src/net/bdew/lib/items/ItemUtils.scala index 9b084fa..5f03f05 100644 --- a/src/net/bdew/lib/items/ItemUtils.scala +++ b/src/net/bdew/lib/items/ItemUtils.scala @@ -9,13 +9,14 @@ package net.bdew.lib.items +import java.util.Random + +import net.bdew.lib.Misc import net.minecraft.entity.item.EntityItem +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.inventory.{IInventory, ISidedInventory} import net.minecraft.item.{Item, ItemStack} import net.minecraft.world.World -import net.minecraft.entity.player.EntityPlayer -import net.minecraft.inventory.{ISidedInventory, IInventory} -import net.bdew.lib.Misc -import java.util.Random import net.minecraftforge.common.util.ForgeDirection object ItemUtils { diff --git a/src/net/bdew/lib/items/SimpleItem.scala b/src/net/bdew/lib/items/SimpleItem.scala index ce10b20..cd8da6b 100644 --- a/src/net/bdew/lib/items/SimpleItem.scala +++ b/src/net/bdew/lib/items/SimpleItem.scala @@ -9,10 +9,10 @@ package net.bdew.lib.items -import net.minecraft.item.Item -import net.minecraft.client.renderer.texture.IIconRegister import cpw.mods.fml.relauncher.{Side, SideOnly} import net.bdew.lib.Misc +import net.minecraft.client.renderer.texture.IIconRegister +import net.minecraft.item.Item trait NamedItem extends Item { def name: String diff --git a/src/net/bdew/lib/items/inventory/ContainerItemInventory.scala b/src/net/bdew/lib/items/inventory/ContainerItemInventory.scala index 1694510..592d3c4 100644 --- a/src/net/bdew/lib/items/inventory/ContainerItemInventory.scala +++ b/src/net/bdew/lib/items/inventory/ContainerItemInventory.scala @@ -9,10 +9,10 @@ package net.bdew.lib.items.inventory -import net.minecraft.entity.player.EntityPlayer import net.bdew.lib.gui.BaseContainer -import net.minecraft.item.ItemStack +import net.minecraft.entity.player.EntityPlayer import net.minecraft.inventory.Slot +import net.minecraft.item.ItemStack class ContainerItemInventory(inv: InventoryItemAdapter, player: EntityPlayer) extends BaseContainer(inv) { def canInteractWith(entityplayer: EntityPlayer) = entityplayer == player diff --git a/src/net/bdew/lib/items/inventory/InventoryItemAdapter.scala b/src/net/bdew/lib/items/inventory/InventoryItemAdapter.scala index c502935..69449cd 100644 --- a/src/net/bdew/lib/items/inventory/InventoryItemAdapter.scala +++ b/src/net/bdew/lib/items/inventory/InventoryItemAdapter.scala @@ -9,11 +9,11 @@ package net.bdew.lib.items.inventory -import net.minecraft.item.ItemStack -import net.bdew.lib.tile.inventory.BaseInventory import net.bdew.lib.Misc -import net.minecraft.nbt.{NBTTagList, NBTTagCompound} +import net.bdew.lib.tile.inventory.BaseInventory import net.minecraft.entity.player.EntityPlayer +import net.minecraft.item.ItemStack +import net.minecraft.nbt.{NBTTagCompound, NBTTagList} class InventoryItemAdapter(val player: EntityPlayer, val slot: Int, val size: Int, val tagName: String) extends BaseInventory { def getSizeInventory = size diff --git a/src/net/bdew/lib/items/inventory/ItemInventory.scala b/src/net/bdew/lib/items/inventory/ItemInventory.scala index d7992d3..f191140 100644 --- a/src/net/bdew/lib/items/inventory/ItemInventory.scala +++ b/src/net/bdew/lib/items/inventory/ItemInventory.scala @@ -9,12 +9,12 @@ package net.bdew.lib.items.inventory -import net.minecraft.item.Item -import net.bdew.lib.gui.GuiProvider import cpw.mods.fml.common.Loader import cpw.mods.fml.relauncher.{Side, SideOnly} -import net.minecraft.entity.player.EntityPlayer import net.bdew.lib.BdLib +import net.bdew.lib.gui.GuiProvider +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.item.Item import net.minecraft.world.World /** diff --git a/src/net/bdew/lib/machine/Machine.scala b/src/net/bdew/lib/machine/Machine.scala index 7347686..d26922f 100644 --- a/src/net/bdew/lib/machine/Machine.scala +++ b/src/net/bdew/lib/machine/Machine.scala @@ -9,11 +9,11 @@ package net.bdew.lib.machine +import cpw.mods.fml.common.registry.GameRegistry +import net.bdew.lib.Misc +import net.bdew.lib.block.HasTE import net.bdew.lib.recipes.gencfg.ConfigSection import net.minecraft.block.Block -import cpw.mods.fml.common.registry.GameRegistry -import net.bdew.lib.block.HasTE -import net.bdew.lib.Misc abstract class Machine[T <: Block](val name: String, blockConstruct: => T) { var block: T = null.asInstanceOf[T] diff --git a/src/net/bdew/lib/power/DataSlotPower.scala b/src/net/bdew/lib/power/DataSlotPower.scala index 5467593..ffa6745 100644 --- a/src/net/bdew/lib/power/DataSlotPower.scala +++ b/src/net/bdew/lib/power/DataSlotPower.scala @@ -9,10 +9,10 @@ package net.bdew.lib.power -import net.minecraft.nbt.NBTTagCompound -import net.bdew.lib.data.base.{TileDataSlots, UpdateKind, DataSlot} import net.bdew.lib.Misc +import net.bdew.lib.data.base.{DataSlot, TileDataSlots, UpdateKind} import net.bdew.lib.machine.PoweredMachine +import net.minecraft.nbt.NBTTagCompound case class DataSlotPower(name: String, parent: TileDataSlots) extends DataSlot { updateKind = Set(UpdateKind.GUI, UpdateKind.SAVE) diff --git a/src/net/bdew/lib/power/ItemPoweredBase.scala b/src/net/bdew/lib/power/ItemPoweredBase.scala index 7f2a0a8..2f2af66 100644 --- a/src/net/bdew/lib/power/ItemPoweredBase.scala +++ b/src/net/bdew/lib/power/ItemPoweredBase.scala @@ -9,9 +9,9 @@ package net.bdew.lib.power -import net.minecraft.item.{ItemStack, Item} import net.bdew.lib.Misc import net.minecraft.entity.EntityLivingBase +import net.minecraft.item.{Item, ItemStack} import net.minecraft.nbt.NBTTagCompound trait ItemPoweredBase extends Item { diff --git a/src/net/bdew/lib/power/TileBaseProcessor.scala b/src/net/bdew/lib/power/TileBaseProcessor.scala index 15eda46..0c12353 100644 --- a/src/net/bdew/lib/power/TileBaseProcessor.scala +++ b/src/net/bdew/lib/power/TileBaseProcessor.scala @@ -9,11 +9,11 @@ package net.bdew.lib.power -import net.bdew.lib.tile.TileExtended -import net.bdew.lib.data.base.{UpdateKind, TileDataSlots} -import net.bdew.lib.tile.inventory.{BreakableInventoryTile, SidedInventory, PersistentInventoryTile} import net.bdew.lib.data.DataSlotFloat +import net.bdew.lib.data.base.{TileDataSlots, UpdateKind} import net.bdew.lib.machine.ProcessorMachine +import net.bdew.lib.tile.TileExtended +import net.bdew.lib.tile.inventory.{BreakableInventoryTile, PersistentInventoryTile, SidedInventory} abstract class TileBaseProcessor extends TileExtended with TileDataSlots diff --git a/src/net/bdew/lib/power/TilePoweredBase.scala b/src/net/bdew/lib/power/TilePoweredBase.scala index f7b76e0..1dfc4d8 100644 --- a/src/net/bdew/lib/power/TilePoweredBase.scala +++ b/src/net/bdew/lib/power/TilePoweredBase.scala @@ -9,8 +9,8 @@ package net.bdew.lib.power -import net.bdew.lib.tile.TileExtended import net.bdew.lib.machine.PoweredMachine +import net.bdew.lib.tile.TileExtended trait TilePoweredBase extends TileExtended { def power: DataSlotPower diff --git a/src/net/bdew/lib/power/WidgetPowerGauge.scala b/src/net/bdew/lib/power/WidgetPowerGauge.scala index 204e9be..2bd3e63 100644 --- a/src/net/bdew/lib/power/WidgetPowerGauge.scala +++ b/src/net/bdew/lib/power/WidgetPowerGauge.scala @@ -9,10 +9,12 @@ package net.bdew.lib.power -import net.bdew.lib.gui.{Texture, Point, Rect} -import scala.collection.mutable import java.text.DecimalFormat + import net.bdew.lib.gui.widgets.Widget +import net.bdew.lib.gui.{Point, Rect, Texture} + +import scala.collection.mutable class WidgetPowerGauge(val rect: Rect, texture: Texture, dslot: DataSlotPower) extends Widget { val formater = new DecimalFormat("#,###") diff --git a/src/net/bdew/lib/recipes/RecipeLoader.scala b/src/net/bdew/lib/recipes/RecipeLoader.scala index 7c7536d..e82e3ef 100644 --- a/src/net/bdew/lib/recipes/RecipeLoader.scala +++ b/src/net/bdew/lib/recipes/RecipeLoader.scala @@ -10,11 +10,12 @@ package net.bdew.lib.recipes import java.io.Reader -import net.minecraft.item.{Item, ItemStack} + +import cpw.mods.fml.common.registry.GameRegistry import net.bdew.lib.{BdLib, Misc} import net.minecraft.block.Block -import cpw.mods.fml.common.registry.GameRegistry -import net.minecraftforge.oredict.{ShapelessOreRecipe, OreDictionary} +import net.minecraft.item.{Item, ItemStack} +import net.minecraftforge.oredict.{OreDictionary, ShapelessOreRecipe} /** * Main recipe loader class diff --git a/src/net/bdew/lib/recipes/RecipeParser.scala b/src/net/bdew/lib/recipes/RecipeParser.scala index fe39610..c58c38a 100644 --- a/src/net/bdew/lib/recipes/RecipeParser.scala +++ b/src/net/bdew/lib/recipes/RecipeParser.scala @@ -11,9 +11,10 @@ package net.bdew.lib.recipes import java.io.Reader -import scala.util.parsing.combinator._ -import org.apache.commons.lang3.StringEscapeUtils import net.minecraftforge.oredict.OreDictionary +import org.apache.commons.lang3.StringEscapeUtils + +import scala.util.parsing.combinator._ class RecipeParser extends JavaTokenParsers { // Allows C-style comments diff --git a/src/net/bdew/lib/recipes/Vanilla.scala b/src/net/bdew/lib/recipes/Vanilla.scala index c3c851e..e7ce2fa 100644 --- a/src/net/bdew/lib/recipes/Vanilla.scala +++ b/src/net/bdew/lib/recipes/Vanilla.scala @@ -9,10 +9,12 @@ package net.bdew.lib.recipes +import java.lang.reflect.Modifier + import net.minecraft.block.Block import net.minecraft.item.Item + import scala.reflect.ClassTag -import java.lang.reflect.Modifier object Vanilla { diff --git a/src/net/bdew/lib/recipes/gencfg/GenericConfigLoader.scala b/src/net/bdew/lib/recipes/gencfg/GenericConfigLoader.scala index dc78717..1e1078f 100644 --- a/src/net/bdew/lib/recipes/gencfg/GenericConfigLoader.scala +++ b/src/net/bdew/lib/recipes/gencfg/GenericConfigLoader.scala @@ -9,8 +9,8 @@ package net.bdew.lib.recipes.gencfg -import net.bdew.lib.recipes.{Statement, RecipeLoader} import net.bdew.lib.BdLib +import net.bdew.lib.recipes.{RecipeLoader, Statement} trait GenericConfigLoader extends RecipeLoader { val cfgStore: ConfigSection diff --git a/src/net/bdew/lib/recipes/lootlist/LootListLoader.scala b/src/net/bdew/lib/recipes/lootlist/LootListLoader.scala index eec3234..459e5e2 100644 --- a/src/net/bdew/lib/recipes/lootlist/LootListLoader.scala +++ b/src/net/bdew/lib/recipes/lootlist/LootListLoader.scala @@ -9,11 +9,11 @@ package net.bdew.lib.recipes.lootlist -import net.bdew.lib.recipes.gencfg.GenericConfigLoader -import net.minecraftforge.oredict.OreDictionary -import net.bdew.lib.recipes.StackRef -import net.minecraft.item.ItemStack import net.bdew.lib.BdLib +import net.bdew.lib.recipes.StackRef +import net.bdew.lib.recipes.gencfg.GenericConfigLoader +import net.minecraft.item.ItemStack +import net.minecraftforge.oredict.OreDictionary /** * Loader mixin for loot lists diff --git a/src/net/bdew/lib/render/IconPreloader.scala b/src/net/bdew/lib/render/IconPreloader.scala index b13b6b6..175503a 100644 --- a/src/net/bdew/lib/render/IconPreloader.scala +++ b/src/net/bdew/lib/render/IconPreloader.scala @@ -9,11 +9,11 @@ package net.bdew.lib.render -import net.minecraft.client.renderer.texture.IIconRegister -import net.minecraftforge.common.MinecraftForge -import net.minecraftforge.client.event.TextureStitchEvent -import net.bdew.lib.gui.{Texture, IconWrapper} import cpw.mods.fml.common.eventhandler.SubscribeEvent +import net.bdew.lib.gui.{IconWrapper, Texture} +import net.minecraft.client.renderer.texture.IIconRegister +import net.minecraftforge.client.event.TextureStitchEvent +import net.minecraftforge.common.MinecraftForge /** * Allows loading of texture that don't belong to specific block or item into vanilla block/item atlas @@ -33,7 +33,7 @@ class IconPreloader(kind: Int) { icons += this } - import language.implicitConversions + import scala.language.implicitConversions implicit def entry2icon(v: TextureLoc) = v.texture.icon implicit def entry2texture(v: TextureLoc) = v.texture diff --git a/src/net/bdew/lib/rotate/BaseRotateableBlock.scala b/src/net/bdew/lib/rotate/BaseRotateableBlock.scala index 49f4616..a1ba72e 100644 --- a/src/net/bdew/lib/rotate/BaseRotateableBlock.scala +++ b/src/net/bdew/lib/rotate/BaseRotateableBlock.scala @@ -9,15 +9,14 @@ package net.bdew.lib.rotate -import cpw.mods.fml.relauncher.Side -import cpw.mods.fml.relauncher.SideOnly +import java.util.EnumSet + +import cpw.mods.fml.relauncher.{Side, SideOnly} import net.minecraft.block.Block import net.minecraft.entity.EntityLivingBase import net.minecraft.item.ItemStack import net.minecraft.util.{IIcon, MathHelper} -import net.minecraft.world.IBlockAccess -import net.minecraft.world.World -import java.util.EnumSet +import net.minecraft.world.{IBlockAccess, World} import net.minecraftforge.common.util.ForgeDirection /** diff --git a/src/net/bdew/lib/rotate/RotateableTile.scala b/src/net/bdew/lib/rotate/RotateableTile.scala index 848d679..4360eff 100644 --- a/src/net/bdew/lib/rotate/RotateableTile.scala +++ b/src/net/bdew/lib/rotate/RotateableTile.scala @@ -9,8 +9,8 @@ package net.bdew.lib.rotate -import net.bdew.lib.data.base.{UpdateKind, TileDataSlots} import net.bdew.lib.data.DataSlotDirection +import net.bdew.lib.data.base.{TileDataSlots, UpdateKind} trait RotateableTile extends TileDataSlots { var rotation = DataSlotDirection("rotation", this).setUpdate(UpdateKind.SAVE, UpdateKind.WORLD) diff --git a/src/net/bdew/lib/rotate/RotateableTileBlock.scala b/src/net/bdew/lib/rotate/RotateableTileBlock.scala index 6e7f3d9..f3e50aa 100644 --- a/src/net/bdew/lib/rotate/RotateableTileBlock.scala +++ b/src/net/bdew/lib/rotate/RotateableTileBlock.scala @@ -9,10 +9,9 @@ package net.bdew.lib.rotate -import net.minecraft.block.ITileEntityProvider -import net.minecraft.world.IBlockAccess -import net.minecraft.world.World import cpw.mods.fml.common.FMLCommonHandler +import net.minecraft.block.ITileEntityProvider +import net.minecraft.world.{IBlockAccess, World} import net.minecraftforge.common.util.ForgeDirection /** diff --git a/src/net/bdew/lib/tile/ExposeTank.scala b/src/net/bdew/lib/tile/ExposeTank.scala index 4d9e228..21dda79 100644 --- a/src/net/bdew/lib/tile/ExposeTank.scala +++ b/src/net/bdew/lib/tile/ExposeTank.scala @@ -10,8 +10,8 @@ package net.bdew.lib.tile import net.minecraft.tileentity.TileEntity -import net.minecraftforge.fluids._ import net.minecraftforge.common.util.ForgeDirection +import net.minecraftforge.fluids._ trait ExposeTank extends TileEntity with IFluidHandler { def getTankFromDirection(dir: ForgeDirection): IFluidTank diff --git a/src/net/bdew/lib/tile/TileExtended.scala b/src/net/bdew/lib/tile/TileExtended.scala index e2efac9..b949b78 100644 --- a/src/net/bdew/lib/tile/TileExtended.scala +++ b/src/net/bdew/lib/tile/TileExtended.scala @@ -9,11 +9,11 @@ package net.bdew.lib.tile -import net.minecraft.tileentity.TileEntity -import net.minecraft.nbt.NBTTagCompound -import net.minecraft.network.{NetworkManager, Packet} import net.bdew.lib.Event +import net.minecraft.nbt.NBTTagCompound import net.minecraft.network.play.server.S35PacketUpdateTileEntity +import net.minecraft.network.{NetworkManager, Packet} +import net.minecraft.tileentity.TileEntity class TileExtended extends TileEntity { final val ACT_CLIENT = 1 diff --git a/src/net/bdew/lib/tile/inventory/BaseInventory.scala b/src/net/bdew/lib/tile/inventory/BaseInventory.scala index 049971c..4a787c4 100644 --- a/src/net/bdew/lib/tile/inventory/BaseInventory.scala +++ b/src/net/bdew/lib/tile/inventory/BaseInventory.scala @@ -9,9 +9,9 @@ package net.bdew.lib.tile.inventory +import net.minecraft.entity.player.EntityPlayer import net.minecraft.inventory.IInventory import net.minecraft.item.ItemStack -import net.minecraft.entity.player.EntityPlayer trait BaseInventory extends IInventory { var inv: Array[ItemStack] = new Array(getSizeInventory) diff --git a/src/net/bdew/lib/tile/inventory/BreakableInventoryTile.scala b/src/net/bdew/lib/tile/inventory/BreakableInventoryTile.scala index 6bc4f93..d467696 100644 --- a/src/net/bdew/lib/tile/inventory/BreakableInventoryTile.scala +++ b/src/net/bdew/lib/tile/inventory/BreakableInventoryTile.scala @@ -9,9 +9,9 @@ package net.bdew.lib.tile.inventory -import net.minecraft.tileentity.TileEntity -import net.minecraft.item.ItemStack import net.bdew.lib.items.ItemUtils +import net.minecraft.item.ItemStack +import net.minecraft.tileentity.TileEntity trait BreakableInventoryTile extends TileEntity with BaseInventory { def dropItems() { diff --git a/src/net/bdew/lib/tile/inventory/PersistentInventoryTile.scala b/src/net/bdew/lib/tile/inventory/PersistentInventoryTile.scala index 1a5f035..d940f40 100644 --- a/src/net/bdew/lib/tile/inventory/PersistentInventoryTile.scala +++ b/src/net/bdew/lib/tile/inventory/PersistentInventoryTile.scala @@ -9,10 +9,10 @@ package net.bdew.lib.tile.inventory -import net.minecraft.item.ItemStack -import net.minecraft.nbt.{NBTTagList, NBTTagCompound} import net.bdew.lib.Misc import net.bdew.lib.tile.TileExtended +import net.minecraft.item.ItemStack +import net.minecraft.nbt.{NBTTagCompound, NBTTagList} trait PersistentInventoryTile extends TileExtended with BaseInventory { persistLoad.listen((tag: NBTTagCompound) => {