From e356ae3fc2d2545b3f3c55403238b4895237358b Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 23 Oct 2016 17:51:53 +0200 Subject: [PATCH] 1.2-beta1 --- build.gradle | 2 +- .../com/raoulvdberge/refinedstorage/RS.java | 2 +- .../CraftingMonitorElementFluidRender.java | 2 +- .../CraftingMonitorElementItemRender.java | 2 +- .../refinedstorage/proxy/ProxyClient.java | 12 ++++++++++++ .../textures/items/fortune_upgrade.png | Bin 1480 -> 372 bytes .../textures/items/silk_touch_upgrade.png | Bin 1480 -> 372 bytes src/main/resources/mcmod.info | 2 +- 8 files changed, 17 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 8b06e5a86..bf5193a93 100755 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ apply plugin: 'maven' apply plugin: 'maven-publish' apply plugin: 'net.minecraftforge.gradle.forge' -version = "1.2" +version = "1.2-beta1" group = "refinedstorage" archivesBaseName = "refinedstorage" diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java index aaa95bcc6..b0c5da424 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java @@ -22,7 +22,7 @@ public final class RS { } public static final String ID = "refinedstorage"; - public static final String VERSION = "1.2"; + public static final String VERSION = "1.2-beta1"; public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2088,);required-after:mcmultipart@[1.2.1,);after:JEI@[3.12.0,);"; public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory"; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java index b1c8e9675..77d6e777d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java @@ -34,7 +34,7 @@ public class CraftingMonitorElementFluidRender implements ICraftingMonitorElemen GlStateManager.pushMatrix(); GlStateManager.scale(scale, scale, 1); - drawers.getStringDrawer().draw(GuiBase.calculateOffsetOnScale(x + 21 + offset, scale), GuiBase.calculateOffsetOnScale(y + 7, scale), RSUtils.QUANTITY_FORMATTER.format((float) stack.amount / 1000F) + " " + stack.getLocalizedName()); + drawers.getStringDrawer().draw(GuiBase.calculateOffsetOnScale(x + 21 + offset, scale), GuiBase.calculateOffsetOnScale(y + 7, scale), RSUtils.QUANTITY_FORMATTER.format((float) stack.amount / 1000F) + "x " + stack.getLocalizedName()); GlStateManager.popMatrix(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java index 8563b3d26..9daec87f7 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java @@ -36,7 +36,7 @@ public class CraftingMonitorElementItemRender implements ICraftingMonitorElement GlStateManager.pushMatrix(); GlStateManager.scale(scale, scale, 1); - drawers.getStringDrawer().draw(GuiBase.calculateOffsetOnScale(x + 21 + offset, scale), GuiBase.calculateOffsetOnScale(y + 7, scale), quantity + " " + stack.getDisplayName()); + drawers.getStringDrawer().draw(GuiBase.calculateOffsetOnScale(x + 21 + offset, scale), GuiBase.calculateOffsetOnScale(y + 7, scale), quantity + "x " + stack.getDisplayName()); GlStateManager.popMatrix(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java index dccdab6d8..1b4ec0cae 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java @@ -30,6 +30,8 @@ import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.client.event.DrawBlockHighlightEvent; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.ICustomModelLoader; @@ -41,6 +43,7 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; import org.lwjgl.opengl.GL11; import java.util.List; @@ -233,6 +236,15 @@ public class ProxyClient extends ProxyCommon { }); } + @SubscribeEvent + public void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent e) { + if (RS.VERSION.contains("beta")) { + e.player.addChatComponentMessage(new TextComponentString("" + TextFormatting.RED + TextFormatting.BOLD + "WARNING: You are playing on a beta version of Refined Storage (" + RS.VERSION + ")!" + TextFormatting.RESET)); + e.player.addChatComponentMessage(new TextComponentString("Remember to take backups as there is no guarantee that beta builds won't break your world.")); + e.player.addChatComponentMessage(new TextComponentString("If you encounter a bug, please report it on the GitHub issue tracker.")); + } + } + @SubscribeEvent public void onModelBake(ModelBakeEvent e) { for (ModelResourceLocation model : e.getModelRegistry().getKeys()) { diff --git a/src/main/resources/assets/refinedstorage/textures/items/fortune_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/fortune_upgrade.png index 2c46a53b5a4985fe4a18d594aab06346d7fb468e..c45b15e27bdb5e2490561451ca23d34bd78e9879 100755 GIT binary patch delta 356 zcmV-q0h|8F3-khz8Gix*005AYXf^-<00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01m?d01m?e$8V@)0000PbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@J zGD8Gw>;M1&5R>821g3V#jt0&c#7&>Q#yVMBQ#yf@2~IU+3H_{UIzG8u|_T`Eh<6?-lrxzY<&*QPk%LhJ~u?gQ9KKTVOoK z;lR-}vD;LAOcE3Y=5y#egn;i$Ax*JdqG`BVtymb1dQAzF3A&D(>6F$ATrNC% zJYu`$(eoMW^<9%-S^P=ZHclsbhQ$Jgfjs9?&qEw@c@yYY6||u&r4WX^gxK#n)HUau zKnKt??t_5p;agIWFq?6>-_mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvEeuVQbq#?b3Jgypvt&bam^s+=o0^z8TAH}JnmW4zW5dk1m-nRzMs<;9wyXoC3KCABECEH%ZgC_h&L9L`pmSlnP}k(Op; zVrisnYHn42&;4T^vIyZY`N?n-LW#a{Rw}Aj`tyPK%HY-s-G^ zYn-(?`WCUocCVY+yH#LiguPkeMMsflK0z13?OaV$6s#;dH!EoIwYp@BPPtvKr(tqF zz>apJoiy5P$uq7+Gd}XSF>1ajb?6GzAJ9M`nk=|Po&87AD`&AynjJ( zQCZiT>#r+~X1c5mJDj!E$wW$YLi2TT#=Pyb+Ycv(tPW*qcD(Ysbj|hb7AM7p)q)Oj zNgHQ;@HzIjEPBq`Fz*+C>-O8ozGAY~o8H~;rhIDlWRHiRK31Hup4<0h*?*x4-+$No zmGhS!=eUw(8lojC!^bYv$x>n^Ya+#~BgWl!SkXp~f7e|-v2NBWUQ2CQk4Z2!GJN}O z`=-pgXs1lsZdnno)`n0mQ3)P4k?y0H8{U?2U;iz)f=z|Rb7|0x9J57J-4+YZ^kEBI z9V!ya_T$GlaXtIL$8sMTulWD@r;OTUPlpr5D?^$tzZ7Bp`m@G|t>TAr@6&eCcklBi z?0a21N-9Q5Bz(|m@ilVXznKMR{?s{AAYU6 zm|@bAp1H>VJ(H>Vyg7m`_FkHL=X8I3{434Y+&H8AWy!Dk&yzp$-~LfDldF~KYLotS lZ(z`;Pw(7YHupcL0R!v4ulDS1ZxcXetEa1<%Q~loCIF1v5uyM9 diff --git a/src/main/resources/assets/refinedstorage/textures/items/silk_touch_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/silk_touch_upgrade.png index 2c46a53b5a4985fe4a18d594aab06346d7fb468e..c45b15e27bdb5e2490561451ca23d34bd78e9879 100644 GIT binary patch delta 356 zcmV-q0h|8F3-khz8Gix*005AYXf^-<00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01m?d01m?e$8V@)0000PbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@J zGD8Gw>;M1&5R>821g3V#jt0&c#7&>Q#yVMBQ#yf@2~IU+3H_{UIzG8u|_T`Eh<6?-lrxzY<&*QPk%LhJ~u?gQ9KKTVOoK z;lR-}vD;LAOcE3Y=5y#egn;i$Ax*JdqG`BVtymb1dQAzF3A&D(>6F$ATrNC% zJYu`$(eoMW^<9%-S^P=ZHclsbhQ$Jgfjs9?&qEw@c@yYY6||u&r4WX^gxK#n)HUau zKnKt??t_5p;agIWFq?6>-_mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvEeuVQbq#?b3Jgypvt&bam^s+=o0^z8TAH}JnmW4zW5dk1m-nRzMs<;9wyXoC3KCABECEH%ZgC_h&L9L`pmSlnP}k(Op; zVrisnYHn42&;4T^vIyZY`N?n-LW#a{Rw}Aj`tyPK%HY-s-G^ zYn-(?`WCUocCVY+yH#LiguPkeMMsflK0z13?OaV$6s#;dH!EoIwYp@BPPtvKr(tqF zz>apJoiy5P$uq7+Gd}XSF>1ajb?6GzAJ9M`nk=|Po&87AD`&AynjJ( zQCZiT>#r+~X1c5mJDj!E$wW$YLi2TT#=Pyb+Ycv(tPW*qcD(Ysbj|hb7AM7p)q)Oj zNgHQ;@HzIjEPBq`Fz*+C>-O8ozGAY~o8H~;rhIDlWRHiRK31Hup4<0h*?*x4-+$No zmGhS!=eUw(8lojC!^bYv$x>n^Ya+#~BgWl!SkXp~f7e|-v2NBWUQ2CQk4Z2!GJN}O z`=-pgXs1lsZdnno)`n0mQ3)P4k?y0H8{U?2U;iz)f=z|Rb7|0x9J57J-4+YZ^kEBI z9V!ya_T$GlaXtIL$8sMTulWD@r;OTUPlpr5D?^$tzZ7Bp`m@G|t>TAr@6&eCcklBi z?0a21N-9Q5Bz(|m@ilVXznKMR{?s{AAYU6 zm|@bAp1H>VJ(H>Vyg7m`_FkHL=X8I3{434Y+&H8AWy!Dk&yzp$-~LfDldF~KYLotS lZ(z`;Pw(7YHupcL0R!v4ulDS1ZxcXetEa1<%Q~loCIF1v5uyM9 diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 0dcfffc46..963f74e85 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "refinedstorage", "name": "Refined Storage", "description": "An elegant solution to your hoarding problem", - "version": "1.2", + "version": "1.2-beta1", "mcversion": "1.10.2", "url": "", "updateUrl": "",