From 49a2f0baec65d1719bc554675be4f88d290db8bf Mon Sep 17 00:00:00 2001 From: bdew Date: Tue, 13 May 2014 02:15:57 +0300 Subject: [PATCH 1/5] Fix NPE in getBiomeByName (bdew/gendustry#22) --- src/net/bdew/lib/Misc.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net/bdew/lib/Misc.scala b/src/net/bdew/lib/Misc.scala index 7a054c7..d540d65 100644 --- a/src/net/bdew/lib/Misc.scala +++ b/src/net/bdew/lib/Misc.scala @@ -55,7 +55,7 @@ object Misc { def filterType[T](from: Iterable[_], cls: Class[T]) = from.filter(cls.isInstance).asInstanceOf[Iterable[T]] - def getBiomeByName(name: String) = BiomeGenBase.biomeList.find(_.biomeName == name).getOrElse(null) + def getBiomeByName(name: String) = BiomeGenBase.biomeList.find(x => x != null && x.biomeName == name).getOrElse(null) def haveModVersion(spec: String): Boolean = { val req = VersionParser.parseVersionReference(spec) From 0b87dd83e77d32e55918b5b7d16104c41b32f3d5 Mon Sep 17 00:00:00 2001 From: bdew Date: Thu, 29 May 2014 11:24:24 +0300 Subject: [PATCH 2/5] Fixed tile entity names not being scoped, should prevent collisions --- build.gradle | 2 +- src/net/bdew/lib/config/BlockManager.scala | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 8896b6d..b425f55 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { apply plugin: 'forge' apply plugin: 'scala' -version = "1.2.2" +version = "1.2.3" if (project.hasProperty('buildnum')) { project.version = project.version + '.' + project.buildnum diff --git a/src/net/bdew/lib/config/BlockManager.scala b/src/net/bdew/lib/config/BlockManager.scala index aa3e05d..26d64b2 100644 --- a/src/net/bdew/lib/config/BlockManager.scala +++ b/src/net/bdew/lib/config/BlockManager.scala @@ -13,8 +13,11 @@ 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 -class BlockManager(val ids: IdManager) { +class BlockManager(val ids: IdManager, addOldTileNames: Boolean = true) { + + def this(ids: IdManager) = this(ids, true) def regBlockCls[T <: Block](blockCls: Class[T], name: String, addStack: Boolean = true): T = { val block = blockCls.getConstructor(classOf[Int]).newInstance(ids.getBlockId(name): Integer) @@ -28,7 +31,12 @@ class BlockManager(val ids: IdManager) { GameRegistry.registerCustomItemStack(name, new ItemStack(block)) if (block.isInstanceOf[HasTE[_]]) - GameRegistry.registerTileEntity(block.asInstanceOf[HasTE[_]].TEClass, name) + if (addOldTileNames) + GameRegistry.registerTileEntityWithAlternatives(block.asInstanceOf[HasTE[_]].TEClass, + "%s.%s".format(Misc.getActiveModId, name), name) + else + GameRegistry.registerTileEntity(block.asInstanceOf[HasTE[_]].TEClass, + "%s.%s".format(Misc.getActiveModId, name)) return block } From e41e203b7ee0ecefdeca756d4739dd6b0dc2bce0 Mon Sep 17 00:00:00 2001 From: bdew Date: Sun, 1 Jun 2014 15:07:33 +0300 Subject: [PATCH 3/5] Added Misc.forgeDirection, Misc.asInstanceOpt, Misc.getNeighbourTile and ItemUtils.getAccessibleSlotsFromSide helpers --- src/net/bdew/lib/Misc.scala | 14 ++++++++++++++ src/net/bdew/lib/items/ItemUtils.scala | 8 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/net/bdew/lib/Misc.scala b/src/net/bdew/lib/Misc.scala index d540d65..a27e191 100644 --- a/src/net/bdew/lib/Misc.scala +++ b/src/net/bdew/lib/Misc.scala @@ -17,6 +17,8 @@ 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 net.minecraftforge.common.ForgeDirection +import net.minecraft.tileentity.TileEntity object Misc { def iterNbtList[X](list: NBTTagList) = @@ -69,4 +71,16 @@ object Misc { return true } + + // Because writing this every time is awkward + def forgeDirection(i: Int) = ForgeDirection.values()(i) + + // Easy replacement for various "if(foo.isInstanceOf[Bar]) foo.asInstanceOf[Bar]" constructs + def asInstanceOpt[T](v: Any, cls: Class[T]) = + if (cls.isInstance(v)) Some(v.asInstanceOf[T]) else None + + def getNeighbourTile[T](origin: TileEntity, dir: ForgeDirection, cls: Class[T]) = + Option(origin.worldObj.getBlockTileEntity(origin.xCoord + dir.offsetX, + origin.yCoord + dir.offsetY, origin.zCoord + dir.offsetZ)) flatMap (asInstanceOpt(_, cls)) } + diff --git a/src/net/bdew/lib/items/ItemUtils.scala b/src/net/bdew/lib/items/ItemUtils.scala index 4d03704..1e98a8d 100644 --- a/src/net/bdew/lib/items/ItemUtils.scala +++ b/src/net/bdew/lib/items/ItemUtils.scala @@ -13,9 +13,10 @@ import net.minecraft.entity.item.EntityItem import net.minecraft.item.{Item, ItemStack} import net.minecraft.world.World import net.minecraft.entity.player.EntityPlayer -import net.minecraft.inventory.IInventory +import net.minecraft.inventory.{ISidedInventory, IInventory} import net.bdew.lib.Misc import java.util.Random +import net.minecraftforge.common.ForgeDirection object ItemUtils { def throwItemAt(world: World, x: Int, y: Int, z: Int, stack: ItemStack) { @@ -78,6 +79,11 @@ object ItemUtils { return stack } + def getAccessibleSlotsFromSide(inv: IInventory, side: ForgeDirection) = + (Misc.asInstanceOpt(inv, classOf[ISidedInventory]) + map (_.getAccessibleSlotsFromSide(side.ordinal()).toList) + getOrElse (0 until inv.getSizeInventory)) + def findItemInInventory(inv: IInventory, item: Item) = Range(0, inv.getSizeInventory).map(x => x -> inv.getStackInSlot(x)) .find({ case (slot, stack) => stack != null && stack.getItem == item }) From 5bac374211ba23edb0bdc4c036fb32d6a1ad1635 Mon Sep 17 00:00:00 2001 From: bdew Date: Sun, 1 Jun 2014 15:07:54 +0300 Subject: [PATCH 4/5] Added cover upgrades system --- src/net/bdew/lib/covers/BlockCoverable.scala | 65 ++++++++++++++++++++ src/net/bdew/lib/covers/DataslotCover.scala | 35 +++++++++++ src/net/bdew/lib/covers/ItemCover.scala | 31 ++++++++++ src/net/bdew/lib/covers/TileCoverable.scala | 33 ++++++++++ 4 files changed, 164 insertions(+) create mode 100644 src/net/bdew/lib/covers/BlockCoverable.scala create mode 100644 src/net/bdew/lib/covers/DataslotCover.scala create mode 100644 src/net/bdew/lib/covers/ItemCover.scala create mode 100644 src/net/bdew/lib/covers/TileCoverable.scala diff --git a/src/net/bdew/lib/covers/BlockCoverable.scala b/src/net/bdew/lib/covers/BlockCoverable.scala new file mode 100644 index 0000000..581b489 --- /dev/null +++ b/src/net/bdew/lib/covers/BlockCoverable.scala @@ -0,0 +1,65 @@ +/* + * Copyright (c) bdew, 2013 - 2014 + * https://github.com/bdew/bdlib + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +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.items.ItemUtils +import net.minecraft.item.ItemStack + +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 = { + val te = getTE(world, x, y, z) + val side = Misc.forgeDirection(face) + + if (player.getCurrentEquippedItem == null && player.isSneaking) { + for (cover <- te.covers(side)) { + if (!world.isRemote) { + te.covers(side) := None + te.onCoversChanged() + ItemUtils.dropItemToPlayer(world, player, new ItemStack(cover)) + } + return true + } + } + + for { + activeStack <- Option(player.getCurrentEquippedItem) + activeItem <- Option(activeStack.getItem) + coverItem <- Misc.asInstanceOpt(activeItem, classOf[ItemCover]) + if te.isValidCover(side, coverItem) && coverItem.isValidTile(te) + } { + if (!world.isRemote) { + for (cover <- te.covers(side)) + ItemUtils.dropItemToPlayer(world, player, new ItemStack(cover)) + + player.inventory.decrStackSize(player.inventory.currentItem, 1) + te.covers(side) := coverItem + te.onCoversChanged() + } + return true + } + + super.onBlockActivated(world, x, y, z, player, face, xoffs, yoffs, zoffs) + } + + override def getBlockTexture(w: IBlockAccess, x: Int, y: Int, z: Int, side: Int) = + getTE(w, x, y, z).covers(Misc.forgeDirection(side)).cval map (_.getCoverIcon) getOrElse + super.getBlockTexture(w, x, y, z, side) + + override def breakBlock(world: World, x: Int, y: Int, z: Int, blockId: Int, meta: Int) { + if (!world.isRemote) + for ((dir, covOpt) <- getTE(world, x, y, z).covers; cover <- covOpt) + ItemUtils.throwItemAt(world, x, y, z, new ItemStack(cover)) + super.breakBlock(world, x, y, z, blockId, meta) + } +} diff --git a/src/net/bdew/lib/covers/DataslotCover.scala b/src/net/bdew/lib/covers/DataslotCover.scala new file mode 100644 index 0000000..640a63e --- /dev/null +++ b/src/net/bdew/lib/covers/DataslotCover.scala @@ -0,0 +1,35 @@ +/* + * Copyright (c) bdew, 2013 - 2014 + * https://github.com/bdew/bdlib + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.covers + +import net.minecraft.item.Item +import net.bdew.lib.data.base.{DataSlotVal, UpdateKind} +import net.minecraft.nbt.NBTTagCompound +import net.bdew.lib.BdLib + +case class DataslotCover(name: String, parent: TileCoverable) extends DataSlotVal[Option[ItemCover]] { + var cval: Option[ItemCover] = None + + setUpdate(UpdateKind.SAVE, UpdateKind.WORLD, UpdateKind.RENDER) + + def :=(v: ItemCover) = update(Option(v)) + + override def load(t: NBTTagCompound, kind: UpdateKind.Value) = { + try { + cval = Option(Item.itemsList(t.getInteger(name)).asInstanceOf[ItemCover]) + } catch { + case t: Throwable => BdLib.logError("Failed to load cover %s for block at %d, %d, %d: %s", name, parent.xCoord, parent.yCoord, parent.zCoord, t.toString) + t.printStackTrace() + } + } + + override def save(t: NBTTagCompound, kind: UpdateKind.Value) = + for (v <- cval) t.setInteger(name, v.itemID) +} diff --git a/src/net/bdew/lib/covers/ItemCover.scala b/src/net/bdew/lib/covers/ItemCover.scala new file mode 100644 index 0000000..033bd97 --- /dev/null +++ b/src/net/bdew/lib/covers/ItemCover.scala @@ -0,0 +1,31 @@ +/* + * Copyright (c) bdew, 2013 - 2014 + * https://github.com/bdew/bdlib + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.covers + +import net.minecraft.item.Item +import net.minecraftforge.common.ForgeDirection +import net.minecraft.util.Icon + +trait ItemCover extends Item { + /** + * @return Icon to render, MUST be on terrain spritesheet (0), not item! + */ + def getCoverIcon: Icon + + /** + * Perform tick, called on server only + */ + def tickCover(te: TileCoverable, side: ForgeDirection) + + /** + * Checks if this cover can be installed on a specific TE + */ + def isValidTile(te: TileCoverable): Boolean +} diff --git a/src/net/bdew/lib/covers/TileCoverable.scala b/src/net/bdew/lib/covers/TileCoverable.scala new file mode 100644 index 0000000..fae050b --- /dev/null +++ b/src/net/bdew/lib/covers/TileCoverable.scala @@ -0,0 +1,33 @@ +/* + * Copyright (c) bdew, 2013 - 2014 + * https://github.com/bdew/bdlib + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.covers + +import net.bdew.lib.data.base.TileDataSlots +import net.minecraftforge.common.ForgeDirection + +trait TileCoverable extends TileDataSlots { + val covers = (ForgeDirection.VALID_DIRECTIONS map { x => x -> DataslotCover("cv_" + x.toString.toLowerCase, this) }).toMap + + /** + * Checks if a specific cover can be installed here + */ + def isValidCover(side: ForgeDirection, cover: ItemCover): Boolean + + /** + * Called when new covers are installed + */ + def onCoversChanged() {} + + def tickCovers() = + for ((dir, covopt) <- covers; cover <- covopt.cval) + cover.tickCover(this, dir) + + serverTick.listen(tickCovers) +} From da3e58b44b484569e0052f27c1e3ab98c22135f8 Mon Sep 17 00:00:00 2001 From: bdew Date: Sun, 1 Jun 2014 16:53:51 +0300 Subject: [PATCH 5/5] Reworked cover system to store full itemstack of the cover (for stuff like filter covers to have a place to store data) --- src/net/bdew/lib/covers/BlockCoverable.scala | 29 ++++++++-------- src/net/bdew/lib/covers/DataslotCover.scala | 35 -------------------- src/net/bdew/lib/covers/ItemCover.scala | 8 ++--- src/net/bdew/lib/covers/TileCoverable.scala | 20 ++++++++--- 4 files changed, 35 insertions(+), 57 deletions(-) delete mode 100644 src/net/bdew/lib/covers/DataslotCover.scala diff --git a/src/net/bdew/lib/covers/BlockCoverable.scala b/src/net/bdew/lib/covers/BlockCoverable.scala index 581b489..ef1b8b2 100644 --- a/src/net/bdew/lib/covers/BlockCoverable.scala +++ b/src/net/bdew/lib/covers/BlockCoverable.scala @@ -14,7 +14,6 @@ import net.minecraft.world.{IBlockAccess, World} import net.minecraft.entity.player.EntityPlayer import net.bdew.lib.Misc import net.bdew.lib.items.ItemUtils -import net.minecraft.item.ItemStack 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 = { @@ -22,11 +21,11 @@ trait BlockCoverable[T <: TileCoverable] extends HasTE[T] { val side = Misc.forgeDirection(face) if (player.getCurrentEquippedItem == null && player.isSneaking) { - for (cover <- te.covers(side)) { + for (cover <- Option(te.covers(side).cval)) { if (!world.isRemote) { - te.covers(side) := None + te.covers(side) := null te.onCoversChanged() - ItemUtils.dropItemToPlayer(world, player, new ItemStack(cover)) + ItemUtils.dropItemToPlayer(world, player, cover) } return true } @@ -36,14 +35,15 @@ trait BlockCoverable[T <: TileCoverable] extends HasTE[T] { activeStack <- Option(player.getCurrentEquippedItem) activeItem <- Option(activeStack.getItem) coverItem <- Misc.asInstanceOpt(activeItem, classOf[ItemCover]) - if te.isValidCover(side, coverItem) && coverItem.isValidTile(te) + if te.isValidCover(side, activeStack) && coverItem.isValidTile(te, activeStack) } { if (!world.isRemote) { - for (cover <- te.covers(side)) - ItemUtils.dropItemToPlayer(world, player, new ItemStack(cover)) + for (cover <- Option(te.covers(side).cval)) + ItemUtils.throwItemAt(world, te.xCoord + side.offsetX, te.yCoord + side.offsetY, te.zCoord + side.offsetZ, cover.copy()) - player.inventory.decrStackSize(player.inventory.currentItem, 1) - te.covers(side) := coverItem + te.covers(side) := activeStack.splitStack(1) + + if (activeStack.stackSize <= 0) player.inventory.setInventorySlotContents(player.inventory.currentItem, null) te.onCoversChanged() } return true @@ -53,13 +53,16 @@ trait BlockCoverable[T <: TileCoverable] extends HasTE[T] { } override def getBlockTexture(w: IBlockAccess, x: Int, y: Int, z: Int, side: Int) = - getTE(w, x, y, z).covers(Misc.forgeDirection(side)).cval map (_.getCoverIcon) getOrElse - super.getBlockTexture(w, x, y, z, side) + (for { + coverStack <- Option(getTE(w, x, y, z).covers(Misc.forgeDirection(side)).cval) + coverItem <- Option(coverStack.getItem) flatMap (Misc.asInstanceOpt(_, classOf[ItemCover])) + } yield coverItem.getCoverIcon(coverStack) + ) getOrElse super.getBlockTexture(w, x, y, z, side) override def breakBlock(world: World, x: Int, y: Int, z: Int, blockId: Int, meta: Int) { if (!world.isRemote) - for ((dir, covOpt) <- getTE(world, x, y, z).covers; cover <- covOpt) - ItemUtils.throwItemAt(world, x, y, z, new ItemStack(cover)) + for ((dir, covOpt) <- getTE(world, x, y, z).covers; cover <- Option(covOpt.cval)) + ItemUtils.throwItemAt(world, x, y, z, cover) super.breakBlock(world, x, y, z, blockId, meta) } } diff --git a/src/net/bdew/lib/covers/DataslotCover.scala b/src/net/bdew/lib/covers/DataslotCover.scala deleted file mode 100644 index 640a63e..0000000 --- a/src/net/bdew/lib/covers/DataslotCover.scala +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) bdew, 2013 - 2014 - * https://github.com/bdew/bdlib - * - * This mod is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt - */ - -package net.bdew.lib.covers - -import net.minecraft.item.Item -import net.bdew.lib.data.base.{DataSlotVal, UpdateKind} -import net.minecraft.nbt.NBTTagCompound -import net.bdew.lib.BdLib - -case class DataslotCover(name: String, parent: TileCoverable) extends DataSlotVal[Option[ItemCover]] { - var cval: Option[ItemCover] = None - - setUpdate(UpdateKind.SAVE, UpdateKind.WORLD, UpdateKind.RENDER) - - def :=(v: ItemCover) = update(Option(v)) - - override def load(t: NBTTagCompound, kind: UpdateKind.Value) = { - try { - cval = Option(Item.itemsList(t.getInteger(name)).asInstanceOf[ItemCover]) - } catch { - case t: Throwable => BdLib.logError("Failed to load cover %s for block at %d, %d, %d: %s", name, parent.xCoord, parent.yCoord, parent.zCoord, t.toString) - t.printStackTrace() - } - } - - override def save(t: NBTTagCompound, kind: UpdateKind.Value) = - for (v <- cval) t.setInteger(name, v.itemID) -} diff --git a/src/net/bdew/lib/covers/ItemCover.scala b/src/net/bdew/lib/covers/ItemCover.scala index 033bd97..b104467 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.Item +import net.minecraft.item.{ItemStack, Item} import net.minecraftforge.common.ForgeDirection import net.minecraft.util.Icon @@ -17,15 +17,15 @@ trait ItemCover extends Item { /** * @return Icon to render, MUST be on terrain spritesheet (0), not item! */ - def getCoverIcon: Icon + def getCoverIcon(stack: ItemStack): Icon /** * Perform tick, called on server only */ - def tickCover(te: TileCoverable, side: ForgeDirection) + def tickCover(te: TileCoverable, side: ForgeDirection, cover: ItemStack) /** * Checks if this cover can be installed on a specific TE */ - def isValidTile(te: TileCoverable): Boolean + def isValidTile(te: TileCoverable, cover: ItemStack): Boolean } diff --git a/src/net/bdew/lib/covers/TileCoverable.scala b/src/net/bdew/lib/covers/TileCoverable.scala index fae050b..5f05d9f 100644 --- a/src/net/bdew/lib/covers/TileCoverable.scala +++ b/src/net/bdew/lib/covers/TileCoverable.scala @@ -9,16 +9,21 @@ package net.bdew.lib.covers -import net.bdew.lib.data.base.TileDataSlots +import net.bdew.lib.data.base.{UpdateKind, TileDataSlots} import net.minecraftforge.common.ForgeDirection +import net.bdew.lib.data.DataSlotItemStack +import net.bdew.lib.Misc +import net.minecraft.item.ItemStack trait TileCoverable extends TileDataSlots { - val covers = (ForgeDirection.VALID_DIRECTIONS map { x => x -> DataslotCover("cv_" + x.toString.toLowerCase, this) }).toMap + val covers = (ForgeDirection.VALID_DIRECTIONS map { x => + x -> DataSlotItemStack("cover_" + x.toString.toLowerCase, this).setUpdate(UpdateKind.SAVE, UpdateKind.WORLD, UpdateKind.RENDER) + }).toMap /** * Checks if a specific cover can be installed here */ - def isValidCover(side: ForgeDirection, cover: ItemCover): Boolean + def isValidCover(side: ForgeDirection, cover: ItemStack): Boolean /** * Called when new covers are installed @@ -26,8 +31,13 @@ trait TileCoverable extends TileDataSlots { def onCoversChanged() {} def tickCovers() = - for ((dir, covopt) <- covers; cover <- covopt.cval) - cover.tickCover(this, dir) + for { + (dir, coverSlot) <- covers + coverStack <- Option(coverSlot.cval) + coverItem <- Option(coverStack.getItem) flatMap (Misc.asInstanceOpt(_, classOf[ItemCover])) + } { + coverItem.tickCover(this, dir, coverStack) + } serverTick.listen(tickCovers) }