From 39015f05a6a917e6d69bea40a5b8170b5bbb7108 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Thu, 7 Jan 2016 22:40:04 -0500 Subject: [PATCH] Changed Soul Forge Gui texture --- .settings/org.eclipse.jdt.core.prefs | 8 ++++---- .../bloodmagic/client/gui/GuiSoulForge.java | 12 ++++++------ .../tile/container/ContainerSoulForge.java | 4 ++-- .../bloodmagic/textures/gui/soulForge.png | Bin 1743 -> 5048 bytes 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index c0f76391..52dc701c 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Fri Jan 01 22:21:11 EST 2016 +#Thu Jan 07 22:26:15 EST 2016 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert org.eclipse.jdt.core.formatter.brace_position_for_block=next_line org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert @@ -268,9 +268,9 @@ org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not i org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 org.eclipse.jdt.core.formatter.lineSplit=600 org.eclipse.jdt.core.compiler.source=1.6 -org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert @@ -288,10 +288,10 @@ org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -eclipse.preferences.version=1 org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +eclipse.preferences.version=1 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.formatter.blank_lines_after_package=1 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java index abebc3a6..9d5c3dbc 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java @@ -19,14 +19,14 @@ public class GuiSoulForge extends GuiContainer { super(new ContainerSoulForge(playerInventory, tileTeleposer)); this.xSize = 176; - this.ySize = 157; + this.ySize = 205; } @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - this.fontRendererObj.drawString(TextHelper.localize("tile.BloodMagic.soulForge.name"), 64, 23, 4210752); - this.fontRendererObj.drawString(TextHelper.localize("container.inventory"), 8, 47, 4210752); + this.fontRendererObj.drawString(TextHelper.localize("tile.BloodMagic.soulForge.name"), 8, 5, 4210752); + this.fontRendererObj.drawString(TextHelper.localize("container.inventory"), 8, 111, 4210752); } @Override @@ -39,13 +39,13 @@ public class GuiSoulForge extends GuiContainer int j = (this.height - this.ySize) / 2; this.drawTexturedModalRect(i, j, 0, 0, this.xSize, this.ySize); - int l = this.getCookProgressScaled(36); - this.drawTexturedModalRect(i + 79, j + 32, 176, 0, l, 18); + int l = this.getCookProgressScaled(90); + this.drawTexturedModalRect(i + 115, j + 14 + 90 - l, 176, 90 - l, 18, l); } public int getCookProgressScaled(int scale) { - double progress = 1; + double progress = 0.5; return (int) (progress * scale); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java index 6aae5609..24022121 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java @@ -23,13 +23,13 @@ public class ContainerSoulForge extends Container { for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9, 8 + j * 18, 75 + i * 18)); + addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9, 8 + j * 18, 123 + i * 18)); } } for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 133)); + addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 181)); } } diff --git a/src/main/resources/assets/bloodmagic/textures/gui/soulForge.png b/src/main/resources/assets/bloodmagic/textures/gui/soulForge.png index 929cf1567d3acd6698fdb8cf93cd6151aa92baf5..d0c8fa7520dcad52e4e11ed10d06881ff62dada3 100644 GIT binary patch literal 5048 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 literal 1743 zcmah}4K!3~7=G`}U{KQtiO|R+M?i*8AT%u%iRpFOl3g zJX+D)*XKmL+0@juET1PLFgRK6{kKJ7U&WV}t3R$iow+;J@i8~VcE$+TGqU#dQ)N7C zl5|T?+0_e)Qo#WBZKx6symc`cFddo)7fyQGTDgV405aq-BvuOM@d#BC8Wv{gnftc9 zH*|BIQ~{dn>+5$7aUV6$wyt3{4Or0a#S>HX_$N=}mtLMJp0!$=P|aw0c{TJw_Tm@s zrWlg!_C;XoKaBwyR}{OB=+`NjEjI(<>uqa!6_spuUf{BOh4IfqYdR60PCbjy=hF#4 zD}aVBZkGyzfMzlaSZNMC1CryGooWpe?=uW=hqVu3!2C_O^g%wg%z&W^nqhy7Faid~ zzgu%Zfdq^L%>lzUuIp8)k{EHNX#0$I2w(Q@%;5)pKQz?6X}&YE-79M*KA}pX_VAO1 zdCSfJ$jpe{xnw9jE>5q>=Dth(^;B--m>G*s8D#svVw0<-0gkVL(omCM_+Z(q$V(F*u>)ZG%tYHT4RY0rtw<$Qz)_JD)_c||(@ z-ILcGBH)U7d|_k?q2E3xOiXhC?^`zaISM?16EGx(z>$V4j%Lv*oqje)3LUYe8al;G zMkzMlui|-ZVppUdH8dmEb&)CiV0hzM1Ta7Z?~w>{^Q(yWBNM?9ir}?UmY0{8k|LE1 zqT$FBvnwn8zCd`nTC<$dzJgG3RO8CN)}I9t6Z;b{BgIQdg4b5 zKL>}0Y;+wD135qgVSJUEbN*{l4nE=>fl-TW&51hS@tACcS%>``8TrYBQZq;JP-Jg} zDa(k{8yX*=k$z84rE)(o9yM92kI7Z3a3@4|lwhjo^v?4Nd#Jsob>Q-+&U~VA4wj1c zGnJ_TnyWQ^P+AsCy%J51m+?O0KD;vPx>a4xt<$nh9HXVR^EG(7+zGAO^R@9|EKeCd zVxFI232$#!4(Mx4s9~s(=t#ysgh@NqOm2W`DWM?P$qIwwealyH`pv-*Y zJSMh<%WNIos26F($5`mGvH#-qA91*}ZP`iklkPwYMdzp>2Oq48ZU*XC;n;vdQ5kPo z=