diff options
| author | Benjamin Culkin <scorpress@gmail.com> | 2024-08-12 16:59:01 -0400 |
|---|---|---|
| committer | Benjamin Culkin <scorpress@gmail.com> | 2024-08-12 16:59:01 -0400 |
| commit | bca395edc27296c9721b0d6634893644b122784a (patch) | |
| tree | 9f2361f9592a454adbd3d74ac2d5b19c9af9d75a | |
| parent | 9a4d1e95ea7784f0f98ea2913701a3a3c28aefaa (diff) | |
Bulk commit of changes1.7.10
330 files changed, 717 insertions, 151 deletions
diff --git a/.classpath b/.classpath index d37a610..118b7ef 100755..100644 --- a/.classpath +++ b/.classpath @@ -12,6 +12,5 @@ </classpathentry> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/> - <classpathentry kind="lib" path="/Users/bjculkin/Desktop/passthrough/Jewlerycraft/NotEnoughItems-1.7.10-1.0.5.120-dev.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/.gitignore b/.gitignore index 717f97b..3cbe78c 100755..100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ .gradle/* +.DS_Store .settings/* +minecraft/ misc/* ModelCreator/* bin/* diff --git a/NotEnoughItems-1.7.10-1.0.5.120-dev.jar b/NotEnoughItems-1.7.10-1.0.5.120-dev.jar Binary files differdeleted file mode 100644 index 0bb0483..0000000 --- a/NotEnoughItems-1.7.10-1.0.5.120-dev.jar +++ /dev/null diff --git a/README.md b/README.md index aa1951a..aa1951a 100755..100644 --- a/README.md +++ b/README.md diff --git a/build.gradle b/build.gradle index 12682ac..3d031a3 100755..100644 --- a/build.gradle +++ b/build.gradle @@ -55,12 +55,13 @@ repositories { }
dependencies {
+ compile fileTree(dir: 'lib', include: '*.jar')
compile "com.pahimar.ee3:EquivalentExchange3:${project.mcVersion}-${project.ee3Version}:dev"
// compile "fiskfille.alpaca:alpaca:${project.mcVersion}-${project.alpacaVersion}:dev"
}
minecraft {
- version = "1.7.10-10.13.3.1428-1.7.10"
+ version = "1.7.10-10.13.4.1614-1.7.10"
runDir = "minecraft/assets"
// replacing stuff in the source
diff --git a/changelog.txt b/changelog.txt index 24e2b55..24e2b55 100755..100644 --- a/changelog.txt +++ b/changelog.txt diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex b761216..b761216 100755..100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 678d9d8..678d9d8 100755..100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties diff --git a/gradlew.bat b/gradlew.bat index 8a0b282..8a0b282 100755..100644 --- a/gradlew.bat +++ b/gradlew.bat diff --git a/minecraft/assets/config/CodeChickenCore.cfg b/minecraft/assets/config/CodeChickenCore.cfg index 98426c4..34fd4eb 100755..100644 --- a/minecraft/assets/config/CodeChickenCore.cfg +++ b/minecraft/assets/config/CodeChickenCore.cfg @@ -1,3 +1,21 @@ #CodeChickenCore configuration file. #set to true to completely deobfuscate mcp names +dev.deobfuscate=true +#Enabling this setting will make all minecraft classes public at runtime in MCP just as they are in modloader. +#You should ONLY use this when you are testing with a mod that relies on runtime publicity and doesn't include access transformers. +#Such mods are doing the wrong thing and should be fixed. +dev.runtimePublic=false + +#Various tweaks that can be applied to game mechanics. +tweaks +{ + #If set to true and doFireTick is disabled in the game rules, fire will still dissipate if it's not over a fire source + doFireTickOut=true + #If set to true, creepers will not destroy landscape. (A version of mobGriefing setting just for creepers) + environmentallyFriendlyCreepers=false + #If set to true two adjacent water source blocks will not generate a third. + finiteWater=false + #If set to false, leaves will only replace air when growing + softLeafReplace=false +} diff --git a/minecraft/assets/config/CodeChickenLib.cfg b/minecraft/assets/config/CodeChickenLib.cfg index 2ae9b87..13ecbe4 100755..100644 --- a/minecraft/assets/config/CodeChickenLib.cfg +++ b/minecraft/assets/config/CodeChickenLib.cfg @@ -1,3 +1,4 @@ #CodeChickenLib development configuration file. #Path to directory holding packaged.srg, fields.csv and methods.csv for mcp remapping +mappingDir=/Users/bjculkin/Desktop/mcp908/conf diff --git a/minecraft/assets/logs/latest.log b/minecraft/assets/logs/latest.log index 878a427..4b4775b 100755..100644 --- a/minecraft/assets/logs/latest.log +++ b/minecraft/assets/logs/latest.log @@ -1,45 +1,675 @@ -[22:26:05] [main/INFO]: Extra: [] -[22:26:05] [main/INFO]: Found and added coremod: codechicken.nei.asm.NEICorePlugin -[22:26:05] [main/INFO]: Found and added coremod: codechicken.core.launch.CodeChickenCorePlugin -[22:26:05] [main/INFO]: Running with arguments: [--userProperties, {}, --assetsDir, /Users/ben/.gradle/caches/minecraft/assets, --assetIndex, 1.7.10, --accessToken, {REDACTED}, --version, 1.7.10, --tweakClass, cpw.mods.fml.common.launcher.FMLTweaker, --tweakClass, net.minecraftforge.gradle.tweakers.CoremodTweaker] -[22:26:05] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLTweaker -[22:26:05] [main/INFO]: Using primary tweak class name cpw.mods.fml.common.launcher.FMLTweaker -[22:26:05] [main/INFO]: Loading tweak class name net.minecraftforge.gradle.tweakers.CoremodTweaker -[22:26:05] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLTweaker -[22:26:05] [main/INFO]: Forge Mod Loader version 7.99.9.1428 for Minecraft 1.7.10 loading -[22:26:05] [main/INFO]: Java is Java HotSpot(TM) 64-Bit Server VM, version 1.8.0_05, running on Mac OS X:x86_64:10.12, installed at /Library/Java/JavaVirtualMachines/jdk1.8.0_05.jdk/Contents/Home/jre -[22:26:05] [main/INFO]: Managed to load a deobfuscated Minecraft name- we are in a deobfuscated environment. Skipping runtime deobfuscation -[22:26:05] [main/INFO]: Found a command line coremod : codechicken.nei.asm.NEICorePlugin -[22:26:05] [main/WARN]: The coremod codechicken.nei.asm.NEICorePlugin does not have a MCVersion annotation, it may cause issues with this version of Minecraft -[22:26:05] [main/INFO]: Found a command line coremod : codechicken.core.launch.CodeChickenCorePlugin -[22:26:05] [main/WARN]: The coremod codechicken.core.launch.CodeChickenCorePlugin does not have a MCVersion annotation, it may cause issues with this version of Minecraft -[22:26:05] [main/INFO]: Calling tweak class net.minecraftforge.gradle.tweakers.CoremodTweaker -[22:26:05] [main/INFO]: Injecting location in coremod cpw.mods.fml.relauncher.FMLCorePlugin -[22:26:05] [main/INFO]: Injecting location in coremod net.minecraftforge.classloading.FMLForgePlugin -[22:26:05] [main/INFO]: Injecting location in coremod codechicken.core.asm.MCPDeobfuscationTransformer.LoadPlugin -[22:26:05] [main/INFO]: Injecting location in coremod codechicken.nei.asm.NEICorePlugin -[22:26:05] [main/INFO]: Injecting location in coremod codechicken.core.launch.CodeChickenCorePlugin -[22:26:05] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker -[22:26:05] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLDeobfTweaker -[22:26:05] [main/INFO]: Loading tweak class name net.minecraftforge.gradle.tweakers.AccessTransformerTweaker -[22:26:05] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker -[22:26:05] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker -[22:26:05] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper -[22:26:05] [main/ERROR]: The binary patch set is missing. Either you are in a development environment, or things are not going to work! -[22:26:06] [main/ERROR]: FML appears to be missing any signature data. This is not a good thing -[22:26:06] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper -[22:26:06] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: java.lang.ExceptionInInitializerError -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at codechicken.core.asm.MCPDeobfuscationTransformer.load(MCPDeobfuscationTransformer.java:118) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at codechicken.core.asm.MCPDeobfuscationTransformer$LoadPlugin.injectData(MCPDeobfuscationTransformer.java:57) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper.injectIntoClassLoader(CoreModManager.java:112) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at net.minecraft.launchwrapper.Launch.launch(Launch.java:115) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at net.minecraft.launchwrapper.Launch.main(Launch.java:28) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at net.minecraftforge.gradle.GradleStartCommon.launch(Unknown Source) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at GradleStart.main(Unknown Source) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: Caused by: java.lang.RuntimeException: Failed to select mappings directory, set it manually in the config -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at codechicken.lib.asm.ObfMapping$MCPRemapper.getConfFiles(ObfMapping.java:107) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at codechicken.lib.asm.ObfMapping$MCPRemapper.<init>(ObfMapping.java:162) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at codechicken.lib.asm.ObfMapping.loadMCPRemapper(ObfMapping.java:205) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at codechicken.lib.asm.ObfMapping.<clinit>(ObfMapping.java:217) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: ... 7 more +[17:42:01] [main/INFO]: Extra: [] +[17:42:01] [main/INFO]: Found and added coremod: codechicken.nei.asm.NEICorePlugin +[17:42:01] [main/INFO]: Found and added coremod: codechicken.core.launch.CodeChickenCorePlugin +[17:42:01] [main/INFO]: Running with arguments: [--userProperties, {}, --assetsDir, /Users/bjculkin/.gradle/caches/minecraft/assets, --assetIndex, 1.7.10, --accessToken, {REDACTED}, --version, 1.7.10, --tweakClass, cpw.mods.fml.common.launcher.FMLTweaker, --tweakClass, net.minecraftforge.gradle.tweakers.CoremodTweaker] +[17:42:01] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLTweaker +[17:42:01] [main/INFO]: Using primary tweak class name cpw.mods.fml.common.launcher.FMLTweaker +[17:42:01] [main/INFO]: Loading tweak class name net.minecraftforge.gradle.tweakers.CoremodTweaker +[17:42:01] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLTweaker +[17:42:01] [main/INFO]: Forge Mod Loader version 7.99.40.1614 for Minecraft 1.7.10 loading +[17:42:01] [main/INFO]: Java is Java HotSpot(TM) 64-Bit Server VM, version 1.8.0_121, running on Mac OS X:x86_64:10.12.6, installed at /Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre +[17:42:01] [main/INFO]: Managed to load a deobfuscated Minecraft name- we are in a deobfuscated environment. Skipping runtime deobfuscation +[17:42:01] [main/INFO]: Found a command line coremod : codechicken.nei.asm.NEICorePlugin +[17:42:01] [main/WARN]: The coremod codechicken.nei.asm.NEICorePlugin does not have a MCVersion annotation, it may cause issues with this version of Minecraft +[17:42:01] [main/INFO]: Found a command line coremod : codechicken.core.launch.CodeChickenCorePlugin +[17:42:01] [main/WARN]: The coremod codechicken.core.launch.CodeChickenCorePlugin does not have a MCVersion annotation, it may cause issues with this version of Minecraft +[17:42:01] [main/INFO]: Calling tweak class net.minecraftforge.gradle.tweakers.CoremodTweaker +[17:42:01] [main/INFO]: Injecting location in coremod cpw.mods.fml.relauncher.FMLCorePlugin +[17:42:01] [main/INFO]: Injecting location in coremod net.minecraftforge.classloading.FMLForgePlugin +[17:42:01] [main/INFO]: Injecting location in coremod codechicken.core.asm.MCPDeobfuscationTransformer.LoadPlugin +[17:42:01] [main/INFO]: Injecting location in coremod codechicken.nei.asm.NEICorePlugin +[17:42:01] [main/INFO]: Injecting location in coremod codechicken.core.launch.CodeChickenCorePlugin +[17:42:01] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker +[17:42:01] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLDeobfTweaker +[17:42:01] [main/INFO]: Loading tweak class name net.minecraftforge.gradle.tweakers.AccessTransformerTweaker +[17:42:01] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker +[17:42:01] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker +[17:42:01] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper +[17:42:01] [main/ERROR]: The binary patch set is missing. Either you are in a development environment, or things are not going to work! +[17:42:02] [main/ERROR]: FML appears to be missing any signature data. This is not a good thing +[17:42:02] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper +[17:42:02] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper +[17:42:02] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper +[17:42:02] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper +[17:42:02] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLDeobfTweaker +[17:42:03] [main/INFO]: Calling tweak class net.minecraftforge.gradle.tweakers.AccessTransformerTweaker +[17:42:03] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.TerminalTweaker +[17:42:03] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.TerminalTweaker +[17:42:03] [main/INFO]: Launching wrapped minecraft {net.minecraft.client.main.Main} +[17:42:03] [main/ERROR]: Unable to launch +java.lang.reflect.InvocationTargetException + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[?:1.8.0_121] + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[?:1.8.0_121] + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:1.8.0_121] + at java.lang.reflect.Method.invoke(Method.java:498) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.Launch.launch(Launch.java:135) [launchwrapper-1.12.jar:?] + at net.minecraft.launchwrapper.Launch.main(Launch.java:28) [launchwrapper-1.12.jar:?] + at net.minecraftforge.gradle.GradleStartCommon.launch(Unknown Source) [start/:?] + at GradleStart.main(Unknown Source) [start/:?] +Caused by: java.lang.NoClassDefFoundError: net/minecraft/client/gui/inventory/GuiInventory + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.ClassNotFoundException: net.minecraft.client.gui.inventory.GuiInventory + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:191) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.NoClassDefFoundError: net/minecraft/client/renderer/InventoryEffectRenderer + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.ClassNotFoundException: net.minecraft.client.renderer.InventoryEffectRenderer + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:191) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.NoClassDefFoundError: net/minecraft/client/gui/inventory/GuiContainer + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.ClassNotFoundException: net.minecraft.client.gui.inventory.GuiContainer + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:191) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.RuntimeException: java.lang.RuntimeException: Error transforming method: [net/minecraft/client/gui/inventory/GuiContainer.drawScreen(IIF)V] + at codechicken.nei.asm.NEITransformer.transform(NEITransformer.java:238) ~[NotEnoughItems-1.7.10-1.0.3.56-dev.jar:?] + at net.minecraft.launchwrapper.LaunchClassLoader.runTransformers(LaunchClassLoader.java:279) ~[launchwrapper-1.12.jar:?] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:176) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.RuntimeException: Error transforming method: [net/minecraft/client/gui/inventory/GuiContainer.drawScreen(IIF)V] + at codechicken.lib.asm.ModularASMTransformer$MethodTransformer.transform(ModularASMTransformer.java:90) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.ModularASMTransformer$ClassNodeTransformerList.transform(ModularASMTransformer.java:36) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.ModularASMTransformer.transform(ModularASMTransformer.java:283) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.nei.asm.NEITransformer.transform(NEITransformer.java:236) ~[NotEnoughItems-1.7.10-1.0.3.56-dev.jar:?] + at net.minecraft.launchwrapper.LaunchClassLoader.runTransformers(LaunchClassLoader.java:279) ~[launchwrapper-1.12.jar:?] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:176) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.RuntimeException: Needle not found in Haystack: + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.manager : Lcodechicken/nei/guihook/GuiContainerManager; + INVOKEVIRTUAL codechicken/nei/guihook/GuiContainerManager.preDraw ()V + L0 + LINENUMBER 75 L0 + ALOAD 0 + INVOKEVIRTUAL net/minecraft/client/gui/inventory/GuiContainer.drawDefaultBackground ()V + L1 + LINENUMBER 76 L1 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.guiLeft : I + ISTORE 4 + L2 + LINENUMBER 77 L2 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.guiTop : I + ISTORE 5 + L3 + LINENUMBER 78 L3 + ALOAD 0 + FLOAD 3 + ILOAD 1 + ILOAD 2 + INVOKEVIRTUAL net/minecraft/client/gui/inventory/GuiContainer.drawGuiContainerBackgroundLayer (FII)V + L4 + LINENUMBER 79 L4 + LDC 32826 + INVOKESTATIC org/lwjgl/opengl/GL11.glDisable (I)V + L5 + LINENUMBER 80 L5 + INVOKESTATIC net/minecraft/client/renderer/RenderHelper.disableStandardItemLighting ()V + L6 + LINENUMBER 81 L6 + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glDisable (I)V + L7 + LINENUMBER 82 L7 + SIPUSH 2929 + INVOKESTATIC org/lwjgl/opengl/GL11.glDisable (I)V + L8 + LINENUMBER 83 L8 + ALOAD 0 + ILOAD 1 + ILOAD 2 + FLOAD 3 + INVOKESPECIAL net/minecraft/client/gui/GuiScreen.drawScreen (IIF)V + L9 + LINENUMBER 84 L9 + INVOKESTATIC net/minecraft/client/renderer/RenderHelper.enableGUIStandardItemLighting ()V + L10 + LINENUMBER 85 L10 + INVOKESTATIC org/lwjgl/opengl/GL11.glPushMatrix ()V + L11 + LINENUMBER 86 L11 + ILOAD 4 + I2F + ILOAD 5 + I2F + FCONST_0 + INVOKESTATIC org/lwjgl/opengl/GL11.glTranslatef (FFF)V + L12 + LINENUMBER 87 L12 + FCONST_1 + FCONST_1 + FCONST_1 + FCONST_1 + INVOKESTATIC org/lwjgl/opengl/GL11.glColor4f (FFFF)V + L13 + LINENUMBER 88 L13 + LDC 32826 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + L14 + LINENUMBER 89 L14 + ALOAD 0 + ACONST_NULL + PUTFIELD net/minecraft/client/gui/inventory/GuiContainer.theSlot : Lnet/minecraft/inventory/Slot; + L15 + LINENUMBER 90 L15 + SIPUSH 240 + ISTORE 6 + L16 + LINENUMBER 91 L16 + SIPUSH 240 + ISTORE 7 + L17 + LINENUMBER 92 L17 + GETSTATIC net/minecraft/client/renderer/OpenGlHelper.lightmapTexUnit : I + ILOAD 6 + I2F + FCONST_1 + FDIV + ILOAD 7 + I2F + FCONST_1 + FDIV + INVOKESTATIC net/minecraft/client/renderer/OpenGlHelper.setLightmapTextureCoords (IFF)V + L18 + LINENUMBER 93 L18 + FCONST_1 + FCONST_1 + FCONST_1 + FCONST_1 + INVOKESTATIC org/lwjgl/opengl/GL11.glColor4f (FFFF)V + L19 + LINENUMBER 96 L19 + ICONST_0 + ISTORE 8 + L20 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I I] [] + ILOAD 8 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.inventorySlots : Lnet/minecraft/inventory/Container; + GETFIELD net/minecraft/inventory/Container.inventorySlots : Ljava/util/List; + INVOKEINTERFACE java/util/List.size ()I + IF_ICMPGE L21 + L22 + LINENUMBER 98 L22 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.inventorySlots : Lnet/minecraft/inventory/Container; + GETFIELD net/minecraft/inventory/Container.inventorySlots : Ljava/util/List; + ILOAD 8 + INVOKEINTERFACE java/util/List.get (I)Ljava/lang/Object; + CHECKCAST net/minecraft/inventory/Slot + ASTORE 9 + L23 + LINENUMBER 99 L23 + ALOAD 0 + ALOAD 9 + INVOKESPECIAL net/minecraft/client/gui/inventory/GuiContainer.func_146977_a (Lnet/minecraft/inventory/Slot;)V + L24 + LINENUMBER 101 L24 + ALOAD 0 + ALOAD 9 + ILOAD 1 + ILOAD 2 + INVOKESPECIAL net/minecraft/client/gui/inventory/GuiContainer.isMouseOverSlot (Lnet/minecraft/inventory/Slot;II)Z + IFEQ L25 + ALOAD 9 + INVOKEVIRTUAL net/minecraft/inventory/Slot.func_111238_b ()Z + IFEQ L25 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.manager : Lcodechicken/nei/guihook/GuiContainerManager; + ILOAD 1 + ILOAD 2 + INVOKEVIRTUAL codechicken/nei/guihook/GuiContainerManager.objectUnderMouse (II)Z + IFNE L25 + L26 + LINENUMBER 103 L26 + ALOAD 0 + ALOAD 9 + PUTFIELD net/minecraft/client/gui/inventory/GuiContainer.theSlot : Lnet/minecraft/inventory/Slot; + L27 + LINENUMBER 104 L27 + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glDisable (I)V + L28 + LINENUMBER 105 L28 + SIPUSH 2929 + INVOKESTATIC org/lwjgl/opengl/GL11.glDisable (I)V + L29 + LINENUMBER 106 L29 + ALOAD 9 + GETFIELD net/minecraft/inventory/Slot.xDisplayPosition : I + ISTORE 10 + L30 + LINENUMBER 107 L30 + ALOAD 9 + GETFIELD net/minecraft/inventory/Slot.yDisplayPosition : I + ISTORE 11 + L31 + LINENUMBER 108 L31 + ICONST_1 + ICONST_1 + ICONST_1 + ICONST_0 + INVOKESTATIC org/lwjgl/opengl/GL11.glColorMask (ZZZZ)V + L32 + LINENUMBER 109 L32 + ALOAD 0 + ILOAD 10 + ILOAD 11 + ILOAD 10 + BIPUSH 16 + IADD + ILOAD 11 + BIPUSH 16 + IADD + LDC -2130706433 + LDC -2130706433 + INVOKEVIRTUAL net/minecraft/client/gui/inventory/GuiContainer.drawGradientRect (IIIIII)V + L33 + LINENUMBER 110 L33 + ICONST_1 + ICONST_1 + ICONST_1 + ICONST_1 + INVOKESTATIC org/lwjgl/opengl/GL11.glColorMask (ZZZZ)V + L34 + LINENUMBER 111 L34 + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + L35 + LINENUMBER 112 L35 + SIPUSH 2929 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + L25 + LINENUMBER 96 L25 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I I] [] + IINC 8 1 + GOTO L20 + L21 + LINENUMBER 118 L21 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I] [] + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glDisable (I)V + L36 + LINENUMBER 119 L36 + ALOAD 0 + ILOAD 1 + ILOAD 2 + INVOKEVIRTUAL net/minecraft/client/gui/inventory/GuiContainer.drawGuiContainerForegroundLayer (II)V + L37 + LINENUMBER 120 L37 + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + L38 + LINENUMBER 121 L38 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.mc : Lnet/minecraft/client/Minecraft; + GETFIELD net/minecraft/client/Minecraft.thePlayer : Lnet/minecraft/client/entity/EntityClientPlayerMP; + GETFIELD net/minecraft/client/entity/EntityClientPlayerMP.inventory : Lnet/minecraft/entity/player/InventoryPlayer; + ASTORE 8 + L39 + LINENUMBER 122 L39 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.draggedStack : Lnet/minecraft/item/ItemStack; + IFNONNULL L40 + ALOAD 8 + INVOKEVIRTUAL net/minecraft/entity/player/InventoryPlayer.getItemStack ()Lnet/minecraft/item/ItemStack; + GOTO L41 + L40 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer] [] + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.draggedStack : Lnet/minecraft/item/ItemStack; + L41 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer] [net/minecraft/item/ItemStack] + ASTORE 9 + L42 + LINENUMBER 124 L42 + ALOAD 9 + IFNULL L43 + L44 + LINENUMBER 126 L44 + BIPUSH 8 + ISTORE 10 + L45 + LINENUMBER 127 L45 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.draggedStack : Lnet/minecraft/item/ItemStack; + IFNONNULL L46 + BIPUSH 8 + GOTO L47 + L46 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack I] [] + BIPUSH 16 + L47 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack I] [I] + ISTORE 11 + L48 + LINENUMBER 128 L48 + ACONST_NULL + ASTORE 12 + L49 + LINENUMBER 130 L49 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.draggedStack : Lnet/minecraft/item/ItemStack; + IFNULL L50 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.isRightMouseClick : Z + IFEQ L50 + L51 + LINENUMBER 132 L51 + ALOAD 9 + INVOKEVIRTUAL net/minecraft/item/ItemStack.copy ()Lnet/minecraft/item/ItemStack; + ASTORE 9 + L52 + LINENUMBER 133 L52 + ALOAD 9 + ALOAD 9 + GETFIELD net/minecraft/item/ItemStack.stackSize : I + I2F + FCONST_2 + FDIV + INVOKESTATIC net/minecraft/util/MathHelper.ceiling_float_int (F)I + PUTFIELD net/minecraft/item/ItemStack.stackSize : I + GOTO L53 + L50 + LINENUMBER 135 L50 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack I I java/lang/String] [] + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_147007_t : Z + IFEQ L53 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_147008_s : Ljava/util/Set; + INVOKEINTERFACE java/util/Set.size ()I + ICONST_1 + IF_ICMPLE L53 + L54 + LINENUMBER 137 L54 + ALOAD 9 + INVOKEVIRTUAL net/minecraft/item/ItemStack.copy ()Lnet/minecraft/item/ItemStack; + ASTORE 9 + L55 + LINENUMBER 138 L55 + ALOAD 9 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_146996_I : I + PUTFIELD net/minecraft/item/ItemStack.stackSize : I + L56 + LINENUMBER 140 L56 + ALOAD 9 + GETFIELD net/minecraft/item/ItemStack.stackSize : I + IFNE L53 + L57 + LINENUMBER 142 L57 + NEW java/lang/StringBuilder + DUP + INVOKESPECIAL java/lang/StringBuilder.<init> ()V + LDC "" + INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; + GETSTATIC net/minecraft/util/EnumChatFormatting.YELLOW : Lnet/minecraft/util/EnumChatFormatting; + INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; + LDC "0" + INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; + INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; + ASTORE 12 + L53 + LINENUMBER 146 L53 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack I I java/lang/String] [] + ALOAD 0 + ALOAD 9 + ILOAD 1 + ILOAD 4 + ISUB + ILOAD 10 + ISUB + ILOAD 2 + ILOAD 5 + ISUB + ILOAD 11 + ISUB + ALOAD 12 + INVOKESPECIAL net/minecraft/client/gui/inventory/GuiContainer.drawItemStack (Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V + L43 + LINENUMBER 149 L43 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack] [] + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.returningStack : Lnet/minecraft/item/ItemStack; + IFNULL L58 + L59 + LINENUMBER 151 L59 + INVOKESTATIC net/minecraft/client/Minecraft.getSystemTime ()J + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.returningStackTime : J + LSUB + L2F + LDC 100.0 + FDIV + FSTORE 10 + L60 + LINENUMBER 153 L60 + FLOAD 10 + FCONST_1 + FCMPL + IFLT L61 + L62 + LINENUMBER 155 L62 + FCONST_1 + FSTORE 10 + L63 + LINENUMBER 156 L63 + ALOAD 0 + ACONST_NULL + PUTFIELD net/minecraft/client/gui/inventory/GuiContainer.returningStack : Lnet/minecraft/item/ItemStack; + L61 + LINENUMBER 159 L61 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack F] [] + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.returningStackDestSlot : Lnet/minecraft/inventory/Slot; + GETFIELD net/minecraft/inventory/Slot.xDisplayPosition : I + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_147011_y : I + ISUB + ISTORE 11 + L64 + LINENUMBER 160 L64 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.returningStackDestSlot : Lnet/minecraft/inventory/Slot; + GETFIELD net/minecraft/inventory/Slot.yDisplayPosition : I + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_147010_z : I + ISUB + ISTORE 12 + L65 + LINENUMBER 161 L65 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_147011_y : I + ILOAD 11 + I2F + FLOAD 10 + FMUL + F2I + IADD + ISTORE 13 + L66 + LINENUMBER 162 L66 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_147010_z : I + ILOAD 12 + I2F + FLOAD 10 + FMUL + F2I + IADD + ISTORE 14 + L67 + LINENUMBER 163 L67 + ALOAD 0 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.returningStack : Lnet/minecraft/item/ItemStack; + ILOAD 13 + ILOAD 14 + ACONST_NULL + CHECKCAST java/lang/String + INVOKESPECIAL net/minecraft/client/gui/inventory/GuiContainer.drawItemStack (Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V + L58 + LINENUMBER 166 L58 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack] [] + INVOKESTATIC org/lwjgl/opengl/GL11.glPopMatrix ()V + L68 + LINENUMBER 168 L68 + ALOAD 8 + INVOKEVIRTUAL net/minecraft/entity/player/InventoryPlayer.getItemStack ()Lnet/minecraft/item/ItemStack; + IFNONNULL L69 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.theSlot : Lnet/minecraft/inventory/Slot; + IFNULL L69 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.theSlot : Lnet/minecraft/inventory/Slot; + INVOKEVIRTUAL net/minecraft/inventory/Slot.getHasStack ()Z + IFEQ L69 + L70 + LINENUMBER 170 L70 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.theSlot : Lnet/minecraft/inventory/Slot; + INVOKEVIRTUAL net/minecraft/inventory/Slot.getStack ()Lnet/minecraft/item/ItemStack; + ASTORE 10 + L71 + LINENUMBER 171 L71 + ALOAD 0 + ALOAD 10 + ILOAD 1 + ILOAD 2 + INVOKEVIRTUAL net/minecraft/client/gui/inventory/GuiContainer.renderToolTip (Lnet/minecraft/item/ItemStack;II)V + L69 + LINENUMBER 174 L69 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack] [] + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + L72 + LINENUMBER 175 L72 + SIPUSH 2929 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + L73 + LINENUMBER 176 L73 + INVOKESTATIC net/minecraft/client/renderer/RenderHelper.enableStandardItemLighting ()V + L74 + LINENUMBER 177 L74 + RETURN + L75 + + + INVOKEVIRTUAL net/minecraft/client/gui/inventory/GuiContainer.func_146979_b (II)V + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + + at codechicken.lib.asm.InsnComparator.findN(InsnComparator.java:181) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.InsnComparator.findN(InsnComparator.java:187) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.ModularASMTransformer$MethodInjector.transform(ModularASMTransformer.java:199) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.ModularASMTransformer$MethodTransformer.transform(ModularASMTransformer.java:88) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.ModularASMTransformer$ClassNodeTransformerList.transform(ModularASMTransformer.java:36) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.ModularASMTransformer.transform(ModularASMTransformer.java:283) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.nei.asm.NEITransformer.transform(NEITransformer.java:236) ~[NotEnoughItems-1.7.10-1.0.3.56-dev.jar:?] + at net.minecraft.launchwrapper.LaunchClassLoader.runTransformers(LaunchClassLoader.java:279) ~[launchwrapper-1.12.jar:?] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:176) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: cpw.mods.fml.relauncher.FMLSecurityManager$ExitTrappedException +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at cpw.mods.fml.relauncher.FMLSecurityManager.checkPermission(FMLSecurityManager.java:25) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at java.lang.SecurityManager.checkExit(SecurityManager.java:761) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at java.lang.Runtime.exit(Runtime.java:107) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at java.lang.System.exit(System.java:971) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at net.minecraft.launchwrapper.Launch.launch(Launch.java:138) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at net.minecraft.launchwrapper.Launch.main(Launch.java:28) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at net.minecraftforge.gradle.GradleStartCommon.launch(Unknown Source) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at GradleStart.main(Unknown Source) diff --git a/src/.classpath b/src/.classpath index ea2f0aa..ea2f0aa 100755..100644 --- a/src/.classpath +++ b/src/.classpath diff --git a/src/.gitignore b/src/.gitignore index ae3c172..ae3c172 100755..100644 --- a/src/.gitignore +++ b/src/.gitignore diff --git a/src/.project b/src/.project index 954353a..954353a 100755..100644 --- a/src/.project +++ b/src/.project diff --git a/src/.settings/org.eclipse.core.resources.prefs b/src/.settings/org.eclipse.core.resources.prefs index cd3347e..cd3347e 100755..100644 --- a/src/.settings/org.eclipse.core.resources.prefs +++ b/src/.settings/org.eclipse.core.resources.prefs diff --git a/src/main/java/com/pau101/util/BezierUtils.java b/src/main/java/com/pau101/util/BezierUtils.java index 27b82d5..27b82d5 100755..100644 --- a/src/main/java/com/pau101/util/BezierUtils.java +++ b/src/main/java/com/pau101/util/BezierUtils.java diff --git a/src/main/java/com/pau101/util/CubicBezier.java b/src/main/java/com/pau101/util/CubicBezier.java index b681517..b681517 100755..100644 --- a/src/main/java/com/pau101/util/CubicBezier.java +++ b/src/main/java/com/pau101/util/CubicBezier.java diff --git a/src/main/java/darkknight/jewelrycraft/CreativeTabLiquids.java b/src/main/java/darkknight/jewelrycraft/CreativeTabLiquids.java index e272b51..e272b51 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/CreativeTabLiquids.java +++ b/src/main/java/darkknight/jewelrycraft/CreativeTabLiquids.java diff --git a/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java b/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java index 182cbb6..182cbb6 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java +++ b/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java diff --git a/src/main/java/darkknight/jewelrycraft/achievements/AchievementsList.java b/src/main/java/darkknight/jewelrycraft/achievements/AchievementsList.java index 6ef1f19..6ef1f19 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/achievements/AchievementsList.java +++ b/src/main/java/darkknight/jewelrycraft/achievements/AchievementsList.java diff --git a/src/main/java/darkknight/jewelrycraft/api/Curse.java b/src/main/java/darkknight/jewelrycraft/api/Curse.java index c3af0f0..dd220f1 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/api/Curse.java +++ b/src/main/java/darkknight/jewelrycraft/api/Curse.java @@ -21,7 +21,9 @@ import net.minecraftforge.event.world.BlockEvent; public abstract class Curse {
protected int textureID, ticksActive;
protected String name, description, texturePackName;
+
protected Random rand = new Random();
+
private static ArrayList<Curse> curses = new ArrayList<>();
public static ArrayList<Curse> availableCurses = new ArrayList<>();
diff --git a/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java b/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java index ad15c7a..ad15c7a 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java +++ b/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java diff --git a/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java b/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java index 389bafc..389bafc 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java +++ b/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockCrystal.java b/src/main/java/darkknight/jewelrycraft/block/BlockCrystal.java index 98416c2..98416c2 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockCrystal.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockCrystal.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockDisplayer.java b/src/main/java/darkknight/jewelrycraft/block/BlockDisplayer.java index d84cbf7..d84cbf7 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockDisplayer.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockDisplayer.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockHandPedestal.java b/src/main/java/darkknight/jewelrycraft/block/BlockHandPedestal.java index 2cfe437..2cfe437 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockHandPedestal.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockHandPedestal.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockItemCrystal.java b/src/main/java/darkknight/jewelrycraft/block/BlockItemCrystal.java index 2b76784..2b76784 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockItemCrystal.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockItemCrystal.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockJCOre.java b/src/main/java/darkknight/jewelrycraft/block/BlockJCOre.java index 41b61e5..41b61e5 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockJCOre.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockJCOre.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockJewelersCraftingTable.java b/src/main/java/darkknight/jewelrycraft/block/BlockJewelersCraftingTable.java index 2bd78ac..2bd78ac 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockJewelersCraftingTable.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockJewelersCraftingTable.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockList.java b/src/main/java/darkknight/jewelrycraft/block/BlockList.java index 5fe71d5..5fe71d5 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockList.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockList.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockMidasTouch.java b/src/main/java/darkknight/jewelrycraft/block/BlockMidasTouch.java index 8713796..8713796 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockMidasTouch.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockMidasTouch.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockMolder.java b/src/main/java/darkknight/jewelrycraft/block/BlockMolder.java index 4f763ad..4f763ad 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockMolder.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockMolder.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java index 6d88443..6d88443 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockShadow.java b/src/main/java/darkknight/jewelrycraft/block/BlockShadow.java index dff2a94..dff2a94 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockShadow.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockShadow.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockShadowEye.java b/src/main/java/darkknight/jewelrycraft/block/BlockShadowEye.java index 553ab05..553ab05 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockShadowEye.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockShadowEye.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockShadowHand.java b/src/main/java/darkknight/jewelrycraft/block/BlockShadowHand.java index 0d9ceb4..0d9ceb4 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockShadowHand.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockShadowHand.java diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java index 4da1037..4da1037 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java diff --git a/src/main/java/darkknight/jewelrycraft/block/render/BlockCrystalRenderer.java b/src/main/java/darkknight/jewelrycraft/block/render/BlockCrystalRenderer.java index f8344b6..f8344b6 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/block/render/BlockCrystalRenderer.java +++ b/src/main/java/darkknight/jewelrycraft/block/render/BlockCrystalRenderer.java diff --git a/src/main/java/darkknight/jewelrycraft/client/AbstractTab.java b/src/main/java/darkknight/jewelrycraft/client/AbstractTab.java index 0db57c7..0db57c7 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/AbstractTab.java +++ b/src/main/java/darkknight/jewelrycraft/client/AbstractTab.java diff --git a/src/main/java/darkknight/jewelrycraft/client/InventoryTabVanilla.java b/src/main/java/darkknight/jewelrycraft/client/InventoryTabVanilla.java index 401d3db..401d3db 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/InventoryTabVanilla.java +++ b/src/main/java/darkknight/jewelrycraft/client/InventoryTabVanilla.java diff --git a/src/main/java/darkknight/jewelrycraft/client/JewelryInventory.java b/src/main/java/darkknight/jewelrycraft/client/JewelryInventory.java index 6571634..6571634 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/JewelryInventory.java +++ b/src/main/java/darkknight/jewelrycraft/client/JewelryInventory.java diff --git a/src/main/java/darkknight/jewelrycraft/client/Page.java b/src/main/java/darkknight/jewelrycraft/client/Page.java index 4d67c81..4d67c81 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/Page.java +++ b/src/main/java/darkknight/jewelrycraft/client/Page.java diff --git a/src/main/java/darkknight/jewelrycraft/client/TabCurses.java b/src/main/java/darkknight/jewelrycraft/client/TabCurses.java index 09ccb36..09ccb36 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/TabCurses.java +++ b/src/main/java/darkknight/jewelrycraft/client/TabCurses.java diff --git a/src/main/java/darkknight/jewelrycraft/client/TabJewelry.java b/src/main/java/darkknight/jewelrycraft/client/TabJewelry.java index 44d2118..44d2118 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/TabJewelry.java +++ b/src/main/java/darkknight/jewelrycraft/client/TabJewelry.java diff --git a/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java b/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java index 9b30274..9b30274 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java +++ b/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java index 0c833ec..0c833ec 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java index d322761..d322761 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiHandler.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiHandler.java index be4a907..be4a907 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiHandler.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiHandler.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelry.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelry.java index 1498f75..1498f75 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelry.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelry.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java index 30f0b5b..30f0b5b 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiRectangle.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiRectangle.java index d5e2451..d5e2451 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiRectangle.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiRectangle.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiRingChest.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiRingChest.java index 8013440..8013440 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiRingChest.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiRingChest.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java index 27ad51f..27ad51f 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabBlocks.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabBlocks.java index 6c72a13..6c72a13 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabBlocks.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabBlocks.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java index cd18b64..cd18b64 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java index f161cdd..f161cdd 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java index fe22374..fe22374 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabItems.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabItems.java index 5b9bf55..5b9bf55 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabItems.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabItems.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabModifiers.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabModifiers.java index cf22586..cf22586 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabModifiers.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabModifiers.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabOresToIngots.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabOresToIngots.java index 36a8a1e..36a8a1e 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabOresToIngots.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabOresToIngots.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabRitual.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabRitual.java index 863aa09..863aa09 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabRitual.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabRitual.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerCurseInfo.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerCurseInfo.java index 5b92385..5b92385 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerCurseInfo.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerCurseInfo.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerGuide.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerGuide.java index fc6c5bf..fc6c5bf 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerGuide.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerGuide.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryModifier.java index 975dbd2..975dbd2 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryModifier.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryModifier.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java index d3fbab1..d3fbab1 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerRingChest.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerRingChest.java index 825b737..825b737 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerRingChest.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerRingChest.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotBracelet.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotBracelet.java index ab09015..ab09015 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotBracelet.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotBracelet.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotEarrings.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotEarrings.java index 1527e29..1527e29 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotEarrings.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotEarrings.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotNecklace.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotNecklace.java index ba39329..ba39329 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotNecklace.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotNecklace.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRing.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRing.java index 41381b1..41381b1 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRing.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRing.java diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRingChest.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRingChest.java index 72c149d..72c149d 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRingChest.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRingChest.java diff --git a/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java b/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java index 6407dd4..6407dd4 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java +++ b/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java diff --git a/src/main/java/darkknight/jewelrycraft/config/ConfigGui.java b/src/main/java/darkknight/jewelrycraft/config/ConfigGui.java index 8ef6c47..8ef6c47 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/config/ConfigGui.java +++ b/src/main/java/darkknight/jewelrycraft/config/ConfigGui.java diff --git a/src/main/java/darkknight/jewelrycraft/config/ConfigGuiFactory.java b/src/main/java/darkknight/jewelrycraft/config/ConfigGuiFactory.java index 1ff4a6f..1ff4a6f 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/config/ConfigGuiFactory.java +++ b/src/main/java/darkknight/jewelrycraft/config/ConfigGuiFactory.java diff --git a/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java b/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java index ac524e6..ac524e6 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java +++ b/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java index adaf528..adaf528 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java index 6281db1..6281db1 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java b/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java index 202d8bf..202d8bf 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java index 9811eb8..9811eb8 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java index 4ea7ba3..4ea7ba3 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java index 76487a6..76487a6 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseIncredibleDevotion.java b/src/main/java/darkknight/jewelrycraft/curses/CurseIncredibleDevotion.java index da88c50..da88c50 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseIncredibleDevotion.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseIncredibleDevotion.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java index 720ea6f..720ea6f 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseList.java b/src/main/java/darkknight/jewelrycraft/curses/CurseList.java index 2c11364..2c11364 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseList.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseList.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java index d576803..d576803 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseMoneyEqualsPower.java b/src/main/java/darkknight/jewelrycraft/curses/CurseMoneyEqualsPower.java index 741a857..741a857 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseMoneyEqualsPower.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseMoneyEqualsPower.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java index bf40d55..bf40d55 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java index da61cd7..da61cd7 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java index 78d10bc..78d10bc 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseScionOfHell.java b/src/main/java/darkknight/jewelrycraft/curses/CurseScionOfHell.java index 2264017..2264017 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseScionOfHell.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseScionOfHell.java diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java index 9b8c1f3..9b8c1f3 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java diff --git a/src/main/java/darkknight/jewelrycraft/damage/DamageSourceList.java b/src/main/java/darkknight/jewelrycraft/damage/DamageSourceList.java index e156755..e156755 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/damage/DamageSourceList.java +++ b/src/main/java/darkknight/jewelrycraft/damage/DamageSourceList.java diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java index ebfa48c..ebfa48c 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java index 4f24e8f..4f24e8f 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java index 562d83e..562d83e 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java index 5235b7d..5235b7d 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java index 3b79390..3b79390 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java b/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java index ee5f64c..ee5f64c 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java index 259bf13..259bf13 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java +++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java index 2590e55..2590e55 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java +++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityList.java b/src/main/java/darkknight/jewelrycraft/entities/EntityList.java index 6df9ada..6df9ada 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/entities/EntityList.java +++ b/src/main/java/darkknight/jewelrycraft/entities/EntityList.java diff --git a/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java b/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java index b5419a4..b5419a4 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java +++ b/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java diff --git a/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java b/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java index cf2278a..cf2278a 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java +++ b/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java diff --git a/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java index 964ebd2..964ebd2 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java diff --git a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java b/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java index 13948af..13948af 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java index e9809d0..e9809d0 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java diff --git a/src/main/java/darkknight/jewelrycraft/events/EventCommonHandler.java b/src/main/java/darkknight/jewelrycraft/events/EventCommonHandler.java index 1aa45e1..1aa45e1 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/events/EventCommonHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/EventCommonHandler.java diff --git a/src/main/java/darkknight/jewelrycraft/events/EventList.java b/src/main/java/darkknight/jewelrycraft/events/EventList.java index 17f6d0e..17f6d0e 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/events/EventList.java +++ b/src/main/java/darkknight/jewelrycraft/events/EventList.java diff --git a/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java b/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java index d196a05..d196a05 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java +++ b/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java diff --git a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java index 40be3e5..40be3e5 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java diff --git a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java index 9df771d..9df771d 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java diff --git a/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java b/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java index 0fed13f..0fed13f 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java +++ b/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java index 2c2311c..2c2311c 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java b/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java index 2de324a..2de324a 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java b/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java index 10929bd..10929bd 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java b/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java index c9e84f4..c9e84f4 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java b/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java index 331fd65..331fd65 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java b/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java index 83f8531..83f8531 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java index 481126f..481126f 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemList.java b/src/main/java/darkknight/jewelrycraft/item/ItemList.java index 63bc7a4..63bc7a4 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemList.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemList.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java b/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java index b2acd18..b2acd18 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java index 9b5b8a3..9b5b8a3 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java index 72f1228..72f1228 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java b/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java index 3a71d0b..3a71d0b 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemRing.java b/src/main/java/darkknight/jewelrycraft/item/ItemRing.java index 4df83d0..4df83d0 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemRing.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemRing.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java b/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java index bb57f9a..bb57f9a 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java b/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java index a929430..a929430 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemTest.java b/src/main/java/darkknight/jewelrycraft/item/ItemTest.java index 312c38c..312c38c 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemTest.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemTest.java diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java b/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java index 76d056d..76d056d 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java diff --git a/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java b/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java index 2f1ba9e..2f1ba9e 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java +++ b/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java diff --git a/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java b/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java index c82f2e2..c82f2e2 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java +++ b/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java diff --git a/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java b/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java index 50f3472..50f3472 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java +++ b/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java diff --git a/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java b/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java index dd671e2..dd671e2 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java +++ b/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java diff --git a/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java b/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java index c021e7a..c021e7a 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java +++ b/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java diff --git a/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java b/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java index 1cde268..1cde268 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java +++ b/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java b/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java index fe5a183..fe5a183 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java +++ b/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java b/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java index f63e4bf..f63e4bf 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java b/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java index 4668ab8..4668ab8 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelEarrings.java b/src/main/java/darkknight/jewelrycraft/model/ModelEarrings.java index ed378e9..ed378e9 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelEarrings.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelEarrings.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java b/src/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java index 016bf02..016bf02 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java b/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java index fc02886..fc02886 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelHeart.java b/src/main/java/darkknight/jewelrycraft/model/ModelHeart.java index 474dc69..474dc69 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelHeart.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelHeart.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java b/src/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java index 1ecfeb5..1ecfeb5 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelMask.java b/src/main/java/darkknight/jewelrycraft/model/ModelMask.java index d1934ab..d1934ab 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelMask.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelMask.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelMolder.java b/src/main/java/darkknight/jewelrycraft/model/ModelMolder.java index 36989af..36989af 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelMolder.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelMolder.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java b/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java index 537a8c2..537a8c2 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelRing.java b/src/main/java/darkknight/jewelrycraft/model/ModelRing.java index a9b8e34..a9b8e34 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelRing.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelRing.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java b/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java index 1ea7819..1ea7819 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java b/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java index 28d48d7..28d48d7 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java b/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java index b5e3baf..b5e3baf 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java b/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java index c9fefa3..c9fefa3 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java b/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java index d90cf1a..d90cf1a 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java index 393647f..393647f 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java b/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java index d335b6a..d335b6a 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java index 21000de..21000de 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java index bf3ce1a..bf3ce1a 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java index 5b67e59..5b67e59 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java diff --git a/src/main/java/darkknight/jewelrycraft/particles/EntityFlatShadowFX.java b/src/main/java/darkknight/jewelrycraft/particles/EntityFlatShadowFX.java index 2fd304d..2fd304d 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/particles/EntityFlatShadowFX.java +++ b/src/main/java/darkknight/jewelrycraft/particles/EntityFlatShadowFX.java diff --git a/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java b/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java index 6157927..6157927 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java +++ b/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java diff --git a/src/main/java/darkknight/jewelrycraft/potions/PotionBase.java b/src/main/java/darkknight/jewelrycraft/potions/PotionBase.java index 0c170e5..0c170e5 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/potions/PotionBase.java +++ b/src/main/java/darkknight/jewelrycraft/potions/PotionBase.java diff --git a/src/main/java/darkknight/jewelrycraft/potions/PotionList.java b/src/main/java/darkknight/jewelrycraft/potions/PotionList.java index 53c768e..53c768e 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/potions/PotionList.java +++ b/src/main/java/darkknight/jewelrycraft/potions/PotionList.java diff --git a/src/main/java/darkknight/jewelrycraft/potions/PotionStun.java b/src/main/java/darkknight/jewelrycraft/potions/PotionStun.java index a0fca81..a0fca81 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/potions/PotionStun.java +++ b/src/main/java/darkknight/jewelrycraft/potions/PotionStun.java diff --git a/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java b/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java index f7a6842..f7a6842 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java +++ b/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java diff --git a/src/main/java/darkknight/jewelrycraft/proxy/CommonProxy.java b/src/main/java/darkknight/jewelrycraft/proxy/CommonProxy.java index ba9273f..ba9273f 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/proxy/CommonProxy.java +++ b/src/main/java/darkknight/jewelrycraft/proxy/CommonProxy.java diff --git a/src/main/java/darkknight/jewelrycraft/random/WeightedRandomCurse.java b/src/main/java/darkknight/jewelrycraft/random/WeightedRandomCurse.java index 2a3b19a..2a3b19a 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/random/WeightedRandomCurse.java +++ b/src/main/java/darkknight/jewelrycraft/random/WeightedRandomCurse.java diff --git a/src/main/java/darkknight/jewelrycraft/random/WeightedRandomItem.java b/src/main/java/darkknight/jewelrycraft/random/WeightedRandomItem.java index cc84ab4..cc84ab4 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/random/WeightedRandomItem.java +++ b/src/main/java/darkknight/jewelrycraft/random/WeightedRandomItem.java diff --git a/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java b/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java index ca2f2aa..ca2f2aa 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java +++ b/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java diff --git a/src/main/java/darkknight/jewelrycraft/thirdparty/EE3.java b/src/main/java/darkknight/jewelrycraft/thirdparty/EE3.java index 8f61767..8f61767 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/thirdparty/EE3.java +++ b/src/main/java/darkknight/jewelrycraft/thirdparty/EE3.java diff --git a/src/main/java/darkknight/jewelrycraft/thirdparty/IRegistryListener.java b/src/main/java/darkknight/jewelrycraft/thirdparty/IRegistryListener.java index 850fc35..850fc35 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/thirdparty/IRegistryListener.java +++ b/src/main/java/darkknight/jewelrycraft/thirdparty/IRegistryListener.java diff --git a/src/main/java/darkknight/jewelrycraft/thirdparty/IThirdParty.java b/src/main/java/darkknight/jewelrycraft/thirdparty/IThirdParty.java index fe555ca..fe555ca 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/thirdparty/IThirdParty.java +++ b/src/main/java/darkknight/jewelrycraft/thirdparty/IThirdParty.java diff --git a/src/main/java/darkknight/jewelrycraft/thirdparty/ModIds.java b/src/main/java/darkknight/jewelrycraft/thirdparty/ModIds.java index 42fc800..42fc800 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/thirdparty/ModIds.java +++ b/src/main/java/darkknight/jewelrycraft/thirdparty/ModIds.java diff --git a/src/main/java/darkknight/jewelrycraft/thirdparty/NEI.java b/src/main/java/darkknight/jewelrycraft/thirdparty/NEI.java index 70a8744..70a8744 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/thirdparty/NEI.java +++ b/src/main/java/darkknight/jewelrycraft/thirdparty/NEI.java diff --git a/src/main/java/darkknight/jewelrycraft/thirdparty/ThirdPartyManager.java b/src/main/java/darkknight/jewelrycraft/thirdparty/ThirdPartyManager.java index bb819d5..bb819d5 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/thirdparty/ThirdPartyManager.java +++ b/src/main/java/darkknight/jewelrycraft/thirdparty/ThirdPartyManager.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityBlockShadow.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityBlockShadow.java index dc387ff..dc387ff 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityBlockShadow.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityBlockShadow.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityCrystal.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityCrystal.java index 90fbd99..90fbd99 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityCrystal.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityCrystal.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityDisplayer.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityDisplayer.java index 72fa7c0..72fa7c0 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityDisplayer.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityDisplayer.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityHandPedestal.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityHandPedestal.java index f6fb323..f6fb323 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityHandPedestal.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityHandPedestal.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityJewelrsCraftingTable.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityJewelrsCraftingTable.java index 66d54b0..66d54b0 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityJewelrsCraftingTable.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityJewelrsCraftingTable.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMidasTouch.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMidasTouch.java index eab8bfb..eab8bfb 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMidasTouch.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMidasTouch.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMolder.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMolder.java index c7607a4..c7607a4 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMolder.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMolder.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMoltenMetal.java index 77e06c7..77e06c7 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMoltenMetal.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMoltenMetal.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java index c5b5aef..c5b5aef 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowHand.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowHand.java index 1b86d07..1b86d07 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowHand.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowHand.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java index dd73951..dd73951 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java index aaf4613..aaf4613 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityHandPedestalRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityHandPedestalRender.java index da8fa58..da8fa58 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityHandPedestalRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityHandPedestalRender.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityJewelrsCraftingTableRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityJewelrsCraftingTableRender.java index fbe3db6..fbe3db6 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityJewelrsCraftingTableRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityJewelrsCraftingTableRender.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMidasTouchRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMidasTouchRender.java index f423bc8..f423bc8 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMidasTouchRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMidasTouchRender.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java index c93a09b..c93a09b 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowEyeRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowEyeRender.java index 5e191ec..5e191ec 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowEyeRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowEyeRender.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowHandRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowHandRender.java index dd960d0..dd960d0 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowHandRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowHandRender.java diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntitySmelterRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntitySmelterRender.java index b694afa..b694afa 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntitySmelterRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntitySmelterRender.java diff --git a/src/main/java/darkknight/jewelrycraft/util/BlockUtils.java b/src/main/java/darkknight/jewelrycraft/util/BlockUtils.java index 17a6cdc..17a6cdc 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/util/BlockUtils.java +++ b/src/main/java/darkknight/jewelrycraft/util/BlockUtils.java diff --git a/src/main/java/darkknight/jewelrycraft/util/EntitySelector.java b/src/main/java/darkknight/jewelrycraft/util/EntitySelector.java index 2398817..2398817 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/util/EntitySelector.java +++ b/src/main/java/darkknight/jewelrycraft/util/EntitySelector.java diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java b/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java index 320497b..320497b 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java +++ b/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java index bab97d1..397f501 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java +++ b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java @@ -84,40 +84,20 @@ public class JewelrycraftUtil { jewelry.add(new ItemStack(ItemList.bracelet));
jewelry.add(new ItemStack(ItemList.earrings));
- // Add random modifiers
- for (Object item : GameData.getItemRegistry()) {
- if (item != null) {
- if (Loader.isModLoaded("Mantle")
- && ((Item) item).getUnlocalizedName()
- .equals("Mantle:item.mantle.manual")) {
- continue;
- }
-
- try {
- if (itemHasSubtypes(item)) {
- ((Item) item).getSubItems(
- (Item) item,
- null,
- items);
- } else {
- objects.add(new ItemStack(
- (Item) item));
- }
-
- if (!items.isEmpty()) {
- objects.addAll(items);
- }
+ for(ItemStack is : gem) {
+ objects.add(is.copy());
+ }
- items.removeAll(items);
- } catch (Exception e) {
- JewelrycraftMod.logger.info(
- "Error, tried to add subtypes of item "
- + ((Item) item).getUnlocalizedName()
- + "\nItem is not added in the list.");
- }
- }
+ for(ItemStack is : metal) {
+ objects.add(is.copy());
}
+ objects.add(new ItemStack(Items.blaze_powder));
+ objects.add(new ItemStack(Items.ender_eye));
+ objects.add(new ItemStack(Items.ender_pearl));
+ objects.add(new ItemStack(Items.feather));
+ objects.add(new ItemStack(Blocks.obsidian));
+
// Structures
try {
for (Field f : Generation.class
@@ -139,6 +119,10 @@ public class JewelrycraftUtil { @SideOnly(Side.CLIENT)
public static void generateColors() {
+ /*
+ * Doesn't seem to do much of anything
+ */
+ /*
for (Object item : GameData.getItemRegistry()) {
if (item != null) {
if (Loader.isModLoaded("Mantle")
@@ -177,6 +161,7 @@ public class JewelrycraftUtil { }
}
}
+ */
}
@SideOnly(Side.CLIENT)
@@ -206,36 +191,6 @@ public class JewelrycraftUtil { return (int) Math.random() * 16777215;
}
- // This takes too long for me
- // IResourceManager rm =
- // Minecraft.getMinecraft().getResourceManager();
- // ResourceLocation ingot;
- // BufferedImage icon;
- // try {
- // ingot = getLocation(stack);
- // } catch (Exception e) {
- // ingot = new
- // ResourceLocation("textures/items/apple.png");
- // }
- // icon =
- // ImageIO.read(rm.getResource(ingot).getInputStream());
- // int height = icon.getHeight();
- // int width = icon.getWidth();
- // Map m = new HashMap();
- // for (int i = 0; i < width; i++)
- // for (int j = 0; j < height; j++) {
- // int rgb = icon.getRGB(i, j);
- // int red = rgb >> 16 & 0xff;
- // int green = rgb >> 8 & 0xff;
- // int blue = rgb & 0xff;
- // int[] rgbArr = { red, green, blue };
- // int Cmax = Math.max(red, Math.max(green, blue));
- // int Cmin = Math.min(red, Math.min(green, blue));
- // if (!isGray(rgbArr))
- // m.put(rgb, (Cmax + Cmin) / 2);
- // }
- // return getMostCommonColour(m);
-
return stack.getItem().getColorFromItemStack(stack,
pass);
}
@@ -437,49 +392,7 @@ public class JewelrycraftUtil { * Links ores with their appropriate ingot
*/
public static void addMetals() {
- /*
- * int index = 0;
- *
- * while (index < OreDictionary.getOreNames().length) {
- * Iterator<ItemStack> i = OreDictionary
- * .getOres(OreDictionary.getOreNames()[index])
- * .iterator();
- *
- * while (i.hasNext()) { ItemStack nextStack = i.next();
- *
- * String stackName =
- * nextStack.getItem().getUnlocalizedName() .toLowerCase();
- *
- * if ((stackName.contains("ingot") ||
- * stackName.contains("alloy")) &&
- * !metal.contains(nextStack)) { metal.add(nextStack); }
- *
- * if
- * (nextStack.getItem().getUnlocalizedName().toLowerCase()
- * .contains("ore") && !ores.contains(nextStack)) {
- * ItemStack ingot = FurnaceRecipes.smelting()
- * .getSmeltingResult(nextStack);
- *
- * if (ingot != null && (ingot.getItem()
- * .getUnlocalizedName().toLowerCase() .contains("ingot")
- * || ingot.getItem().getUnlocalizedName()
- * .toLowerCase().contains("alloy"))) {
- * ores.add(nextStack);
- *
- * oreToIngot.put(nextStack, ingot);
- *
- * JewelrycraftMod.logger.info(nextStack + " Adding " +
- * nextStack.getDisplayName() + " with damage value " +
- * nextStack.getItemDamage() + " and with " +
- * nextStack.stackSize + " in stack");
- *
- * JewelrycraftMod.logger.info(ingot + " Adding ingot " +
- * ingot.getDisplayName() + " with damage value " +
- * ingot.getItemDamage() + " and with " + ingot.stackSize +
- * " in stack"); } } }
- *
- * index++; }
- */
+ /* Doesn't do anything, because I've disabled the ingot cast */
}
/**
diff --git a/src/main/java/darkknight/jewelrycraft/util/PlayerUtils.java b/src/main/java/darkknight/jewelrycraft/util/PlayerUtils.java index 8a3abe3..8a3abe3 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/util/PlayerUtils.java +++ b/src/main/java/darkknight/jewelrycraft/util/PlayerUtils.java diff --git a/src/main/java/darkknight/jewelrycraft/util/Variables.java b/src/main/java/darkknight/jewelrycraft/util/Variables.java index 8b853ef..8b853ef 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/util/Variables.java +++ b/src/main/java/darkknight/jewelrycraft/util/Variables.java diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/ChestGeneration.java b/src/main/java/darkknight/jewelrycraft/worldGen/ChestGeneration.java index c84696d..c84696d 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/ChestGeneration.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/ChestGeneration.java diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/Generation.java b/src/main/java/darkknight/jewelrycraft/worldGen/Generation.java index cc7790b..cc7790b 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/Generation.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/Generation.java diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure.java index bc4f508..bc4f508 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure.java diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure1.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure1.java index 9e86822..9e86822 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure1.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure1.java diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure2.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure2.java index b61b9cd..b61b9cd 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure2.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure2.java diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure3.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure3.java index 5eafd03..5eafd03 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure3.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure3.java diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure4.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure4.java index 2dc2544..2dc2544 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure4.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure4.java diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure5.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure5.java index 16782af..16782af 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure5.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure5.java diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure6.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure6.java index ec85f35..ec85f35 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure6.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure6.java diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java index c5d0cc2..c5d0cc2 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java index d905948..d905948 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java index 0a4b832..0a4b832 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java index 3b9c274..3b9c274 100755..100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java diff --git a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang index 35c6fda..35c6fda 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang +++ b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang diff --git a/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang b/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang index ae56c16..ae56c16 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang +++ b/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang diff --git a/src/main/resources/assets/jewelrycraft2/pack.mcmeta b/src/main/resources/assets/jewelrycraft2/pack.mcmeta index 0b04ef8..0b04ef8 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/pack.mcmeta +++ b/src/main/resources/assets/jewelrycraft2/pack.mcmeta diff --git a/src/main/resources/assets/jewelrycraft2/sounds.json b/src/main/resources/assets/jewelrycraft2/sounds.json index ec9ff11..ec9ff11 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/sounds.json +++ b/src/main/resources/assets/jewelrycraft2/sounds.json diff --git a/src/main/resources/assets/jewelrycraft2/sounds/Ritual.ogg b/src/main/resources/assets/jewelrycraft2/sounds/Ritual.ogg Binary files differindex 3912236..3912236 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/sounds/Ritual.ogg +++ b/src/main/resources/assets/jewelrycraft2/sounds/Ritual.ogg diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockCrystal.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockCrystal.png Binary files differindex 50bf5ec..50bf5ec 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockCrystal.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockCrystal.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow0.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow0.png Binary files differindex 0b5323d..0b5323d 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow0.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow0.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow1.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow1.png Binary files differindex 16f9908..16f9908 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow1.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow1.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow10.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow10.png Binary files differindex be70eb5..be70eb5 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow10.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow10.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow11.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow11.png Binary files differindex 1684d9a..1684d9a 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow11.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow11.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow12.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow12.png Binary files differindex ed4ea49..ed4ea49 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow12.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow12.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow13.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow13.png Binary files differindex 9b2100a..9b2100a 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow13.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow13.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow14.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow14.png Binary files differindex ea00725..ea00725 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow14.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow14.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow15.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow15.png Binary files differindex 2140624..2140624 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow15.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow15.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow2.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow2.png Binary files differindex f95b111..f95b111 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow2.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow2.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow3.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow3.png Binary files differindex 0dd5633..0dd5633 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow3.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow3.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow4.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow4.png Binary files differindex a4e926c..a4e926c 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow4.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow4.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow5.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow5.png Binary files differindex 8461ac4..8461ac4 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow5.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow5.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow6.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow6.png Binary files differindex 352d3e4..352d3e4 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow6.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow6.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow7.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow7.png Binary files differindex 9aa0e03..9aa0e03 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow7.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow7.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow8.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow8.png Binary files differindex ad21447..ad21447 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow8.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow8.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow9.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow9.png Binary files differindex 01c0fa4..01c0fa4 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow9.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow9.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/molder.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/molder.png Binary files differindex 5a08164..5a08164 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/molder.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/molder.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png Binary files differindex 8e9a452..8e9a452 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png.mcmeta b/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png.mcmeta index 8e55e43..8e55e43 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png.mcmeta +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png.mcmeta diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png Binary files differindex 1eff844..1eff844 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png.mcmeta b/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png.mcmeta index 7ceb363..7ceb363 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png.mcmeta +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png.mcmeta diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/oreShadow.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/oreShadow.png Binary files differindex ffc48dc..ffc48dc 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/blocks/oreShadow.png +++ b/src/main/resources/assets/jewelrycraft2/textures/blocks/oreShadow.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/BlackHeart.png b/src/main/resources/assets/jewelrycraft2/textures/entities/BlackHeart.png Binary files differindex 3fd03f2..3fd03f2 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/entities/BlackHeart.png +++ b/src/main/resources/assets/jewelrycraft2/textures/entities/BlackHeart.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/BlueHeart.png b/src/main/resources/assets/jewelrycraft2/textures/entities/BlueHeart.png Binary files differindex f664372..f664372 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/entities/BlueHeart.png +++ b/src/main/resources/assets/jewelrycraft2/textures/entities/BlueHeart.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Bracelet.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Bracelet.png Binary files differindex 6f936e4..6f936e4 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/entities/Bracelet.png +++ b/src/main/resources/assets/jewelrycraft2/textures/entities/Bracelet.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Earrings.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Earrings.png Binary files differindex 9b716ef..9b716ef 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/entities/Earrings.png +++ b/src/main/resources/assets/jewelrycraft2/textures/entities/Earrings.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png Binary files differindex 0ebdf14..0ebdf14 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png +++ b/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png Binary files differindex fae7bcf..fae7bcf 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png +++ b/src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/RedHeart.png b/src/main/resources/assets/jewelrycraft2/textures/entities/RedHeart.png Binary files differindex 8f8623c..8f8623c 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/entities/RedHeart.png +++ b/src/main/resources/assets/jewelrycraft2/textures/entities/RedHeart.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png Binary files differindex 48233a7..48233a7 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png +++ b/src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/WhiteHeart.png b/src/main/resources/assets/jewelrycraft2/textures/entities/WhiteHeart.png Binary files differindex 1f8d528..1f8d528 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/entities/WhiteHeart.png +++ b/src/main/resources/assets/jewelrycraft2/textures/entities/WhiteHeart.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/jeweler.png b/src/main/resources/assets/jewelrycraft2/textures/entities/jeweler.png Binary files differindex fbd01cb..fbd01cb 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/entities/jeweler.png +++ b/src/main/resources/assets/jewelrycraft2/textures/entities/jeweler.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/chest_ring.png b/src/main/resources/assets/jewelrycraft2/textures/gui/chest_ring.png Binary files differindex 66f00cc..66f00cc 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/gui/chest_ring.png +++ b/src/main/resources/assets/jewelrycraft2/textures/gui/chest_ring.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/curses_tab.png b/src/main/resources/assets/jewelrycraft2/textures/gui/curses_tab.png Binary files differindex 5c5ef83..5c5ef83 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/gui/curses_tab.png +++ b/src/main/resources/assets/jewelrycraft2/textures/gui/curses_tab.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png Binary files differindex f715b17..f715b17 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png +++ b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png Binary files differindex 7d7845d..7d7845d 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png +++ b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png b/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png Binary files differindex e9dc99d..e9dc99d 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png +++ b/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_modifier.png b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_modifier.png Binary files differindex 2aad1f5..2aad1f5 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_modifier.png +++ b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_modifier.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_tab.png b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_tab.png Binary files differindex 376249b..376249b 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_tab.png +++ b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_tab.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png Binary files differindex 6e5b606..6e5b606 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png +++ b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/potions.png b/src/main/resources/assets/jewelrycraft2/textures/gui/potions.png Binary files differindex 21a4b11..21a4b11 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/gui/potions.png +++ b/src/main/resources/assets/jewelrycraft2/textures/gui/potions.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/bracelet.png b/src/main/resources/assets/jewelrycraft2/textures/items/bracelet.png Binary files differindex 8dde1d3..8dde1d3 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/bracelet.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/bracelet.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/braceletMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/braceletMold.png Binary files differindex 03f56ac..03f56ac 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/braceletMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/braceletMold.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/bucketOverlay.png b/src/main/resources/assets/jewelrycraft2/textures/items/bucketOverlay.png Binary files differindex fc2e2a9..fc2e2a9 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/bucketOverlay.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/bucketOverlay.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/clayBraceletMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/clayBraceletMold.png Binary files differindex e3d929a..e3d929a 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/clayBraceletMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/clayBraceletMold.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/clayEarringsMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/clayEarringsMold.png Binary files differindex f6e60a9..f6e60a9 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/clayEarringsMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/clayEarringsMold.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/clayIngotMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/clayIngotMold.png Binary files differindex 0fecb22..0fecb22 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/clayIngotMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/clayIngotMold.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/clayNecklaceMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/clayNecklaceMold.png Binary files differindex 455f094..455f094 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/clayNecklaceMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/clayNecklaceMold.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/clayRingMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/clayRingMold.png Binary files differindex 49d2ab1..49d2ab1 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/clayRingMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/clayRingMold.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/crystal.png b/src/main/resources/assets/jewelrycraft2/textures/items/crystal.png Binary files differindex 563a41f..563a41f 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/crystal.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/crystal.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/crystalOverlay.png b/src/main/resources/assets/jewelrycraft2/textures/items/crystalOverlay.png Binary files differindex d17e909..d17e909 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/crystalOverlay.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/crystalOverlay.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/earrings.png b/src/main/resources/assets/jewelrycraft2/textures/items/earrings.png Binary files differindex 7bf3a63..7bf3a63 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/earrings.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/earrings.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/earringsMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/earringsMold.png Binary files differindex e59ca7d..e59ca7d 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/earringsMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/earringsMold.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/guide.png b/src/main/resources/assets/jewelrycraft2/textures/items/guide.png Binary files differindex 8d6eb02..8d6eb02 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/guide.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/guide.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ingotMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/ingotMold.png Binary files differindex 0575de5..0575de5 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/ingotMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/ingotMold.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ingotShadow.png b/src/main/resources/assets/jewelrycraft2/textures/items/ingotShadow.png Binary files differindex e3b3aed..e3b3aed 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/ingotShadow.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/ingotShadow.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/jewelBracelet.png b/src/main/resources/assets/jewelrycraft2/textures/items/jewelBracelet.png Binary files differindex f6fc3c8..f6fc3c8 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/jewelBracelet.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/jewelBracelet.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/jewelEarrings.png b/src/main/resources/assets/jewelrycraft2/textures/items/jewelEarrings.png Binary files differindex 713e5c7..713e5c7 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/jewelEarrings.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/jewelEarrings.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/jewelNecklace.png b/src/main/resources/assets/jewelrycraft2/textures/items/jewelNecklace.png Binary files differindex 41244d4..41244d4 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/jewelNecklace.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/jewelNecklace.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/jewelRing.png b/src/main/resources/assets/jewelrycraft2/textures/items/jewelRing.png Binary files differindex 4875772..4875772 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/jewelRing.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/jewelRing.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/jewelryModifier.png b/src/main/resources/assets/jewelrycraft2/textures/items/jewelryModifier.png Binary files differindex 5deb768..5deb768 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/jewelryModifier.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/jewelryModifier.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png b/src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png Binary files differindex 1eff844..1eff844 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png.mcmeta b/src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png.mcmeta index 7ceb363..7ceb363 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png.mcmeta +++ b/src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png.mcmeta diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/necklace.png b/src/main/resources/assets/jewelrycraft2/textures/items/necklace.png Binary files differindex 054744d..054744d 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/necklace.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/necklace.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/necklaceMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/necklaceMold.png Binary files differindex 0df4b65..0df4b65 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/necklaceMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/necklaceMold.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ring.png b/src/main/resources/assets/jewelrycraft2/textures/items/ring.png Binary files differindex ae59f5a..ae59f5a 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/ring.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/ring.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ringMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/ringMold.png Binary files differindex 7bab639..7bab639 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/ringMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/ringMold.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/structureGen.png b/src/main/resources/assets/jewelrycraft2/textures/items/structureGen.png Binary files differindex 83fbcbc..83fbcbc 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/structureGen.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/structureGen.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png Binary files differindex b697488..b697488 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png Binary files differindex e685e40..e685e40 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png Binary files differindex 8a2cc52..8a2cc52 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png Binary files differindex 91a2869..91a2869 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png Binary files differindex 6e2360c..6e2360c 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png Binary files differindex 32a0cfb..32a0cfb 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png Binary files differindex 75141a5..75141a5 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png Binary files differindex ee2a582..ee2a582 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png Binary files differindex c011c21..c011c21 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png Binary files differindex 5c145ff..5c145ff 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png Binary files differindex 833e7d6..833e7d6 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png Binary files differindex d3bc0af..d3bc0af 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png Binary files differindex 1b3193f..1b3193f 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/thiefGloves.png b/src/main/resources/assets/jewelrycraft2/textures/items/thiefGloves.png Binary files differindex b56e925..b56e925 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/thiefGloves.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/thiefGloves.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png Binary files differindex e1c2d7b..e1c2d7b 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png Binary files differindex 0dd9029..0dd9029 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png Binary files differindex 8bd47da..8bd47da 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png Binary files differindex 47c9cb8..47c9cb8 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png Binary files differindex 78894d0..78894d0 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png Binary files differindex 968b53d..968b53d 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png Binary files differindex e025782..e025782 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png Binary files differindex b378e29..b378e29 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_axe.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_axe.png Binary files differindex d17f67a..d17f67a 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_axe.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_axe.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_boots.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_boots.png Binary files differindex 9c88a3b..9c88a3b 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_boots.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_boots.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_chestplate.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_chestplate.png Binary files differindex 9d4a336..9d4a336 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_chestplate.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_chestplate.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_helmet.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_helmet.png Binary files differindex 97e1541..97e1541 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_helmet.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_helmet.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_hoe.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_hoe.png Binary files differindex 5e0df11..5e0df11 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_hoe.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_hoe.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_leggings.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_leggings.png Binary files differindex 65f5117..65f5117 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_leggings.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_leggings.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_pickaxe.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_pickaxe.png Binary files differindex 95c5394..95c5394 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_pickaxe.png +++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_pickaxe.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/particle/shadows.png b/src/main/resources/assets/jewelrycraft2/textures/particle/shadows.png Binary files differindex 8853fb2..8853fb2 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/particle/shadows.png +++ b/src/main/resources/assets/jewelrycraft2/textures/particle/shadows.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/BricksPedestal.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/BricksPedestal.png Binary files differindex 08ca87b..08ca87b 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/tileentities/BricksPedestal.png +++ b/src/main/resources/assets/jewelrycraft2/textures/tileentities/BricksPedestal.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/Displayer.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/Displayer.png Binary files differindex 200637b..200637b 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/tileentities/Displayer.png +++ b/src/main/resources/assets/jewelrycraft2/textures/tileentities/Displayer.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/JewelrsCraftingBench.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/JewelrsCraftingBench.png Binary files differindex 86f0ece..86f0ece 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/tileentities/JewelrsCraftingBench.png +++ b/src/main/resources/assets/jewelrycraft2/textures/tileentities/JewelrsCraftingBench.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/Molder.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/Molder.png Binary files differindex c5acc88..c5acc88 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/tileentities/Molder.png +++ b/src/main/resources/assets/jewelrycraft2/textures/tileentities/Molder.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye1.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye1.png Binary files differindex 8916dc4..8916dc4 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye1.png +++ b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye1.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye2.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye2.png Binary files differindex 3c53104..3c53104 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye2.png +++ b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye2.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye3.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye3.png Binary files differindex a6340fb..a6340fb 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye3.png +++ b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye3.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye4.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye4.png Binary files differindex 0ba066e..0ba066e 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye4.png +++ b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye4.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowHand.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowHand.png Binary files differindex e2b82c7..e2b82c7 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowHand.png +++ b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowHand.png diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/Smelter.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/Smelter.png Binary files differindex 975c577..975c577 100755..100644 --- a/src/main/resources/assets/jewelrycraft2/textures/tileentities/Smelter.png +++ b/src/main/resources/assets/jewelrycraft2/textures/tileentities/Smelter.png diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png Binary files differindex d5d68c2..d5d68c2 100755..100644 --- a/src/main/resources/logo.png +++ b/src/main/resources/logo.png diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 61d26c9..61d26c9 100755..100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info |
