diff --git a/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java b/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java index dfb7ee7..68a0c42 100644 --- a/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java +++ b/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java @@ -1,9 +1,12 @@ package makeo.gadomancy.client.gui; import makeo.gadomancy.common.containers.ContainerArcanePackager; +import makeo.gadomancy.common.utils.SimpleResourceLocation; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; /** * This class is part of the Gadomancy Mod @@ -14,13 +17,19 @@ import net.minecraft.inventory.IInventory; * Created by makeo @ 14.11.2015 01:17 */ public class ArcanePackagerGui extends GuiContainer { + private static final ResourceLocation BACKGROUND = new SimpleResourceLocation("gui/gui_packager.png"); + public ArcanePackagerGui(InventoryPlayer playerInv, IInventory inventory) { super(new ContainerArcanePackager(playerInv, inventory)); } @Override protected void drawGuiContainerBackgroundLayer(float mouseX, int mouseZ, int par3) { - + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + this.mc.getTextureManager().bindTexture(BACKGROUND); + int k = (this.width - this.xSize) / 2; + int l = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); } @Override diff --git a/src/main/java/makeo/gadomancy/common/items/ItemArcanePackage.java b/src/main/java/makeo/gadomancy/common/items/ItemArcanePackage.java index 4f60c2c..161f9e4 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemArcanePackage.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemArcanePackage.java @@ -16,6 +16,8 @@ import net.minecraft.world.World; import thaumcraft.common.items.ItemLootBag; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; /** @@ -71,14 +73,18 @@ public class ItemArcanePackage extends ItemLootBag { } public void setContents(ItemStack stack, List items) { - NBTTagList stackList = new NBTTagList(); + items = new ArrayList(items); - for (ItemStack item : items) { - if (stack != null) { - NBTTagCompound nbtStack = new NBTTagCompound(); - item.writeToNBT(nbtStack); - stackList.appendTag(nbtStack); + Collections.sort(items, new Comparator() { + @Override + public int compare(ItemStack i1, ItemStack i2) { + return i1.writeToNBT(new NBTTagCompound()).hashCode() - i2.writeToNBT(new NBTTagCompound()).hashCode(); } + }); + + NBTTagList stackList = new NBTTagList(); + for (ItemStack item : items) { + stackList.appendTag(item.writeToNBT(new NBTTagCompound())); } NBTHelper.getData(stack).setTag("items", stackList); } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java index 9bc9843..8cfa2ef 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java @@ -59,6 +59,7 @@ public class RegisteredRecipes { public static IArcaneRecipe recipeArcaneDropper; public static IArcaneRecipe recipeRemoteJar; public static IArcaneRecipe recipeAncientPedestal; + public static IArcaneRecipe recipeBlockProtector; public static void init() { AdditionalGolemType typeSilverwood = RegisteredGolemStuff.typeSilverwood; @@ -132,6 +133,10 @@ public class RegisteredRecipes { recipesFamilar = createFamilarRecipes(); recipesFamiliarAugmentation = createFamiliarAugmentationRecipes(); + + recipeBlockProtector = ThaumcraftApi.addArcaneCraftingRecipe("TODO", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2), + new AspectList().add(Aspect.ORDER, 120).add(Aspect.EARTH, 120), + "WNW", "PJP", "GRG", 'W', new ItemStack(Items.potionitem, 1, 8232), 'V', new ItemStack(Items.potionitem, 1, 8264), 'N', new ItemStack(ConfigItems.itemResource, 1, 1), 'P', new ItemStack(ConfigBlocks.blockTube), 'J', new ItemStack(ConfigBlocks.blockJar), 'G', new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), 'R', new ItemStack(Items.redstone)); } private static InfusionRecipe[][] createFamiliarAugmentationRecipes() { diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index 5a7913a..c8d7de0 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -71,11 +71,16 @@ gadomancy.research_page.NODE_MANIPULATOR.1=Aura nodes have intrigued you for the gadomancy.research_page.NODE_MANIPULATOR.3=The Node Manipulator is a device that essentially works in a manner opposite to that of a wand recharge pedestal. By drawing vis from a wand or staff and channeling it back into the node, the node manipulator will force a node to destabilize slightly. The manipulator's main pedestal is not stable enough to alter nodes on its own. By adding a specially modified focus to hold the wand/staff in place for vis extraction and a set of pillars to channel the extracted vis into the node, the device is finally ready for use. Just place a wand/staff on the pedestal, and the node manipulator will start automatically. gadomancy.research_page.NODE_MANIPULATOR.6=The Node Manipulator needs at least 70 of all six primal aspects to begin manipulating a node, but allowing more that 70 seems to yield greater effects.
Despite all of your research into node behavior, you still haven't the slightest idea what the node manipulator will actually do to aura nodes. The only way to find out seems to be testing it out... -tc.research_name.GADOMANCY.E_PORTAL_CREATOR=Eldritch Portal Creator -tc.research_text.GADOMANCY.E_PORTAL_CREATOR= -gadomancy.research_page.E_PORTAL_CREATOR.1= -gadomancy.research_page.E_PORTAL_CREATOR.3= -gadomancy.research_page.E_PORTAL_CREATOR.5= +tc.research_name.GADOMANCY.E_PORTAL_CREATOR=Gate of the Voidwalkers +tc.research_text.GADOMANCY.E_PORTAL_CREATOR=Into the abyss... +gadomancy.research_page.E_PORTAL_CREATOR.1="He who fights with monsters should look to it that he himself does not become a monster. And when you gaze long into an abyss the abyss also gazes into you."
-Friedrich Nietzsche At first it was just a miracle, the discovery of the primordial pearl. Its light revealed many secrets of the world and of creation, but after a while, you began to feel that one pearl just wasn't enough. Its light was warm, but seemed fitful and weak, as though it was only a spark.
Dark, ancient whispers have begun to pervade you consciousness. More powerful and insistent that before, they speak of a road not meant to be walked, a way too dark to see, a path to the greatest of all powers, hidden beyond the edges of the void. You suspect you know exactly what the voices speak of, as you have a piece of that power in your possession. Now you have only to solve the problem of finding this invisible, intangible path. +gadomancy.research_page.E_PORTAL_CREATOR.3=Not surprisingly, the solution to the problem of entering the path came directly from the eldritch obelisks. These ancient devices each contain a node that, when enough vis is directed through, can be widened into a small stable portal. By altering the functions of a compound recharge focus to mimic the functions of the obelisk, the same type of vis redirection can be achieved.
This new focus is not unlike the normal randomization focus, as it also needs to be placed atop a node manipulator in order to function. +gadomancy.research_page.E_PORTAL_CREATOR.5=In order to build the gate frame , a node manipulator must be constructed in the same manner as normal, but with four ancient pedestals around the outside and the redirection focus in place of the usual randomization focus. The Gate of the Voidwalkers needs 150 of each primal aspect vis to be assembled.
Once assembled, four eldritch eyes must be placed on the pedestals surrounding the gate, and a staff/wand containing at least 120 vis must be placed in the central pedestal.
Once the gate drains the necessary vis, the node atop the focus will be forced to open into a portal. At first glance it resembles any other eldritch portal, however when you look closer, you can see that it it far stronger and less stable than the others. You can see that the Gate will not survive more than one entity passing through, so return via the same portal will be impossible. As you step through the Gate of the Voidwalkers, you feel an odd sense of anticipation and forboding, as though hundreds of ancient eyes are watching silently as you walk into the depths of the abyss... + +tc.research_name.GADOMANCY.BLOCK_PROTECTOR=Enervation Field Emitter +tc.research_text.GADOMANCY.BLOCK_PROTECTOR=ENOUGH OF THESE DAMN CREEPERS ALREADY!!!!! +gadomancy.research_page.BLOCK_PROTECTOR.1=EVERYONE. HATES. CREEPERS. It is practically a given that at some point in a builder's career, one of these indescribably rage inducing freaks will sneak up from behind, above, below, or even right in front of them and explode, ruining the project in progress completely.Almost by chance, you discovered an interesting way to solve this problem with essential gas. By exposing gunpowder to a small trace of ordo essentia, you found could completely nullify its ability to explode when ignited.
Turning essentia into gas directly without having it dissolve into flux is all but impossible, but some careful tinkering with various alchemical machinery components and redstone yields a device that can use a slightly different process to acquire the same effects as liquid essentia. +gadomancy.research_page.BLOCK_PROTECTOR.3=The Arcane Enervation Emitter diffuses a light aura of ordo across a limited area. Any creepers in that affected area will be unable to explode. The emitter is slow to start, and when it receives fuel in the form of ordo essentia and a redstone signal, it will gradually expand its area of effect until it reaches maximum size. The size of its area can be controlled by changing the strength of the redstone signal used to activate the device, and monitored by placing a comparator running out of the device.
After using this device for some time, you noticed, much to your delight, that the field that the Arcane Enervation Emitter emits is strong enough to affect other mobs than just creepers. It appears to stop other mobs from breaking blocks. It isn’t strong enough to affect players though… tc.research_name.GADOMANCY.BLOCK_PROTECTOR=Runic Enervation Projector tc.research_text.GADOMANCY.BLOCK_PROTECTOR= @@ -84,6 +89,7 @@ gadomancy.research_page.BLOCK_PROTECTOR.1= tc.research_name.GADOMANCY.GROWING=Growing Nodes tc.research_text.GADOMANCY.GROWING=Feed me Semour gadomancy.research_page.GROWING.1=This node is something... different.
You did expect an Energized Node to be the only stable connection between us and the source of all Vis, but this Aura Node seems very stable too. Energizing an Aura Node channels Vis from its source into the world and breaks it down to the purest primal Aspects.
But... this node behaves much differently from others. It feels as though it's looking for something... it seems... restless. Something about this behavior is disconcerting in the extreme. +gadomancy.research_page.GROWING.2=What could it be searching for? Judging from what I know so far it is similar to a hungry Aura Node, but there is just something about it that is very disconcerting. tc.research_name.GADOMANCY.GROWING_AGGRESSION=Aggressive Behavior tc.research_text.GADOMANCY.GROWING_AGGRESSION=Someone call Tesla diff --git a/src/main/resources/assets/gadomancy/textures/gui/gui_packager.png b/src/main/resources/assets/gadomancy/textures/gui/gui_packager.png new file mode 100644 index 0000000..a239ced Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/gui/gui_packager.png differ