From 5f9c311f41efd517026a82c1ec10bb60d4c49f94 Mon Sep 17 00:00:00 2001 From: bdew Date: Thu, 27 Feb 2014 11:13:40 +0200 Subject: [PATCH 01/10] Fixed BaseScreen not drawing the background in correct position --- src/net/bdew/lib/gui/BaseScreen.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/net/bdew/lib/gui/BaseScreen.scala b/src/net/bdew/lib/gui/BaseScreen.scala index cdf6b4b..69e4fdc 100644 --- a/src/net/bdew/lib/gui/BaseScreen.scala +++ b/src/net/bdew/lib/gui/BaseScreen.scala @@ -12,6 +12,7 @@ package net.bdew.lib.gui import net.minecraft.client.gui.inventory.GuiContainer import net.minecraft.inventory.Container import scala.collection.mutable +import org.lwjgl.opengl.GL11 abstract class BaseScreen(cont: Container, xSz: Int, ySz: Int) extends GuiContainer(cont) { xSize = xSz @@ -60,6 +61,10 @@ abstract class BaseScreen(cont: Container, xSz: Int, ySz: Int) extends GuiContai protected def drawGuiContainerBackgroundLayer(f: Float, x: Int, y: Int) { if (background != null) widgets.drawTexture(rect, background) - widgets.drawBackground(Point(x, y)) + + GL11.glPushMatrix() + GL11.glTranslatef(rect.x, rect.y, 0) + widgets.drawBackground(Point(x, y) - rect.origin) + GL11.glPopMatrix() } } From 561f176682c8c8e118c0242ad9927589002d245d Mon Sep 17 00:00:00 2001 From: bdew Date: Tue, 4 Mar 2014 16:32:59 +0200 Subject: [PATCH 02/10] Added workaround for bug in GuiContainer - not resetting color when rendering background icon --- src/net/bdew/lib/gui/BaseSlot.scala | 21 +++++++++++++++++++++ src/net/bdew/lib/gui/SlotValidating.scala | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/net/bdew/lib/gui/BaseSlot.scala diff --git a/src/net/bdew/lib/gui/BaseSlot.scala b/src/net/bdew/lib/gui/BaseSlot.scala new file mode 100644 index 0000000..d036e71 --- /dev/null +++ b/src/net/bdew/lib/gui/BaseSlot.scala @@ -0,0 +1,21 @@ +/* + * 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.gui + +import net.minecraft.inventory.{IInventory, Slot} +import org.lwjgl.opengl.GL11 + +class BaseSlot(inv: IInventory, slot: Int, x: Int, y: Int) extends Slot(inv, slot, x, y) { + override def getBackgroundIconIndex = { + // Workaround for bug in GuiContainer, color isn't reset if previous slot had an item with color. + GL11.glColor4d(1,1,1,1) + super.getBackgroundIconIndex + } +} diff --git a/src/net/bdew/lib/gui/SlotValidating.scala b/src/net/bdew/lib/gui/SlotValidating.scala index 9512e6d..291ac4e 100644 --- a/src/net/bdew/lib/gui/SlotValidating.scala +++ b/src/net/bdew/lib/gui/SlotValidating.scala @@ -13,6 +13,6 @@ import net.minecraft.inventory.IInventory import net.minecraft.inventory.Slot import net.minecraft.item.ItemStack -class SlotValidating(inv: IInventory, slot: Int, x: Int, y: Int) extends Slot(inv, slot, x, y) { +class SlotValidating(inv: IInventory, slot: Int, x: Int, y: Int) extends BaseSlot(inv, slot, x, y) { override def isItemValid(stack: ItemStack) = inventory.isItemValidForSlot(getSlotIndex, stack) } \ No newline at end of file From 07fbbb026703f8a5bbdb55c2f2d9d3fc4fe3ad93 Mon Sep 17 00:00:00 2001 From: bdew Date: Sun, 9 Mar 2014 12:21:53 +0200 Subject: [PATCH 03/10] Workaround for ItemInventory crashing on servers (scala synthetic methods not keeping annotations) --- src/net/bdew/lib/items/inventory/ItemInventory.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net/bdew/lib/items/inventory/ItemInventory.scala b/src/net/bdew/lib/items/inventory/ItemInventory.scala index 285712c..7c46116 100644 --- a/src/net/bdew/lib/items/inventory/ItemInventory.scala +++ b/src/net/bdew/lib/items/inventory/ItemInventory.scala @@ -29,7 +29,7 @@ trait ItemInventory extends Item with GuiProvider { val modObj = Loader.instance().activeModContainer().getMod @SideOnly(Side.CLIENT) - def makeGui(inv: InventoryItemAdapter, player: EntityPlayer): BaseScreen + def makeGui(inv: InventoryItemAdapter, player: EntityPlayer): AnyRef def makeContainer(inv: InventoryItemAdapter, player: EntityPlayer): ContainerItemInventory def makeAdaptor(player: EntityPlayer) = new InventoryItemAdapter(player, player.inventory.currentItem, invSize, invTagName) From 3001309a856dc79042dc48ea254a06d221fd356a Mon Sep 17 00:00:00 2001 From: bdew Date: Thu, 13 Mar 2014 12:02:48 +0200 Subject: [PATCH 04/10] Config parser/loader changes: IfOreDict can now contain only delayed statements and is a delayed statement itself (will be evaluated when loadDealayed is called) Also 2 new terms added at parser level - delayedStatement(s) - to separate lists that require delayed statements --- src/net/bdew/lib/recipes/DataClasses.scala | 3 +- src/net/bdew/lib/recipes/RecipeLoader.scala | 33 +++++++++++++-------- src/net/bdew/lib/recipes/RecipeParser.scala | 11 +++---- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/net/bdew/lib/recipes/DataClasses.scala b/src/net/bdew/lib/recipes/DataClasses.scala index a86072e..8c6982d 100644 --- a/src/net/bdew/lib/recipes/DataClasses.scala +++ b/src/net/bdew/lib/recipes/DataClasses.scala @@ -125,13 +125,14 @@ case class StIfHaveMod(mod: String, thn: List[Statement], els: List[Statement]) /** * Conditional block - checks if mod is loaded + * Can contain only delayed statements * Syntax: ifOreDict {string} { {statements} } [else { {statements} }] * Parser: [[net.bdew.lib.recipes.RecipeParser.ifOreDict]] * @param id Ore Dictionary Entry * @param thn Statements to run if present * @param els Statements to run otherwise */ -case class StIfHaveOD(id: String, thn: List[Statement], els: List[Statement]) extends Statement +case class StIfHaveOD(id: String, thn: List[DelayedStatement], els: List[DelayedStatement]) extends DelayedStatement /** * Removes previously defined recieps for a specific result diff --git a/src/net/bdew/lib/recipes/RecipeLoader.scala b/src/net/bdew/lib/recipes/RecipeLoader.scala index 0edb066..e91d80c 100644 --- a/src/net/bdew/lib/recipes/RecipeLoader.scala +++ b/src/net/bdew/lib/recipes/RecipeLoader.scala @@ -222,15 +222,6 @@ class RecipeLoader { processStatementsSafe(els) } - case StIfHaveOD(od, thn, els) => - if (OreDictionary.getOres(od).size() > 0) { - log.info("ifOreDict: %s found".format(od)) - processStatementsSafe(thn) - } else { - log.info("ifOreDict: %s not found".format(od)) - processStatementsSafe(els) - } - case StClearRecipes(res) => log.info("Clearing recipes that produce %s".format(res)) delayedStatements = delayedStatements.filter({ @@ -315,16 +306,34 @@ class RecipeLoader { } } + case StIfHaveOD(od, thn, els) => + if (OreDictionary.getOres(od).size() > 0) { + log.info("ifOreDict: %s found".format(od)) + processDelayedStatementsSafe(thn) + } else { + log.info("ifOreDict: %s not found".format(od)) + processDelayedStatementsSafe(els) + } + case x => log.severe("Can't process %s - this is a programing bug!".format(x)) } /** - * Process delayed statements, clear the list afterwards + * Process main delayed statements list, clear the list afterwards */ def processDelayedStatements() { log.info("Processing %d delayed statements".format(delayedStatements.size)) - for (s <- delayedStatements) { + processDelayedStatementsSafe(delayedStatements) + delayedStatements = List.empty + } + + /** + * Process a list of delayed statements and catch all exceptions + * @param list The list to process + */ + def processDelayedStatementsSafe(list: List[DelayedStatement]) { + for (s <- list) { try { processDelayedStatement(s) } catch { @@ -335,9 +344,9 @@ class RecipeLoader { e.printStackTrace() } } - delayedStatements = List.empty } + /** * Process a list of statements and catch all exceptions * @param r The list to process diff --git a/src/net/bdew/lib/recipes/RecipeParser.scala b/src/net/bdew/lib/recipes/RecipeParser.scala index 7f7ce83..bd079ae 100644 --- a/src/net/bdew/lib/recipes/RecipeParser.scala +++ b/src/net/bdew/lib/recipes/RecipeParser.scala @@ -78,8 +78,8 @@ class RecipeParser extends JavaTokenParsers { case mod ~ thn ~ els => new StIfHaveMod(mod, thn, els.getOrElse(List.empty[Statement])) } - def ifOreDict = ("ifOreDict" ~> str) ~ ("{" ~> statements <~ "}") ~ ("else" ~> "{" ~> statements <~ "}").? ^^ { - case id ~ thn ~ els => new StIfHaveOD(id, thn, els.getOrElse(List.empty[Statement])) + def ifOreDict = ("ifOreDict" ~> str) ~ ("{" ~> delayedStatements <~ "}") ~ ("else" ~> "{" ~> delayedStatements <~ "}").? ^^ { + case id ~ thn ~ els => new StIfHaveOD(id, thn, els.getOrElse(List.empty[DelayedStatement])) } def recipeShaped3x3 = recipeTriplet ~ recipeTriplet ~ ("=>" ~> specWithCount) ~ recipeTriplet ^^ { @@ -104,20 +104,21 @@ class RecipeParser extends JavaTokenParsers { def clearRecipes = "clearRecipes" ~> ":" ~> spec ^^ { case sp => StClearRecipes(sp) } - def statement: Parser[Statement] = ( + def delayedStatement: Parser[DelayedStatement] = ( charSpec | classMacro - | ifMod | ifOreDict | recipeShaped3x3 | recipeShaped2x2 | recipeShaped9 | recipeShapeless | recipeSmelting - | clearRecipes ) + def statement: Parser[Statement] = delayedStatement | ifMod | clearRecipes + def statements = statement.* + def delayedStatements = delayedStatement.* def doParse(r: Reader): List[Statement] = { parseAll(statements, r) match { From c9c014a3a961ebaef35369d8f2d192ec82199d3a Mon Sep 17 00:00:00 2001 From: bdew Date: Mon, 17 Mar 2014 17:23:35 +0200 Subject: [PATCH 05/10] Added misc method to find biome by name --- src/net/bdew/lib/Misc.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/net/bdew/lib/Misc.scala b/src/net/bdew/lib/Misc.scala index a9a3a66..aedda85 100644 --- a/src/net/bdew/lib/Misc.scala +++ b/src/net/bdew/lib/Misc.scala @@ -16,6 +16,7 @@ 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 object Misc { def iterNbtList[X](list: NBTTagList) = @@ -53,6 +54,8 @@ 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 haveModVersion(spec: String): Boolean = { val req = VersionParser.parseVersionReference(spec) val modid = req.getLabel From a9e1e88ff2d138c293146bd707d7353287f6999f Mon Sep 17 00:00:00 2001 From: bdew Date: Tue, 18 Mar 2014 12:01:25 +0200 Subject: [PATCH 06/10] Added object for misc clientside functions --- src/net/bdew/lib/Client.scala | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/net/bdew/lib/Client.scala diff --git a/src/net/bdew/lib/Client.scala b/src/net/bdew/lib/Client.scala new file mode 100644 index 0000000..d22e1e9 --- /dev/null +++ b/src/net/bdew/lib/Client.scala @@ -0,0 +1,29 @@ +/* + * 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 + +import org.lwjgl.input.Keyboard +import net.minecraft.client.Minecraft + +/** + * Misc functions and shortcuts for clientside code + */ +object Client { + def minecraft = Minecraft.getMinecraft + def fontRenederer = Minecraft.getMinecraft.fontRenderer + def renderEngine = Minecraft.getMinecraft.renderEngine + def world = Minecraft.getMinecraft.theWorld + def player = Minecraft.getMinecraft.thePlayer + + def shiftDown: Boolean = { + return Keyboard.isKeyDown(42) || Keyboard.isKeyDown(54) + } + +} From 971fd945327fb227535fc0407b681d7c35b90939 Mon Sep 17 00:00:00 2001 From: bdew Date: Tue, 18 Mar 2014 12:01:34 +0200 Subject: [PATCH 07/10] Cleanup --- src/net/bdew/lib/gui/BaseSlot.scala | 2 +- src/net/bdew/lib/gui/SlotValidating.scala | 1 - src/net/bdew/lib/gui/widgets/Widget.scala | 2 -- src/net/bdew/lib/items/inventory/ItemInventory.scala | 2 +- src/net/bdew/lib/recipes/RecipeLoader.scala | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/net/bdew/lib/gui/BaseSlot.scala b/src/net/bdew/lib/gui/BaseSlot.scala index d036e71..a6ab605 100644 --- a/src/net/bdew/lib/gui/BaseSlot.scala +++ b/src/net/bdew/lib/gui/BaseSlot.scala @@ -15,7 +15,7 @@ import org.lwjgl.opengl.GL11 class BaseSlot(inv: IInventory, slot: Int, x: Int, y: Int) extends Slot(inv, slot, x, y) { override def getBackgroundIconIndex = { // Workaround for bug in GuiContainer, color isn't reset if previous slot had an item with color. - GL11.glColor4d(1,1,1,1) + GL11.glColor4d(1, 1, 1, 1) super.getBackgroundIconIndex } } diff --git a/src/net/bdew/lib/gui/SlotValidating.scala b/src/net/bdew/lib/gui/SlotValidating.scala index 291ac4e..5961337 100644 --- a/src/net/bdew/lib/gui/SlotValidating.scala +++ b/src/net/bdew/lib/gui/SlotValidating.scala @@ -10,7 +10,6 @@ package net.bdew.lib.gui import net.minecraft.inventory.IInventory -import net.minecraft.inventory.Slot import net.minecraft.item.ItemStack class SlotValidating(inv: IInventory, slot: Int, x: Int, y: Int) extends BaseSlot(inv, slot, x, y) { diff --git a/src/net/bdew/lib/gui/widgets/Widget.scala b/src/net/bdew/lib/gui/widgets/Widget.scala index 5281c44..fbb5af1 100644 --- a/src/net/bdew/lib/gui/widgets/Widget.scala +++ b/src/net/bdew/lib/gui/widgets/Widget.scala @@ -11,8 +11,6 @@ package net.bdew.lib.gui.widgets import scala.collection.mutable import net.bdew.lib.gui.{WidgetContainer, Point, Rect} -import net.minecraft.util.ResourceLocation -import net.minecraft.client.Minecraft trait BaseWidget { val rect: Rect diff --git a/src/net/bdew/lib/items/inventory/ItemInventory.scala b/src/net/bdew/lib/items/inventory/ItemInventory.scala index 7c46116..d7992d3 100644 --- a/src/net/bdew/lib/items/inventory/ItemInventory.scala +++ b/src/net/bdew/lib/items/inventory/ItemInventory.scala @@ -10,7 +10,7 @@ package net.bdew.lib.items.inventory import net.minecraft.item.Item -import net.bdew.lib.gui.{BaseScreen, GuiProvider} +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 diff --git a/src/net/bdew/lib/recipes/RecipeLoader.scala b/src/net/bdew/lib/recipes/RecipeLoader.scala index e91d80c..e4b66c6 100644 --- a/src/net/bdew/lib/recipes/RecipeLoader.scala +++ b/src/net/bdew/lib/recipes/RecipeLoader.scala @@ -346,7 +346,6 @@ class RecipeLoader { } } - /** * Process a list of statements and catch all exceptions * @param r The list to process From 8891cfff069eb73cde41dd2505201022d1b312c4 Mon Sep 17 00:00:00 2001 From: bdew Date: Wed, 19 Mar 2014 11:28:34 +0200 Subject: [PATCH 08/10] Added extractor (for scala pattern matching) for ItemStack --- src/net/bdew/lib/items/IStack.scala | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/net/bdew/lib/items/IStack.scala diff --git a/src/net/bdew/lib/items/IStack.scala b/src/net/bdew/lib/items/IStack.scala new file mode 100644 index 0000000..10f2aaf --- /dev/null +++ b/src/net/bdew/lib/items/IStack.scala @@ -0,0 +1,23 @@ +/* + * 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.items + +import net.minecraft.item.{Item, ItemStack} + +/** + * Allows matching Items in ItemStacks in scala pattern matches + */ +object IStack { + def unapply(x: ItemStack): Option[Item] = + if (x == null || x.getItem == null) + None + else + Some(x.getItem) +} From 4697c96cf2aa3ea0b063d49af2edeefc8603e7c8 Mon Sep 17 00:00:00 2001 From: bdew Date: Wed, 2 Apr 2014 17:47:57 +0300 Subject: [PATCH 09/10] Added ItemUtils.findItemInInventory --- src/net/bdew/lib/items/ItemUtils.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/net/bdew/lib/items/ItemUtils.scala b/src/net/bdew/lib/items/ItemUtils.scala index 804684e..4a23ef5 100644 --- a/src/net/bdew/lib/items/ItemUtils.scala +++ b/src/net/bdew/lib/items/ItemUtils.scala @@ -10,7 +10,7 @@ package net.bdew.lib.items import net.minecraft.entity.item.EntityItem -import net.minecraft.item.ItemStack +import net.minecraft.item.{Item, ItemStack} import net.minecraft.world.World import net.minecraft.entity.player.EntityPlayer import net.minecraft.inventory.IInventory @@ -76,4 +76,9 @@ object ItemUtils { return stack } + + 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 }) + .map({ case (slot, stack) => slot }) } \ No newline at end of file From 926f006f68b6b8c0b8c7c247b27c700fd4730d35 Mon Sep 17 00:00:00 2001 From: bdew Date: Wed, 2 Apr 2014 17:52:23 +0300 Subject: [PATCH 10/10] Bumped version number --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0a025ee..e8b0e52 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { apply plugin: 'forge' apply plugin: 'scala' -version = "1.2.0" +version = "1.2.1" if (project.hasProperty('buildnum')) { project.version = project.version + '.' + project.buildnum