From f2ab4dabb67c9d8143898e2ae650c9efb96c225c Mon Sep 17 00:00:00 2001 From: brandon Date: Mon, 18 Apr 2016 13:50:10 +1000 Subject: [PATCH] Updated License --- Change Log.txt | 3 +++ LICENSE | 20 ++++++++++++++++--- README.md | 5 ++--- .../client/gui/componentguis/GUIManual.java | 3 +++ .../ComponentContributorsPage.java | 3 ++- .../common/handler/ContributorHandler.java | 5 ++--- .../integration/nei/DENEIGuiHandler.java | 3 ++- src/main/resources/mcmod.info | 2 +- 8 files changed, 32 insertions(+), 12 deletions(-) diff --git a/Change Log.txt b/Change Log.txt index 2aebea3e..338b6242 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -1,3 +1,6 @@ +######## 1.0.2c ######## +- + ######## 1.0.2b ######## -fixed not being able to close the flow gate gui's by pressing the inventory key. -fixed inability to pick up arrows fired by the bows. diff --git a/LICENSE b/LICENSE index 14000ea5..4e8be118 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,19 @@ -ALL RIGHTS RESERVED. +Copyright (c) 2013-2016 brandon3055 -See the "README.md" file. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -©2013-2015 brandon3055 +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index 640185d5..d65393e1 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,5 @@ Draconic-Evolution Draconic Evolution adds powerful new tools, Items, weapons and Armor. The premise is the enigmatic ore - Draconium. As you progress you find it has many uses from the mundane such as machines and items, to the near-mystical at the top with Awakened Draconium to make extremely powerful armor and tools. -Code Permissions: - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +## License / Use in Modpacks +This mod is [licensed under the **MIT license**](https://github.com/brandon3055/Draconic-Evolution/blob/master/LICENSE). All **assets are public domain**, unless otherwise stated; all are free to be distributed as long as the license / source credits are kept. This means you can use this mod in any mod pack **as you please**. diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java index 637b8819..2a1c9887 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java @@ -9,6 +9,7 @@ import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentManua import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import com.brandon3055.draconicevolution.common.container.DummyContainer; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.handler.ContributorHandler; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.google.gson.stream.JsonReader; @@ -62,6 +63,8 @@ public class GUIManual extends GUIScrollingBase implements GuiYesNoCallback { if (previousScale == -1) adjustGuiScale(); if (!Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode().equals(lang)) loadPages(); + + LogHelper.info(ContributorHandler.contributors); } private void adjustGuiScale(){ diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentContributorsPage.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentContributorsPage.java index ed3d5c8e..2b38e530 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentContributorsPage.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentContributorsPage.java @@ -94,7 +94,8 @@ public class ComponentContributorsPage extends ComponentScrollingBase implements renderPlayer(contributor.ign); GL11.glPopMatrix(); - fontRendererObj.drawStringWithShadow(EnumChatFormatting.GOLD + contributor.name, 50, yOffset-15, 0x000000); + fontRendererObj.drawStringWithShadow(EnumChatFormatting.GOLD + contributor.name, 50, yOffset-20, 0x000000); + fontRendererObj.drawString(EnumChatFormatting.DARK_BLUE + contributor.contribution, 50, yOffset-10, 0x000000); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/ContributorHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/ContributorHandler.java index c0cfd73c..3e7e5df9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/ContributorHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/ContributorHandler.java @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import java.io.*; import java.net.URL; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.UUID; @@ -29,7 +29,7 @@ import java.util.UUID; */ public class ContributorHandler { - public static Map contributors = new HashMap(); + public static Map contributors = new LinkedHashMap(); public static boolean successfulLoad = false; private static DLThread thread; private static ModelContributorWings wings = new ModelContributorWings(); @@ -269,7 +269,6 @@ public class ContributorHandler { public boolean isUserValid(EntityPlayer player){ if (!validated){ isValid = !UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getCommandSenderName()).getBytes(Charsets.UTF_8)).equals(player.getUniqueID()); - validated = true; } return isValid; } diff --git a/src/main/java/com/brandon3055/draconicevolution/integration/nei/DENEIGuiHandler.java b/src/main/java/com/brandon3055/draconicevolution/integration/nei/DENEIGuiHandler.java index dc9ebfcf..2f09b7b7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/integration/nei/DENEIGuiHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/integration/nei/DENEIGuiHandler.java @@ -4,6 +4,7 @@ import codechicken.nei.VisiblityData; import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; import com.brandon3055.draconicevolution.client.gui.GUIUpgradeModifier; +import com.brandon3055.draconicevolution.client.gui.componentguis.GUIManual; import com.brandon3055.draconicevolution.client.gui.componentguis.GUIToolConfig; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -18,7 +19,7 @@ public class DENEIGuiHandler implements INEIGuiHandler { public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) { if (gui instanceof GUIUpgradeModifier && ((GUIUpgradeModifier)gui).inUse) currentVisibility.showNEI = false; - else if (gui instanceof GUIToolConfig) currentVisibility.showNEI = false; + else if (gui instanceof GUIToolConfig || gui instanceof GUIManual) currentVisibility.showNEI = false; return currentVisibility; } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 96010082..1c30d4e0 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ { "modid": "DraconicEvolution", "name": "Draconic Evolution", - "description": "This is a mod that was originally made for the Tolkiencraft mod pack but it has since evolved way beyond that. This mod adds a mot of extremely expensive ant powerful end game items as well as a lot of random useful bits and peaces.", + "description": "This is a mod that was originally made for the Tolkiencraft mod pack but it has since evolved way beyond that. This mod adds a lot of extremely expensive and powerful end game items as well as a lot of random useful bits and pieces.", "version": "${version}", "mcversion": "${mcversion}", "url": "http://www.brandon3055.com/",