mirror of
https://github.com/GTNewHorizons/Draconic-Evolution.git
synced 2026-11-20 20:22:10 +00:00
Updated License
This commit is contained in:
1 parent
56ff1370f0
commit
f2ab4dabb6
8 files changed
+32
-12
No files matched your search
+3
@@ -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(){
|
||||
|
||||
+2
-1
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-3
@@ -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<String, Contributor> contributors = new HashMap<String, Contributor>();
|
||||
public static Map<String, Contributor> contributors = new LinkedHashMap<String, Contributor>();
|
||||
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;
|
||||
}
|
||||
|
||||
+2
-1
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user