From aa6ec72ae9a1a022348a75f2dbe5bcf3375b7a14 Mon Sep 17 00:00:00 2001 From: brandon3055 Date: Fri, 11 Mar 2016 18:34:20 +1100 Subject: [PATCH] 1.0.2 RC2 --- Change Log.txt | 9 +- build.properties | 2 +- .../draconicevolution/client/ClientProxy.java | 7 +- .../client/gui/componentguis/GUIManual.java | 1 + .../gui/componentguis/GUIToolConfig.java | 26 ++ .../client/gui/componentguis/ManualPage.java | 27 +- .../ComponentContributorsPage.java | 16 +- .../guicomponents/ComponentManualPage.java | 21 +- .../client/handler/ClientEventHandler.java | 8 +- .../client/handler/ContributorHandler.java | 158 ---------- .../client/handler/ResourceHandler.java | 11 +- .../model/special/ModelContributorWings.java | 101 +++++++ .../draconicevolution/common/CommonProxy.java | 9 +- .../draconicevolution/common/ModItems.java | 2 + .../blocks/multiblock/ReactorStabilizer.java | 4 +- .../common/entity/EntityCustomArrow.java | 23 +- .../common/handler/ContributorHandler.java | 282 ++++++++++++++++++ .../common/handler/CraftingHandler.java | 4 + .../common/handler/FMLEventHandler.java | 7 +- .../common/items/Tclogo.java | 41 ++- .../items/armor/CustomArmorHandler.java | 2 +- .../common/items/armor/WyvernArmor.java | 13 +- .../items/tools/DraconiumFluxCapacitor.java | 3 +- .../common/items/tools/Magnet.java | 106 +++++++ .../items/tools/baseclasses/ToolBase.java | 5 +- .../common/items/weapons/BowHandler.java | 4 +- .../common/items/weapons/DraconicBow.java | 14 +- .../common/items/weapons/WyvernBow.java | 16 +- .../common/lib/VersionHandler.java | 2 +- .../common/network/ContributorPacket.java | 69 +++++ .../reactor/TileReactorEnergyInjector.java | 2 +- .../reactor/TileReactorStabilizer.java | 3 +- .../assets/draconicevolution/lang/en_US.lang | 10 +- .../assets/draconicevolution/lang/zh_CN.lang | 1 - .../manual/manual-en_US.json | 135 ++++++--- .../textures/items/magnetDraconic.png | Bin 0 -> 3468 bytes .../textures/items/magnetWyvern.png | Bin 0 -> 3529 bytes .../textures/models/ContributorWings.png | Bin 0 -> 15033 bytes .../textures/special/PatreonBadge.png | Bin 0 -> 6740 bytes 39 files changed, 838 insertions(+), 306 deletions(-) delete mode 100644 src/main/java/com/brandon3055/draconicevolution/client/handler/ContributorHandler.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/model/special/ModelContributorWings.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/handler/ContributorHandler.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/network/ContributorPacket.java create mode 100644 src/main/resources/assets/draconicevolution/textures/items/magnetDraconic.png create mode 100644 src/main/resources/assets/draconicevolution/textures/items/magnetWyvern.png create mode 100644 src/main/resources/assets/draconicevolution/textures/models/ContributorWings.png create mode 100644 src/main/resources/assets/draconicevolution/textures/special/PatreonBadge.png diff --git a/Change Log.txt b/Change Log.txt index 144d24d6..40d63386 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -1,9 +1,16 @@ -######## 1.0.2-Snapshot 11 ######## +######## 1.0.2-Snapshot 12 (RC2) ######## +-fixed issue with the different tier Item Dislocators stacking ant reverting to ether the Wyvern or Draconic tier. + +######## 1.0.2-Snapshot 11 (RC1) ######## -the upgrade modifier can now hold any item FOR DISPLAY PURPOSES ONLY (this was requested by a user) -added inertia cancellation to the draconic chestplate. -change: an active dragon heart will now immediately drop as an item if a player comes into contact with it. -rewrote the bows from the ground up. -the capacitors can now be upgraded. +-improved ComputerCraft/Open Computers documentation. +-fixed info tablet image sizes and moved images to github. +-added shiny things for contributors! +-added Item Dislocators! Because someone felt modded minecraft needed more magnets... ######## 1.0.2-Snapshot 10-beta2 ######## -fixed client unable to connect to a server while wearing draconic armor. diff --git a/build.properties b/build.properties index 8ec660b2..b496bb63 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.7.10 -mod_version=1.0.2-Snapshot_10-beta2 +mod_version=1.0.2-RC2 forge_version=10.13.4.1492-1.7.10 CCLIB_version=1.1.3.140 NEI_version=1.0.3.74 diff --git a/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java index 7acf0a71..bc6527be 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java @@ -1,14 +1,16 @@ package com.brandon3055.draconicevolution.client; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.client.handler.*; +import com.brandon3055.draconicevolution.client.handler.ClientEventHandler; +import com.brandon3055.draconicevolution.client.handler.HudHandler; +import com.brandon3055.draconicevolution.client.handler.ParticleHandler; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import com.brandon3055.draconicevolution.client.keybinding.KeyBindings; import com.brandon3055.draconicevolution.client.keybinding.KeyInputHandler; import com.brandon3055.draconicevolution.client.render.IRenderTweak; import com.brandon3055.draconicevolution.client.render.block.*; import com.brandon3055.draconicevolution.client.render.entity.*; import com.brandon3055.draconicevolution.client.render.item.*; -import com.brandon3055.draconicevolution.client.render.item.RenderTool; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyBeam; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField; import com.brandon3055.draconicevolution.client.render.particle.ParticleReactorBeam; @@ -57,7 +59,6 @@ public class ClientProxy extends CommonProxy { super.preInit(event); ResourceHandler.init(event); - ContributorHandler.init(); // downloadLocation = event.getModConfigurationDirectory().getParentFile().getAbsolutePath() + "/mods/derspack"; // downloadLocation = downloadLocation.replaceAll("\\\\", "/"); 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 1d3982bc..637b8819 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 @@ -58,6 +58,7 @@ public class GUIManual extends GUIScrollingBase implements GuiYesNoCallback { @Override public void initGui() { super.initGui(); + loadPages(); if (previousScale == -1) adjustGuiScale(); if (!Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode().equals(lang)) loadPages(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java index 7e4eca0c..6b8d68b3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java @@ -9,8 +9,10 @@ import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentConfi import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentFieldAdjuster; import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentFieldButton; import com.brandon3055.draconicevolution.common.container.ContainerAdvTool; +import com.brandon3055.draconicevolution.common.handler.ContributorHandler; import com.brandon3055.draconicevolution.common.items.weapons.BowHandler; import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.network.ContributorPacket; import com.brandon3055.draconicevolution.common.network.ItemConfigPacket; import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; import com.brandon3055.draconicevolution.common.utills.IInventoryTool; @@ -50,11 +52,35 @@ public class GUIToolConfig extends GUIBase { @Override public void initGui() { super.initGui(); + if (ContributorHandler.contributors.containsKey(player.getCommandSenderName())){ + ContributorHandler.Contributor contributor = ContributorHandler.contributors.get(player.getCommandSenderName()); + if (!contributor.isUserValid(player)) return; + + buttonList.clear(); + + if (contributor.contributionLevel >= 1) buttonList.add(new GuiButton(0, guiLeft - 150, guiTop, 150, 20, "Contributor Wings: " + (contributor.contributorWingsEnabled ? "Enabled" : "Disabled"))); + if (contributor.contribution.toLowerCase().contains("patreon")) buttonList.add(new GuiButton(1, guiLeft - 150, guiTop + 22, 150, 20, "Patreon Badge: " + (contributor.patreonBadgeEnabled ? "Enabled" : "Disabled"))); + } } @Override protected void actionPerformed(GuiButton button) { super.actionPerformed(button); + if (ContributorHandler.contributors.containsKey(player.getCommandSenderName())) { + ContributorHandler.Contributor contributor = ContributorHandler.contributors.get(player.getCommandSenderName()); + if (!contributor.isUserValid(player)) return; + + if (button.id == 0) { + contributor.contributorWingsEnabled = !contributor.contributorWingsEnabled; + button.displayString = "Contributor Wings: " + (contributor.contributorWingsEnabled ? "Enabled" : "Disabled"); + } else if (button.id == 1) { + contributor.patreonBadgeEnabled = !contributor.patreonBadgeEnabled; + button.displayString = "Patreon Badge: " + (contributor.patreonBadgeEnabled ? "Enabled" : "Disabled"); + } + + DraconicEvolution.network.sendToServer(new ContributorPacket(player.getCommandSenderName(), contributor.contributorWingsEnabled, contributor.patreonBadgeEnabled)); + } + } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/ManualPage.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/ManualPage.java index b10c9738..5ab40485 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/ManualPage.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/ManualPage.java @@ -1,9 +1,8 @@ package com.brandon3055.draconicevolution.client.gui.componentguis; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import net.minecraft.util.StatCollector; - -import java.net.MalformedURLException; -import java.net.URL; +import org.apache.commons.io.FilenameUtils; /** * Created by Brandon on 7/03/2015. @@ -33,16 +32,18 @@ public class ManualPage { public String getImageResourceName(String url) { - try - { - String fileName = new URL(url).getFile(); - return fileName.substring(fileName.indexOf("/") + 1); - } - catch (MalformedURLException e) - { - e.printStackTrace(); - return ""; - } +// try +// { + LogHelper.info(url); + return FilenameUtils.getName(url); + //String fileName = new URL(url).getFile(); + //return fileName.substring(fileName.indexOf("/") + 1); +// } +// catch (MalformedURLException e) +// { +// e.printStackTrace(); +// return ""; +// } } public String getLocalizedName() 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 ece46617..ed3d5c8e 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 @@ -4,8 +4,8 @@ import com.brandon3055.brandonscore.client.gui.guicomponents.ComponentScrollingB import com.brandon3055.brandonscore.client.gui.guicomponents.GUIScrollingBase; import com.brandon3055.brandonscore.client.utills.ClientUtills; import com.brandon3055.brandonscore.common.utills.InfoHelper; -import com.brandon3055.draconicevolution.client.handler.ContributorHandler; -import com.brandon3055.draconicevolution.client.handler.ContributorHandler.Contributor; +import com.brandon3055.draconicevolution.common.handler.ContributorHandler; +import com.brandon3055.draconicevolution.common.handler.ContributorHandler.Contributor; import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; @@ -73,7 +73,8 @@ public class ComponentContributorsPage extends ComponentScrollingBase implements boolean patreonButtonHighlighted = mouseX >= 140 && mouseY >= 290; - for (Contributor contributor : ContributorHandler.contributors){ + for (Contributor contributor : ContributorHandler.contributors.values()){ + if (!StringUtils.isNullOrEmpty(contributor.details) && contributor.details.contains("[UNLISTED]")) continue; yOffset += 30; if (!(yOffset > 25 && yOffset < 324)) continue; @@ -103,7 +104,8 @@ public class ComponentContributorsPage extends ComponentScrollingBase implements boolean patreonButtonHighlighted = mouseX >= 140 && mouseY >= 290; - for (Contributor contributor : ContributorHandler.contributors){ + for (Contributor contributor : ContributorHandler.contributors.values()){ + if (!StringUtils.isNullOrEmpty(contributor.details) && contributor.details.contains("[UNLISTED]")) continue; yOffset += 30; if (!(yOffset > 20 && yOffset < 330)) continue; @@ -152,7 +154,8 @@ public class ComponentContributorsPage extends ComponentScrollingBase implements boolean patreonButtonHighlighted = x >= 140 && y >= 290; - for (Contributor contributor : ContributorHandler.contributors){ + for (Contributor contributor : ContributorHandler.contributors.values()){ + if (!StringUtils.isNullOrEmpty(contributor.details) && contributor.details.contains("[UNLISTED]")) continue; yOffset += 30; if (!(yOffset > 20 && yOffset < 330) || patreonButtonHighlighted) continue; @@ -182,8 +185,9 @@ public class ComponentContributorsPage extends ComponentScrollingBase implements private static ResourceLocation getSkin(String username){ if (!skinCashInitialized){ - for (Contributor contributor : ContributorHandler.contributors) + for (Contributor contributor : ContributorHandler.contributors.values()) { + if (!StringUtils.isNullOrEmpty(contributor.details) && contributor.details.contains("[UNLISTED]")) continue; ResourceLocation skin = AbstractClientPlayer.getLocationSkin(contributor.ign); AbstractClientPlayer.getDownloadImageSkin(skin, contributor.ign); skinCache.put(contributor.ign, skin); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java index f0fb8567..d4e7cfcd 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java @@ -2,12 +2,12 @@ package com.brandon3055.draconicevolution.client.gui.guicomponents; import com.brandon3055.brandonscore.client.gui.guicomponents.ComponentScrollingBase; import com.brandon3055.brandonscore.client.gui.guicomponents.GUIScrollingBase; -import com.brandon3055.draconicevolution.client.gui.componentguis.ManualPage; -import com.brandon3055.draconicevolution.client.handler.ResourceHandler; -import com.brandon3055.draconicevolution.client.utill.CustomResourceLocation; import com.brandon3055.brandonscore.client.utills.GuiHelper; import com.brandon3055.brandonscore.common.utills.InfoHelper; import com.brandon3055.brandonscore.common.utills.Utills; +import com.brandon3055.draconicevolution.client.gui.componentguis.ManualPage; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; +import com.brandon3055.draconicevolution.client.utill.CustomResourceLocation; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; @@ -15,6 +15,7 @@ import net.minecraft.item.crafting.*; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; +import org.apache.commons.io.FilenameUtils; import org.lwjgl.opengl.GL11; import java.lang.reflect.Field; @@ -125,7 +126,8 @@ public class ComponentManualPage extends ComponentScrollingBase { { isTitle = content != null && content.contains("title."); - type = content.contains("http://") ? 1 : content.contains("[c]") ? 2 : 0; + type = content.contains(".png") ? 1 : content.contains("[c]") ? 2 : 0; + slide = (type == 1) && content.contains("[>]"); if (slide) { @@ -195,9 +197,9 @@ public class ComponentManualPage extends ComponentScrollingBase { public int getHeight() { - if (type == 1 && (ResourceHandler.downloadedImages.containsKey(content) || (slide && ResourceHandler.downloadedImages.containsKey(content.substring(0, content.indexOf("[>]")))))) + if (type == 1 && (ResourceHandler.downloadedImages.containsKey(FilenameUtils.getName(content)) || (slide && ResourceHandler.downloadedImages.containsKey(FilenameUtils.getName(content))))) { - CustomResourceLocation texture = slide ? ResourceHandler.downloadedImages.get(content.substring(0, content.indexOf("[>]"))) : ResourceHandler.downloadedImages.get(content); + CustomResourceLocation texture = slide ? ResourceHandler.downloadedImages.get(FilenameUtils.getName(content)) : ResourceHandler.downloadedImages.get(FilenameUtils.getName(content)); return (int)((double)texture.getHeight() / (double)texture.getWidth() * 220D) + 5; } else if (type == 2) @@ -250,9 +252,12 @@ public class ComponentManualPage extends ComponentScrollingBase { if (slide) { int index = (page.slideTick / 20) % (slides.size()); - image = (slides.size() > index) ? ResourceHandler.downloadedImages.get(slides.get(index)) : null; + image = (slides.size() > index) ? ResourceHandler.downloadedImages.get(FilenameUtils.getName(slides.get(index))) : null; } - else if (ResourceHandler.downloadedImages.containsKey(content)) image = ResourceHandler.downloadedImages.get(content); + else if (ResourceHandler.downloadedImages.containsKey(FilenameUtils.getName(content))) { + image = ResourceHandler.downloadedImages.get(FilenameUtils.getName(content)); + } + if (image != null) { diff --git a/src/main/java/com/brandon3055/draconicevolution/client/handler/ClientEventHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/handler/ClientEventHandler.java index 52c706f2..faabf460 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/handler/ClientEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/handler/ClientEventHandler.java @@ -4,6 +4,7 @@ import com.brandon3055.brandonscore.common.utills.DataUtills.XZPair; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.handler.ContributorHandler; import com.brandon3055.draconicevolution.common.items.armor.CustomArmorHandler; import com.brandon3055.draconicevolution.common.items.armor.DraconicArmor; import com.brandon3055.draconicevolution.common.items.armor.WyvernArmor; @@ -59,7 +60,7 @@ public class ClientEventHandler { } @SubscribeEvent - public void tickEnd(TickEvent event) { + public void tickEnd(TickEvent.ClientTickEvent event) { if (event.phase != TickEvent.Phase.START || event.type != TickEvent.Type.CLIENT || event.side != Side.CLIENT) return; for (Iterator>> i = playerShieldStatus.entrySet().iterator(); i.hasNext(); ){ @@ -154,6 +155,11 @@ public class ClientEventHandler { LogHelper.info("Started checking for player mount"); } + @SubscribeEvent + public void renderPlayerEvent(RenderPlayerEvent.Specials.Post event) { + ContributorHandler.render(event); + } + @SubscribeEvent public void renderArmorEvent(RenderPlayerEvent.SetArmorModel event) { if (ConfigHandler.useOriginal3DArmorModel || ConfigHandler.useOldArmorModel) return; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/handler/ContributorHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/handler/ContributorHandler.java deleted file mode 100644 index b4103803..00000000 --- a/src/main/java/com/brandon3055/draconicevolution/client/handler/ContributorHandler.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.brandon3055.draconicevolution.client.handler; - -import com.brandon3055.brandonscore.common.handlers.FileHandler; -import com.brandon3055.draconicevolution.common.utills.LogHelper; -import com.google.gson.stream.JsonReader; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import org.apache.commons.io.IOUtils; - -import java.io.*; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -/** - * Created by brandon3055 on 5/11/2015. - */ -public class ContributorHandler { - - public static List contributors = new ArrayList(); - public static boolean successfulLoad = false; - private static DLThread thread; - - public static void init(){ - - thread = new DLThread(); - thread.start(); - - FMLCommonHandler.instance().bus().register(new ContributorHandler()); - } - - private static void readFile(){ - File cFile = new File(FileHandler.configFolder, "/draconicevolution/contributors.json"); - - if (!cFile.exists()){ - LogHelper.error("Could not find contributors file"); - return; - } - - try - { - JsonReader reader = new JsonReader(new FileReader(cFile)); - reader.setLenient(true); - - reader.beginArray(); - - while (reader.hasNext()) - { - reader.beginObject(); - - Contributor contributor = new Contributor(); - - while (reader.hasNext()) - { - String name = reader.nextName(); - - if (name.equals("name")) contributor.name = reader.nextString(); - else if (name.equals("ign")) contributor.ign = reader.nextString(); - else if (name.equals("contribution")) contributor.contribution = reader.nextString(); - else if (name.equals("details")) contributor.details = reader.nextString(); - else if (name.equals("website")) contributor.website = reader.nextString(); - else if (name.equals("contributionLevel")) contributor.contributionLevel = reader.nextInt(); - } - - contributors.add(contributor); - - reader.endObject(); - } - - reader.endArray(); - - reader.close(); - cFile.delete(); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - @SubscribeEvent - public void tick(TickEvent.ClientTickEvent event){ - if (thread == null) { - FMLCommonHandler.instance().bus().unregister(this); - return; - } - - if (thread.isFinished()){ - thread = null; - readFile(); - successfulLoad = true; - } - else if (thread.isFailed()){ - thread = null; - } - } - - public static class Contributor { - public String name; - public String ign; - public String contribution; - public String details; - public String website; - public int contributionLevel; - - public Contributor() {} - - @Override - public String toString() { - return "[Contributor: "+name+", Contribution: "+contribution+", Details: "+details+", Website: "+website+"]"; - } - } - - public static class DLThread extends Thread { - - private boolean finished = false; - private boolean failed = false; - - public DLThread(){ - super("DE Contributors DL Thread"); - } - - @Override - public void run() { - super.run(); - - try - { - URL url = new URL("http://www.brandon3055.com/json/DEContributors.json"); - File cFile = new File(FileHandler.configFolder, "/draconicevolution/contributors.json"); - - InputStream is = url.openStream(); - OutputStream os = new FileOutputStream(cFile); - - IOUtils.copy(is, os); - - is.close(); - os.close(); - finished = true; - } - catch (Exception e) - { - failed = true; - e.printStackTrace(); - } - - } - - public boolean isFinished() { - return finished; - } - - public boolean isFailed() { - return failed; - } - } -} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHandler.java index bee40dbe..a4685d6e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHandler.java @@ -15,6 +15,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.resources.FolderResourcePack; import net.minecraft.util.ResourceLocation; +import org.apache.commons.io.FilenameUtils; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; @@ -94,8 +95,8 @@ public class ResourceHandler { URL url = new URL(s); String fileName = url.getFile(); - BufferedImage bi = ImageIO.read(new File(getImagesFolder(), fileName)); - downloadedImages.put(s, new CustomResourceLocation(fileName.substring(fileName.indexOf("/") + 1), bi.getWidth(), bi.getHeight())); + BufferedImage bi = ImageIO.read(new File(getImagesFolder(), FilenameUtils.getName(fileName))); + downloadedImages.put(FilenameUtils.getName(fileName), new CustomResourceLocation(FilenameUtils.getName(fileName), bi.getWidth(), bi.getHeight())); } catch (MalformedURLException e) { @@ -119,9 +120,9 @@ public class ResourceHandler { URL url = new URL(urlString); String fileName = url.getFile(); - LogHelper.info("Downloading Image " + fileName); + LogHelper.info("Downloading Image " + FilenameUtils.getName(fileName)); - File dll = new File(getImagesFolder(), fileName); + File dll = new File(getImagesFolder(), FilenameUtils.getName(fileName)); InputStream is = url.openStream(); OutputStream os = new FileOutputStream(dll); @@ -145,7 +146,7 @@ public class ResourceHandler { { URL url = new URL(urlS); String fileName = url.getFile(); - return Arrays.asList(getImagesFolder().list()).contains(fileName.substring(fileName.indexOf("/") + 1)); + return Arrays.asList(getImagesFolder().list()).contains(FilenameUtils.getName(fileName)); } catch (MalformedURLException e) { diff --git a/src/main/java/com/brandon3055/draconicevolution/client/model/special/ModelContributorWings.java b/src/main/java/com/brandon3055/draconicevolution/client/model/special/ModelContributorWings.java new file mode 100644 index 00000000..fb015f43 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/model/special/ModelContributorWings.java @@ -0,0 +1,101 @@ +package com.brandon3055.draconicevolution.client.model.special; + +import com.brandon3055.draconicevolution.client.handler.ClientEventHandler; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; +import org.lwjgl.opengl.GL11; + +/** + * DragonWings - brandon3055 + * Created using Tabula 5.0.0 + */ +public class ModelContributorWings extends ModelBase { + public ModelRenderer rightBaseStem; + public ModelRenderer leftBaseStem; + public ModelRenderer rightOuterStem; + public ModelRenderer rightWingInner; + public ModelRenderer rightWingOuter; + public ModelRenderer leftOuterStem; + public ModelRenderer leftWingInner; + public ModelRenderer leftWingOuter; + + public ModelContributorWings() { + this.textureWidth = 32; + this.textureHeight = 32; + this.leftWingOuter = new ModelRenderer(this, 0, 18); + this.leftWingOuter.mirror = true; + this.leftWingOuter.setRotationPoint(0.5F, 0.0F, 0.0F); + this.leftWingOuter.addBox(-0.5F, 0.5F, 0.0F, 15, 14, 0, 0.0F); + this.rightOuterStem = new ModelRenderer(this, 0, 2); + this.rightOuterStem.setRotationPoint(-12.5F, 0.0F, 0.0F); + this.rightOuterStem.addBox(-15.0F, -0.5F, -0.5F, 15, 1, 1, 0.0F); + this.setRotateAngle(rightOuterStem, 0.0F, -0.6108652381980153F, 0.0F); + this.leftWingInner = new ModelRenderer(this, 0, 4); + this.leftWingInner.setRotationPoint(0.0F, 0.0F, 0.0F); + this.leftWingInner.addBox(-0.5F, 0.5F, 0.0F, 13, 14, 0, 0.0F); + this.rightWingInner = new ModelRenderer(this, 0, 4); + this.rightWingInner.mirror = true; + this.rightWingInner.setRotationPoint(0.0F, 0.0F, 0.0F); + this.rightWingInner.addBox(-12.5F, 0.5F, 0.0F, 13, 14, 0, 0.0F); + this.rightWingOuter = new ModelRenderer(this, 0, 18); + this.rightWingOuter.setRotationPoint(-0.5F, 0.0F, 0.0F); + this.rightWingOuter.addBox(-14.5F, 0.5F, 0.0F, 15, 14, 0, 0.0F); + this.leftBaseStem = new ModelRenderer(this, 0, 0); + this.leftBaseStem.setRotationPoint(0.5F, 1.0F, 2.0F); + this.leftBaseStem.addBox(-0.5F, -0.5F, -0.5F, 13, 1, 1, 0.0F); + this.setRotateAngle(leftBaseStem, 0.0F, -0.3490658503988659F, 0.0F); + this.leftOuterStem = new ModelRenderer(this, 0, 2); + this.leftOuterStem.setRotationPoint(12.5F, 0.0F, 0.0F); + this.leftOuterStem.addBox(0.0F, -0.5F, -0.5F, 15, 1, 1, 0.0F); + this.setRotateAngle(leftOuterStem, 0.0F, 0.6108652381980153F, 0.0F); + this.rightBaseStem = new ModelRenderer(this, 0, 0); + this.rightBaseStem.setRotationPoint(-0.5F, 1.0F, 2.0F); + this.rightBaseStem.addBox(-12.5F, -0.5F, -0.5F, 13, 1, 1, 0.0F); + this.setRotateAngle(rightBaseStem, 0.0F, 0.3490658503988659F, 0.0F); + this.leftOuterStem.addChild(this.leftWingOuter); + this.rightBaseStem.addChild(this.rightOuterStem); + this.leftBaseStem.addChild(this.leftWingInner); + this.rightBaseStem.addChild(this.rightWingInner); + this.rightOuterStem.addChild(this.rightWingOuter); + this.leftBaseStem.addChild(this.leftOuterStem); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float partialTick, float scale) { + GL11.glPushMatrix(); + + float baseRot = 0.45906584F; + float outerRot = 0.61086524F; + + float animation = (float)Math.sin(((float)ClientEventHandler.elapsedTicks + partialTick) / 20); + + if (entity.isSneaking()){ + this.leftBaseStem.rotateAngleX = 0.5F; + this.rightBaseStem.rotateAngleX = 0.5F; + } + else { + this.leftBaseStem.rotateAngleX = 0F; + this.rightBaseStem.rotateAngleX = 0F; + } + + this.leftBaseStem.rotateAngleY = -baseRot + (animation * 0.15F); + this.leftOuterStem.rotateAngleY = outerRot + (animation * 0.3F); + this.rightBaseStem.rotateAngleY = baseRot - (animation * 0.15F); + this.rightOuterStem.rotateAngleY = -outerRot - (animation * 0.3F); + + this.leftBaseStem.render(scale); + this.rightBaseStem.render(scale); + + GL11.glPopMatrix(); + } + + /** + * This is a helper function from Tabula to set the rotation of model parts + */ + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java index c69a1cd8..35f41130 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java @@ -8,10 +8,7 @@ import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyFi import com.brandon3055.draconicevolution.client.render.particle.ParticleReactorBeam; import com.brandon3055.draconicevolution.common.achievements.Achievements; import com.brandon3055.draconicevolution.common.entity.*; -import com.brandon3055.draconicevolution.common.handler.ConfigHandler; -import com.brandon3055.draconicevolution.common.handler.CraftingHandler; -import com.brandon3055.draconicevolution.common.handler.FMLEventHandler; -import com.brandon3055.draconicevolution.common.handler.MinecraftForgeEventHandler; +import com.brandon3055.draconicevolution.common.handler.*; import com.brandon3055.draconicevolution.common.lib.OreDoublingRegistry; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.magic.EnchantmentReaper; @@ -54,6 +51,7 @@ public class CommonProxy { registerEventListeners(event.getSide()); ModBlocks.init(); ModItems.init(); + ContributorHandler.init(); registerTileEntities(); initializeNetwork(); registerOres(); @@ -126,6 +124,9 @@ public class CommonProxy { DraconicEvolution.network.registerMessage(ToolModePacket.Handler.class, ToolModePacket.class, 14, Side.SERVER); DraconicEvolution.network.registerMessage(GenericParticlePacket.Handler.class, GenericParticlePacket.class, 15, Side.CLIENT); DraconicEvolution.network.registerMessage(ShieldHitPacket.Handler.class, ShieldHitPacket.class, 16, Side.CLIENT); + DraconicEvolution.network.registerMessage(ContributorPacket.Handler.class, ContributorPacket.class, 17, Side.CLIENT); + DraconicEvolution.network.registerMessage(ContributorPacket.Handler.class, ContributorPacket.class, 18, Side.SERVER); + } public void registerTileEntities() { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java b/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java index cc6f53e3..3f98cb82 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java @@ -75,6 +75,7 @@ public class ModItems { public static ItemDE chaoticCore; public static ItemDE nugget; public static ItemDE chaosFragment; + public static ItemDE magnet; public static ItemDE teleporterMKI; public static ItemDE teleporterMKII; @@ -143,6 +144,7 @@ public class ModItems { reactorStabilizerParts = new ReactorStabiliserPart(); nugget = new Nugget(); chaosFragment = new ChaosFragment(); + magnet = new Magnet(); dezilsMarshmallow = new DezilsMarshmallow(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorStabilizer.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorStabilizer.java index 48908560..61ce643c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorStabilizer.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorStabilizer.java @@ -26,8 +26,8 @@ public class ReactorStabilizer extends BlockDE { public ReactorStabilizer() { this.setCreativeTab(DraconicEvolution.tabBlocksItems); this.setBlockName("reactorStabilizer"); - this.setResistance(10000F); - + this.setResistance(10F); + this.setHardness(10F); ModBlocks.register(this); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java index d6ed12e8..57a91a84 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java @@ -6,6 +6,8 @@ import com.brandon3055.draconicevolution.client.render.particle.Particles; import com.brandon3055.draconicevolution.common.items.weapons.BowHandler; import com.brandon3055.draconicevolution.common.network.GenericParticlePacket; import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; @@ -290,15 +292,10 @@ public class EntityCustomArrow extends EntityArrow { //endregion //region Motion - if (this.getIsCritical() || bowProperties.energyBolt) { + if ((this.getIsCritical() || bowProperties.energyBolt) && worldObj.isRemote) { for (i = 0; i < 4; ++i) { if (bowProperties.energyBolt) { - Particles.ArrowParticle particle = new Particles.ArrowParticle(worldObj, posX - 0.25 + rand.nextDouble() * 0.5, posY + rand.nextDouble() * 0.5, posZ - 0.25 + rand.nextDouble() * 0.5, 0xff6000, 0.2F+rand.nextFloat()*0.5f); - double mm = 0.2; - particle.motionX = (rand.nextDouble() - 0.5) * mm; - particle.motionY = (rand.nextDouble() - 0.5) * mm; - particle.motionZ = (rand.nextDouble() - 0.5) * mm; - ParticleHandler.spawnCustomParticle(particle, 64); + spawnArrowParticles(); } else { this.worldObj.spawnParticle("crit", this.posX + this.motionX * i / 4.0D, this.posY + this.motionY * i / 4.0D, this.posZ + this.motionZ * i / 4.0D, -this.motionX, -this.motionY + 0.2D, -this.motionZ); @@ -356,6 +353,16 @@ public class EntityCustomArrow extends EntityArrow { } } + @SideOnly(Side.CLIENT) + private void spawnArrowParticles(){ + Particles.ArrowParticle particle = new Particles.ArrowParticle(worldObj, posX - 0.25 + rand.nextDouble() * 0.5, posY + rand.nextDouble() * 0.5, posZ - 0.25 + rand.nextDouble() * 0.5, 0xff6000, 0.2F+rand.nextFloat()*0.5f); + double mm = 0.2; + particle.motionX = (rand.nextDouble() - 0.5) * mm; + particle.motionY = (rand.nextDouble() - 0.5) * mm; + particle.motionZ = (rand.nextDouble() - 0.5) * mm; + ParticleHandler.spawnCustomParticle(particle, 64); + } + @Override public void writeEntityToNBT(NBTTagCompound compound) { @@ -425,7 +432,7 @@ public class EntityCustomArrow extends EntityArrow { double range = (double)bowProperties.shockWavePower + 5; List list = worldObj.getEntitiesWithinAABB(Entity.class, boundingBox.expand(range, range, range)); - float damage = 20F * bowProperties.shockWavePower; + float damage = 40F * bowProperties.shockWavePower; for (Entity e : list) { if (e instanceof EntityLivingBase) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/ContributorHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/ContributorHandler.java new file mode 100644 index 00000000..c0cfd73c --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/ContributorHandler.java @@ -0,0 +1,282 @@ +package com.brandon3055.draconicevolution.common.handler; + +import com.brandon3055.brandonscore.common.handlers.FileHandler; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; +import com.brandon3055.draconicevolution.client.model.special.ModelContributorWings; +import com.brandon3055.draconicevolution.common.network.ContributorPacket; +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import com.google.common.base.Charsets; +import com.google.gson.stream.JsonReader; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.gameevent.PlayerEvent; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraftforge.client.event.RenderPlayerEvent; +import org.apache.commons.io.IOUtils; +import org.lwjgl.opengl.GL11; + +import java.io.*; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +/** + * Created by brandon3055 on 5/11/2015. + */ +public class ContributorHandler { + + public static Map contributors = new HashMap(); + public static boolean successfulLoad = false; + private static DLThread thread; + private static ModelContributorWings wings = new ModelContributorWings(); + + public static void init(){ + thread = new DLThread(); + thread.start(); + } + + public static void render(RenderPlayerEvent.Specials event) { + if (isPlayerContributor(event.entityPlayer)){ + Contributor contributor = contributors.get(event.entityPlayer.getCommandSenderName()); + + if (contributor.contributionLevel >= 1 && (contributor.contributorWingsEnabled)) renderWings(event); + if (contributor.contribution != null && contributor.contribution.toLowerCase().contains("patreon") && contributor.patreonBadgeEnabled) renderBadge(event); + } + } + + public static boolean isPlayerContributor(EntityPlayer player) { + return contributors.containsKey(player.getCommandSenderName()) && contributors.get(player.getCommandSenderName()).isUserValid(player); + } + + private static void renderWings(RenderPlayerEvent event){ + ResourceHandler.bindResource("textures/models/ContributorWings.png"); + GL11.glColor4f(1F, 1F, 1F, 1F); + wings.render(event.entityPlayer, 0F, 0F, 0F, 0F, event.partialRenderTick, 1F / 16F); + } + + private static void renderBadge(RenderPlayerEvent event){ + ResourceHandler.bindResource("textures/special/PatreonBadge.png"); + Tessellator tess = Tessellator.instance; + GL11.glPushMatrix(); + + if (event.entityPlayer.isSneaking()){ + GL11.glRotatef(29.0F, 1.0F, 0.0F, 0F); + } + + double x = 0.01; + double y = 0.04; + double z = -0.13; + double xSize = 0.22; + double ySize = 0.22; + + tess.startDrawingQuads(); + tess.setColorRGBA_F(1F, 1F, 1F, 1F); + tess.addVertexWithUV(x, y, z, 0, 0); + tess.addVertexWithUV(x, y+ySize, z, 0, 1); + tess.addVertexWithUV(x+xSize, y+ySize, z, 1, 1); + tess.addVertexWithUV(x+xSize, y, z, 1, 0); + tess.draw(); + + GL11.glDepthFunc(GL11.GL_EQUAL); + GL11.glDisable(GL11.GL_LIGHTING); + ResourceHandler.bindTexture(ResourceHandler.getResourceWOP("textures/misc/enchanted_item_glint.png")); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + float f11 = 0.76F; + GL11.glColor4f(0.9F * f11, 0.8F * f11, 0.1F * f11, 1.0F); + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glPushMatrix(); + + float f12 = 0.125F; + GL11.glScalef(f12, f12, f12); + float f13 = (float)(Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; + GL11.glTranslatef(f13, 0.0F, 0.0F); + GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); + + tess.startDrawingQuads(); + tess.addVertexWithUV(x, y, z, 0, 0); + tess.addVertexWithUV(x, y+ySize, z, 0, 1); + tess.addVertexWithUV(x+xSize, y+ySize, z, 1, 1); + tess.addVertexWithUV(x+xSize, y, z, 1, 0); + tess.draw(); + + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glScalef(f12, f12, f12); + f13 = (float)(Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; + GL11.glTranslatef(-f13, 0.0F, 0.0F); + GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); + + tess.startDrawingQuads(); + tess.addVertexWithUV(x, y, z, 0, 0); + tess.addVertexWithUV(x, y+ySize, z, 0, 1); + tess.addVertexWithUV(x+xSize, y+ySize, z, 1, 1); + tess.addVertexWithUV(x+xSize, y, z, 1, 0); + tess.draw(); + + GL11.glPopMatrix(); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + GL11.glPopMatrix(); + } + + public static void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { + if (event.player instanceof EntityPlayerMP) { + for (String contribName : ContributorHandler.contributors.keySet()) { + for (String name : FMLCommonHandler.instance().getMinecraftServerInstance().getAllUsernames()) { + if (name.equals(contribName)) { + ContributorHandler.Contributor contributor = ContributorHandler.contributors.get(contribName); + DraconicEvolution.network.sendTo(new ContributorPacket(contribName, contributor.contributorWingsEnabled, contributor.patreonBadgeEnabled), (EntityPlayerMP) event.player); + } + } + } + } + } + + //region Reading online contributors list + private static void readFile(){ + File cFile = new File(FileHandler.configFolder, "/draconicevolution/contributors.json"); + + if (!cFile.exists()){ + LogHelper.error("Could not find contributors file"); + return; + } + + try + { + JsonReader reader = new JsonReader(new FileReader(cFile)); + reader.setLenient(true); + + reader.beginArray(); + + while (reader.hasNext()) + { + reader.beginObject(); + + Contributor contributor = new Contributor(); + + while (reader.hasNext()) + { + String name = reader.nextName(); + + if (name.equals("name")) contributor.name = reader.nextString(); + else if (name.equals("ign")) contributor.ign = reader.nextString(); + else if (name.equals("contribution")) contributor.contribution = reader.nextString(); + else if (name.equals("details")) contributor.details = reader.nextString(); + else if (name.equals("website")) contributor.website = reader.nextString(); + else if (name.equals("contributionLevel")) contributor.contributionLevel = reader.nextInt(); + } + + contributors.put(contributor.ign, contributor); + + reader.endObject(); + } + + reader.endArray(); + + reader.close(); + cFile.delete(); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + public static void tick(){ + + if (thread == null) { + return; + } + + if (thread.isFinished()){ + thread = null; + readFile(); + successfulLoad = true; + } + else if (thread.isFailed()){ + thread = null; + } + } + + public static class DLThread extends Thread { + + private boolean finished = false; + private boolean failed = false; + + public DLThread(){ + super("DE Contributors DL Thread"); + } + + @Override + public void run() { + super.run(); + + try + { + URL url = new URL("http://www.brandon3055.com/json/DEContributors.json"); + File cFile = new File(FileHandler.configFolder, "/draconicevolution/contributors.json"); + + InputStream is = url.openStream(); + OutputStream os = new FileOutputStream(cFile); + + IOUtils.copy(is, os); + + is.close(); + os.close(); + finished = true; + } + catch (Exception e) + { + LogHelper.error("Failed to download contributors list"); + failed = true; + e.printStackTrace(); + } + + } + + public boolean isFinished() { + return finished; + } + + public boolean isFailed() { + return failed; + } + } + //endregion + + public static class Contributor { + public String name; + public String ign; + public String contribution; + public String details; + public String website; + public int contributionLevel; + /**0=Disabled, 1=Enabled when flying, 2=Always Enabled*/ + public boolean contributorWingsEnabled = true; + public boolean patreonBadgeEnabled = true; + private boolean validated = false; + private boolean isValid; + + public Contributor() {} + + public boolean isUserValid(EntityPlayer player){ + if (!validated){ + isValid = !UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getCommandSenderName()).getBytes(Charsets.UTF_8)).equals(player.getUniqueID()); + validated = true; + } + return isValid; + } + + @Override + public String toString() { + return "[Contributor: "+name+", Contribution: "+contribution+", Details: "+details+", Website: "+website+"]"; + } + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java index aaeb3d08..c0be1bc9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java @@ -63,6 +63,8 @@ public class CraftingHandler { add(ModItems.wyvernShovel, " W ", "ITI", " E ", 'W', ModItems.wyvernCore, 'I', ModItems.draconiumIngot, 'T', Items.diamond_shovel, 'E', ModItems.wyvernEnergyCore); add(ModItems.wyvernSword, " W ", "ITI", " E ", 'W', ModItems.wyvernCore, 'I', ModItems.draconiumIngot, 'T', Items.diamond_sword, 'E', ModItems.wyvernEnergyCore); add(ModItems.wyvernBow, " W ", "ITI", " E ", 'W', ModItems.wyvernCore, 'I', ModItems.draconiumIngot, 'T', Items.bow, 'E', ModItems.wyvernEnergyCore); + addOre(new ItemStack(ModItems.magnet, 1, 0), "RII", " C", "RII", 'R', Blocks.redstone_block, 'I', "ingotIron", 'C', ModItems.teleporterMKI); + //armor add(ModItems.wyvernHelm, "IWI", "IAI", "IEI", 'W', ModItems.wyvernCore, 'I', ModItems.draconiumIngot, 'A', Items.diamond_helmet, 'E', ModItems.wyvernEnergyCore); add(ModItems.wyvernChest, "IWI", "IAI", "IEI", 'W', ModItems.wyvernCore, 'I', ModItems.draconiumIngot, 'A', Items.diamond_chestplate, 'E', ModItems.wyvernEnergyCore); @@ -80,6 +82,8 @@ public class CraftingHandler { addEnergy(ModItems.draconicSword, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'T', ModItems.wyvernSword, 'E', ModItems.draconicEnergyCore); addOre(ModItems.draconicBow, " C ", "ITI", " E ", 'C', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'T', ModItems.wyvernBow, 'E', ModItems.draconicEnergyCore); addEnergy(ModItems.draconicDestructionStaff, "IAI", "PIS", "IWI", 'I', "ingotDraconiumAwakened", 'A', ModItems.awakenedCore, 'P', ModItems.draconicPickaxe, 'S', ModItems.draconicShovel, 'W', ModItems.draconicSword); + addOre(new ItemStack(ModItems.magnet, 1, 1), "RII", " C", "RII", 'R', new ItemStack(ModBlocks.draconiumBlock, 1, 2), 'I', "ingotDraconiumAwakened", 'C', new ItemStack(ModItems.magnet, 1, 0)); + //armor addEnergy(ModItems.draconicHelm, "IWI", "IAI", "IEI", 'W', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'A', ModItems.wyvernHelm, 'E', ModItems.draconicEnergyCore); addEnergy(ModItems.draconicChest, "IWI", "IAI", "IEI", 'W', ModItems.awakenedCore, 'I', "ingotDraconiumAwakened", 'A', ModItems.wyvernChest, 'E', ModItems.draconicEnergyCore); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/FMLEventHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/FMLEventHandler.java index 8bbf2c41..f29242d5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/FMLEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/FMLEventHandler.java @@ -32,7 +32,10 @@ public class FMLEventHandler { CustomArmorHandler.onPlayerTick(event); } - + @SubscribeEvent + public void serverTickEvent(TickEvent event){ + ContributorHandler.tick(); + } @SubscribeEvent public void playerLogin(PlayerEvent.PlayerLoggedInEvent event) @@ -51,5 +54,7 @@ public class FMLEventHandler { event.player.addChatComponentMessage(new ChatComponentText("Hello Dez! Here have a Marshmallow")); event.player.worldObj.spawnEntityInWorld(new EntityItem(event.player.worldObj, event.player.posX, event.player.posY, event.player.posZ, new ItemStack(ModItems.dezilsMarshmallow))); } + + ContributorHandler.onPlayerLogin(event); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java b/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java index 18155879..5bf717e2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java @@ -2,25 +2,24 @@ package com.brandon3055.draconicevolution.common.items; import com.brandon3055.draconicevolution.client.render.particle.Particles; import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.entity.ExtendedPlayer; import com.brandon3055.draconicevolution.common.items.tools.baseclasses.ToolHandler; -import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.utills.LogHelper; import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.server.integrated.IntegratedServer; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import java.io.IOException; import java.util.List; public class Tclogo extends ItemDE { @@ -115,17 +114,37 @@ public class Tclogo extends ItemDE { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - LogHelper.info(Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode()); - - ResourceLocation rs = new ResourceLocation(References.RESOURCESPREFIX + "manual-en_US.json"); - - try { - LogHelper.info(Minecraft.getMinecraft().getResourceManager().getResource(rs)); + try + { + if (!world.isRemote) { + //ExtendedPlayer.get(player).setSpawnCount(6); + LogHelper.info(ExtendedPlayer.get(player).getSpawnCount()); + // player.getEntityData().setTag("Tag", new NBTTagCompound()); + } else LogHelper.info(ExtendedPlayer.get(player).getSpawnCount()); + //LogHelper.info(FMLCommonHandler.instance().getMinecraftServerInstance().func_152358_ax().func_152655_a(player.getCommandSenderName()).getId()); + //LogHelper.info(player.getUniqueID()); + //LogHelper.info(UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getCommandSenderName()).getBytes(Charsets.UTF_8))); + //LogHelper.info(UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getCommandSenderName()).getBytes(Charsets.UTF_8)).equals(player.getUniqueID())); + if (FMLCommonHandler.instance().getMinecraftServerInstance() instanceof IntegratedServer){ + // LogHelper.info(FMLClientHandler.instance().getClient().getSession().getToken()); + // LogHelper.info(((YggdrasilMinecraftSessionService)FMLCommonHandler.instance().getMinecraftServerInstance().func_147130_as()).getAuthenticationService().); + } } - catch (IOException e) { + catch (Exception e){ e.printStackTrace(); } +// LogHelper.info(Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode()); +// +// ResourceLocation rs = new ResourceLocation(References.RESOURCESPREFIX + "manual-en_US.json"); +// +// try { +// LogHelper.info(Minecraft.getMinecraft().getResourceManager().getResource(rs)); +// } +// catch (IOException e) { +// e.printStackTrace(); +// } + // if ((int)System.currentTimeMillis() < lts + 10) return stack; // else lts = (int)System.currentTimeMillis(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java index 6e1e10e0..cd0c8167 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java @@ -240,7 +240,7 @@ public class CustomArmorHandler { player.sendPlayerAbilities(); } - player.capabilities.setFlySpeed(0.05F); + if (player.worldObj.isRemote)setPlayerFlySpeed(player, 0.05F); } } //endregion diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java index 6fb87781..0015ff20 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java @@ -161,18 +161,7 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IConfigurab @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { -// if(stack != null && stack.getItem() == ModItems.wyvernLeggs) { -// if (player.isSprinting()) -// player.addPotionEffect(new PotionEffect(PotionHandler.potionSpeed.id, 10, 1, true)); -// else -// player.addPotionEffect(new PotionEffect(PotionHandler.potionSpeed.id, 10, 0, true)); -// } -// if(stack != null && stack.getItem() == ModItems.wyvernBoots) { -// if (player.isSprinting()) -// player.addPotionEffect(new PotionEffect(PotionHandler.potionJumpBoost.id, 10, 1, true)); -// else -// player.addPotionEffect(new PotionEffect(PotionHandler.potionJumpBoost.id, 10, 0, true)); -// } + } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java index 0c7b2ae4..c6194935 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java @@ -139,12 +139,13 @@ public class DraconiumFluxCapacitor extends RFItemBase implements IUpgradableIte public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) { if (InfoHelper.holdShiftForDetails(list)){ - InfoHelper.addEnergyInfo(stack, list); + list.add(StatCollector.translateToLocal("info.de.changwMode.txt")); list.add(InfoHelper.ITC()+StatCollector.translateToLocal("info.de.capacitorMode.txt")+": "+InfoHelper.HITC()+StatCollector.translateToLocal("info.de.capacitorMode"+ItemNBTHelper.getShort(stack, "Mode", (short)0)+".txt")); //InfoHelper.addLore(stack, list); } ToolBase.holdCTRLForUpgrades(list, stack); + InfoHelper.addEnergyInfo(stack, list); } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java new file mode 100644 index 00000000..35e0235d --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java @@ -0,0 +1,106 @@ +package com.brandon3055.draconicevolution.common.items.tools; + +import com.brandon3055.brandonscore.common.utills.InfoHelper; +import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.items.ItemDE; +import com.brandon3055.draconicevolution.common.lib.References; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +import java.util.List; + +/** + * Created by brandon3055 on 9/3/2016. + */ +public class Magnet extends ItemDE { + private IIcon draconium; + private IIcon awakened; + + public Magnet(){ + this.setUnlocalizedName("magnet"); + this.setCreativeTab(DraconicEvolution.tabBlocksItems); + ModItems.register(this); + } + + @Override + public void registerIcons(IIconRegister iconRegister) { + draconium = iconRegister.registerIcon(References.RESOURCESPREFIX+"magnetWyvern"); + awakened = iconRegister.registerIcon(References.RESOURCESPREFIX+"magnetDraconic"); + } + + @Override + public IIcon getIconFromDamage(int dmg) { + return dmg == 0 ? draconium : awakened; + } + + @Override + public boolean getHasSubtypes() { + return true; + } + + @SideOnly(Side.CLIENT) + @SuppressWarnings("unchecked") + @Override + public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { + list.add(new ItemStack(item, 1, 0)); + list.add(new ItemStack(item, 1, 1)); + } + + @Override + public String getUnlocalizedName(ItemStack itemStack) { + return super.getUnlocalizedName(itemStack)+(itemStack.getItemDamage() == 0 ? ".wyvern" : ".draconic"); + } + + @SideOnly(Side.CLIENT) + @Override + public boolean hasEffect(ItemStack stack, int pass) { + return ItemNBTHelper.getBoolean(stack, "MagnetEnabled", false); + } + + @SuppressWarnings("unchecked") + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int damage, boolean hotbar) { + if (!entity.isSneaking() && entity.ticksExisted % 5 == 0 && ItemNBTHelper.getBoolean(stack, "MagnetEnabled", false)){ + int range = damage == 0 ? 8 : 32; + + List items = world.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(entity.posX, entity.posY, entity.posZ, entity.posX, entity.posY, entity.posZ).expand(range, range, range)); + + boolean flag = false; + + for (EntityItem item : items) { + flag = true; + if (item.delayBeforeCanPickup > 0) item.delayBeforeCanPickup = 0; + item.motionX = item.motionY = item.motionZ = 0; + item.setPosition(entity.posX-0.2+(world.rand.nextDouble()*0.4), entity.posY-0.6, entity.posZ-0.2+(world.rand.nextDouble()*0.4)); + } + if (flag) world.playSoundAtEntity(entity, "random.orb", 0.1F, 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 2F)); + } + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (player.isSneaking()) ItemNBTHelper.setBoolean(stack, "MagnetEnabled", !ItemNBTHelper.getBoolean(stack, "MagnetEnabled", false)); + return stack; + } + + @SuppressWarnings("unchecked") + @Override + public void addInformation(ItemStack stack, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { + list.add(StatCollector.translateToLocal("info.de.shiftRightClickToActivate.txt")); + int range = stack.getItemDamage() == 0 ? 8 : 32; + list.add(InfoHelper.HITC()+range+InfoHelper.ITC()+" "+StatCollector.translateToLocal("info.de.blockRange.txt")); + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolBase.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolBase.java index 607e95e1..27c06ab8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolBase.java @@ -4,7 +4,6 @@ import com.brandon3055.brandonscore.BrandonsCore; import com.brandon3055.brandonscore.common.utills.DataUtills; import com.brandon3055.brandonscore.common.utills.InfoHelper; import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; -import com.brandon3055.brandonscore.common.utills.Utills; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.keybinding.KeyBindings; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; @@ -155,13 +154,13 @@ public class ToolBase extends RFItemBase { } List l = getFields(stack, 0); for (ItemConfigField f : l) list.add(f.getTooltipInfo()); - if (getCapacity(stack) > 0) list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.charge.txt") + ": " + InfoHelper.HITC() + Utills.formatNumber(getEnergyStored(stack)) + " / " + Utills.formatNumber(getCapacity(stack))); + // if (getCapacity(stack) > 0) list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.charge.txt") + ": " + InfoHelper.HITC() + Utills.formatNumber(getEnergyStored(stack)) + " / " + Utills.formatNumber(getCapacity(stack))); } holdCTRLForUpgrades(list, stack); addAditionalInformation(stack, player, list, extended); - if (show && !ConfigHandler.disableLore) InfoHelper.addLore(stack, list, true); InfoHelper.addEnergyInfo(stack, list); + if (show && !ConfigHandler.disableLore) InfoHelper.addLore(stack, list, true); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/BowHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/BowHandler.java index 30457b8c..a335cfdf 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/BowHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/BowHandler.java @@ -184,7 +184,7 @@ public class BowHandler { cantFireMessage = "msg.de.explosiveNotForEnergyBolts.txt"; return false; } - else if (calculateEnergyCost() > ((IEnergyContainerItem)bow.getItem()).getEnergyStored(bow)){ + else if (calculateEnergyCost() > ((IEnergyContainerItem)bow.getItem()).getEnergyStored(bow) && !player.capabilities.isCreativeMode){ cantFireMessage = "msg.de.insufficientPowerToFire.txt"; return false; } @@ -215,7 +215,7 @@ public class BowHandler { public boolean consumeArrowAndEnergy(){ - ((IEnergyContainerItem)bow.getItem()).extractEnergy(bow, calculateEnergyCost(), false); + if (!player.capabilities.isCreativeMode)((IEnergyContainerItem)bow.getItem()).extractEnergy(bow, calculateEnergyCost(), false); if (!energyBolt && EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, bow) == 0 && !player.capabilities.isCreativeMode) { player.inventory.consumeInventoryItem(Items.arrow); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java index 133e08d7..45d751f0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java @@ -8,6 +8,7 @@ import com.brandon3055.brandonscore.common.utills.Utills; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import com.brandon3055.draconicevolution.common.items.tools.baseclasses.ToolBase; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; @@ -114,11 +115,16 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI @SuppressWarnings({ "unchecked", "rawtypes" }) public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) { - if (InfoHelper.holdShiftForDetails(list)) { - list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.bowEnchants.txt")); - InfoHelper.addLore(stack, list); + boolean show = InfoHelper.holdShiftForDetails(list); + if (show){ + int preset = ItemNBTHelper.getInteger(stack, "ConfigProfile", 0); + list.add(EnumChatFormatting.DARK_PURPLE+StatCollector.translateToLocal("info.de.capacitorMode.txt")+": "+ItemNBTHelper.getString(stack, "ProfileName"+preset, "Profile "+preset)); + List l = getFields(stack, 0); + for (ItemConfigField f : l) list.add(f.getTooltipInfo()); } ToolBase.holdCTRLForUpgrades(list, stack); + InfoHelper.addEnergyInfo(stack, list); + if (show && !ConfigHandler.disableLore) InfoHelper.addLore(stack, list, true); } @SideOnly(Side.CLIENT) @@ -210,7 +216,7 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI @Override public List getUpgrades(ItemStack itemstack) { return new ArrayList(){{ - // add(EnumUpgrade.RF_CAPACITY); + add(EnumUpgrade.RF_CAPACITY); add(EnumUpgrade.DRAW_SPEED); add(EnumUpgrade.ARROW_SPEED); add(EnumUpgrade.ARROW_DAMAGE); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java index 401a710e..ff5552fb 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java @@ -8,6 +8,7 @@ import com.brandon3055.brandonscore.common.utills.Utills; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import com.brandon3055.draconicevolution.common.items.tools.baseclasses.ToolBase; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; @@ -123,11 +124,16 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte @SuppressWarnings({ "unchecked", "rawtypes" }) public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) { - if (InfoHelper.holdShiftForDetails(list)) { - list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.bowEnchants.txt")); - InfoHelper.addLore(stack, list); + boolean show = InfoHelper.holdShiftForDetails(list); + if (show){ + int preset = ItemNBTHelper.getInteger(stack, "ConfigProfile", 0); + list.add(EnumChatFormatting.DARK_PURPLE+StatCollector.translateToLocal("info.de.capacitorMode.txt")+": "+ItemNBTHelper.getString(stack, "ProfileName"+preset, "Profile "+preset)); + List l = getFields(stack, 0); + for (ItemConfigField f : l) list.add(f.getTooltipInfo()); } ToolBase.holdCTRLForUpgrades(list, stack); + InfoHelper.addEnergyInfo(stack, list); + if (show && !ConfigHandler.disableLore) InfoHelper.addLore(stack, list, true); } @SideOnly(Side.CLIENT) @@ -210,8 +216,8 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte @Override public List getUpgrades(ItemStack itemstack) { - return new ArrayList(){{ - // add(EnumUpgrade.RF_CAPACITY); + return new ArrayList() {{ + add(EnumUpgrade.RF_CAPACITY); add(EnumUpgrade.DRAW_SPEED); add(EnumUpgrade.ARROW_SPEED); add(EnumUpgrade.ARROW_DAMAGE); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java index 93a0bf05..230f1c61 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java @@ -6,7 +6,7 @@ package com.brandon3055.draconicevolution.common.lib; public class VersionHandler { public static final String VERSION = "1.0.2"; - public static final int SNAPSHOT = 10; + public static final int SNAPSHOT = 12; public static final String MCVERSION = "1.7.10"; public static final String FULL_VERSION = VERSION + (SNAPSHOT > 0 ? "-snapshot_" + SNAPSHOT : ""); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/ContributorPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/ContributorPacket.java new file mode 100644 index 00000000..28d77989 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/ContributorPacket.java @@ -0,0 +1,69 @@ +package com.brandon3055.draconicevolution.common.network; + +import com.brandon3055.brandonscore.BrandonsCore; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.handler.ContributorHandler; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; + +public class ContributorPacket implements IMessage +{ + public String contributor; + public boolean wings; + public boolean badge; + + public ContributorPacket() {} + + public ContributorPacket(String contributor, boolean wings, boolean badge) { + this.contributor = contributor; + this.wings = wings; + this.badge = badge; + } + + @Override + public void fromBytes(ByteBuf bytes){ + this.contributor = ByteBufUtils.readUTF8String(bytes); + this.wings = bytes.readBoolean(); + this.badge = bytes.readBoolean(); + } + + @Override + public void toBytes(ByteBuf bytes){ + ByteBufUtils.writeUTF8String(bytes, contributor); + bytes.writeBoolean(wings); + bytes.writeBoolean(badge); + } + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(ContributorPacket message, MessageContext ctx) { + if (ContributorHandler.contributors.containsKey(message.contributor)){ + ContributorHandler.Contributor contributor1 = ContributorHandler.contributors.get(message.contributor); + + if (ctx.side == Side.SERVER){ + if (!contributor1.isUserValid(ctx.getServerHandler().playerEntity)) return null; + + contributor1.contributorWingsEnabled = message.wings; + contributor1.patreonBadgeEnabled = message.badge; + + DraconicEvolution.network.sendToAll(message); + } + else { + EntityPlayer player = BrandonsCore.proxy.getClientPlayer(); + if (!contributor1.isUserValid(player) || message.contributor.equals(player.getCommandSenderName())) return null; + + contributor1.contributorWingsEnabled = message.wings; + contributor1.patreonBadgeEnabled = message.badge; + } + } + + return null; + } + } +} \ No newline at end of file diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorEnergyInjector.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorEnergyInjector.java index deee312b..3ba76946 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorEnergyInjector.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorEnergyInjector.java @@ -211,7 +211,7 @@ public class TileReactorEnergyInjector extends TileEntity implements IReactorPar map.put("maxFuelConversion", reactor.reactorFuel + reactor.convertedFuel); map.put("generationRate", (int)reactor.generationRate); map.put("fieldDrainRate", reactor.fieldDrain); - map.put("fuelConversionRateN", (int)Math.round(reactor.fuelUseRate * 1000000D)); + map.put("fuelConversionRate", (int)Math.round(reactor.fuelUseRate * 1000000D)); map.put("status", reactor.reactorState == 0 ? "offline" : reactor.reactorState == 1 && !reactor.canStart() ? "charging" : reactor.reactorState == 1 && reactor.canStart() ? "charged" : reactor.reactorState == 2 ? "online" : reactor.reactorState == 3 ? "stopping" : "invalid"); return new Object[]{ map }; } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorStabilizer.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorStabilizer.java index 58e37944..c2b1963a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorStabilizer.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/reactor/TileReactorStabilizer.java @@ -55,6 +55,7 @@ public class TileReactorStabilizer extends TileEntity implements IReactorPart, I coreSpeed = 30F * core.renderSpeed; ringSpeed = 5F * core.renderSpeed; modelIllumination = core.renderSpeed; + if (tick % 100 == 0) beam = null; if (isValid) beam = DraconicEvolution.proxy.reactorBeam(this, beam, true); return; } @@ -238,7 +239,7 @@ public class TileReactorStabilizer extends TileEntity implements IReactorPart, I map.put("maxFuelConversion", reactor.reactorFuel + reactor.convertedFuel); map.put("generationRate", (int)reactor.generationRate); map.put("fieldDrainRate", reactor.fieldDrain); - map.put("fuelConversionRateN", (int)Math.round(reactor.fuelUseRate * 1000000D)); + map.put("fuelConversionRate", (int)Math.round(reactor.fuelUseRate * 1000000D)); map.put("status", reactor.reactorState == 0 ? "offline" : reactor.reactorState == 1 && !reactor.canStart() ? "charging" : reactor.reactorState == 1 && reactor.canStart() ? "charged" : reactor.reactorState == 2 ? "online" : reactor.reactorState == 3 ? "stopping" : "invalid"); return new Object[]{ map }; } diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index 935fd852..9575d014 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -1,4 +1,3 @@ -//Description format \n=Force new line \% at start of line=add half line space above line //Tile Information ---------------------------------------------------------------------------------------------------------------------------------------- tile.draconicevolution:xRayBlock.name=Distortion Flame tile.draconicevolution:sunDial.name=Sun Dial @@ -106,7 +105,8 @@ item.draconicevolution:chaosFragment1.name=Small Chaos Fragment item.draconicevolution:chaosFragment2.name=Large Chaos Fragment item.draconicevolution:nugget.draconium.name=Draconium Nugget item.draconicevolution:nugget.awakened.name=Awakened Draconium Nugget - +item.draconicevolution:magnet.wyvern.name=Item Dislocator +item.draconicevolution:magnet.draconic.name=Awakened Item Dislocator //Item Groups ---------------------------------------------------------------------------------------------------------------------------------------- itemGroup.toolsAndWeapons=Draconic Evolution Tools & Weapons @@ -239,8 +239,6 @@ info.de.toOpenConfigGUI.txt=To open config GUI info.de.shiftToPause.txt=Hold shift to pause slide info.de.power.txt=Power -info.de.bowEnchants.txt=10x more accurate then a vanilla bow! - info.de.sword.txt=Your enemy's strength makes this blade stronger! info.de.safetyMatch.txt=Light a fire that will NOT burn your house down! @@ -274,6 +272,8 @@ info.de.manual.contribution.txt=Contribution info.de.manual.clickToGoToSite.txt=(Click name to open website) info.de.manual.contributorsButton.txt=Contributors info.de.manual.contributorsButtonInfo.txt=A list of people who have contributed to Draconic Evolution +info.de.shiftRightClickToActivate.txt=Shift-Right click to activate. +info.de.blockRange.txt=Block Range. info.de.manual.nav1.txt=Navigation Tips info.de.manual.nav2.txt=Press Backspace to go to the previous page. @@ -404,7 +404,7 @@ item.draconicevolution:draconicAxe.lore=2After lots of trial and error\nyou can item.draconicevolution:draconicShovel.lore=2Even more efficient\nyou can dig an even larger area item.draconicevolution:draconicHoe.lore=2Draconium even improves farming\nentire areas can be tilled and placed in a single click item.draconicevolution:draconicSword.lore=2Wyvern was good, but draconic weapons\nare even more powerful and hit more enemies -item.draconicevolution:draconicBow.lore=2The peak of ranged perfection\nfaster shooting, explosive arrows, what more could you want? +item.draconicevolution:draconicBow.lore=2The peak of ranged perfection faster shooting,\nexplosive arrows, what more could you want? item.draconicevolution:draconicHelm.lore=2No longer do you fear the night\nyou now can see all the time regardless\nof what is out there item.draconicevolution:draconicChest.lore=2Using the heart of a dragon\nyou are stronger and have the gift of flight diff --git a/src/main/resources/assets/draconicevolution/lang/zh_CN.lang b/src/main/resources/assets/draconicevolution/lang/zh_CN.lang index 856c96bb..70fda946 100644 --- a/src/main/resources/assets/draconicevolution/lang/zh_CN.lang +++ b/src/main/resources/assets/draconicevolution/lang/zh_CN.lang @@ -1,4 +1,3 @@ -//Description format \n=Force new line \% at start of line=add half line space above line //Tile Information ---------------------------------------------------------------------------------------------------------------------------------------- tile.draconicevolution:xRayBlock.name=影扭曲之焰 tile.draconicevolution:sunDial.name=日晷 diff --git a/src/main/resources/assets/draconicevolution/manual/manual-en_US.json b/src/main/resources/assets/draconicevolution/manual/manual-en_US.json index d6765229..b4ac2977 100644 --- a/src/main/resources/assets/draconicevolution/manual/manual-en_US.json +++ b/src/main/resources/assets/draconicevolution/manual/manual-en_US.json @@ -129,10 +129,16 @@ "images":[], "content": [ - "Looking for a more powerful bow with some fancy features? This is the one for you. The Wyvern bow has 2 operating modes. Selectable with shift + right click.", - "Rapid Fire: As the name suggests, it fires arrows at a rather high rate and does moderate damage.", - "Sharp Shooter: Allows you to zoom in on your target and deal extremely high damage with pin point accuracy.", - "Enchantments are also twice as effective on this bow.", + "Looking for a more powerful bow with some fancy features? This is the one for you.", + "Adjustable Settings:", + "-[Base Damage] This multiplied by the arrows velocity on impact determines the inflicted damage", + "-[Arrow Velocity Modifier] +0 is equivalent to a vanilla bow.", + "-[Auto Fire] The bow will automatically fire when it reaches full draw.", + "-[Explosive Power] Exactly what it sounds like!", + "-[Magnification] Allows you to zoom in on your target for better accuracy.", + "The RF cost per shot if determined by multiplying the settings for Damage Velocity and Explosion power. This means that simply setting everything to Max requires exponentially more power then setting say damage to maximum.", + "Energy Capacity, Draw Speed, Arrow Velocity and Base Damage can all be upgraded", + "This bow is 10X more accurate then a vanilla bow. Meaning the arrow will land closer to where you were actually aiming and wont drift as much in flight", "[c]item.draconicevolution:wyvernBow:0" ] }, @@ -158,6 +164,22 @@ "[c]item.draconicevolution:draconiumFluxCapacitor:0" ] }, + { + "name":"item.draconicevolution:magnet", + "nameL":"Item Dislocator", + "meta":1, + "images":[], + "content": + [ + "Item Dislocator", + "You have found by combining the unique powers of the Dislocator and a simple magnet you can create a way to easily pick up items dropped on the ground.", + "[c]item.draconicevolution:magnet:0", + "", + "Awakened Item Dislocator", + "Further testing has revealed that upgrading the Item dislocator with a bit of power and Awakened Draconium can greatly increase the range and effectiveness.", + "[c]item.draconicevolution:magnet:1" + ] + }, { "name":"item.draconicevolution:wyvernHelm", "images":[], @@ -262,7 +284,7 @@ { "name":"tile.draconicevolution:dislocatorReceptacle", "nameL":"Draconic Portal", - "images":["http://i.imgur.com/hTLS3UK.png"], + "images":["https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/dislocatorReceptical.png"], "content": [ "Like Obsidian, Infused Obsidian can be used to create a magical portal, but with some big differences. This portal can be any size between 1x1 and 150x150 blocks and using a dislocator to set the destination this portal can send you to any location.", @@ -270,7 +292,7 @@ "To activate the portal simply right-click the Receptacle with a Basic or Advanced Charm of Dislocation that is bound to a location.", "You can also pipe Dislocators in and out of the Receptacle with hoppers or other methods of automation.", "The portal can be either horizontal or vertical.", - "http://i.imgur.com/hTLS3UK.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/dislocatorReceptical.png", "[c]tile.draconicevolution:dislocatorReceptacle:0" ] }, @@ -432,10 +454,17 @@ "content": [ "Further Draconic research has shown you ways to even greater power...", - "Sharpshooter – Zoom in on your target and deal extreme damage with pin point accuracy.", - "Rapid Fire – Barrage your enemies in a rain of arrows.", - "Explosive – With gunpowder in your inventory destroy an area slightly larger than TNT with your arrows.", - "Devastation (Creative Mode only) – Explosive + Double rapid fire", + "Adjustable Settings:", + "-[Base Damage] This multiplied by the arrows velocity on impact determines the inflicted damage", + "-[Arrow Velocity Modifier] +0 is equivalent to a vanilla bow.", + "-[Auto Fire] The bow will automatically fire when it reaches full draw.", + "-[Explosive Power] Exactly what it sounds like!", + "-[Shock Wave Power] The arrow will generate an extremely powerful shock wave on impact that will deal a large amount of damage to entities within the blast radius. This will not destroy blocks and is only possible with Arrow Of Draconic Fire enabled.", + "-[Arrow of Draconic Fire] Similar to Infinity this allows you to fire without needing arrows in your inventory. But it also increases inflicted damage by 10% allows you to use the Shock Wave effect and is 50% lighter meaning it is less effected by gravity in flight.", + "-[Magnification] Allows you to zoom in on your target for better accuracy.", + "The RF cost per shot if determined by multiplying the settings for Damage Velocity and Explosion power. This means that simply setting everything to Max requires exponentially more power then setting say damage to maximum.", + "Energy Capacity, Draw Speed, Arrow Velocity and Base Damage can all be upgraded", + "This bow is 10X more accurate then a vanilla bow. Meaning the arrow will land closer to where you were actually aiming and wont drift as much in flight", "[c]item.draconicevolution:draconicBow:0" ] }, @@ -633,7 +662,16 @@ "These devices are very simple to use. They have an input face (blue) and an output face (orange). When you place them the input face will always point towards you, similar to the way you place a piston. You can also rotate them with a wrench.", "The GUI is very simple with only 2 values for you to adjust. \"Redstone Signal High\" is the flow when a redstone signal of 15 is applied. \"Redstone Signal Low\" is the flow when no redstone signal is applied. You can apply a partial signal to vary the actual flow rate between these two numbers. The \"Flow\" indicator at the bottom shows how much energy or fluid is currently able to flow through the device as determined by the received redstone signal.", "[c]tile.draconicevolution:flowGate:0", - "[c]tile.draconicevolution:flowGate:6" + "[c]tile.draconicevolution:flowGate:6", + "ComputerCraft/Open Commuters methods:", + "getFlow() - Returns the current flow", + "setSignalHighFlow(integer)", + "getSignalHighFlow()", + "setSignalLowFlow(integer)", + "getSignalLowFlow()", + "setOverrideEnabled(boolean) - Setting this to true allows you to directly control the flow rate without any influence from redstone input", + "getOverrideEnabled()", + "setFlowOverride(integer) - If setOverrideEnabled is set to true this method allows you to set the flow rate. This rate can not be modified from within the gate's gui or by a redstone signal." ] }, { @@ -751,9 +789,14 @@ "Instability:", "[Not-Yet Implemented] (This may or may not be implemented in the future. Keep an eye out for this as it may or may not affect your reactors if/when it is implemented)", + "Computercraft and Open Computers Integration:", "Simply attach a Computer to one of the Stabilizers or Energy Injectors and you will have access to all of the reactor information as well as the ability to turn the Reactor on and off remotely. The methods for implementing this are pretty self-explanatory.", - "You can also use one of these Computers to control the Flux Gates." + "Methods:", + "getReactorInfo() - Returns and array containing [temperature, fieldStrength, maxFieldStrength, energySaturation, maxEnergySaturation, fuelConversion, maxFuelConversion, generationRate, fieldDrainRate, fuelConversionRate, status]", + "chargeReactor() - Dose exactly what the charge reactor button in the gui dose.", + "activateReactor() - Dose exactly what the activate reactor button in the gui dose.", + "stopReactor() - Dose exactly what the stop reactor button in the gui dose." ] }, { @@ -940,25 +983,25 @@ { "name":"info.Energy Storage Multiblock", "images":[ - "http://i.imgur.com/BXl1x7e.png", - "http://i.imgur.com/gmgDwH8.png", - "http://i.imgur.com/DyYw9Tr.png", - "http://i.imgur.com/46X3Kqd.png", - "http://i.imgur.com/SoAY47W.png", - "http://i.imgur.com/tmL6ot4.png", - "http://i.imgur.com/7rtdJV2.png", - "http://i.imgur.com/x4IxV9F.png", - "http://i.imgur.com/4FxoUvf.png", - "http://i.imgur.com/IagzpKW.png", - "http://i.imgur.com/1S6h9Po.png", - "http://i.imgur.com/MTmGhLv.png", - "http://i.imgur.com/crmnC6v.png", - "http://i.imgur.com/eH3OvhW.png", - "http://i.imgur.com/oEBI4lj.png", - "http://i.imgur.com/KSpFook.png", - "http://i.imgur.com/C7WwlAu.png", - "http://i.imgur.com/uC4b8AC.png", - "http://i.imgur.com/rS9rOoF.png" + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore1.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore2.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore3.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore4.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore5.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore6.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore7.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore8.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore9.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore10.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore11.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore12.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore13.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore14.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore15.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore16.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore17.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore18.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore19.png" ], "content": [ @@ -968,28 +1011,28 @@ "The Energy core consists of the Energy Core (Block) at the centre surrounded by 4 Particle Generators. The generators must be directly in line with the core as shown in the following images. \nThe generators must be placed within 10 blocks of the core.", "The Core is then surrounded by a combination of Redstone Blocks and Draconium Blocks. The following images show the configuration of each tier as well as the material cost and storage capacity. Once the structure is built, simply shift right-click one of the particle generators with a empty hand to activate the core.", "Tier 1", - "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/gmgDwH8.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore1.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore2.png", "Redstone x0\nDraconium x0\nCapacity = 45.5Million RF", "Tier 2", - "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/DyYw9Tr.png[>]http://i.imgur.com/46X3Kqd.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore1.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore3.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore4.png", "Redstone x0\nDraconium x6\nCapacity = 273Million RF", "Tier 3", - "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/SoAY47W.png[>]http://i.imgur.com/tmL6ot4.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore1.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore5.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore6.png", "Redstone x0\nDraconium x26\nCapacity = 1.64Billion RF", "Tier 4", - "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/7rtdJV2.png[>]http://i.imgur.com/x4IxV9F.png[>]http://i.imgur.com/4FxoUvf.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore1.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore7.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore8.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore9.png", "Redstone x26\nDraconium x54\nCapacity = 9.88Billion RF", "Tier 5", - "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/7rtdJV2.png[>]http://i.imgur.com/IagzpKW.png[>]http://i.imgur.com/1S6h9Po.png[>]http://i.imgur.com/MTmGhLv.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore1.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore7.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore10.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore11.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore12.png", "Redstone x80\nDraconium x98\nCapacity = 59.3Billion RF", "Tier 6", - "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/7rtdJV2.png[>]http://i.imgur.com/IagzpKW.png[>]http://i.imgur.com/crmnC6v.png[>]http://i.imgur.com/eH3OvhW.png[>]http://i.imgur.com/oEBI4lj.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore1.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore7.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore10.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore13.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore14.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore15.png", "Redstone 133\nDraconium 150\nCapacity = 356Billion RF", "Tier 7", - "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/7rtdJV2.png[>]http://i.imgur.com/IagzpKW.png[>]http://i.imgur.com/crmnC6v.png[>]http://i.imgur.com/KSpFook.png[>]http://i.imgur.com/C7WwlAu.png[>]http://i.imgur.com/uC4b8AC.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore1.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore7.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore10.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore13.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore16.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore17.png[>]https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore18.png", "Redstone x328\nDraconium x218\nCapacity = 2.14Trillion RF", "To add and remove energy from the core you need to place energy pylons within 15 blocks of the core. To activate a pylon place a glass block either above or below it – depending on whether the pylon is placed below or above the core e.g. if you place the pylon on your roof you would place the glass block under it.", - "http://i.imgur.com/rS9rOoF.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/ECore/ECore19.png", "When the glass block is placed the pylon should immediately activate and link with a nearby Energy Core. The link is indicated by white energy particles and the glass should change to the renderer shown in the image above. You can shift right-click the pylon to change which core it is linked to if there is more than one within range.", "Energy is added and removed from the core using Energy Pylons. To toggle a Pylon between input and output mode simply right-click the sphere. The mode is identified by the colour of the Pylon (blue for input and orange for output).", "Energy Transfer between the pylon and the core is indicated by a stream of blue energy particles flowing between the Pylon sphere and the core. The amount of energy flowing is roughly indicated by the density of the particle stream.", @@ -998,11 +1041,11 @@ }, { "name":"info.Ritual of Draconic Resurrection", - "images":["http://i.imgur.com/j2Hm0Am.png"], + "images":["https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/resurrectionRitual.png"], "content": [ "The Ritual of Draconic Resurrection allows you to summon the Ender Dragon. To set it up you will need the following items.\n\n(1) Resurrection Stone\n(4) Glowstone Blocks\n(4) Obsidian\n(4) Diamond Blocks\n(4) Charged Draconium Blocks\n(12) Quartz Pillars\nset up in the following configuration.", - "http://i.imgur.com/j2Hm0Am.png", + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/resurrectionRitual.png", "The pillars dont have to be in that exact configuration as long as they are within 5 blocks of the Resurrection Stone. It also looks better if they are symmetrical. The ritual must be set up within 150 blocks of 0,0.", "Once you have that set up, simply right-click the Ritual stone and stand back. The ritual should start immediately. If it doesn't you have done something wrong.", "Right-clicking the Ritual Stone again will stop the ritual and drain the charge from the draconium blocks.", @@ -1020,16 +1063,16 @@ }, { "name":"info.Comets", - "images":["http://i.imgur.com/894RVmP.png"], + "images":["https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/comet.png"], "content": [ "Mined out all of the Draconium Ore in The End? Get yourself some form of flight and go search the end. If you're lucky, you may come across an Ender Comet. These comets are comprised of End Stone, Obsidian and a significant amount of Draconium Ore. By default they have a 1 in 10000 chance to spawn in each chunk so you may need to search for a while. They come in various sizes.", - "http://i.imgur.com/894RVmP.png" + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/comet.png" ] }, { "name":"info.Chaos Islands", - "images":["http://i.imgur.com/gL4T6dG.png"], + "images":["https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/chaosIsland.png"], "content": [ "Looking for a challenge? The fight of your life! The Ender Dragon wasn't hard enough? Maby try 100 ender dragons all at once plus maby a few dosen withers. And if thats still not hard enough then maby this is for you! If you travel to any multiple of 10,000 in The End (e.g. {x=0, z=10000}, {x=0, z=20000}, {x=10000, z=0} etc.) you will find a Chaos Island.", @@ -1040,9 +1083,7 @@ "Be aware that when low on health the guardian will occasionally try to re ignite some of the disabled crystals.", "Once the guardian is defeated you can claim your reward. At the centre of the island several blocks below the surface you will find a chaos chamber containing a chaos crystal. When broken the chaos crystal will drop 5 chaos shards.", "§4Be Warned!§r When you destroy the crystal the energy field it was generating will collapse. This will result in the total animation of the island within a matter of seconds. Unless you are wearing full draconic armor you will only have a few seconds to collect the shards and escape the island before you are obliterated along with the island.", - - "This image needs to be updated. The islands look very different now.", - "http://i.imgur.com/gL4T6dG.png" + "https://raw.githubusercontent.com/brandon3055/Random-Bits/master/DE%20Tablet%20Images/chaosIsland.png" ] }, { diff --git a/src/main/resources/assets/draconicevolution/textures/items/magnetDraconic.png b/src/main/resources/assets/draconicevolution/textures/items/magnetDraconic.png new file mode 100644 index 0000000000000000000000000000000000000000..e6db02ecbb6ad3446eaef3be504546c06321df49 GIT binary patch literal 3468 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\OM>YP2J)6hMHZoW=yCKLpMclNm6fDtn4BXf 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 qcb!ofxpB#J{^