diff options
| author | Lance5057 <Lance5057@gmail.com> | 2015-01-27 19:27:30 -0600 |
|---|---|---|
| committer | Lance5057 <Lance5057@gmail.com> | 2015-01-27 19:27:30 -0600 |
| commit | c472007bbfa5e319e3e3967fb061875e000bb95e (patch) | |
| tree | 294bd85b20156e45a71014575ba1ea68fc1a7dc0 | |
| parent | 6925bf39ee227970c19b979806d52bf6a0ca5b3b (diff) | |
A whole mess of graphic updates
125 files changed, 689 insertions, 28 deletions
@@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources"/> + <classpathentry excluding="assets/tinker/textures/blocks/" kind="src" path="src/main/resources"/> <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="src/api/java"/> - <classpathentry exported="true" kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/build/dirtyArtifacts/forgeSrc-1.7.10-10.13.2.1240.jar" sourcepath="C:/Users/T/Desktop/Minecraft Modding/1.7.10/build/dirtyArtifacts/forgeSrc-1.7.10-10.13.2.1240-sources.jar"/> + <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.2.1277/forgeBin-1.7.10-10.13.2.1277.jar"/> <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.11/9c0592c6e1e9ea296a70948081bd4cc84dda1289/launchwrapper-1.11.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.11/ea64c0bce5e9f465cd56566530133331568d2157/launchwrapper-1.11-sources.jar"/> <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar"/> <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.0.3/f9e364ae2a66ce2a543012a4668856e84e5dab74/asm-debug-all-5.0.3.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.0.3/f0f24f6666c1a15c7e202e91610476bd4ce59368/asm-debug-all-5.0.3-sources.jar"/> @@ -62,12 +62,11 @@ <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.1/2d12c83fdfbc04ecabf02c7bc8cc54d034f0daac/lwjgl-platform-2.9.1-natives-osx.jar"/> <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/17.0/9c6ef172e8de35fd8d4d8783e4821e57cdef7445/guava-17.0.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/17.0/7ca0efbeb87ca845b5d7a0ac9c21a4b7b95f7b28/guava-17.0-sources.jar"/> <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.3.2/90a3822c38ec8c996e84c16a3477ef632cbc87a3/commons-lang3-3.3.2.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.3.2/d2a489573c0ed2c4942b3660decad5d65087b406/commons-lang3-3.3.2-sources.jar"/> - <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.2.1240/start"/> - <classpathentry kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/jars/TConstruct-1.7.10-1.7.1.DEV.GITBORK-deobf.jar"/> - <classpathentry kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/jars/mods/CodeChickenLib-1.7.10-1.1.1.106-dev.jar"/> - <classpathentry kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/jars/mods/ForgeMultipart-1.7.10-1.1.0.314-dev.jar"/> - <classpathentry kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/jars/mods/Mantle-1.7.10-0.3.2.DEV.GITBORK-deobf.jar"/> - <classpathentry kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/jars/mods/NotEnoughItems-1.7.10-1.0.3.72-dev.jar"/> - <classpathentry kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/eclipse/mods/1.7.10-Battlegear-Bin-1.0.6.3.jar"/> + <classpathentry exported="true" kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/Tinkers-Defense/libs/1.7.10-Battlegear-Bin-1.0.6.3.jar"/> + <classpathentry exported="true" kind="lib" path="C:/Users/T/Desktop/Minecraft Modding/1.7.10/Tinkers-Defense/libs/Mantle-1.7.10-0.3.2.DEV.GITBORK-deobf.jar"/> + <classpathentry exported="true" kind="lib" path="C:/Users/T/.gradle/caches/minecraft/net/minecraftforge/forge/1.7.10-10.13.2.1277/start"/> + <classpathentry kind="lib" path="libs/TConstruct-1.7.10-1.8.2.DEV.GITBORK-deobf.jar" sourcepath="libs/TConstruct-1.7.10-1.8.2.DEV.GITBORK-sources.jar"/> + <classpathentry kind="lib" path="libs/TConstruct-1.7.10-1.8.2.DEV.GITBORK-lib.jar"/> + <classpathentry kind="lib" path="jars/mods"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock Binary files differindex 42aec80..267ed16 100644 --- a/.gradle/2.0/taskArtifacts/cache.properties.lock +++ b/.gradle/2.0/taskArtifacts/cache.properties.lock diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin Binary files differindex a8bdcdf..b4c2800 100644 --- a/.gradle/2.0/taskArtifacts/fileHashes.bin +++ b/.gradle/2.0/taskArtifacts/fileHashes.bin diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin Binary files differindex 7d61e41..6b85f93 100644 --- a/.gradle/2.0/taskArtifacts/fileSnapshots.bin +++ b/.gradle/2.0/taskArtifacts/fileSnapshots.bin diff --git a/.gradle/2.0/taskArtifacts/outputFileStates.bin b/.gradle/2.0/taskArtifacts/outputFileStates.bin Binary files differindex 3eb9eab..6f71eb6 100644 --- a/.gradle/2.0/taskArtifacts/outputFileStates.bin +++ b/.gradle/2.0/taskArtifacts/outputFileStates.bin diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin Binary files differindex 67c1f17..17a7830 100644 --- a/.gradle/2.0/taskArtifacts/taskArtifacts.bin +++ b/.gradle/2.0/taskArtifacts/taskArtifacts.bin diff --git a/.gradle/gradle.log b/.gradle/gradle.log index 870d65f..ca6ed20 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -34,4 +34,4 @@ BUILD SUCCESSFUL -Total time: 1 mins 19.447 secs +Total time: 28.112 secs @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>1.7.10</name> + <name>Tinkers-Defense</name> <comment/> <projects/> <natures> diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 2f721f8..427f511 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Fri Jan 02 08:22:49 CST 2015 +#Thu Jan 22 15:30:02 CST 2015 org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve diff --git a/Gimp files/Gem.xcf b/Gimp files/Gem.xcf Binary files differnew file mode 100644 index 0000000..dfad9d6 --- /dev/null +++ b/Gimp files/Gem.xcf diff --git a/Gimp files/Pendant.xcf b/Gimp files/Pendant.xcf Binary files differnew file mode 100644 index 0000000..22c9851 --- /dev/null +++ b/Gimp files/Pendant.xcf diff --git a/bin/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png b/bin/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png Binary files differnew file mode 100644 index 0000000..2975dc2 --- /dev/null +++ b/bin/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png diff --git a/bin/assets/tinker/textures/items/shield/aeonsteel_shield_boss.png b/bin/assets/tinker/textures/items/shield/aeonsteel_shield_boss.png Binary files differnew file mode 100644 index 0000000..8ae1f0e --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/aeonsteel_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/aeonsteel_shield_edge.png b/bin/assets/tinker/textures/items/shield/aeonsteel_shield_edge.png Binary files differnew file mode 100644 index 0000000..a244a96 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/aeonsteel_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/alumite_shield_boss.png b/bin/assets/tinker/textures/items/shield/alumite_shield_boss.png Binary files differnew file mode 100644 index 0000000..0f3a71a --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/alumite_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/alumite_shield_edge.png b/bin/assets/tinker/textures/items/shield/alumite_shield_edge.png Binary files differnew file mode 100644 index 0000000..d359096 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/alumite_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/alumite_shield_shield.png b/bin/assets/tinker/textures/items/shield/alumite_shield_shield.png Binary files differnew file mode 100644 index 0000000..3cd6127 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/alumite_shield_shield.png diff --git a/bin/assets/tinker/textures/items/shield/ardite_shield_boss.png b/bin/assets/tinker/textures/items/shield/ardite_shield_boss.png Binary files differnew file mode 100644 index 0000000..8d5cdb1 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/ardite_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/ardite_shield_shield.png b/bin/assets/tinker/textures/items/shield/ardite_shield_shield.png Binary files differnew file mode 100644 index 0000000..1db11c1 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/ardite_shield_shield.png diff --git a/bin/assets/tinker/textures/items/shield/blueslime_shield_boss.png b/bin/assets/tinker/textures/items/shield/blueslime_shield_boss.png Binary files differnew file mode 100644 index 0000000..f4e204d --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/blueslime_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/blueslime_shield_edge.png b/bin/assets/tinker/textures/items/shield/blueslime_shield_edge.png Binary files differnew file mode 100644 index 0000000..ea39ba8 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/blueslime_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/bone_shield_boss.png b/bin/assets/tinker/textures/items/shield/bone_shield_boss.png Binary files differnew file mode 100644 index 0000000..51f848c --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/bone_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/bone_shield_edge.png b/bin/assets/tinker/textures/items/shield/bone_shield_edge.png Binary files differnew file mode 100644 index 0000000..9a7b2c4 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/bone_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/bronze_shield_boss.png b/bin/assets/tinker/textures/items/shield/bronze_shield_boss.png Binary files differnew file mode 100644 index 0000000..723a489 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/bronze_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/bronze_shield_edge.png b/bin/assets/tinker/textures/items/shield/bronze_shield_edge.png Binary files differnew file mode 100644 index 0000000..3551d8c --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/bronze_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/cactus_shield_boss.png b/bin/assets/tinker/textures/items/shield/cactus_shield_boss.png Binary files differnew file mode 100644 index 0000000..3f42899 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/cactus_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/cactus_shield_edge.png b/bin/assets/tinker/textures/items/shield/cactus_shield_edge.png Binary files differnew file mode 100644 index 0000000..1fc1b5e --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/cactus_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/cobalt_shield_boss.png b/bin/assets/tinker/textures/items/shield/cobalt_shield_boss.png Binary files differnew file mode 100644 index 0000000..858f96f --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/cobalt_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/cobalt_shield_edge.png b/bin/assets/tinker/textures/items/shield/cobalt_shield_edge.png Binary files differnew file mode 100644 index 0000000..0871efb --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/cobalt_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/copper_shield_boss.png b/bin/assets/tinker/textures/items/shield/copper_shield_boss.png Binary files differnew file mode 100644 index 0000000..51c42de --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/copper_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/copper_shield_edge.png b/bin/assets/tinker/textures/items/shield/copper_shield_edge.png Binary files differnew file mode 100644 index 0000000..131f870 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/copper_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/dogbearium_shield_boss.png b/bin/assets/tinker/textures/items/shield/dogbearium_shield_boss.png Binary files differnew file mode 100644 index 0000000..4434fd3 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/dogbearium_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/dogbearium_shield_edge.png b/bin/assets/tinker/textures/items/shield/dogbearium_shield_edge.png Binary files differnew file mode 100644 index 0000000..bd27fd5 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/dogbearium_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/flint_shield_boss.png b/bin/assets/tinker/textures/items/shield/flint_shield_boss.png Binary files differnew file mode 100644 index 0000000..e2b3de4 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/flint_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/flint_shield_edge.png b/bin/assets/tinker/textures/items/shield/flint_shield_edge.png Binary files differnew file mode 100644 index 0000000..541f5e1 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/flint_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/manyullyn_shield_boss.png b/bin/assets/tinker/textures/items/shield/manyullyn_shield_boss.png Binary files differnew file mode 100644 index 0000000..ad4de8d --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/manyullyn_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/manyullyn_shield_edge.png b/bin/assets/tinker/textures/items/shield/manyullyn_shield_edge.png Binary files differnew file mode 100644 index 0000000..9bd5887 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/manyullyn_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/netherrack_shield_boss.png b/bin/assets/tinker/textures/items/shield/netherrack_shield_boss.png Binary files differnew file mode 100644 index 0000000..14fcee8 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/netherrack_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/netherrack_shield_edge.png b/bin/assets/tinker/textures/items/shield/netherrack_shield_edge.png Binary files differnew file mode 100644 index 0000000..16989ed --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/netherrack_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/obsidian_shield_boss.png b/bin/assets/tinker/textures/items/shield/obsidian_shield_boss.png Binary files differnew file mode 100644 index 0000000..2cf28a3 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/obsidian_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/obsidian_shield_edge.png b/bin/assets/tinker/textures/items/shield/obsidian_shield_edge.png Binary files differnew file mode 100644 index 0000000..dc1c106 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/obsidian_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/paper_shield_boss.png b/bin/assets/tinker/textures/items/shield/paper_shield_boss.png Binary files differnew file mode 100644 index 0000000..c986e26 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/paper_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/paper_shield_edge.png b/bin/assets/tinker/textures/items/shield/paper_shield_edge.png Binary files differnew file mode 100644 index 0000000..aa0a0e6 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/paper_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/pigiron_shield_boss.png b/bin/assets/tinker/textures/items/shield/pigiron_shield_boss.png Binary files differnew file mode 100644 index 0000000..cb177fa --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/pigiron_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/pigiron_shield_edge.png b/bin/assets/tinker/textures/items/shield/pigiron_shield_edge.png Binary files differnew file mode 100644 index 0000000..afa4b02 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/pigiron_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/queensgold_shield_boss.png b/bin/assets/tinker/textures/items/shield/queensgold_shield_boss.png Binary files differnew file mode 100644 index 0000000..4052ddb --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/queensgold_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/queensgold_shield_edge.png b/bin/assets/tinker/textures/items/shield/queensgold_shield_edge.png Binary files differnew file mode 100644 index 0000000..948f699 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/queensgold_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/slime_shield_boss.png b/bin/assets/tinker/textures/items/shield/slime_shield_boss.png Binary files differnew file mode 100644 index 0000000..a3e231a --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/slime_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/slime_shield_edge.png b/bin/assets/tinker/textures/items/shield/slime_shield_edge.png Binary files differnew file mode 100644 index 0000000..891760b --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/slime_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/steel_shield_boss.png b/bin/assets/tinker/textures/items/shield/steel_shield_boss.png Binary files differindex 0b68181..02ee488 100644 --- a/bin/assets/tinker/textures/items/shield/steel_shield_boss.png +++ b/bin/assets/tinker/textures/items/shield/steel_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/stone_shield_boss.png b/bin/assets/tinker/textures/items/shield/stone_shield_boss.png Binary files differnew file mode 100644 index 0000000..39209c0 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/stone_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/stone_shield_edge.png b/bin/assets/tinker/textures/items/shield/stone_shield_edge.png Binary files differnew file mode 100644 index 0000000..f15da9d --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/stone_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/thaumium_shield_boss.png b/bin/assets/tinker/textures/items/shield/thaumium_shield_boss.png Binary files differnew file mode 100644 index 0000000..c423014 --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/thaumium_shield_boss.png diff --git a/bin/assets/tinker/textures/items/shield/thaumium_shield_edge.png b/bin/assets/tinker/textures/items/shield/thaumium_shield_edge.png Binary files differnew file mode 100644 index 0000000..a8627ac --- /dev/null +++ b/bin/assets/tinker/textures/items/shield/thaumium_shield_edge.png diff --git a/bin/assets/tinker/textures/items/shield/wood_shield_boss.png b/bin/assets/tinker/textures/items/shield/wood_shield_boss.png Binary files differindex acbd23d..9626ddd 100644 --- a/bin/assets/tinker/textures/items/shield/wood_shield_boss.png +++ b/bin/assets/tinker/textures/items/shield/wood_shield_boss.png diff --git a/bin/assets/tinkersdefense/textures/armor/TinkerArmor2.png b/bin/assets/tinkersdefense/textures/armor/TinkerArmor2.png Binary files differdeleted file mode 100644 index 706a34a..0000000 --- a/bin/assets/tinkersdefense/textures/armor/TinkerArmor2.png +++ /dev/null diff --git a/build.gradle b/build.gradle index 9fca14a..d2122db 100644 --- a/build.gradle +++ b/build.gradle @@ -23,13 +23,21 @@ sourceSets { main { -java { srcDirs = ["$projectDir/src/main/java"] } -resources { srcDirs = ["$projectDir/src/main/resources"] } +java + { + srcDirs = ["$projectDir/src/main/java"] + } +resources + { + srcDirs = ["$projectDir/src/main/resources"] + exclude '**/Thumbs.db' // cause I'm tired of picking them out like nasty olives in an otherwise decent pizza + } + } } -archivesBaseName = "1.7.10" -version = "in_development" +archivesBaseName = "Tinkers-Defense" +version = "1.1" minecraft.version = "1.7.10-10.13.2.1277" dependencies { diff --git a/src/api/java/cofh/core/item/IEqualityOverrideItem.java b/src/api/java/cofh/core/item/IEqualityOverrideItem.java new file mode 100644 index 0000000..c2dc3ac --- /dev/null +++ b/src/api/java/cofh/core/item/IEqualityOverrideItem.java @@ -0,0 +1,9 @@ +package cofh.core.item; + +import net.minecraft.item.ItemStack; + +public interface IEqualityOverrideItem { + + public boolean isLastHeldItemEqual(ItemStack current, ItemStack previous); + +}
\ No newline at end of file diff --git a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java new file mode 100644 index 0000000..13279ef --- /dev/null +++ b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java @@ -0,0 +1,11 @@ +package exterminatorJeff.undergroundBiomes.api; + +/** + * Striped down version, get the full API from here: https://github.com/Zeno410/UndergroundBiomes1.7API + * @author Zeno410 + */ +public class UBAPIHook { + public static final UBAPIHook ubAPIHook = new UBAPIHook(); + //public UBDimensionalStrataColumnProvider dimensionalStrataColumnProvider; // set in the main Underground Biomes + public UBOreTexturizer ubOreTexturizer; +} diff --git a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java new file mode 100644 index 0000000..947b156 --- /dev/null +++ b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java @@ -0,0 +1,70 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package exterminatorJeff.undergroundBiomes.api; + +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import net.minecraft.block.Block; +import net.minecraft.world.World; + +/** + * Striped down version, get the full API from here: https://github.com/Zeno410/UndergroundBiomes1.7API + * This is an interface for the class that can create Underground Biomes versions of arbitary ores + * It creates three new blocks for each texturized ore. + * @author Zeno410 + */ +public interface UBOreTexturizer { + // usage: Block is the ore block. + // Overlay name is the fully qualified name, e.g. modname:overlayName + // that static vars are fully qualified names for all the textures in the UB pack, just pass as is + // the event isn't needed per se, but if this is called anytime else, the blocks will not "stick" + public void setupUBOre(Block oreBlock, String overlayName, FMLPreInitializationEvent event); + public void setupUBOre(Block oreBlock, int metadata, String overlayName, FMLPreInitializationEvent event); + public void setupUBOre(Block oreBlock, int metadata, String overlayName, String blockName, FMLPreInitializationEvent event); + + public void requestUBOreSetup(Block oreBlock, String overlayName) throws BlocksAreAlreadySet; + public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName) throws BlocksAreAlreadySet; + public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName, String blockName) throws BlocksAreAlreadySet; + public void redoOres(int xInBlockCoordinates, int zInBlockCoordinates, World serverSideWorld) ; + + public static String amber_overlay = "undergroundbiomes:amber_overlay"; + public static String cinnabar_overlay = "undergroundbiomes:cinnabar_overlay"; + public static String coal_overlay = "undergroundbiomes:coal_overlay"; + public static String copper_overlay = "undergroundbiomes:copper_overlay"; + public static String diamond_overlay = "undergroundbiomes:diamond_overlay"; + public static String emerald_overlay = "undergroundbiomes:emerald_overlay"; + public static String gold_overlay = "undergroundbiomes:gold_overlay"; + public static String iron_overlay = "undergroundbiomes:iron_overlay"; + public static String lapis_overlay = "undergroundbiomes:lapis_overlay"; + public static String lead_overlay = "undergroundbiomes:lead_overlay"; + public static String olivine_peridot_overlay = "undergroundbiomes:olivine-peridot_overlay"; + public static String redstone_overlay = "undergroundbiomes:redstone_overlay"; + public static String ruby_overlay = "undergroundbiomes:ruby_overlay"; + public static String sapphire_overlay = "undergroundbiomes:sapphire_overlay"; + public static String tin_overlay = "undergroundbiomes:tin_overlay"; + public static String uranium_overlay = "undergroundbiomes:uranium_overlay"; + + public class BlocksAreAlreadySet extends RuntimeException { + // this is thrown if UB has already run its pre-initialization step and can no longer register blocks + public final Block oreBlock; + public final String overlayName; + + public BlocksAreAlreadySet(Block oreBlock, String overlayName) { + this.oreBlock = oreBlock; + this.overlayName = overlayName; + } + + @Override + public String toString() { + String blockDescription = "undefined block"; + String overlayDescription = "undefined overlay"; + if (oreBlock != null) blockDescription = oreBlock.getUnlocalizedName(); + if (overlayName != null) overlayDescription = overlayName; + return "Attempt to create Underground Biomes ore for "+blockDescription+" with "+overlayDescription + + " after blocks have already been defined"; + } + + } +} diff --git a/src/api/java/mods/battlegear2/api/IAllowItem.java b/src/api/java/mods/battlegear2/api/IAllowItem.java new file mode 100644 index 0000000..78e9ffa --- /dev/null +++ b/src/api/java/mods/battlegear2/api/IAllowItem.java @@ -0,0 +1,11 @@ +package mods.battlegear2.api; + +import net.minecraft.item.ItemStack; + +public interface IAllowItem { + + /** + * Returns true if the mainhand {@link ItemStack} allows the offhand {@link ItemStack} to be placed in the partner offhand slot + */ + public boolean allowOffhand(ItemStack mainhand, ItemStack offhand); +} diff --git a/src/api/java/mods/battlegear2/api/IOffhandDual.java b/src/api/java/mods/battlegear2/api/IOffhandDual.java new file mode 100644 index 0000000..4e93dd5 --- /dev/null +++ b/src/api/java/mods/battlegear2/api/IOffhandDual.java @@ -0,0 +1,62 @@ +package mods.battlegear2.api; + +import cpw.mods.fml.relauncher.Side; +import net.minecraft.item.ItemStack; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; + +public interface IOffhandDual { + /** + * Returns true if this item can be dual wielded in the offhand slot + * @param off The {@link ItemStack} holding this item + */ + public boolean isOffhandHandDual(ItemStack off); + + /** + * Perform any function when this item is held in the offhand and the user right clicks an entity. + * This is generally used to attack an entity with the offhand item. + * If this is the case the {@link PlayerEventChild.OffhandAttackEvent#parent} field should + * be canceled (or {@link PlayerEventChild.OffhandAttackEvent#cancelParent} field left at true, to prevent any default right clicking events (Eg Villager Trading) + * + * @param event the OffhandAttackEvent that was generated + * @param mainhandItem the {@link ItemStack} currently being held in the right hand + * @param offhandItem the {@link ItemStack} currently being held in the left hand, holding this item + * @return true if the off hand swing animation should be performed + */ + public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem); + + /** + * Perform any function when this item is held in the offhand and the user right clicks "Air". + * Note: Called first on client-side, then on server side if {@link PlayerInteractEvent} is not cancelled and mainhandItem is not null, + * following Forge rules for PlayerInteractEvent with Action==RIGHT_CLICK_AIR + * Note: PlayerInteractEvent is already cancelled beforehand, and will be cancelled after if this method returns false + * Note: Above issues will be fixed in next Minecraft versions by replacing first arg with a shallow copy + * @param event the PlayerInteractEvent that was generated + * @param mainhandItem the {@link ItemStack} currently being held in the right hand + * @param offhandItem the {@link ItemStack} currently being held in the left hand, holding this item + * @return true if the off hand swing animation should be performed + */ + public boolean offhandClickAir(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem); + + /** + * Perform any function when this item is held in the offhand and the user right clicks a block. + * Note: this will happen prior to the activation of any activation functions of blocks + * Note: Called first on client-side, then on server side if {@link PlayerInteractEvent} is not cancelled + * Note: {@link PlayerInteractEvent#useItem} is already set on {@link Event.Result#DENY} before reaching this method, in order to avoid mainhandItem usage + * + * @param event the PlayerInteractEvent that was generated + * @param mainhandItem the {@link ItemStack} currently being held in the right hand + * @param offhandItem the {@link ItemStack} currently being held in the left hand, holding this item + * @return true if the off hand swing animation should be performed + */ + public boolean offhandClickBlock(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem); + + @SuppressWarnings("unused") + /** + * Perform any passive effects on each game tick when this item is held in the offhand + * @deprecated See {@link Item#onUpdate(ItemStack, World, Entity, int, boolean)} + * @param effectiveSide the effective side the method was called from + * @param mainhandItem the {@link ItemStack} currently being held in the right hand + * @param offhandItem the {@link ItemStack} currently being held in the left hand + */ + public void performPassiveEffects(Side effectiveSide, ItemStack mainhandItem, ItemStack offhandItem); +} diff --git a/src/api/java/mods/battlegear2/api/ISheathed.java b/src/api/java/mods/battlegear2/api/ISheathed.java new file mode 100644 index 0000000..411c639 --- /dev/null +++ b/src/api/java/mods/battlegear2/api/ISheathed.java @@ -0,0 +1,20 @@ +package mods.battlegear2.api; + +import net.minecraft.item.ItemStack; + +/** + * When a {@link net.minecraft.entity.player.EntityPlayer} is not in "battlemode", the {@link ItemStack}s stored in Battlegear additional slots + * and previously selected are displayed, either on the back (slightly moved depending on armor) or on the hip (opposite side to the hand slot it is stored in) + * Note:Default behavior is dependent on Battlegear configuration + * This interface can be implemented in a {@link net.minecraft.item.Item} instance to decide where to actually render it + * See {@link mods.battlegear2.api.RenderPlayerEventChild.PreRenderSheathed} and {@link mods.battlegear2.api.RenderPlayerEventChild.PostRenderSheathed} + * for more flexibility over the rendering + */ +public interface ISheathed { + + /** + * Returns true if this item should always be sheathed on the back, false if it should be sheathed on the hip + * @param item the {@link ItemStack} to be sheathed + */ + public boolean sheatheOnBack(ItemStack item); +} diff --git a/src/api/java/mods/battlegear2/api/PlayerEventChild.java b/src/api/java/mods/battlegear2/api/PlayerEventChild.java new file mode 100644 index 0000000..95ea329 --- /dev/null +++ b/src/api/java/mods/battlegear2/api/PlayerEventChild.java @@ -0,0 +1,271 @@ +package mods.battlegear2.api; + +import cpw.mods.fml.common.eventhandler.Cancelable; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.ArrowLooseEvent; +import net.minecraftforge.event.entity.player.EntityInteractEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; + +public abstract class PlayerEventChild extends PlayerEvent{ + + /** + * The event that this event is a child of + */ + public final PlayerEvent parent; + + public PlayerEventChild(PlayerEvent parent) { + super(parent.entityPlayer); + this.parent = parent; + } + + public void setCancelParentEvent(boolean cancel) { + parent.setCanceled(cancel); + } + + @Override + public void setCanceled(boolean cancel) { + super.setCanceled(cancel); + parent.setCanceled(cancel); + } + + @Override + public void setResult(Result value) { + super.setResult(value); + parent.setResult(value); + } + + public EntityPlayer getPlayer(){ + return parent.entityPlayer; + } + + /** + * Event fired when a shield successfully blocks an attack (in {@link LivingHurtEvent}) + */ + public static class ShieldBlockEvent extends PlayerEventChild { + public final ItemStack shield; + public final DamageSource source; + public final float ammount; // use same name as other Forge events + public float ammountRemaining = 0.0F; // damage remaining after shield block event, if any + /** + * If the {@link IShield#blockAnimation(EntityPlayer, float)} should be called + */ + public boolean performAnimation = true; + /** + * If the shield should be damaged based on the ammount and the result of {@link IShield#getDamageReduction(ItemStack, DamageSource)} + */ + public boolean damageShield = true; + public ShieldBlockEvent(PlayerEvent parent, ItemStack shield, DamageSource source, float ammount) { + super(parent); + this.shield = shield; + this.source = source; + this.ammount = ammount; + } + } + + /** + * Called when a player right clicks in battlemode + * The parent event can be either {@link PlayerInteractEvent} or {@link EntityInteractEvent} if the OffhandAttackEvent allowed swinging + * Both {@link ItemStack} can be null + * If cancelled, no offhand swinging will be performed + */ + @Cancelable + public static class OffhandSwingEvent extends PlayerEventChild { + public final ItemStack mainHand; + public final ItemStack offHand; + public OffhandSwingEvent(PlayerEvent parent, ItemStack mainHand, ItemStack offHand){ + super(parent); + this.mainHand = mainHand; + this.offHand = offHand; + } + } + + /** + * Called when a player right clicks an entity in battlemode + * Both {@link ItemStack} can be null + * Cancelling will prevent any further processing and prevails over the boolean fields + */ + @Cancelable + public static class OffhandAttackEvent extends PlayerEventChild { + + /** + * If we should call the OffhandSwingEvent and perform swinging + */ + public boolean swingOffhand = true; + /** + * If we should perform an attack on the entity with the offhand item + * Note: Will post {@link AttackEntityEvent} and {@link Item#onLeftClickEntity(ItemStack, EntityPlayer, Entity)} + * with {@link InventoryPlayer#currentItem} offset to the offhand + */ + public boolean shouldAttack = true; + /** + * If we should cancel the base entity interaction event + */ + public boolean cancelParent = true; + /** + * The base entity interaction event + */ + public final EntityInteractEvent event; + /** + * Content of the main hand slot + */ + public final ItemStack mainHand; + /** + * Content of the off hand slot + */ + public final ItemStack offHand; + + public OffhandAttackEvent(EntityInteractEvent parent, ItemStack mainHand, ItemStack offHand) { + super(parent); + this.event = parent; + this.mainHand = mainHand; + this.offHand = offHand; + } + + public Entity getTarget() { + return ((EntityInteractEvent)parent).target; + } + } + + /** + * This event replicates the event usage of {@link PlayerInteractEvent} for the item in left hand on right click, + * allowing support for other mods that use such event to customize item usage + * {@link Item#onItemUseFirst}, {@link Item#onItemRightClick} and {@link Item#onItemUse} will then get called the same way as with the item in the player right hand for PlayerInteractEvent + */ + @Cancelable + public static class UseOffhandItemEvent extends PlayerEventChild{ + /** + * The {@link ItemStack} held in left hand + */ + public final ItemStack offhand; + /** + * The equivalent {@link PlayerInteractEvent} that would have been triggered if the offhand item was held in right hand and right click was pressed + */ + public final PlayerInteractEvent event; + public UseOffhandItemEvent(PlayerInteractEvent event, ItemStack offhand){ + super(event); + this.event = event; + this.offhand = offhand; + } + } + + public static class QuiverArrowEvent extends PlayerEventChild{ + /** + * The event from which this occurred + */ + protected final ArrowLooseEvent event; + public QuiverArrowEvent(ArrowLooseEvent event){ + super(event); + this.event = event; + } + + /** + * @return the player using the bow + */ + public EntityPlayer getArcher(){ + return getPlayer(); + } + + /** + * @return the bow trying to fire + */ + public ItemStack getBow() + { + return event.bow; + } + + /** + * @return the amount of charge in the bow + */ + public float getCharge() + { + return event.charge; + } + + /** + * Event fired after an arrow has been selected and taken from a {@link IArrowContainer2}, before it is actually spawned + */ + @Cancelable + public static class Firing extends QuiverArrowEvent { + /** + * Damage done to the bow after arrow is fired + */ + public int bowDamage = 1; + /** + * The volume of the sound emitted from the bow after arrow is fired + */ + public float bowSoundVolume = 1.0F; + /** + * Decides if standard enchantments can be added to the arrow + */ + public boolean addEnchantments = true; + /** + * Decides if critical state should be forced into the arrow + */ + public boolean isCritical = false; + /** + * The quiver from which the arrow was pulled from + */ + public final ItemStack quiver; + /** + * The arrow to be fired, can't be null + */ + public final EntityArrow arrow; + + public Firing(ArrowLooseEvent parent, ItemStack quiver, EntityArrow arrow) { + super(parent); + this.quiver = quiver; + this.arrow = arrow; + } + + } + + /** + * The DEFAULT result for this event is the vanilla charge calculated value + * Use setNewCharge to override the value with the one provided + * Change the event result to DENY to prevent further processing + */ + @HasResult + public static class ChargeCalculations extends QuiverArrowEvent { + /** + * Returned value if the result is set to allow + */ + protected float charge; + public ChargeCalculations(ArrowLooseEvent event){ + super(event); + } + + @Override + public float getCharge(){ + MinecraftForge.EVENT_BUS.post(this); + switch (this.getResult()){ + case ALLOW: + return charge; + case DENY: + return 0; + } + float f = super.getCharge()/20.0F; + f = (f * f + f * 2.0F) / 3.0F; + if ((double)f < 0.1D) + { + return 0; + } + if (f > 1.0F) + { + f = 1.0F; + } + return f; + } + + public void setNewCharge(float charge){ + this.setResult(Result.ALLOW); + this.charge = charge; + } + } + } +} diff --git a/src/api/java/mods/battlegear2/api/package-info.java b/src/api/java/mods/battlegear2/api/package-info.java new file mode 100644 index 0000000..49f47ea --- /dev/null +++ b/src/api/java/mods/battlegear2/api/package-info.java @@ -0,0 +1,4 @@ +@API(owner = "battlegear2", provides = "DualWield", apiVersion = "0.1") +package mods.battlegear2.api; + +import cpw.mods.fml.common.API;
\ No newline at end of file diff --git a/src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java b/src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java new file mode 100644 index 0000000..8442153 --- /dev/null +++ b/src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java @@ -0,0 +1,13 @@ +package mods.battlegear2.api.weapons; + +import mods.battlegear2.api.IAllowItem; +import mods.battlegear2.api.IOffhandDual; +import mods.battlegear2.api.ISheathed; + +/** + * A generic flag for weapon + * <strong>Not</strong> necessary for an item to be wielded in battlegear slots + */ +public interface IBattlegearWeapon extends ISheathed,IOffhandDual,IAllowItem{ + +}
\ No newline at end of file diff --git a/src/api/java/mods/battlegear2/api/weapons/package-info.java b/src/api/java/mods/battlegear2/api/weapons/package-info.java new file mode 100644 index 0000000..2e3232b --- /dev/null +++ b/src/api/java/mods/battlegear2/api/weapons/package-info.java @@ -0,0 +1,4 @@ +@API(owner = "battlegear2", provides = "Weapons", apiVersion = "0.1") +package mods.battlegear2.api.weapons; + +import cpw.mods.fml.common.API;
\ No newline at end of file diff --git a/src/api/java/modwarriors/notenoughkeys/api/Api.java b/src/api/java/modwarriors/notenoughkeys/api/Api.java new file mode 100644 index 0000000..390d28a --- /dev/null +++ b/src/api/java/modwarriors/notenoughkeys/api/Api.java @@ -0,0 +1,40 @@ +package modwarriors.notenoughkeys.api; + +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Center of the API. Main api methods can be found in this class. + * + * @author TheTemportalist + */ +@SideOnly(Side.CLIENT) +public class Api { + + /** + * Checks if NotEnoughKeys is loaded in the current environment + * + * @return 'true' if loaded + */ + public static boolean isLoaded() { + return Loader.isModLoaded("notenoughkeys"); + } + + /** + * Registers a mod's keys with NEK + * + * @param modname The NAME of the mod registering the key + * @param keyDecriptions A String[] (Array[String]) of the key descriptions. i.e. new String[]{"key.hotbar1"} + */ + public static void registerMod(String modname, String[] keyDecriptions) { + try { + Class.forName("modwarriors.notenoughkeys.keys.KeyHelper").getMethod( + "registerMod", String.class, String[].class + ).invoke(null, modname, keyDecriptions); + } catch (Exception e) { + e.printStackTrace(); + } + } + +} diff --git a/src/api/java/modwarriors/notenoughkeys/api/KeyBindingPressedEvent.java b/src/api/java/modwarriors/notenoughkeys/api/KeyBindingPressedEvent.java new file mode 100644 index 0000000..d17b808 --- /dev/null +++ b/src/api/java/modwarriors/notenoughkeys/api/KeyBindingPressedEvent.java @@ -0,0 +1,43 @@ +package modwarriors.notenoughkeys.api; + +import cpw.mods.fml.common.eventhandler.Cancelable; +import cpw.mods.fml.common.eventhandler.Event; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.settings.KeyBinding; + +/** + * Called when a keybinding is triggered with the passed with valid modifiers + * + * @author TheTemportalist + */ +@SideOnly(Side.CLIENT) +@Cancelable +public class KeyBindingPressedEvent extends Event { + + /** + * The KeyBinding being triggered + */ + public KeyBinding keyBinding = null; + /** + * Tells whether a modifier was required AND was down when triggered + */ + public boolean shiftRequired = false, ctrlRequired = false, altRequired = false; + + /** + * Called with the passed keyBinding and modifiers. + * Subscribe to this event so activate a keybinding when triggered. + * + * @param keyBinding The KeyBinding being triggered. Stores the key's description and keycode + * @param modifiers The modifiers (SHIFT, CTRL, ALT) that determine when a compatible key is pressed + */ + public KeyBindingPressedEvent(KeyBinding keyBinding, boolean[] modifiers) { + super(); + this.keyBinding = keyBinding; + this.shiftRequired = modifiers[0]; + this.ctrlRequired = modifiers[1]; + this.altRequired = modifiers[2]; + + } + +} diff --git a/src/api/java/modwarriors/notenoughkeys/api/package-info.java b/src/api/java/modwarriors/notenoughkeys/api/package-info.java new file mode 100644 index 0000000..d53b000 --- /dev/null +++ b/src/api/java/modwarriors/notenoughkeys/api/package-info.java @@ -0,0 +1,5 @@ + +@API(owner = "Not Enough Keys", provides = "API_NEK", + apiVersion = "1.0.0") package modwarriors.notenoughkeys.api; + +import cpw.mods.fml.common.API; diff --git a/src/api/java/thaumcraft/api/ItemApi.java b/src/api/java/thaumcraft/api/ItemApi.java new file mode 100644 index 0000000..25dda28 --- /dev/null +++ b/src/api/java/thaumcraft/api/ItemApi.java @@ -0,0 +1,70 @@ +package thaumcraft.api; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.FMLLog; + +/** + * @author Azanor + * + * This is used to gain access to the items in my mod. + * I only give some examples and it will probably still + * require a bit of work for you to get hold of everything you need. + * + */ +public class ItemApi { + + public static ItemStack getItem(String itemString, int meta) { + ItemStack item = null; + + try { + String itemClass = "thaumcraft.common.config.ConfigItems"; + Object obj = Class.forName(itemClass).getField(itemString).get(null); + if (obj instanceof Item) { + item = new ItemStack((Item) obj,1,meta); + } else if (obj instanceof ItemStack) { + item = (ItemStack) obj; + } + } catch (Exception ex) { + FMLLog.warning("[Thaumcraft] Could not retrieve item identified by: " + itemString); + } + + return item; + } + + public static ItemStack getBlock(String itemString, int meta) { + ItemStack item = null; + + try { + String itemClass = "thaumcraft.common.config.ConfigBlocks"; + Object obj = Class.forName(itemClass).getField(itemString).get(null); + if (obj instanceof Block) { + item = new ItemStack((Block) obj,1,meta); + } else if (obj instanceof ItemStack) { + item = (ItemStack) obj; + } + } catch (Exception ex) { + FMLLog.warning("[Thaumcraft] Could not retrieve block identified by: " + itemString); + } + + return item; + } + + /** + * + * Some examples + * + * Casting Wands: + * itemWandCasting + * + * Resources: + * itemEssence, itemWispEssence, itemResource, itemShard, itemNugget, + * itemNuggetChicken, itemNuggetBeef, itemNuggetPork, itemTripleMeatTreat + * + * Research: + * itemResearchNotes, itemInkwell, itemThaumonomicon + * + */ + +} diff --git a/src/api/java/thaumcraft/api/nodes/IRevealer.java b/src/api/java/thaumcraft/api/nodes/IRevealer.java new file mode 100644 index 0000000..14a19b5 --- /dev/null +++ b/src/api/java/thaumcraft/api/nodes/IRevealer.java @@ -0,0 +1,22 @@ +package thaumcraft.api.nodes; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; + +/** + * + * @author Azanor + * + * Equipped head slot items that extend this class will make nodes visible in world. + * + */ + +public interface IRevealer { + + /* + * If this method returns true the nodes will be visible. + */ + public boolean showNodes(ItemStack itemstack, EntityLivingBase player); + + +} diff --git a/src/main/java/gmail/Lance5057/com/HeaterShield.java b/src/main/java/gmail/Lance5057/com/HeaterShield.java index 13875bc..063eb66 100644 --- a/src/main/java/gmail/Lance5057/com/HeaterShield.java +++ b/src/main/java/gmail/Lance5057/com/HeaterShield.java @@ -1,32 +1,30 @@ package gmail.Lance5057.com; import java.util.List; -import java.util.Random; import mods.battlegear2.api.ISheathed; import mods.battlegear2.api.shield.IArrowCatcher; import mods.battlegear2.api.shield.IArrowDisplay; import mods.battlegear2.api.shield.IShield; -import mods.battlegear2.api.shield.ShieldType; -import mods.battlegear2.utils.BattlegearConfig; -import cpw.mods.fml.relauncher.*; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.*; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.HarvestTool; import tconstruct.tools.TinkerTools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + + public class HeaterShield extends HarvestTool implements IShield, ISheathed, IArrowCatcher, IArrowDisplay { int induceDamage = 0; diff --git a/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java b/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java index 60e4ee1..014edcd 100644 --- a/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java +++ b/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java @@ -3,6 +3,7 @@ package gmail.Lance5057.com; + import static net.minecraft.util.EnumChatFormatting.DARK_RED; import static net.minecraft.util.EnumChatFormatting.GOLD; import static net.minecraft.util.EnumChatFormatting.LIGHT_PURPLE; @@ -247,7 +248,7 @@ public void init(FMLInitializationEvent e) // Tool Materials: id, name, harvestlevel, durability, speed, damage, handlemodifier, reinforced, shoddy, style color, primary color for block use //Dogbearium - TConstructClientRegistry.addMaterialRenderMapping(201, "tinker", "Dogbearium", true); + TConstructClientRegistry.addMaterialRenderMapping(203, "tinker", "Dogbearium", true); TConstructRegistry.addToolMaterial(203, "Dogbearium", 4, 600, 800, 2, 1.6F, 0, -2f, DARK_RED.toString(), 0x754200); TinkerTools.registerPatternMaterial("DogbeariumIngot", 2, "Dogbearium"); TConstructRegistry.addDefaultToolPartMaterial(203); diff --git a/src/main/java/gmail/Lance5057/items/TinkerArmor.java b/src/main/java/gmail/Lance5057/items/TinkerArmor.java index dd632d4..95d776c 100644 --- a/src/main/java/gmail/Lance5057/items/TinkerArmor.java +++ b/src/main/java/gmail/Lance5057/items/TinkerArmor.java @@ -20,7 +20,7 @@ public class TinkerArmor extends ItemArmor @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { - String itemName = "tinkersdefense:textures/armor/TinkerArmor.png"; + String itemName = "tinkersdefense:textures/armor/TinkerArmor"; this.itemIcon = par1IconRegister.registerIcon(itemName); } diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face.png Binary files differindex e002312..48b9bee 100644 --- a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face.png +++ b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face.png diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_other.png Binary files differindex aa2c757..5d422a4 100644 --- a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_other.png +++ b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_other.png diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_binding.png Binary files differnew file mode 100644 index 0000000..c6fd97a --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_binding.png diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_edge.png Binary files differnew file mode 100644 index 0000000..7cf091d --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_face.png Binary files differnew file mode 100644 index 0000000..2a3485d --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_face.png diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_face_other.png Binary files differnew file mode 100644 index 0000000..6db407e --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_face_other.png diff --git a/src/main/resources/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png b/src/main/resources/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png Binary files differnew file mode 100644 index 0000000..2975dc2 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_boss.png Binary files differnew file mode 100644 index 0000000..8ae1f0e --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_edge.png Binary files differnew file mode 100644 index 0000000..a244a96 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_boss.png Binary files differnew file mode 100644 index 0000000..0f3a71a --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_edge.png Binary files differnew file mode 100644 index 0000000..d359096 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_shield.png b/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_shield.png Binary files differnew file mode 100644 index 0000000..3cd6127 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_shield.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_boss.png Binary files differnew file mode 100644 index 0000000..8d5cdb1 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_shield.png b/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_shield.png Binary files differnew file mode 100644 index 0000000..1db11c1 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_shield.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_boss.png Binary files differnew file mode 100644 index 0000000..f4e204d --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_edge.png Binary files differnew file mode 100644 index 0000000..ea39ba8 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/bone_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/bone_shield_boss.png Binary files differnew file mode 100644 index 0000000..51f848c --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/bone_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/bone_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/bone_shield_edge.png Binary files differnew file mode 100644 index 0000000..9a7b2c4 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/bone_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_boss.png Binary files differnew file mode 100644 index 0000000..723a489 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_edge.png Binary files differnew file mode 100644 index 0000000..3551d8c --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_boss.png Binary files differnew file mode 100644 index 0000000..3f42899 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_edge.png Binary files differnew file mode 100644 index 0000000..1fc1b5e --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_boss.png Binary files differnew file mode 100644 index 0000000..858f96f --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_edge.png Binary files differnew file mode 100644 index 0000000..0871efb --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/copper_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/copper_shield_boss.png Binary files differnew file mode 100644 index 0000000..51c42de --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/copper_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/copper_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/copper_shield_edge.png Binary files differnew file mode 100644 index 0000000..131f870 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/copper_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_boss.png Binary files differnew file mode 100644 index 0000000..4434fd3 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_edge.png Binary files differnew file mode 100644 index 0000000..bd27fd5 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/flint_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/flint_shield_boss.png Binary files differnew file mode 100644 index 0000000..e2b3de4 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/flint_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/flint_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/flint_shield_edge.png Binary files differnew file mode 100644 index 0000000..541f5e1 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/flint_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_boss.png Binary files differnew file mode 100644 index 0000000..ad4de8d --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_edge.png Binary files differnew file mode 100644 index 0000000..9bd5887 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_boss.png Binary files differnew file mode 100644 index 0000000..14fcee8 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_edge.png Binary files differnew file mode 100644 index 0000000..16989ed --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_boss.png Binary files differnew file mode 100644 index 0000000..2cf28a3 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_edge.png Binary files differnew file mode 100644 index 0000000..dc1c106 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/paper_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/paper_shield_boss.png Binary files differnew file mode 100644 index 0000000..c986e26 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/paper_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/paper_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/paper_shield_edge.png Binary files differnew file mode 100644 index 0000000..aa0a0e6 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/paper_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_boss.png Binary files differnew file mode 100644 index 0000000..cb177fa --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_edge.png Binary files differnew file mode 100644 index 0000000..afa4b02 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_boss.png Binary files differnew file mode 100644 index 0000000..4052ddb --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_edge.png Binary files differnew file mode 100644 index 0000000..948f699 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/slime_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/slime_shield_boss.png Binary files differnew file mode 100644 index 0000000..a3e231a --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/slime_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/slime_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/slime_shield_edge.png Binary files differnew file mode 100644 index 0000000..891760b --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/slime_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/steel_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/steel_shield_boss.png Binary files differindex 0b68181..02ee488 100644 --- a/src/main/resources/assets/tinker/textures/items/shield/steel_shield_boss.png +++ b/src/main/resources/assets/tinker/textures/items/shield/steel_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/stone_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/stone_shield_boss.png Binary files differnew file mode 100644 index 0000000..39209c0 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/stone_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/stone_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/stone_shield_edge.png Binary files differnew file mode 100644 index 0000000..f15da9d --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/stone_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_boss.png Binary files differnew file mode 100644 index 0000000..c423014 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_boss.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_edge.png Binary files differnew file mode 100644 index 0000000..a8627ac --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_edge.png diff --git a/src/main/resources/assets/tinker/textures/items/shield/wood_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/wood_shield_boss.png Binary files differindex acbd23d..9626ddd 100644 --- a/src/main/resources/assets/tinker/textures/items/shield/wood_shield_boss.png +++ b/src/main/resources/assets/tinker/textures/items/shield/wood_shield_boss.png |
