From 7a4a79fb84360422d080823e30033902facb83a5 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sun, 15 Oct 2023 00:33:37 -0400 Subject: [PATCH] Changing something that's always annoyed me (#24) * Changing something that's always annoyed me * updating bs and dependencies * thanks for the "useful" commits spotless (also updating a failing try-catch clause) --- build.gradle | 155 +- dependencies.gradle | 6 +- settings.gradle | 2 +- src/main/java/tb/api/RevolverUpgrade.java | 76 +- src/main/java/tb/client/RevolverEvents.java | 10 +- src/main/java/tb/client/gui/GuiRevolver.java | 4 +- .../java/tb/client/gui/GuiThaumicAnvil.java | 71 +- src/main/java/tb/client/gui/GuiVoidAnvil.java | 69 +- .../client/render/block/BrazierRenderer.java | 2 +- .../client/render/block/CampfireRenderer.java | 2 +- .../block/ThaumicRelocatorRenderer.java | 2 +- .../tb/client/render/entity/RenderBullet.java | 2 +- .../render/item/CastingBraceletRenderer.java | 66 +- .../render/item/HerobrinesScytheRenderer.java | 64 +- .../client/render/item/NodeFociRenderer.java | 6 +- .../render/item/NodeLinkerItemRenderer.java | 6 +- .../item/NodeManipulatorItemRenderer.java | 6 +- .../tb/client/render/item/RenderRevolver.java | 38 +- .../tile/RenderEntityDeconstructor.java | 32 +- .../client/render/tile/RenderNodeLinker.java | 8 +- .../render/tile/RenderNodeManipulator.java | 15 +- .../client/render/tile/RenderOverchanter.java | 28 +- .../block/BlockAdvAlchemicalFurnace.java | 2 +- .../java/tb/common/block/BlockAshroom.java | 18 +- .../tb/common/block/BlockAureliaLeaf.java | 2 +- .../tb/common/block/BlockAureliaPlant.java | 10 +- .../java/tb/common/block/BlockBrazier.java | 30 +- src/main/java/tb/common/block/BlockBriar.java | 9 +- .../java/tb/common/block/BlockCampfire.java | 32 +- .../tb/common/block/BlockCryingObelisk.java | 43 +- .../tb/common/block/BlockCrystalBlock.java | 2 +- .../block/BlockEntityDeconstructor.java | 102 +- .../java/tb/common/block/BlockFlaxium.java | 8 +- .../java/tb/common/block/BlockHalfSlab.java | 4 +- .../tb/common/block/BlockNodeManipulator.java | 2 +- .../tb/common/block/BlockOverchanter.java | 2 +- .../java/tb/common/block/BlockPyrofluid.java | 48 +- .../tb/common/block/BlockRainbowCactus.java | 23 +- .../java/tb/common/block/BlockRedlonStem.java | 28 +- .../java/tb/common/block/BlockRelocator.java | 16 +- src/main/java/tb/common/block/BlockSpike.java | 4 +- src/main/java/tb/common/block/BlockSweed.java | 2 +- .../java/tb/common/block/BlockTBLeaves.java | 86 +- .../java/tb/common/block/BlockTBPlant.java | 16 +- .../java/tb/common/block/BlockTBSapling.java | 4 +- .../tb/common/block/BlockThaumicAnvil.java | 2 +- .../java/tb/common/block/BlockVoidAnvil.java | 2 +- .../EnchantmentElderKnowledge.java | 4 +- .../enchantment/EnchantmentEldritchBane.java | 6 +- .../enchantment/EnchantmentHandler.java | 55 +- .../enchantment/EnchantmentMagicTouch.java | 4 +- .../enchantment/EnchantmentTainted.java | 4 +- .../enchantment/EnchantmentVaporising.java | 4 +- .../common/entity/EntityAIAvoidCampfire.java | 19 +- .../common/entity/EntityRevolverBullet.java | 54 +- .../java/tb/common/event/WorldGenBigOak.java | 38 +- .../java/tb/common/event/WorldGenOak.java | 16 +- .../common/inventory/ContainerRevolver.java | 19 +- .../inventory/ContainerThaumicAnvil.java | 53 +- .../common/inventory/ContainerVoidAnvil.java | 53 +- .../java/tb/common/item/ItemBloodyArmor.java | 46 +- .../tb/common/item/ItemCastingBracelet.java | 45 +- .../tb/common/item/ItemConcentratedTaint.java | 36 +- .../tb/common/item/ItemHerobrinesScythe.java | 80 +- .../tb/common/item/ItemKnoseFragment.java | 18 +- .../java/tb/common/item/ItemKnoseSeeds.java | 2 +- .../tb/common/item/ItemMortarAndPestle.java | 2 +- .../java/tb/common/item/ItemNodeFoci.java | 2 +- .../tb/common/item/ItemPyrofluidBucket.java | 2 +- .../java/tb/common/item/ItemRevolver.java | 123 +- .../java/tb/common/item/ItemRosehipSyrup.java | 22 +- .../java/tb/common/item/ItemSmokingPipe.java | 28 +- .../tb/common/item/ItemThauminiteArmor.java | 10 +- .../tb/common/item/ItemVoidFlintAndSteel.java | 5 +- .../java/tb/common/item/ItemVoidShears.java | 5 +- src/main/java/tb/common/item/TBResource.java | 4 +- src/main/java/tb/common/item/TBTobacco.java | 10 +- .../tb/common/item/foci/FociActivation.java | 48 +- .../java/tb/common/item/foci/FociDrain.java | 153 +- .../tb/common/item/foci/FociExperience.java | 102 +- .../java/tb/common/item/foci/FociFlux.java | 79 +- .../tb/common/itemblock/ItemBlockCrystal.java | 4 +- .../tb/common/itemblock/ItemBlockSlab_0.java | 8 +- .../tb/common/itemblock/ItemBlockSlab_1.java | 8 +- .../tb/common/itemblock/ItemBlockSpike.java | 2 +- .../common/tile/TileAdvAlchemicalFurnace.java | 9 +- src/main/java/tb/common/tile/TileBrazier.java | 6 +- .../java/tb/common/tile/TileCampfire.java | 6 +- .../common/tile/TileEntityDeconstructor.java | 66 +- .../java/tb/common/tile/TileNodeLinker.java | 153 +- .../tb/common/tile/TileNodeManipulator.java | 61 +- .../java/tb/common/tile/TileOverchanter.java | 39 +- .../java/tb/common/tile/TileRelocator.java | 56 +- src/main/java/tb/core/TBCore.java | 10 +- src/main/java/tb/init/FakeResearchItem.java | 6 +- src/main/java/tb/init/TBBlocks.java | 170 +- src/main/java/tb/init/TBEnchant.java | 79 +- src/main/java/tb/init/TBFociUpgrades.java | 81 +- src/main/java/tb/init/TBItems.java | 131 +- src/main/java/tb/init/TBRecipes.java | 79 +- src/main/java/tb/init/TBThaumonomicon.java | 6007 +++++++++-------- src/main/java/tb/network/proxy/TBClient.java | 33 +- .../tb/network/proxy/TBNetworkManager.java | 16 +- src/main/java/tb/network/proxy/TBServer.java | 4 +- .../java/tb/utils/RevolverInfusionRecipe.java | 19 +- src/main/java/tb/utils/TBConfig.java | 98 +- src/main/java/tb/utils/TBUtils.java | 13 +- .../assets/thaumicbases/lang/en_US.lang | 4 +- 108 files changed, 5187 insertions(+), 4299 deletions(-) diff --git a/build.gradle b/build.gradle index bd6289c..b74b980 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1689409577 +//version: 1696952014 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -69,7 +69,7 @@ plugins { id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.3.19' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24' } print("You might want to check out './gradlew :faq' if your build fails.\n") @@ -89,6 +89,23 @@ def out = services.get(StyledTextOutputFactory).create('an-output') def projectJavaVersion = JavaLanguageVersion.of(8) boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false +boolean disableCheckstyle = project.hasProperty("disableCheckstyle") ? project.disableCheckstyle.toBoolean() : false + +final String CHECKSTYLE_CONFIG = """ + + + + + + + + + + + +""" checkPropertyExists("modName") checkPropertyExists("modId") @@ -140,6 +157,17 @@ if (!disableSpotless) { apply from: Blowdryer.file('spotless.gradle') } +if (!disableCheckstyle) { + apply plugin: 'checkstyle' + tasks.named("checkstylePatchedMc") { enabled = false } + tasks.named("checkstyleMcLauncher") { enabled = false } + tasks.named("checkstyleIdeVirtualMain") { enabled = false } + tasks.named("checkstyleInjectedTags") { enabled = false } + checkstyle { + config = resources.text.fromString(CHECKSTYLE_CONFIG) + } +} + String javaSourceDir = "src/main/java/" String scalaSourceDir = "src/main/scala/" String kotlinSourceDir = "src/main/kotlin/" @@ -401,9 +429,13 @@ if (identifiedVersion == versionOverride) { group = "com.github.GTNewHorizons" if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) { - archivesBaseName = customArchiveBaseName + base { + archivesName = customArchiveBaseName + } } else { - archivesBaseName = modId + base { + archivesName = modId + } } @@ -558,9 +590,6 @@ repositories { maven { name 'Overmind forge repo mirror' url 'https://gregtech.overminddl1.com/' - mavenContent { - excludeGroup("net.minecraftforge") // missing the `universal` artefact - } } maven { name = "GTNH Maven" @@ -575,24 +604,34 @@ repositories { } } if (includeWellKnownRepositories.toBoolean()) { - maven { - name "CurseMaven" - url "https://cursemaven.com" - content { + exclusiveContent { + forRepository { + maven { + name "CurseMaven" + url "https://cursemaven.com" + } + } + filter { includeGroup "curse.maven" } } - maven { - name = "ic2" - url = "https://maven.ic2.player.to/" - metadataSources { - mavenPom() - artifact() + exclusiveContent { + forRepository { + maven { + name = "Modrinth" + url = "https://api.modrinth.com/maven" + } + } + filter { + includeGroup "maven.modrinth" } } maven { - name = "ic2-mirror" - url = "https://maven2.ic2.player.to/" + name = "ic2" + url = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/") + content { + includeGroup "net.industrial-craft" + } metadataSources { mavenPom() artifact() @@ -612,6 +651,8 @@ def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule} def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" ext.mixinProviderSpec = mixinProviderSpec +def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json' + dependencies { if (usesMixins.toBoolean()) { annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3') @@ -623,7 +664,7 @@ dependencies { } } if (usesMixins.toBoolean()) { - implementation(mixinProviderSpec) + implementation(modUtils.enableMixins(mixinProviderSpec, mixingConfigRefMap)) } else if (forceEnableMixins.toBoolean()) { runtimeOnlyNonPublishable(mixinProviderSpec) } @@ -676,11 +717,6 @@ if (file('dependencies.gradle.kts').exists()) { throw new RuntimeException("Missing dependencies.gradle[.kts]") } -def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json' -def mixinTmpDir = buildDir.path + File.separator + 'tmp' + File.separator + 'mixins' -def refMap = "${mixinTmpDir}" + File.separator + mixingConfigRefMap -def mixinSrg = "${mixinTmpDir}" + File.separator + "mixins.srg" - tasks.register('generateAssets') { group = "GTNH Buildscript" description = "Generates a mixin config file at /src/main/resources/mixins.modid.json if needed" @@ -711,46 +747,17 @@ tasks.register('generateAssets') { } if (usesMixins.toBoolean()) { - tasks.named("reobfJar", ReobfuscatedJar).configure { - extraSrgFiles.from(mixinSrg) - } - tasks.named("processResources").configure { dependsOn("generateAssets") } tasks.named("compileJava", JavaCompile).configure { - doFirst { - new File(mixinTmpDir).mkdirs() - } options.compilerArgs += [ - "-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}", - "-AoutSrgFile=${mixinSrg}", - "-AoutRefMapFile=${refMap}", // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code "-XDenableSunApiLintControl", "-XDignore.symbol.file" ] } - - pluginManager.withPlugin('org.jetbrains.kotlin.kapt') { - kapt { - correctErrorTypes = true - javacOptions { - option("-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}") - option("-AoutSrgFile=$mixinSrg") - option("-AoutRefMapFile=$refMap") - } - } - tasks.configureEach { task -> - if (task.name == "kaptKotlin") { - task.doFirst { - new File(mixinTmpDir).mkdirs() - } - } - } - } - } tasks.named("processResources", ProcessResources).configure { @@ -768,7 +775,6 @@ tasks.named("processResources", ProcessResources).configure { } if (usesMixins.toBoolean()) { - from refMap dependsOn("compileJava", "compileScala") } } @@ -787,23 +793,14 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.4.0' - def asmVersion = '9.4' + def lwjgl3ifyVersion = '1.5.1' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.19') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7') } - java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} - java17PatchDependencies("org.ow2.asm:asm:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}") - java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1') - java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0") java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} } @@ -1166,7 +1163,10 @@ tasks.named("processIdeaSettings").configure { tasks.named("ideVirtualMainClasses").configure { // Make IntelliJ "Build project" build the mod jars - dependsOn("jar", "reobfJar", "spotlessCheck") + dependsOn("jar", "reobfJar") + if (!disableSpotless) { + dependsOn("spotlessCheck") + } } // workaround variable hiding in pom processing @@ -1311,7 +1311,7 @@ def addCurseForgeRelation(String type, String name) { // Updating -def buildscriptGradleVersion = "8.1.1" +def buildscriptGradleVersion = "8.2.1" tasks.named('wrapper', Wrapper).configure { gradleVersion = buildscriptGradleVersion @@ -1590,6 +1590,25 @@ def getSecondaryArtifacts() { return secondaryArtifacts } +def getURL(String main, String fallback) { + return pingURL(main, 10000) ? main : fallback +} + +// credit: https://stackoverflow.com/a/3584332 +def pingURL(String url, int timeout) { + url = url.replaceFirst("^https", "http") // Otherwise an exception may be thrown on invalid SSL certificates. + try { + HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection() + connection.setConnectTimeout(timeout) + connection.setReadTimeout(timeout) + connection.setRequestMethod("HEAD") + int responseCode = connection.getResponseCode() + return 200 <= responseCode && responseCode <= 399 + } catch (IOException ignored) { + return false + } +} + // For easier scripting of things that require variables defined earlier in the buildscript if (file('addon.late.gradle.kts').exists()) { apply from: 'addon.late.gradle.kts' diff --git a/dependencies.gradle b/dependencies.gradle index 091ed56..c46cbaa 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,12 +1,12 @@ // Add your dependencies here dependencies { - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.128:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.36:dev') {transitive=false} compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compile('com.github.GTNewHorizons:CodeChickenLib:1.1.8:dev') - compile('com.github.GTNewHorizons:DummyCore:1.17.0:dev') - runtimeOnly("com.github.GTNewHorizons:NotEnoughItems:2.3.73-GTNH:dev") + compile('com.github.GTNewHorizons:DummyCore:2.0.3:dev') + runtimeOnly("com.github.GTNewHorizons:NotEnoughItems:2.4.4-GTNH:dev") runtimeOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') runtimeOnly('com.github.GTNewHorizons:CodeChickenCore:1.1.11:dev') // Required to allow dummycore to run in dev diff --git a/settings.gradle b/settings.gradle index 01ea5f1..e334397 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,6 +23,6 @@ plugins { blowdryerSetup { repoSubfolder 'gtnhShared' - github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0') + github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.2') //devLocal '.' // Use this when testing config updates locally } diff --git a/src/main/java/tb/api/RevolverUpgrade.java b/src/main/java/tb/api/RevolverUpgrade.java index e81b96a..ef8c5cd 100644 --- a/src/main/java/tb/api/RevolverUpgrade.java +++ b/src/main/java/tb/api/RevolverUpgrade.java @@ -38,17 +38,17 @@ public class RevolverUpgrade { public int instability; public static final ResourceLocation eldritchTextures = new ResourceLocation( - "thaumicbases", - "textures/items/revolver/revolverDarkMetalEldritch.png"); + "thaumicbases", + "textures/items/revolver/revolverDarkMetalEldritch.png"); public static final ResourceLocation primalTextures = new ResourceLocation( - "thaumicbases", - "textures/items/revolver/revolverGunPrimalUV.png"); + "thaumicbases", + "textures/items/revolver/revolverGunPrimalUV.png"); public static final ResourceLocation taintedTextures = new ResourceLocation( - "thaumicbases", - "textures/items/revolver/revolverGunTaintedUV.png"); + "thaumicbases", + "textures/items/revolver/revolverGunTaintedUV.png"); public static final ResourceLocation voidTextures = new ResourceLocation( - "thaumicbases", - "textures/items/revolver/revolverHandleVoidUV.png"); + "thaumicbases", + "textures/items/revolver/revolverHandleVoidUV.png"); public final ArrayList conflicts = new ArrayList(); @@ -58,15 +58,15 @@ public RevolverUpgrade(int id, String name) { if (id < allUpgrades.length && allUpgrades[id] != null) { FMLLog.warning( - "[TB]Attempting to register revolver upgrade " + name - + "[" - + id - + "], but the ID is already occupied by " - + allUpgrades[id].text_id - + "[" - + allUpgrades[id].id - + "], ignoring.", - new Object[0]); + "[TB]Attempting to register revolver upgrade " + name + + "[" + + id + + "], but the ID is already occupied by " + + allUpgrades[id].text_id + + "[" + + allUpgrades[id].id + + "], ignoring.", + new Object[0]); return; } @@ -134,12 +134,12 @@ public RevolverUpgrade setInstabilityPerLevel(int newValue) { * @return the new damage value */ public float modifyDamage_start(EntityLivingBase base, ItemStack revolver, float currentModification, - int modLevel) { + int modLevel) { if (base != null) { if (this == power) return (float) (currentModification * (Math.pow(1.1F, modLevel))); if (this == silver && (base.getCreatureAttribute() == EnumCreatureAttribute.UNDEAD || isBMEntity(base) - || (base instanceof EntityPlayer && isWerewolf(EntityPlayer.class.cast(base))))) + || (base instanceof EntityPlayer && isWerewolf(EntityPlayer.class.cast(base))))) return (float) (currentModification * (Math.pow(1.2F, modLevel))); if (this == atropodsBane && base.getCreatureAttribute() == EnumCreatureAttribute.ARTHROPOD) @@ -193,7 +193,7 @@ public float modifyDamage_end(EntityLivingBase base, ItemStack revolver, float c * @return true to destroy bulled, false otherwise */ public boolean afterhit(EntityLivingBase base, EntityPlayer user, ItemStack revolver, final float damageDealt, - int modLevel) { + int modLevel) { if (this == tainted) if (base.worldObj.rand.nextDouble() <= 0.1D) base.addPotionEffect(new PotionEffect(Config.potionTaintPoisonID, 200, 1, true)); @@ -307,8 +307,8 @@ public boolean isWerewolf(EntityPlayer p) { IExtendedEntityProperties props = p.getExtendedProperties("WitcheryExtendedPlayer"); NBTTagCompound tag = new NBTTagCompound(); props.saveNBTData(tag); - return tag.getCompoundTag("WitcheryExtendedPlayer").getInteger("WerewolfLevel") > 0 - || tag.getInteger("WerewolfLevel") > 0; + return tag.getCompoundTag("WitcheryExtendedPlayer") + .getInteger("WerewolfLevel") > 0 || tag.getInteger("WerewolfLevel") > 0; } } return false; @@ -330,35 +330,35 @@ public static void initConflictingMappings() { } public static final RevolverUpgrade power = new RevolverUpgrade(0, "POWER").setMaxLevel(5) - .setInstabilityPerLevel(2); + .setInstabilityPerLevel(2); public static final RevolverUpgrade accuracy = new RevolverUpgrade(1, "ACCURACY").setMaxLevel(3) - .setInstabilityPerLevel(1); + .setInstabilityPerLevel(1); public static final RevolverUpgrade silver = new RevolverUpgrade(2, "SILVER").setMaxLevel(5) - .setInstabilityPerLevel(3); + .setInstabilityPerLevel(3); public static final RevolverUpgrade poisoned = new RevolverUpgrade(3, "POISONED").setMaxLevel(3) - .setInstabilityPerLevel(1); + .setInstabilityPerLevel(1); public static final RevolverUpgrade atropodsBane = new RevolverUpgrade(4, "BANE_OF_ATROPODS").setMaxLevel(5) - .setInstabilityPerLevel(3); + .setInstabilityPerLevel(3); public static final RevolverUpgrade eldritchBane = new RevolverUpgrade(5, "BANE_OF_ELDRITCH").setMaxLevel(5) - .setInstabilityPerLevel(3); + .setInstabilityPerLevel(3); public static final RevolverUpgrade piercig = new RevolverUpgrade(6, "PIERCING").setMaxLevel(1) - .setInstabilityPerLevel(12); + .setInstabilityPerLevel(12); public static final RevolverUpgrade dueling = new RevolverUpgrade(7, "DUELING").setMaxLevel(5) - .setInstabilityPerLevel(3); + .setInstabilityPerLevel(3); public static final RevolverUpgrade tainted = new RevolverUpgrade(8, "TAINTED").setMaxLevel(3) - .setInstabilityPerLevel(5); + .setInstabilityPerLevel(5); public static final RevolverUpgrade primal = new RevolverUpgrade(9, "PRIMAL").setMaxLevel(1) - .setInstabilityPerLevel(12); + .setInstabilityPerLevel(12); public static final RevolverUpgrade speed = new RevolverUpgrade(10, "SPEED").setMaxLevel(5) - .setInstabilityPerLevel(2); + .setInstabilityPerLevel(2); public static final RevolverUpgrade efficiency = new RevolverUpgrade(11, "EFFICIENCY").setMaxLevel(5) - .setInstabilityPerLevel(4); + .setInstabilityPerLevel(4); public static final RevolverUpgrade eldritch = new RevolverUpgrade(12, "ELDRITCH").setMaxLevel(2) - .setInstabilityPerLevel(7); + .setInstabilityPerLevel(7); public static final RevolverUpgrade uvoid = new RevolverUpgrade(13, "VOID").setMaxLevel(3) - .setInstabilityPerLevel(4); + .setInstabilityPerLevel(4); public static final RevolverUpgrade knowledge = new RevolverUpgrade(14, "KNOWLEDGE").setMaxLevel(5) - .setInstabilityPerLevel(1); + .setInstabilityPerLevel(1); public static final RevolverUpgrade heavy = new RevolverUpgrade(15, "HEAVY").setMaxLevel(5) - .setInstabilityPerLevel(1); + .setInstabilityPerLevel(1); } diff --git a/src/main/java/tb/client/RevolverEvents.java b/src/main/java/tb/client/RevolverEvents.java index 4c71b8e..7ec3357 100644 --- a/src/main/java/tb/client/RevolverEvents.java +++ b/src/main/java/tb/client/RevolverEvents.java @@ -15,7 +15,8 @@ public class RevolverEvents { public void renderCrossharEvent(RenderGameOverlayEvent event) { if (event.type == ElementType.CROSSHAIRS && Minecraft.getMinecraft().thePlayer.isSneaking()) { if (Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem() != null - && Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getItem() instanceof ItemRevolver) { + && Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem() + .getItem() instanceof ItemRevolver) { event.setCanceled(true); } } @@ -25,10 +26,11 @@ public void renderCrossharEvent(RenderGameOverlayEvent event) { public void renderZoomEvent(FOVUpdateEvent event) { if (Minecraft.getMinecraft().thePlayer.isSneaking()) { if (Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem() != null - && Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getItem() instanceof ItemRevolver) { + && Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem() + .getItem() instanceof ItemRevolver) { event.newfov = 0.9F / (ItemRevolver.getUpgradeLevel( - Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem(), - RevolverUpgrade.accuracy) + 1); + Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem(), + RevolverUpgrade.accuracy) + 1); } } } diff --git a/src/main/java/tb/client/gui/GuiRevolver.java b/src/main/java/tb/client/gui/GuiRevolver.java index 2f4dfcb..7230688 100644 --- a/src/main/java/tb/client/gui/GuiRevolver.java +++ b/src/main/java/tb/client/gui/GuiRevolver.java @@ -14,8 +14,8 @@ public class GuiRevolver extends GuiContainer { public static final ResourceLocation revolverTextures = new ResourceLocation( - "thaumicbases", - "textures/gui/revolver.png"); + "thaumicbases", + "textures/gui/revolver.png"); public int blockedSlot; public GuiRevolver(InventoryPlayer inv, World w, int x, int y, int z) { diff --git a/src/main/java/tb/client/gui/GuiThaumicAnvil.java b/src/main/java/tb/client/gui/GuiThaumicAnvil.java index d7c7887..137bb28 100644 --- a/src/main/java/tb/client/gui/GuiThaumicAnvil.java +++ b/src/main/java/tb/client/gui/GuiThaumicAnvil.java @@ -32,15 +32,15 @@ public class GuiThaumicAnvil extends GuiContainer implements ICrafting { private InventoryPlayer field_147094_x; public GuiThaumicAnvil(InventoryPlayer p_i1073_1_, World p_i1073_2_, int p_i1073_3_, int p_i1073_4_, - int p_i1073_5_) { + int p_i1073_5_) { super( - new ContainerThaumicAnvil( - p_i1073_1_, - p_i1073_2_, - p_i1073_3_, - p_i1073_4_, - p_i1073_5_, - Minecraft.getMinecraft().thePlayer)); + new ContainerThaumicAnvil( + p_i1073_1_, + p_i1073_2_, + p_i1073_3_, + p_i1073_4_, + p_i1073_5_, + Minecraft.getMinecraft().thePlayer)); this.field_147094_x = p_i1073_1_; this.field_147092_v = (ContainerThaumicAnvil) this.inventorySlots; } @@ -83,16 +83,18 @@ protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) int k = 8453920; boolean flag = true; String s = I18n - .format("container.repair.cost", new Object[] { Integer.valueOf(this.field_147092_v.maximumCost) }); + .format("container.repair.cost", new Object[] { Integer.valueOf(this.field_147092_v.maximumCost) }); if (this.field_147092_v.maximumCost >= 40 && !this.mc.thePlayer.capabilities.isCreativeMode) { s = I18n.format("container.repair.expensive", new Object[0]); k = 16736352; - } else if (!this.field_147092_v.getSlot(2).getHasStack()) { - flag = false; - } else if (!this.field_147092_v.getSlot(2).canTakeStack(this.field_147094_x.player)) { - k = 16736352; - } + } else if (!this.field_147092_v.getSlot(2) + .getHasStack()) { + flag = false; + } else if (!this.field_147092_v.getSlot(2) + .canTakeStack(this.field_147094_x.player)) { + k = 16736352; + } if (flag) { int l = -16777216 | (k & 16579836) >> 2 | k & -16777216; @@ -131,14 +133,17 @@ private void func_147090_g() { Slot slot = this.field_147092_v.getSlot(0); if (slot != null && slot.getHasStack() - && !slot.getStack().hasDisplayName() - && s.equals(slot.getStack().getDisplayName())) { + && !slot.getStack() + .hasDisplayName() + && s.equals( + slot.getStack() + .getDisplayName())) { s = ""; } this.field_147092_v.updateItemName(s); this.mc.thePlayer.sendQueue - .addToSendQueue(new C17PacketCustomPayload("MC|ItemName", s.getBytes(Charsets.UTF_8))); + .addToSendQueue(new C17PacketCustomPayload("MC|ItemName", s.getBytes(Charsets.UTF_8))); } /** @@ -161,27 +166,37 @@ public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_) { protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(field_147093_u); + this.mc.getTextureManager() + .bindTexture(field_147093_u); int k = (this.width - this.xSize) / 2; int l = (this.height - this.ySize) / 2; this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); this.drawTexturedModalRect( - k + 59, - l + 20, - 0, - this.ySize + (this.field_147092_v.getSlot(0).getHasStack() ? 0 : 16), - 110, - 16); - - if ((this.field_147092_v.getSlot(0).getHasStack() || this.field_147092_v.getSlot(1).getHasStack()) - && !this.field_147092_v.getSlot(2).getHasStack()) { + k + 59, + l + 20, + 0, + this.ySize + (this.field_147092_v.getSlot(0) + .getHasStack() ? 0 : 16), + 110, + 16); + + if ((this.field_147092_v.getSlot(0) + .getHasStack() + || this.field_147092_v.getSlot(1) + .getHasStack()) + && !this.field_147092_v.getSlot(2) + .getHasStack()) { this.drawTexturedModalRect(k + 99, l + 45, this.xSize, 0, 28, 21); } } @SuppressWarnings("rawtypes") public void sendContainerAndContentsToPlayer(Container p_71110_1_, List p_71110_2_) { - this.sendSlotContents(p_71110_1_, 0, p_71110_1_.getSlot(0).getStack()); + this.sendSlotContents( + p_71110_1_, + 0, + p_71110_1_.getSlot(0) + .getStack()); } /** diff --git a/src/main/java/tb/client/gui/GuiVoidAnvil.java b/src/main/java/tb/client/gui/GuiVoidAnvil.java index 06c14a5..6733c2c 100644 --- a/src/main/java/tb/client/gui/GuiVoidAnvil.java +++ b/src/main/java/tb/client/gui/GuiVoidAnvil.java @@ -33,13 +33,13 @@ public class GuiVoidAnvil extends GuiContainer implements ICrafting { public GuiVoidAnvil(InventoryPlayer p_i1073_1_, World p_i1073_2_, int p_i1073_3_, int p_i1073_4_, int p_i1073_5_) { super( - new ContainerVoidAnvil( - p_i1073_1_, - p_i1073_2_, - p_i1073_3_, - p_i1073_4_, - p_i1073_5_, - Minecraft.getMinecraft().thePlayer)); + new ContainerVoidAnvil( + p_i1073_1_, + p_i1073_2_, + p_i1073_3_, + p_i1073_4_, + p_i1073_5_, + Minecraft.getMinecraft().thePlayer)); this.field_147094_x = p_i1073_1_; this.field_147092_v = (ContainerVoidAnvil) this.inventorySlots; } @@ -82,16 +82,18 @@ protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) int k = 8453920; boolean flag = true; String s = I18n - .format("container.repair.cost", new Object[] { Integer.valueOf(this.field_147092_v.maximumCost) }); + .format("container.repair.cost", new Object[] { Integer.valueOf(this.field_147092_v.maximumCost) }); if (this.field_147092_v.maximumCost >= 40 && !this.mc.thePlayer.capabilities.isCreativeMode) { s = I18n.format("container.repair.expensive", new Object[0]); k = 16736352; - } else if (!this.field_147092_v.getSlot(2).getHasStack()) { - flag = false; - } else if (!this.field_147092_v.getSlot(2).canTakeStack(this.field_147094_x.player)) { - k = 16736352; - } + } else if (!this.field_147092_v.getSlot(2) + .getHasStack()) { + flag = false; + } else if (!this.field_147092_v.getSlot(2) + .canTakeStack(this.field_147094_x.player)) { + k = 16736352; + } if (flag) { int l = -16777216 | (k & 16579836) >> 2 | k & -16777216; @@ -130,14 +132,17 @@ private void func_147090_g() { Slot slot = this.field_147092_v.getSlot(0); if (slot != null && slot.getHasStack() - && !slot.getStack().hasDisplayName() - && s.equals(slot.getStack().getDisplayName())) { + && !slot.getStack() + .hasDisplayName() + && s.equals( + slot.getStack() + .getDisplayName())) { s = ""; } this.field_147092_v.updateItemName(s); this.mc.thePlayer.sendQueue - .addToSendQueue(new C17PacketCustomPayload("MC|ItemName", s.getBytes(Charsets.UTF_8))); + .addToSendQueue(new C17PacketCustomPayload("MC|ItemName", s.getBytes(Charsets.UTF_8))); } /** @@ -160,27 +165,37 @@ public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_) { protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(field_147093_u); + this.mc.getTextureManager() + .bindTexture(field_147093_u); int k = (this.width - this.xSize) / 2; int l = (this.height - this.ySize) / 2; this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); this.drawTexturedModalRect( - k + 59, - l + 20, - 0, - this.ySize + (this.field_147092_v.getSlot(0).getHasStack() ? 0 : 16), - 110, - 16); - - if ((this.field_147092_v.getSlot(0).getHasStack() || this.field_147092_v.getSlot(1).getHasStack()) - && !this.field_147092_v.getSlot(2).getHasStack()) { + k + 59, + l + 20, + 0, + this.ySize + (this.field_147092_v.getSlot(0) + .getHasStack() ? 0 : 16), + 110, + 16); + + if ((this.field_147092_v.getSlot(0) + .getHasStack() + || this.field_147092_v.getSlot(1) + .getHasStack()) + && !this.field_147092_v.getSlot(2) + .getHasStack()) { this.drawTexturedModalRect(k + 99, l + 45, this.xSize, 0, 28, 21); } } @SuppressWarnings("rawtypes") public void sendContainerAndContentsToPlayer(Container p_71110_1_, List p_71110_2_) { - this.sendSlotContents(p_71110_1_, 0, p_71110_1_.getSlot(0).getStack()); + this.sendSlotContents( + p_71110_1_, + 0, + p_71110_1_.getSlot(0) + .getStack()); } /** diff --git a/src/main/java/tb/client/render/block/BrazierRenderer.java b/src/main/java/tb/client/render/block/BrazierRenderer.java index 4797eaa..b38a207 100644 --- a/src/main/java/tb/client/render/block/BrazierRenderer.java +++ b/src/main/java/tb/client/render/block/BrazierRenderer.java @@ -60,7 +60,7 @@ public void renderInventoryBlock(Block block, int metadata, int modelId, RenderB @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { renderer.renderAllFaces = true; renderer.setOverrideBlockTexture(ConfigBlocks.blockCosmeticSolid.getIcon(0, 6)); diff --git a/src/main/java/tb/client/render/block/CampfireRenderer.java b/src/main/java/tb/client/render/block/CampfireRenderer.java index eae1051..8ce9eac 100644 --- a/src/main/java/tb/client/render/block/CampfireRenderer.java +++ b/src/main/java/tb/client/render/block/CampfireRenderer.java @@ -17,7 +17,7 @@ public void renderInventoryBlock(Block block, int metadata, int modelId, RenderB @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { renderer.renderAllFaces = true; /* * looks like shit renderer.setOverrideBlockTexture(Blocks.cobblestone.getIcon(0, 0)); Random rand = new diff --git a/src/main/java/tb/client/render/block/ThaumicRelocatorRenderer.java b/src/main/java/tb/client/render/block/ThaumicRelocatorRenderer.java index d78e18f..5bc4a89 100644 --- a/src/main/java/tb/client/render/block/ThaumicRelocatorRenderer.java +++ b/src/main/java/tb/client/render/block/ThaumicRelocatorRenderer.java @@ -108,7 +108,7 @@ public void renderInventoryBlock(Block block, int metadata, int modelId, RenderB @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { int meta = world.getBlockMetadata(x, y, z); int color = meta < 6 ? 0xffff77 : 0x0077ff; diff --git a/src/main/java/tb/client/render/entity/RenderBullet.java b/src/main/java/tb/client/render/entity/RenderBullet.java index 14c7ebf..7bdd0b8 100644 --- a/src/main/java/tb/client/render/entity/RenderBullet.java +++ b/src/main/java/tb/client/render/entity/RenderBullet.java @@ -8,7 +8,7 @@ public class RenderBullet extends Render { @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, - float p_76986_9_) {} + float p_76986_9_) {} @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { diff --git a/src/main/java/tb/client/render/item/CastingBraceletRenderer.java b/src/main/java/tb/client/render/item/CastingBraceletRenderer.java index 9895b80..0168774 100644 --- a/src/main/java/tb/client/render/item/CastingBraceletRenderer.java +++ b/src/main/java/tb/client/render/item/CastingBraceletRenderer.java @@ -37,7 +37,7 @@ public class CastingBraceletRenderer implements IItemRenderer { public static final IModelCustom bracelet = AdvancedModelLoader - .loadModel(new ResourceLocation("thaumicbases", "models/bracelet/bracelet.obj")); + .loadModel(new ResourceLocation("thaumicbases", "models/bracelet/bracelet.obj")); public static final RenderBlocks renderBlocks = new RenderBlocks(); public static final ModelWand wand = new ModelWand(); @@ -93,7 +93,9 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) { GL11.glPushMatrix(); - Minecraft.getMinecraft().getTextureManager().bindTexture(entityclientplayermp.getLocationSkin()); + Minecraft.getMinecraft() + .getTextureManager() + .bindTexture(entityclientplayermp.getLocationSkin()); GL11.glTranslated(0.5D, 1, 1); @@ -140,10 +142,11 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { double ds = 0.2D; GL11.glScaled(ds, ds, ds); Minecraft.getMinecraft().renderEngine.bindTexture( - ItemCastingBracelet.braceletTextures[Math - .min(ItemCastingBracelet.braceletTextures.length - 1, item.getItemDamage())]); + ItemCastingBracelet.braceletTextures[Math + .min(ItemCastingBracelet.braceletTextures.length - 1, item.getItemDamage())]); GL11.glPushMatrix(); - if (wand.getRod(item) != null && wand.getRod(item).isGlowing()) { + if (wand.getRod(item) != null && wand.getRod(item) + .isGlowing()) { int j = (int) (200.0F + MathHelper.sin(entityclientplayermp.ticksExisted) * 5.0F + 5.0F); int k = j % 65536; int l = j / 65536; @@ -153,12 +156,14 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { GL11.glPopMatrix(); if (focusStack != null) { - if (wand.getFocus(item).getOrnament(focusStack) != null) { + if (wand.getFocus(item) + .getOrnament(focusStack) != null) { GL11.glPushMatrix(); GL11.glScaled(5, 5, 5); GL11.glTranslated(0, 0.7D, 0); Tessellator tessellator = Tessellator.instance; - IIcon icon = wand.getFocus(item).getOrnament(focusStack); + IIcon icon = wand.getFocus(item) + .getOrnament(focusStack); float minU = icon.getMinU(); float minV = icon.getMinV(); float maxU = icon.getMaxU(); @@ -168,34 +173,35 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { GL11.glTranslatef(-0.25F, -0.1F, 0.0275F); GL11.glScaled(0.5D, 0.5D, 0.5D); ItemRenderer.renderItemIn2D( - tessellator, - maxU, - minV, - minU, - maxV, - icon.getIconWidth(), - icon.getIconHeight(), - 0.1F); + tessellator, + maxU, + minV, + minU, + maxV, + icon.getIconWidth(), + icon.getIconHeight(), + 0.1F); GL11.glPopMatrix(); GL11.glPushMatrix(); GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(-0.25F, -0.1F, 0.0275F); GL11.glScaled(0.5D, 0.5D, 0.5D); ItemRenderer.renderItemIn2D( - tessellator, - maxU, - minV, - minU, - maxV, - icon.getIconWidth(), - icon.getIconHeight(), - 0.1F); + tessellator, + maxU, + minV, + minU, + maxV, + icon.getIconWidth(), + icon.getIconHeight(), + 0.1F); GL11.glPopMatrix(); GL11.glPopMatrix(); } float alpha = 0.95F; - if (wand.getFocus(item).getFocusDepthLayerIcon(focusStack) != null) { + if (wand.getFocus(item) + .getFocusDepthLayerIcon(focusStack) != null) { GL11.glPushMatrix(); GL11.glScaled(5, 5, 5); GL11.glTranslated(0, 0.87D, 0); @@ -204,8 +210,12 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { // should be identical to his. Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); renderBlocks.setRenderBoundsFromBlock(Blocks.glass); - BlockRenderer - .drawFaces(renderBlocks, null, wand.getFocus(item).getFocusDepthLayerIcon(focusStack), false); + BlockRenderer.drawFaces( + renderBlocks, + null, + wand.getFocus(item) + .getFocusDepthLayerIcon(focusStack), + false); alpha = 0.6F; GL11.glPopMatrix(); } @@ -223,7 +233,9 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { GL11.glTranslated(0, 0.87D, 0); GL11.glTranslatef(0.0F, -0.0475F, 0.0F); GL11.glScaled(0.525D, 0.5525D, 0.525D); - Color c = new Color(wand.getFocus(item).getFocusColor(focusStack)); + Color c = new Color( + wand.getFocus(item) + .getFocusColor(focusStack)); GL11.glColor4f(c.getRed() / 255.0F, c.getGreen() / 255.0F, c.getBlue() / 255.0F, alpha); int j = (int) (195.0F + MathHelper.sin(entityclientplayermp.ticksExisted / 3.0F) * 10.0F + 10.0F); int k = j % 65536; diff --git a/src/main/java/tb/client/render/item/HerobrinesScytheRenderer.java b/src/main/java/tb/client/render/item/HerobrinesScytheRenderer.java index df79dc9..a746a37 100644 --- a/src/main/java/tb/client/render/item/HerobrinesScytheRenderer.java +++ b/src/main/java/tb/client/render/item/HerobrinesScytheRenderer.java @@ -35,14 +35,14 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { GL11.glRotated(15, 0, 0, 1); IIcon icon = item.getIconIndex(); ItemRenderer.renderItemIn2D( - Tessellator.instance, - icon.getMinU(), - icon.getMinV(), - icon.getMaxU(), - icon.getMaxV(), - icon.getIconWidth(), - icon.getIconHeight(), - 0.03125F); + Tessellator.instance, + icon.getMinU(), + icon.getMinV(), + icon.getMaxU(), + icon.getMaxV(), + icon.getIconWidth(), + icon.getIconHeight(), + 0.03125F); } if (type == ItemRenderType.INVENTORY) { @@ -55,14 +55,14 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { GL11.glRotated(60, 0, 1, 1); IIcon icon = item.getIconIndex(); ItemRenderer.renderItemIn2D( - Tessellator.instance, - icon.getMinU(), - icon.getMinV(), - icon.getMaxU(), - icon.getMaxV(), - icon.getIconWidth(), - icon.getIconHeight(), - 0.0625F); + Tessellator.instance, + icon.getMinU(), + icon.getMinV(), + icon.getMaxU(), + icon.getMaxV(), + icon.getIconWidth(), + icon.getIconHeight(), + 0.0625F); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_ALPHA_TEST); } @@ -74,14 +74,14 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { GL11.glTranslated(-0.5D, -0.5D, 0.05D); IIcon icon = item.getIconIndex(); ItemRenderer.renderItemIn2D( - Tessellator.instance, - icon.getMinU(), - icon.getMinV(), - icon.getMaxU(), - icon.getMaxV(), - icon.getIconWidth(), - icon.getIconHeight(), - 0.0625F); + Tessellator.instance, + icon.getMinU(), + icon.getMinV(), + icon.getMaxU(), + icon.getMaxV(), + icon.getIconWidth(), + icon.getIconHeight(), + 0.0625F); } if (type == ItemRenderType.EQUIPPED) { @@ -91,14 +91,14 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { GL11.glTranslated(-0.7D, -0.4D, 0.01D); IIcon icon = item.getIconIndex(); ItemRenderer.renderItemIn2D( - Tessellator.instance, - icon.getMinU(), - icon.getMinV(), - icon.getMaxU(), - icon.getMaxV(), - icon.getIconWidth(), - icon.getIconHeight(), - 0.0225F); + Tessellator.instance, + icon.getMinU(), + icon.getMinV(), + icon.getMaxU(), + icon.getMaxV(), + icon.getIconWidth(), + icon.getIconHeight(), + 0.0225F); } GL11.glPopMatrix(); diff --git a/src/main/java/tb/client/render/item/NodeFociRenderer.java b/src/main/java/tb/client/render/item/NodeFociRenderer.java index ad4f33c..e4b7aff 100644 --- a/src/main/java/tb/client/render/item/NodeFociRenderer.java +++ b/src/main/java/tb/client/render/item/NodeFociRenderer.java @@ -14,7 +14,7 @@ public class NodeFociRenderer implements IItemRenderer { public static final IModelCustom model = AdvancedModelLoader - .loadModel(new ResourceLocation("thaumicbases", "models/nodeManipulator/foci.obj")); + .loadModel(new ResourceLocation("thaumicbases", "models/nodeManipulator/foci.obj")); @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { @@ -36,8 +36,8 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { if (type == ItemRenderType.INVENTORY) GL11.glTranslated(0, -1, 0); MiscUtils.bindTexture( - "thaumicbases", - "textures/blocks/nodeManipulator/foci_" + ItemNodeFoci.names[item.getItemDamage()] + ".png"); + "thaumicbases", + "textures/blocks/nodeManipulator/foci_" + ItemNodeFoci.names[item.getItemDamage()] + ".png"); model.renderAll(); GL11.glPopMatrix(); diff --git a/src/main/java/tb/client/render/item/NodeLinkerItemRenderer.java b/src/main/java/tb/client/render/item/NodeLinkerItemRenderer.java index 4759820..50c4a65 100644 --- a/src/main/java/tb/client/render/item/NodeLinkerItemRenderer.java +++ b/src/main/java/tb/client/render/item/NodeLinkerItemRenderer.java @@ -12,10 +12,10 @@ public class NodeLinkerItemRenderer implements IItemRenderer { public static final IModelCustom model = AdvancedModelLoader - .loadModel(new ResourceLocation("thaumicbases", "models/nodeLinker/nodeLinker.obj")); + .loadModel(new ResourceLocation("thaumicbases", "models/nodeLinker/nodeLinker.obj")); public static final ResourceLocation genIcon = new ResourceLocation( - "thaumicbases", - "textures/blocks/nodeLinker/nodeLinkerUV.png"); + "thaumicbases", + "textures/blocks/nodeLinker/nodeLinkerUV.png"); @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { diff --git a/src/main/java/tb/client/render/item/NodeManipulatorItemRenderer.java b/src/main/java/tb/client/render/item/NodeManipulatorItemRenderer.java index f0de47a..8f63085 100644 --- a/src/main/java/tb/client/render/item/NodeManipulatorItemRenderer.java +++ b/src/main/java/tb/client/render/item/NodeManipulatorItemRenderer.java @@ -12,10 +12,10 @@ public class NodeManipulatorItemRenderer implements IItemRenderer { public static final IModelCustom model = AdvancedModelLoader - .loadModel(new ResourceLocation("thaumicbases", "models/nodeManipulator/nodeManipulator.obj")); + .loadModel(new ResourceLocation("thaumicbases", "models/nodeManipulator/nodeManipulator.obj")); public static final ResourceLocation genIcon = new ResourceLocation( - "thaumicbases", - "textures/blocks/nodeManipulator/baseUVMap.png"); + "thaumicbases", + "textures/blocks/nodeManipulator/baseUVMap.png"); @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { diff --git a/src/main/java/tb/client/render/item/RenderRevolver.java b/src/main/java/tb/client/render/item/RenderRevolver.java index dd07013..0f00b47 100644 --- a/src/main/java/tb/client/render/item/RenderRevolver.java +++ b/src/main/java/tb/client/render/item/RenderRevolver.java @@ -19,22 +19,22 @@ public class RenderRevolver implements IItemRenderer { public static final IModelCustom model = AdvancedModelLoader - .loadModel(new ResourceLocation("thaumicbases", "models/revolver/revolver.obj")); + .loadModel(new ResourceLocation("thaumicbases", "models/revolver/revolver.obj")); public static final ResourceLocation handle = new ResourceLocation( - "thaumicbases", - "textures/items/revolver/revolverHandleUV.png"); + "thaumicbases", + "textures/items/revolver/revolverHandleUV.png"); public static final ResourceLocation barrel = new ResourceLocation( - "thaumicbases", - "textures/items/revolver/revolverBarrelUV.png"); + "thaumicbases", + "textures/items/revolver/revolverBarrelUV.png"); public static final ResourceLocation metal = new ResourceLocation( - "thaumicbases", - "textures/items/revolver/revolverDarkMetal.png"); + "thaumicbases", + "textures/items/revolver/revolverDarkMetal.png"); public static final ResourceLocation gun = new ResourceLocation( - "thaumicbases", - "textures/items/revolver/revolverGunUV.png"); + "thaumicbases", + "textures/items/revolver/revolverGunUV.png"); public static final ResourceLocation press = new ResourceLocation( - "thaumicbases", - "textures/items/revolver/revolverPressUV.png"); + "thaumicbases", + "textures/items/revolver/revolverPressUV.png"); @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { @@ -101,22 +101,23 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { for (Pair p : upgrades) { RevolverUpgrade ru = p.getFirst(); handle = ru.getOverridePartTexture(item, 0, p.getSecond()) == null ? handle - : ru.getOverridePartTexture(item, 0, p.getSecond()); + : ru.getOverridePartTexture(item, 0, p.getSecond()); barrel = ru.getOverridePartTexture(item, 1, p.getSecond()) == null ? barrel - : ru.getOverridePartTexture(item, 1, p.getSecond()); + : ru.getOverridePartTexture(item, 1, p.getSecond()); metal = ru.getOverridePartTexture(item, 2, p.getSecond()) == null ? metal - : ru.getOverridePartTexture(item, 2, p.getSecond()); + : ru.getOverridePartTexture(item, 2, p.getSecond()); gun = ru.getOverridePartTexture(item, 3, p.getSecond()) == null ? gun - : ru.getOverridePartTexture(item, 3, p.getSecond()); + : ru.getOverridePartTexture(item, 3, p.getSecond()); press = ru.getOverridePartTexture(item, 4, p.getSecond()) == null ? press - : ru.getOverridePartTexture(item, 4, p.getSecond()); + : ru.getOverridePartTexture(item, 4, p.getSecond()); } Minecraft.getMinecraft().renderEngine.bindTexture(handle); model.renderPart("Cylinder"); model.renderPart("Plane"); - double rotation = item.hasTagCompound() ? item.getTagCompound().getDouble("renderedRotation") : 0; + double rotation = item.hasTagCompound() ? item.getTagCompound() + .getDouble("renderedRotation") : 0; GL11.glPushMatrix(); GL11.glTranslated(0, 2.9D, 0); @@ -140,7 +141,8 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) { model.renderPart("Cube.001_Cube.005"); if (type == ItemRenderType.EQUIPPED_FIRST_PERSON && item.getTagCompound() != null - && item.getTagCompound().getBoolean("hasJar")) { + && item.getTagCompound() + .getBoolean("hasJar")) { GL11.glPushMatrix(); GL11.glScaled(1.1, 1.1, 1.1); diff --git a/src/main/java/tb/client/render/tile/RenderEntityDeconstructor.java b/src/main/java/tb/client/render/tile/RenderEntityDeconstructor.java index d0fe12b..382b912 100644 --- a/src/main/java/tb/client/render/tile/RenderEntityDeconstructor.java +++ b/src/main/java/tb/client/render/tile/RenderEntityDeconstructor.java @@ -15,34 +15,34 @@ public class RenderEntityDeconstructor extends TileEntitySpecialRenderer { public static final IModelCustom model = AdvancedModelLoader - .loadModel(new ResourceLocation("thaumicbases", "models/entityDeconstructor/deconstructor.obj")); + .loadModel(new ResourceLocation("thaumicbases", "models/entityDeconstructor/deconstructor.obj")); public static final ResourceLocation frameIcon = new ResourceLocation( - "thaumicbases", - "textures/blocks/entityDeconstructor/goldbase.png"); + "thaumicbases", + "textures/blocks/entityDeconstructor/goldbase.png"); public static final ResourceLocation glassIcon = new ResourceLocation( - "thaumicbases", - "textures/blocks/entityDeconstructor/glass.png"); + "thaumicbases", + "textures/blocks/entityDeconstructor/glass.png"); public static final ResourceLocation air = new ResourceLocation("thaumicbases", "textures/blocks/crystal/air.png"); public static final ResourceLocation fire = new ResourceLocation( - "thaumicbases", - "textures/blocks/crystal/fire.png"); + "thaumicbases", + "textures/blocks/crystal/fire.png"); public static final ResourceLocation water = new ResourceLocation( - "thaumicbases", - "textures/blocks/crystal/water.png"); + "thaumicbases", + "textures/blocks/crystal/water.png"); public static final ResourceLocation earth = new ResourceLocation( - "thaumicbases", - "textures/blocks/crystal/earth.png"); + "thaumicbases", + "textures/blocks/crystal/earth.png"); public static final ResourceLocation ordo = new ResourceLocation( - "thaumicbases", - "textures/blocks/crystal/order.png"); + "thaumicbases", + "textures/blocks/crystal/order.png"); public static final ResourceLocation entropy = new ResourceLocation( - "thaumicbases", - "textures/blocks/crystal/entropy.png"); + "thaumicbases", + "textures/blocks/crystal/entropy.png"); @Override public void renderTileEntityAt(TileEntity tile, double screenX, double screenY, double screenZ, - float partialTicks) { + float partialTicks) { GL11.glPushMatrix(); TileEntityDeconstructor d = (TileEntityDeconstructor) tile; diff --git a/src/main/java/tb/client/render/tile/RenderNodeLinker.java b/src/main/java/tb/client/render/tile/RenderNodeLinker.java index b4107db..38d6085 100644 --- a/src/main/java/tb/client/render/tile/RenderNodeLinker.java +++ b/src/main/java/tb/client/render/tile/RenderNodeLinker.java @@ -12,14 +12,14 @@ public class RenderNodeLinker extends TileEntitySpecialRenderer { public static final IModelCustom model = AdvancedModelLoader - .loadModel(new ResourceLocation("thaumicbases", "models/nodeLinker/nodeLinker.obj")); + .loadModel(new ResourceLocation("thaumicbases", "models/nodeLinker/nodeLinker.obj")); public static final ResourceLocation genIcon = new ResourceLocation( - "thaumicbases", - "textures/blocks/nodeLinker/nodeLinkerUV.png"); + "thaumicbases", + "textures/blocks/nodeLinker/nodeLinkerUV.png"); @Override public void renderTileEntityAt(TileEntity tile, double screenX, double screenY, double screenZ, - float partialTicks) { + float partialTicks) { GL11.glPushMatrix(); GL11.glTranslated(screenX + 0.5D, screenY, screenZ + 0.5D); GL11.glScaled(0.5D, 0.5D, 0.5D); diff --git a/src/main/java/tb/client/render/tile/RenderNodeManipulator.java b/src/main/java/tb/client/render/tile/RenderNodeManipulator.java index 69b4c66..7e6b97e 100644 --- a/src/main/java/tb/client/render/tile/RenderNodeManipulator.java +++ b/src/main/java/tb/client/render/tile/RenderNodeManipulator.java @@ -15,14 +15,14 @@ public class RenderNodeManipulator extends TileEntitySpecialRenderer { public static final IModelCustom model = AdvancedModelLoader - .loadModel(new ResourceLocation("thaumicbases", "models/nodeManipulator/nodeManipulator.obj")); + .loadModel(new ResourceLocation("thaumicbases", "models/nodeManipulator/nodeManipulator.obj")); public static final ResourceLocation genIcon = new ResourceLocation( - "thaumicbases", - "textures/blocks/nodeManipulator/baseUVMap.png"); + "thaumicbases", + "textures/blocks/nodeManipulator/baseUVMap.png"); @Override public void renderTileEntityAt(TileEntity tile, double screenX, double screenY, double screenZ, - float partialTicks) { + float partialTicks) { GL11.glPushMatrix(); GL11.glTranslated(screenX + 0.5D, screenY + 1, screenZ + 0.5D); GL11.glRotated(180, 1, 0, 0); @@ -35,11 +35,12 @@ public void renderTileEntityAt(TileEntity tile, double screenX, double screenY, model.renderPart("handle_2_Cube.002"); model.renderPart("handle_3_Cube.002"); - int meta = tile.getWorldObj().getBlockMetadata(tile.xCoord, tile.yCoord, tile.zCoord); + int meta = tile.getWorldObj() + .getBlockMetadata(tile.xCoord, tile.yCoord, tile.zCoord); if (meta != 0) { MiscUtils.bindTexture( - "thaumicbases", - "textures/blocks/nodeManipulator/foci_" + ItemNodeFoci.names[meta - 1] + ".png"); + "thaumicbases", + "textures/blocks/nodeManipulator/foci_" + ItemNodeFoci.names[meta - 1] + ".png"); model.renderPart("foci_Cube.003"); } diff --git a/src/main/java/tb/client/render/tile/RenderOverchanter.java b/src/main/java/tb/client/render/tile/RenderOverchanter.java index 88c9143..7490b2c 100644 --- a/src/main/java/tb/client/render/tile/RenderOverchanter.java +++ b/src/main/java/tb/client/render/tile/RenderOverchanter.java @@ -19,7 +19,7 @@ public class RenderOverchanter extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double screenX, double screenY, double screenZ, - float partialTicks) { + float partialTicks) { TileOverchanter overchanter = (TileOverchanter) tile; /* @@ -44,27 +44,31 @@ public void renderTileEntityAt(TileEntity tile, double screenX, double screenY, int renderPass = 0; do { - IIcon icon = item.getItem().getIcon(item, renderPass); + IIcon icon = item.getItem() + .getIcon(item, renderPass); if (icon != null) { - Color color = new Color(item.getItem().getColorFromItemStack(item, renderPass)); + Color color = new Color( + item.getItem() + .getColorFromItemStack(item, renderPass)); GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); ItemRenderer.renderItemIn2D( - Tessellator.instance, - f1, - f2, - f, - f3, - icon.getIconWidth(), - icon.getIconHeight(), - 1F / 16F); + Tessellator.instance, + f1, + f2, + f, + f3, + icon.getIconWidth(), + icon.getIconHeight(), + 1F / 16F); GL11.glColor3f(1F, 1F, 1F); } renderPass++; - } while (renderPass < item.getItem().getRenderPasses(item.getItemDamage())); + } while (renderPass < item.getItem() + .getRenderPasses(item.getItemDamage())); GL11.glPopMatrix(); } diff --git a/src/main/java/tb/common/block/BlockAdvAlchemicalFurnace.java b/src/main/java/tb/common/block/BlockAdvAlchemicalFurnace.java index 9c846a1..86a928d 100644 --- a/src/main/java/tb/common/block/BlockAdvAlchemicalFurnace.java +++ b/src/main/java/tb/common/block/BlockAdvAlchemicalFurnace.java @@ -99,7 +99,7 @@ public void onNeighborBlockChange(World w, int x, int y, int z, Block changed) { } public boolean onBlockActivated(World w, int x, int y, int z, EntityPlayer player, int side, float par7, float par8, - float par9) { + float par9) { if (w.isRemote) return true; TileEntity tileEntity = w.getTileEntity(x, y, z); diff --git a/src/main/java/tb/common/block/BlockAshroom.java b/src/main/java/tb/common/block/BlockAshroom.java index 6c95048..edfa657 100644 --- a/src/main/java/tb/common/block/BlockAshroom.java +++ b/src/main/java/tb/common/block/BlockAshroom.java @@ -25,12 +25,12 @@ protected boolean func_150109_e(World p_150109_1_, int p_150109_2_, int p_150109 if (!this.canPlaceBlockAt(p_150109_1_, p_150109_2_, p_150109_3_, p_150109_4_)) { if (p_150109_1_.getBlock(p_150109_2_, p_150109_3_, p_150109_4_) == this) { this.dropBlockAsItem( - p_150109_1_, - p_150109_2_, - p_150109_3_, - p_150109_4_, - p_150109_1_.getBlockMetadata(p_150109_2_, p_150109_3_, p_150109_4_), - 0); + p_150109_1_, + p_150109_2_, + p_150109_3_, + p_150109_4_, + p_150109_1_.getBlockMetadata(p_150109_2_, p_150109_3_, p_150109_4_), + 0); p_150109_1_.setBlockToAir(p_150109_2_, p_150109_3_, p_150109_4_); } @@ -45,7 +45,11 @@ public ArrayList getDrops(World world, int x, int y, int z, int metad if (metadata >= this.growthStages - 1) { for (int i = 0; i < 8 + world.rand.nextInt(32); ++i) // Nerf for the shrooms { - Aspect primal = Aspect.getPrimalAspects().get(world.rand.nextInt(Aspect.getPrimalAspects().size())); + Aspect primal = Aspect.getPrimalAspects() + .get( + world.rand.nextInt( + Aspect.getPrimalAspects() + .size())); EntityAspectOrb orb = new EntityAspectOrb(world, x, y, z, primal, 1); if (!world.isRemote) world.spawnEntityInWorld(orb); } diff --git a/src/main/java/tb/common/block/BlockAureliaLeaf.java b/src/main/java/tb/common/block/BlockAureliaLeaf.java index 2d9fbef..be2873a 100644 --- a/src/main/java/tb/common/block/BlockAureliaLeaf.java +++ b/src/main/java/tb/common/block/BlockAureliaLeaf.java @@ -27,7 +27,7 @@ public Item getItemDropped(int meta, Random rnd, int fort) { } public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, - int p_149668_4_) { + int p_149668_4_) { return null; } diff --git a/src/main/java/tb/common/block/BlockAureliaPlant.java b/src/main/java/tb/common/block/BlockAureliaPlant.java index 4fc3808..274141d 100644 --- a/src/main/java/tb/common/block/BlockAureliaPlant.java +++ b/src/main/java/tb/common/block/BlockAureliaPlant.java @@ -41,7 +41,7 @@ public IIcon getIcon(int side, int meta) { protected boolean canPlaceBlockOn(Block b) { return b != null - && (b == Blocks.grass || b == Blocks.dirt || b instanceof BlockGrass || b instanceof BlockDirt); + && (b == Blocks.grass || b == Blocks.dirt || b instanceof BlockGrass || b instanceof BlockDirt); } public void updateTick(World w, int x, int y, int z, Random rnd) { @@ -95,7 +95,7 @@ public int damageDropped(int meta) { } public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, - int p_149668_4_) { + int p_149668_4_) { return null; } @@ -131,7 +131,9 @@ public void checkForMoonlight(World w, int x, int y, int z) { } public static boolean canGrowOn(World w, int x, int y, int z) { - return !w.isAirBlock(x, y, z) && (w.getBlock(x, y, z).isReplaceableOreGen(w, x, y, z, Blocks.grass) - || w.getBlock(x, y, z).isReplaceableOreGen(w, x, y, z, Blocks.dirt)); + return !w.isAirBlock(x, y, z) && (w.getBlock(x, y, z) + .isReplaceableOreGen(w, x, y, z, Blocks.grass) + || w.getBlock(x, y, z) + .isReplaceableOreGen(w, x, y, z, Blocks.dirt)); } } diff --git a/src/main/java/tb/common/block/BlockBrazier.java b/src/main/java/tb/common/block/BlockBrazier.java index 19a9c41..dbf9aaa 100644 --- a/src/main/java/tb/common/block/BlockBrazier.java +++ b/src/main/java/tb/common/block/BlockBrazier.java @@ -43,28 +43,28 @@ public void randomDisplayTick(World w, int x, int y, int z, Random r) { TileEntity tile = w.getTileEntity(x, y, z); if (tile != null && tile instanceof TileBrazier && ((TileBrazier) tile).burning) { w.spawnParticle( - "flame", - x + 0.5D + MathUtils.randomDouble(r) / 4, - y + 0.875D, - z + 0.5D + MathUtils.randomDouble(r) / 4, - 0, - 0.04D, - 0); + "flame", + x + 0.5D + MathUtils.randomDouble(r) / 4, + y + 0.875D, + z + 0.5D + MathUtils.randomDouble(r) / 4, + 0, + 0.04D, + 0); for (int i = 0; i < 10; ++i) w.spawnParticle( - "smoke", - x + 0.5D + MathUtils.randomDouble(r) / 4, - y + 1D, - z + 0.5D + MathUtils.randomDouble(r) / 4, - 0, - r.nextDouble() / 20, - 0); + "smoke", + x + 0.5D + MathUtils.randomDouble(r) / 4, + y + 1D, + z + 0.5D + MathUtils.randomDouble(r) / 4, + 0, + r.nextDouble() / 20, + 0); w.playSound(x + 0.5D, y + 0.5D, z + 0.5D, "thaumicbases:fire.loop", 0.1F, 0.1F, false); } } public void addCollisionBoxesToList(final World world, final int i, final int j, final int k, - final AxisAlignedBB axisalignedbb, final List arraylist, final Entity par7Entity) { + final AxisAlignedBB axisalignedbb, final List arraylist, final Entity par7Entity) { this.setBlockBounds(0.0625f, 0.0f, 0.0625f, 0.9375f, 1f, 0.9375f); super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } diff --git a/src/main/java/tb/common/block/BlockBriar.java b/src/main/java/tb/common/block/BlockBriar.java index 2b1e103..147874a 100644 --- a/src/main/java/tb/common/block/BlockBriar.java +++ b/src/main/java/tb/common/block/BlockBriar.java @@ -106,9 +106,12 @@ public ArrayList getDrops(World world, int x, int y, int z, int metad } public boolean canBlockStay(World w, int x, int y, int z) { - return !w.isAirBlock(x, y - 1, z) && (w.getBlock(x, y - 1, z).isReplaceableOreGen(w, x, y - 1, z, Blocks.grass) - || w.getBlock(x, y - 1, z).isReplaceableOreGen(w, x, y, z, Blocks.dirt) - || w.getBlock(x, y - 1, z).canSustainPlant(w, x, y - 1, z, ForgeDirection.UP, this)); + return !w.isAirBlock(x, y - 1, z) && (w.getBlock(x, y - 1, z) + .isReplaceableOreGen(w, x, y - 1, z, Blocks.grass) + || w.getBlock(x, y - 1, z) + .isReplaceableOreGen(w, x, y, z, Blocks.dirt) + || w.getBlock(x, y - 1, z) + .canSustainPlant(w, x, y - 1, z, ForgeDirection.UP, this)); } public boolean isTopBlock(int meta) { diff --git a/src/main/java/tb/common/block/BlockCampfire.java b/src/main/java/tb/common/block/BlockCampfire.java index 4d97524..052c958 100644 --- a/src/main/java/tb/common/block/BlockCampfire.java +++ b/src/main/java/tb/common/block/BlockCampfire.java @@ -45,28 +45,28 @@ public int getRenderType() { public void randomDisplayTick(World w, int x, int y, int z, Random r) { if (w.getBlockMetadata(x, y, z) > 1) { w.spawnParticle( - "flame", - x + 0.5D + MathUtils.randomDouble(r) / 4, - y, - z + 0.5D + MathUtils.randomDouble(r) / 4, - 0, - 0.04D, - 0); + "flame", + x + 0.5D + MathUtils.randomDouble(r) / 4, + y, + z + 0.5D + MathUtils.randomDouble(r) / 4, + 0, + 0.04D, + 0); for (int i = 0; i < 10; ++i) w.spawnParticle( - "smoke", - x + 0.5D + MathUtils.randomDouble(r) / 4, - y + 0.1D, - z + 0.5D + MathUtils.randomDouble(r) / 4, - 0, - r.nextDouble() / 20, - 0); + "smoke", + x + 0.5D + MathUtils.randomDouble(r) / 4, + y + 0.1D, + z + 0.5D + MathUtils.randomDouble(r) / 4, + 0, + r.nextDouble() / 20, + 0); w.playSound(x + 0.5D, y + 0.5D, z + 0.5D, "thaumicbases:fire.loop", 0.1F, 0.1F, false); } } public boolean onBlockActivated(World w, int x, int y, int z, EntityPlayer p, int side, float vecX, float vecY, - float vecZ) { + float vecZ) { if (w.isRemote) return true; TileCampfire fire = (TileCampfire) w.getTileEntity(x, y, z); @@ -85,7 +85,7 @@ public boolean onBlockActivated(World w, int x, int y, int z, EntityPlayer p, in } public void addCollisionBoxesToList(final World world, final int i, final int j, final int k, - final AxisAlignedBB axisalignedbb, final List arraylist, final Entity par7Entity) { + final AxisAlignedBB axisalignedbb, final List arraylist, final Entity par7Entity) { this.setBlockBounds(0.0625f, 0.0f, 0.0625f, 0.9375f, 0.5f, 0.9375f); super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } diff --git a/src/main/java/tb/common/block/BlockCryingObelisk.java b/src/main/java/tb/common/block/BlockCryingObelisk.java index 059bba0..0c3e64f 100644 --- a/src/main/java/tb/common/block/BlockCryingObelisk.java +++ b/src/main/java/tb/common/block/BlockCryingObelisk.java @@ -51,39 +51,40 @@ public IIcon getIcon(int side, int metadata) { @SideOnly(Side.CLIENT) public void randomDisplayTick(World w, int x, int y, int z, Random rnd) { if ((w.getBlock(x, y + 1, z) == this && w.getBlock(x, y + 2, z) != this && w.getBlock(x, y - 1, z) != this) - || (w.getBlock(x, y - 1, z) == this && w.getBlock(x, y - 2, z) != this - && w.getBlock(x, y + 1, z) != this)) { + || (w.getBlock(x, y - 1, z) == this && w.getBlock(x, y - 2, z) != this + && w.getBlock(x, y + 1, z) != this)) { for (int i = 0; i < 10; ++i) { double rndY = rnd.nextDouble() * 3; w.spawnParticle( - "portal", - x + 0.5D + MathUtils.randomDouble(rnd), - y - 3 + rndY, - z + 0.5D + MathUtils.randomDouble(rnd), - 0, - rndY, - 0); + "portal", + x + 0.5D + MathUtils.randomDouble(rnd), + y - 3 + rndY, + z + 0.5D + MathUtils.randomDouble(rnd), + 0, + rndY, + 0); } } } public boolean isBed(IBlockAccess world, int x, int y, int z, EntityLivingBase player) { return ((world.getBlock(x, y + 1, z) == this && world.getBlock(x, y + 2, z) != this - && world.getBlock(x, y - 1, z) != this) - || (world.getBlock(x, y - 1, z) == this && world.getBlock(x, y - 2, z) != this - && world.getBlock(x, y + 1, z) != this)); + && world.getBlock(x, y - 1, z) != this) + || (world.getBlock(x, y - 1, z) == this && world.getBlock(x, y - 2, z) != this + && world.getBlock(x, y + 1, z) != this)); } public boolean onBlockActivated(World w, int x, int y, int z, EntityPlayer p, int side, float vecX, float vecY, - float vecZ) { + float vecZ) { if ((w.getBlock(x, y + 1, z) == this && w.getBlock(x, y + 2, z) != this && w.getBlock(x, y - 1, z) != this) - || (w.getBlock(x, y - 1, z) == this && w.getBlock(x, y - 2, z) != this - && w.getBlock(x, y + 1, z) != this)) { + || (w.getBlock(x, y - 1, z) == this && w.getBlock(x, y - 2, z) != this + && w.getBlock(x, y + 1, z) != this)) { w.playSound(x + 0.5D, y + 0.5D, z + 0.5D, "portal.travel", 1, 2, false); p.setSpawnChunk(new ChunkCoordinates(x, y, z), false, p.dimension); if (p.worldObj.isRemote) p.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("tb.txt.spawnSet")) - .setChatStyle(new ChatStyle().setItalic(true).setColor(EnumChatFormatting.AQUA))); + new ChatComponentText(StatCollector.translateToLocal("tb.txt.spawnSet")).setChatStyle( + new ChatStyle().setItalic(true) + .setColor(EnumChatFormatting.AQUA))); return true; } return false; @@ -93,8 +94,12 @@ public ChunkCoordinates getBedSpawnPosition(IBlockAccess world, int x, int y, in for (int dy = 0; dy > -3; --dy) for (int dx = -2; dx <= 2; ++dx) { for (int dz = -2; dz <= 2; ++dz) { if (World.doesBlockHaveSolidTopSurface(world, x + dx, y + dy, z + dz) - && !world.getBlock(x + dx, y + dy, z + dz).getMaterial().isOpaque() - && !world.getBlock(x + dx, y + dy + 1, z + dz).getMaterial().isOpaque()) { + && !world.getBlock(x + dx, y + dy, z + dz) + .getMaterial() + .isOpaque() + && !world.getBlock(x + dx, y + dy + 1, z + dz) + .getMaterial() + .isOpaque()) { return new ChunkCoordinates(x + dx, y + dy + 1, z + dz); } } diff --git a/src/main/java/tb/common/block/BlockCrystalBlock.java b/src/main/java/tb/common/block/BlockCrystalBlock.java index 18feff7..aff8439 100644 --- a/src/main/java/tb/common/block/BlockCrystalBlock.java +++ b/src/main/java/tb/common/block/BlockCrystalBlock.java @@ -20,7 +20,7 @@ public class BlockCrystalBlock extends Block implements IInfusionStabiliser { public static IIcon[] icons = new IIcon[8]; public static final String[] names = new String[] { "air", "fire", "water", "earth", "order", "entropy", "mixed", - "tainted" }; + "tainted" }; public BlockCrystalBlock() { super(Material.glass); diff --git a/src/main/java/tb/common/block/BlockEntityDeconstructor.java b/src/main/java/tb/common/block/BlockEntityDeconstructor.java index d4e85f4..9f5c4ec 100644 --- a/src/main/java/tb/common/block/BlockEntityDeconstructor.java +++ b/src/main/java/tb/common/block/BlockEntityDeconstructor.java @@ -40,68 +40,72 @@ public int getRenderType() { } public boolean onBlockActivated(World w, int x, int y, int z, EntityPlayer p, int side, float vecX, float vecY, - float vecZ) { + float vecZ) { if (p.getCurrentEquippedItem() != null) { - if (p.getCurrentEquippedItem().getItem() instanceof ItemBlockCrystal) { + if (p.getCurrentEquippedItem() + .getItem() instanceof ItemBlockCrystal) { if (ResearchManager.isResearchComplete(p.getCommandSenderName(), "TB.EntityDecAdv")) - if (p.getCurrentEquippedItem().getItemDamage() < 6) { - TileEntityDeconstructor d = TileEntityDeconstructor.class.cast(w.getTileEntity(x, y, z)); - switch (p.getCurrentEquippedItem().getItemDamage()) { - case 0: { - if (!d.hasAir) { - d.hasAir = true; - p.inventory.decrStackSize(p.inventory.currentItem, 1); - d.tickTime = 0; + if (p.getCurrentEquippedItem() + .getItemDamage() < 6) { + TileEntityDeconstructor d = TileEntityDeconstructor.class.cast(w.getTileEntity(x, y, z)); + switch (p.getCurrentEquippedItem() + .getItemDamage()) { + case 0: { + if (!d.hasAir) { + d.hasAir = true; + p.inventory.decrStackSize(p.inventory.currentItem, 1); + d.tickTime = 0; + } + break; } - break; - } - case 1: { - if (!d.hasFire) { - d.hasFire = true; - p.inventory.decrStackSize(p.inventory.currentItem, 1); - d.tickTime = 0; + case 1: { + if (!d.hasFire) { + d.hasFire = true; + p.inventory.decrStackSize(p.inventory.currentItem, 1); + d.tickTime = 0; + } + break; } - break; - } - case 2: { - if (!d.hasWater) { - d.hasWater = true; - p.inventory.decrStackSize(p.inventory.currentItem, 1); - d.tickTime = 0; + case 2: { + if (!d.hasWater) { + d.hasWater = true; + p.inventory.decrStackSize(p.inventory.currentItem, 1); + d.tickTime = 0; + } + break; } - break; - } - case 3: { - if (!d.hasEarth) { - d.hasEarth = true; - p.inventory.decrStackSize(p.inventory.currentItem, 1); - d.tickTime = 0; + case 3: { + if (!d.hasEarth) { + d.hasEarth = true; + p.inventory.decrStackSize(p.inventory.currentItem, 1); + d.tickTime = 0; + } + break; } - break; - } - case 4: { - if (!d.hasOrdo) { - d.hasOrdo = true; - p.inventory.decrStackSize(p.inventory.currentItem, 1); - d.tickTime = 0; + case 4: { + if (!d.hasOrdo) { + d.hasOrdo = true; + p.inventory.decrStackSize(p.inventory.currentItem, 1); + d.tickTime = 0; + } + break; } - break; - } - case 5: { - if (!d.hasEntropy) { - d.hasEntropy = true; - p.inventory.decrStackSize(p.inventory.currentItem, 1); - d.tickTime = 0; + case 5: { + if (!d.hasEntropy) { + d.hasEntropy = true; + p.inventory.decrStackSize(p.inventory.currentItem, 1); + d.tickTime = 0; + } + break; } - break; } } - } } } if (p.worldObj.isRemote) p.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("tb.txt.linkEntDecon")) - .setChatStyle(new ChatStyle().setItalic(true).setColor(EnumChatFormatting.AQUA))); + new ChatComponentText(StatCollector.translateToLocal("tb.txt.linkEntDecon")).setChatStyle( + new ChatStyle().setItalic(true) + .setColor(EnumChatFormatting.AQUA))); TileEntityDeconstructor.class.cast(w.getTileEntity(x, y, z)).placerName = p.getCommandSenderName(); return true; diff --git a/src/main/java/tb/common/block/BlockFlaxium.java b/src/main/java/tb/common/block/BlockFlaxium.java index f470eba..4773b76 100644 --- a/src/main/java/tb/common/block/BlockFlaxium.java +++ b/src/main/java/tb/common/block/BlockFlaxium.java @@ -30,7 +30,7 @@ public void onNeighborBlockChange(World w, int x, int y, int z, Block updated) { } public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, - int p_149668_4_) { + int p_149668_4_) { return null; } @@ -47,7 +47,9 @@ public int getRenderType() { } public static boolean canGrowOn(World w, int x, int y, int z) { - return !w.isAirBlock(x, y, z) && (w.getBlock(x, y, z).isReplaceableOreGen(w, x, y, z, Blocks.grass) - || w.getBlock(x, y, z).isReplaceableOreGen(w, x, y, z, Blocks.dirt)); + return !w.isAirBlock(x, y, z) && (w.getBlock(x, y, z) + .isReplaceableOreGen(w, x, y, z, Blocks.grass) + || w.getBlock(x, y, z) + .isReplaceableOreGen(w, x, y, z, Blocks.dirt)); } } diff --git a/src/main/java/tb/common/block/BlockHalfSlab.java b/src/main/java/tb/common/block/BlockHalfSlab.java index da11b2f..888ed7f 100644 --- a/src/main/java/tb/common/block/BlockHalfSlab.java +++ b/src/main/java/tb/common/block/BlockHalfSlab.java @@ -20,7 +20,7 @@ public class BlockHalfSlab extends BlockSlab implements IInfusionStabiliser { public static Block[] parents = new Block[] { TBBlocks.eldritchArk, TBBlocks.oldBrick, TBBlocks.oldCobble, - TBBlocks.oldCobbleMossy, TBBlocks.oldDiamond, TBBlocks.oldGold, TBBlocks.oldIron, TBBlocks.oldLapis }; + TBBlocks.oldCobbleMossy, TBBlocks.oldDiamond, TBBlocks.oldGold, TBBlocks.oldIron, TBBlocks.oldLapis }; public BlockHalfSlab(boolean fullBlock, Material material) { super(fullBlock, material); @@ -61,6 +61,6 @@ public void getSubBlocks(Item itm, CreativeTabs tab, List lst) { public boolean canStabaliseInfusion(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z) & 7; return parents[meta] instanceof IInfusionStabiliser - && ((IInfusionStabiliser) parents[meta]).canStabaliseInfusion(world, x, y, z); + && ((IInfusionStabiliser) parents[meta]).canStabaliseInfusion(world, x, y, z); } } diff --git a/src/main/java/tb/common/block/BlockNodeManipulator.java b/src/main/java/tb/common/block/BlockNodeManipulator.java index c9a9cdf..825dedf 100644 --- a/src/main/java/tb/common/block/BlockNodeManipulator.java +++ b/src/main/java/tb/common/block/BlockNodeManipulator.java @@ -37,7 +37,7 @@ public int getRenderType() { } public boolean onBlockActivated(World w, int x, int y, int z, EntityPlayer p, int side, float vecX, float vecY, - float vecZ) { + float vecZ) { if (p.getCurrentEquippedItem() != null) { ItemStack current = p.getCurrentEquippedItem(); if (current.getItem() instanceof ItemNodeFoci) { diff --git a/src/main/java/tb/common/block/BlockOverchanter.java b/src/main/java/tb/common/block/BlockOverchanter.java index d568866..927b810 100644 --- a/src/main/java/tb/common/block/BlockOverchanter.java +++ b/src/main/java/tb/common/block/BlockOverchanter.java @@ -58,7 +58,7 @@ public void breakBlock(World w, int x, int y, int z, Block b, int meta) { } public boolean onBlockActivated(World w, int x, int y, int z, EntityPlayer p, int side, float vecX, float vecY, - float vecZ) { + float vecZ) { if (!p.isSneaking()) { if (!w.isRemote) { p.openGui(TBCore.instance, 0x421922, w, x, y, z); diff --git a/src/main/java/tb/common/block/BlockPyrofluid.java b/src/main/java/tb/common/block/BlockPyrofluid.java index 5f96f3c..52aa33d 100644 --- a/src/main/java/tb/common/block/BlockPyrofluid.java +++ b/src/main/java/tb/common/block/BlockPyrofluid.java @@ -72,38 +72,40 @@ public void randomDisplayTick(World par1World, int par2, int par3, int par4, Ran d5 = (double) ((float) par2 + par5Random.nextFloat()); d7 = (double) par3 - 0.5D + this.maxY; d6 = (double) ((float) par4 + par5Random.nextFloat()); - if (this.blockMaterial == Material.lava - && par1World.getBlock(par2, par3 + 1, par4).getMaterial() == Material.air - && !par1World.getBlock(par2, par3 + 1, par4).isOpaqueCube()) { + if (this.blockMaterial == Material.lava && par1World.getBlock(par2, par3 + 1, par4) + .getMaterial() == Material.air + && !par1World.getBlock(par2, par3 + 1, par4) + .isOpaqueCube()) { if (par5Random.nextInt(100) == 0) { d5 = (double) ((float) par2 + par5Random.nextFloat()); d7 = (double) par3 + this.maxY; d6 = (double) ((float) par4 + par5Random.nextFloat()); par1World.spawnParticle("lava", d5, d7, d6, 0.0D, 0.0D, 0.0D); par1World.playSound( - d5, - d7, - d6, - "liquid.lavapop", - 0.2F + par5Random.nextFloat() * 0.2F, - 0.9F + par5Random.nextFloat() * 0.15F, - false); + d5, + d7, + d6, + "liquid.lavapop", + 0.2F + par5Random.nextFloat() * 0.2F, + 0.9F + par5Random.nextFloat() * 0.15F, + false); } if (par5Random.nextInt(200) == 0) { par1World.playSound( - (double) par2, - (double) par3, - (double) par4, - "liquid.lava", - 0.2F + par5Random.nextFloat() * 0.2F, - 0.9F + par5Random.nextFloat() * 0.15F, - false); + (double) par2, + (double) par3, + (double) par4, + "liquid.lava", + 0.2F + par5Random.nextFloat() * 0.2F, + 0.9F + par5Random.nextFloat() * 0.15F, + false); } } if (par5Random.nextInt(10) == 0 && World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) - && !par1World.getBlock(par2, par3 - 2, par4).getBlocksMovement(par1World, par2, par3, par4)) { + && !par1World.getBlock(par2, par3 - 2, par4) + .getBlocksMovement(par1World, par2, par3, par4)) { par1World.spawnParticle("dripLava", d5, d7, d6, 0.0D, 0.0D, 0.0D); } } @@ -146,11 +148,11 @@ public ArrayList getDrops(World world, int x, int y, int z, int metad ArrayList retLst = new ArrayList(); retLst.add( - new ItemStack( - Items.blaze_powder, - TBConfig.minBlazePowderFromPyrofluid + world.rand - .nextInt(TBConfig.maxBlazePowderFromPyrofluid - TBConfig.minBlazePowderFromPyrofluid), - 0)); + new ItemStack( + Items.blaze_powder, + TBConfig.minBlazePowderFromPyrofluid + + world.rand.nextInt(TBConfig.maxBlazePowderFromPyrofluid - TBConfig.minBlazePowderFromPyrofluid), + 0)); return retLst; } diff --git a/src/main/java/tb/common/block/BlockRainbowCactus.java b/src/main/java/tb/common/block/BlockRainbowCactus.java index 1c9cd4e..0e4f470 100644 --- a/src/main/java/tb/common/block/BlockRainbowCactus.java +++ b/src/main/java/tb/common/block/BlockRainbowCactus.java @@ -32,7 +32,7 @@ public BlockRainbowCactus() { } public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, - Entity p_149670_5_) {} + Entity p_149670_5_) {} @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { @@ -54,18 +54,17 @@ public ArrayList getDrops(World world, int x, int y, int z, int metad public static void loadColors() { if (Loader.isModLoaded("gregtech")) { allowedDyes = new ItemStack[] { ItemList.Color_00.get(1), ItemList.Color_01.get(1), - ItemList.Color_02.get(1), ItemList.Color_03.get(1), ItemList.Color_04.get(1), - ItemList.Color_05.get(1), ItemList.Color_06.get(1), ItemList.Color_07.get(1), - ItemList.Color_08.get(1), ItemList.Color_09.get(1), ItemList.Color_10.get(1), - ItemList.Color_11.get(1), ItemList.Color_12.get(1), ItemList.Color_13.get(1), - ItemList.Color_14.get(1), ItemList.Color_15.get(1), }; + ItemList.Color_02.get(1), ItemList.Color_03.get(1), ItemList.Color_04.get(1), ItemList.Color_05.get(1), + ItemList.Color_06.get(1), ItemList.Color_07.get(1), ItemList.Color_08.get(1), ItemList.Color_09.get(1), + ItemList.Color_10.get(1), ItemList.Color_11.get(1), ItemList.Color_12.get(1), ItemList.Color_13.get(1), + ItemList.Color_14.get(1), ItemList.Color_15.get(1), }; } else { allowedDyes = new ItemStack[] { new ItemStack(Items.dye, 1, 1), new ItemStack(Items.dye, 1, 2), - new ItemStack(Items.dye, 1, 5), new ItemStack(Items.dye, 1, 2), new ItemStack(Items.dye, 1, 6), - new ItemStack(Items.dye, 1, 7), new ItemStack(Items.dye, 1, 2), new ItemStack(Items.dye, 1, 8), - new ItemStack(Items.dye, 1, 9), new ItemStack(Items.dye, 1, 10), new ItemStack(Items.dye, 1, 2), - new ItemStack(Items.dye, 1, 11), new ItemStack(Items.dye, 1, 12), new ItemStack(Items.dye, 1, 13), - new ItemStack(Items.dye, 1, 14), new ItemStack(Items.dye, 1, 2) }; + new ItemStack(Items.dye, 1, 5), new ItemStack(Items.dye, 1, 2), new ItemStack(Items.dye, 1, 6), + new ItemStack(Items.dye, 1, 7), new ItemStack(Items.dye, 1, 2), new ItemStack(Items.dye, 1, 8), + new ItemStack(Items.dye, 1, 9), new ItemStack(Items.dye, 1, 10), new ItemStack(Items.dye, 1, 2), + new ItemStack(Items.dye, 1, 11), new ItemStack(Items.dye, 1, 12), new ItemStack(Items.dye, 1, 13), + new ItemStack(Items.dye, 1, 14), new ItemStack(Items.dye, 1, 2) }; } } @@ -83,7 +82,7 @@ public IIcon getIcon(int p_149691_1_, int p_149691_2_) { @Override public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, - IPlantable plantable) { + IPlantable plantable) { Block plant = plantable.getPlant(world, x, y + 1, z); if (plant == this) { diff --git a/src/main/java/tb/common/block/BlockRedlonStem.java b/src/main/java/tb/common/block/BlockRedlonStem.java index ed318c2..4b28f0c 100644 --- a/src/main/java/tb/common/block/BlockRedlonStem.java +++ b/src/main/java/tb/common/block/BlockRedlonStem.java @@ -86,7 +86,7 @@ public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int @SideOnly(Side.CLIENT) public void randomDisplayTick(World p_149734_1_, int p_149734_2_, int p_149734_3_, int p_149734_4_, - Random p_149734_5_) { + Random p_149734_5_) { this.func_150186_m(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_); } @@ -99,35 +99,41 @@ private void func_150186_m(World p_150186_1_, int p_150186_2_, int p_150186_3_, double d2 = (double) ((float) p_150186_3_ + random.nextFloat()); double d3 = (double) ((float) p_150186_4_ + random.nextFloat()); - if (l == 0 && !p_150186_1_.getBlock(p_150186_2_, p_150186_3_ + 1, p_150186_4_).isOpaqueCube()) { + if (l == 0 && !p_150186_1_.getBlock(p_150186_2_, p_150186_3_ + 1, p_150186_4_) + .isOpaqueCube()) { d2 = (double) (p_150186_3_ + 1) + d0; } - if (l == 1 && !p_150186_1_.getBlock(p_150186_2_, p_150186_3_ - 1, p_150186_4_).isOpaqueCube()) { + if (l == 1 && !p_150186_1_.getBlock(p_150186_2_, p_150186_3_ - 1, p_150186_4_) + .isOpaqueCube()) { d2 = (double) (p_150186_3_ + 0) - d0; } - if (l == 2 && !p_150186_1_.getBlock(p_150186_2_, p_150186_3_, p_150186_4_ + 1).isOpaqueCube()) { + if (l == 2 && !p_150186_1_.getBlock(p_150186_2_, p_150186_3_, p_150186_4_ + 1) + .isOpaqueCube()) { d3 = (double) (p_150186_4_ + 1) + d0; } - if (l == 3 && !p_150186_1_.getBlock(p_150186_2_, p_150186_3_, p_150186_4_ - 1).isOpaqueCube()) { + if (l == 3 && !p_150186_1_.getBlock(p_150186_2_, p_150186_3_, p_150186_4_ - 1) + .isOpaqueCube()) { d3 = (double) (p_150186_4_ + 0) - d0; } - if (l == 4 && !p_150186_1_.getBlock(p_150186_2_ + 1, p_150186_3_, p_150186_4_).isOpaqueCube()) { + if (l == 4 && !p_150186_1_.getBlock(p_150186_2_ + 1, p_150186_3_, p_150186_4_) + .isOpaqueCube()) { d1 = (double) (p_150186_2_ + 1) + d0; } - if (l == 5 && !p_150186_1_.getBlock(p_150186_2_ - 1, p_150186_3_, p_150186_4_).isOpaqueCube()) { + if (l == 5 && !p_150186_1_.getBlock(p_150186_2_ - 1, p_150186_3_, p_150186_4_) + .isOpaqueCube()) { d1 = (double) (p_150186_2_ + 0) - d0; } if (d1 < (double) p_150186_2_ || d1 > (double) (p_150186_2_ + 1) - || d2 < 0.0D - || d2 > (double) (p_150186_3_ + 1) - || d3 < (double) p_150186_4_ - || d3 > (double) (p_150186_4_ + 1)) { + || d2 < 0.0D + || d2 > (double) (p_150186_3_ + 1) + || d3 < (double) p_150186_4_ + || d3 > (double) (p_150186_4_ + 1)) { p_150186_1_.spawnParticle("reddust", d1, d2, d3, 0.0D, 0.0D, 0.0D); } } diff --git a/src/main/java/tb/common/block/BlockRelocator.java b/src/main/java/tb/common/block/BlockRelocator.java index 33cf969..bfcdc69 100644 --- a/src/main/java/tb/common/block/BlockRelocator.java +++ b/src/main/java/tb/common/block/BlockRelocator.java @@ -99,42 +99,42 @@ public void randomDisplayTick(World w, int x, int y, int z, Random r) { double dy = y; double dz = z + 0.5D + MathUtils.randomDouble(r) / 2; TBCore.proxy - .sparkle(w, dx, doColor ? dy - 3 : dy, dz, dx, doColor ? dy : dy - 3, dz, doColor ? 2 : 1, 1F); + .sparkle(w, dx, doColor ? dy - 3 : dy, dz, dx, doColor ? dy : dy - 3, dz, doColor ? 2 : 1, 1F); } if (meta == 1) { double dx = x + 0.5D + MathUtils.randomDouble(r) / 2; double dy = y + 1; double dz = z + 0.5D + MathUtils.randomDouble(r) / 2; TBCore.proxy - .sparkle(w, dx, doColor ? dy + 3 : dy, dz, dx, doColor ? dy : dy + 3, dz, doColor ? 2 : 1, 1); + .sparkle(w, dx, doColor ? dy + 3 : dy, dz, dx, doColor ? dy : dy + 3, dz, doColor ? 2 : 1, 1); } if (meta == 2) { double dx = x + 0.5D + MathUtils.randomDouble(r) / 2; double dy = y + 0.5D + MathUtils.randomDouble(r) / 2; double dz = z; TBCore.proxy - .sparkle(w, dx, dy, doColor ? dz - 3 : dz, dx, dy, doColor ? dz : dz - 3, doColor ? 2 : 1, 1); + .sparkle(w, dx, dy, doColor ? dz - 3 : dz, dx, dy, doColor ? dz : dz - 3, doColor ? 2 : 1, 1); } if (meta == 3) { double dx = x + 0.5D + MathUtils.randomDouble(r) / 2; double dy = y + 0.5D + MathUtils.randomDouble(r) / 2; double dz = z + 1; TBCore.proxy - .sparkle(w, dx, dy, doColor ? dz + 3 : dz, dx, dy, doColor ? dz : dz + 3, doColor ? 2 : 1, 1); + .sparkle(w, dx, dy, doColor ? dz + 3 : dz, dx, dy, doColor ? dz : dz + 3, doColor ? 2 : 1, 1); } if (meta == 4) { double dx = x; double dy = y + 0.5D + MathUtils.randomDouble(r) / 2; double dz = z + 0.5D + MathUtils.randomDouble(r) / 2; TBCore.proxy - .sparkle(w, doColor ? dx - 3 : dx, dy, dz, doColor ? dx : dx - 3, dy, dz, doColor ? 2 : 1, 1); + .sparkle(w, doColor ? dx - 3 : dx, dy, dz, doColor ? dx : dx - 3, dy, dz, doColor ? 2 : 1, 1); } if (meta == 5) { double dx = x + 1; double dy = y + 0.5D + MathUtils.randomDouble(r) / 2; double dz = z + 0.5D + MathUtils.randomDouble(r) / 2; TBCore.proxy - .sparkle(w, doColor ? dx + 3 : dx, dy, dz, doColor ? dx : dx + 3, dy, dz, doColor ? 2 : 1, 1); + .sparkle(w, doColor ? dx + 3 : dx, dy, dz, doColor ? dx : dx + 3, dy, dz, doColor ? 2 : 1, 1); } } } @@ -145,9 +145,9 @@ public void onBlockPlacedBy(World w, int x, int y, int z, EntityLivingBase p_149 } public static int determineOrientation(World p_150071_0_, int p_150071_1_, int p_150071_2_, int p_150071_3_, - EntityLivingBase p_150071_4_) { + EntityLivingBase p_150071_4_) { if (MathHelper.abs((float) p_150071_4_.posX - (float) p_150071_1_) < 2.0F - && MathHelper.abs((float) p_150071_4_.posZ - (float) p_150071_3_) < 2.0F) { + && MathHelper.abs((float) p_150071_4_.posZ - (float) p_150071_3_) < 2.0F) { double d0 = p_150071_4_.posY + 1.82D - (double) p_150071_4_.yOffset; if (d0 - (double) p_150071_2_ > 2.0D) { diff --git a/src/main/java/tb/common/block/BlockSpike.java b/src/main/java/tb/common/block/BlockSpike.java index 25d9679..d29e65f 100644 --- a/src/main/java/tb/common/block/BlockSpike.java +++ b/src/main/java/tb/common/block/BlockSpike.java @@ -31,7 +31,7 @@ public class BlockSpike extends Block { public static final String[] spikeNames = new String[] { "iron", "iron_bloody", "thaumic", "thaumic_bloody", "void", - "void_bloody" }; + "void_bloody" }; public static IIcon[] icons = new IIcon[spikeNames.length]; @@ -119,7 +119,7 @@ public void onEntityCollidedWithBlock(World w, int x, int y, int z, Entity colli } public boolean onBlockActivated(World w, int x, int y, int z, EntityPlayer player, int side, float vecX, float vecY, - float vecZ) { + float vecZ) { int meta = w.getBlockMetadata(x, y, z); if (meta != 1 && meta != 3 && meta != 5) return false; diff --git a/src/main/java/tb/common/block/BlockSweed.java b/src/main/java/tb/common/block/BlockSweed.java index 1b67c1d..3289d69 100644 --- a/src/main/java/tb/common/block/BlockSweed.java +++ b/src/main/java/tb/common/block/BlockSweed.java @@ -20,7 +20,7 @@ public BlockSweed(int stages, int delay, boolean isCrop) { protected boolean canPlaceBlockOn(Block b) { return b != null - && (b == Blocks.grass || b == Blocks.dirt || b instanceof BlockGrass || b instanceof BlockDirt); + && (b == Blocks.grass || b == Blocks.dirt || b instanceof BlockGrass || b instanceof BlockDirt); } public void updateTick(World w, int x, int y, int z, Random rnd) { diff --git a/src/main/java/tb/common/block/BlockTBLeaves.java b/src/main/java/tb/common/block/BlockTBLeaves.java index 045f3ed..f5f270a 100644 --- a/src/main/java/tb/common/block/BlockTBLeaves.java +++ b/src/main/java/tb/common/block/BlockTBLeaves.java @@ -42,10 +42,10 @@ public class BlockTBLeaves extends BlockOldLeaf { public static final String[] names = new String[] { "goldenOakLeaves", "peacefullTreeLeaves", "netherTreeLeaves", - "enderTreeLeaves" }; + "enderTreeLeaves" }; public static final String[] textures = new String[] { "goldenOak/leaves", "peacefullTree/leaves", - "netherTree/leaves", "enderTree/leaves" }; + "netherTree/leaves", "enderTree/leaves" }; public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) { if (world.getBlockMetadata(x, y, z) % 8 == 3) if (entity instanceof EntityDragon) return false; @@ -116,13 +116,13 @@ public void randomDisplayTick(World w, int x, int y, int z, Random rnd) { } if (w.getBlockMetadata(x, y, z) % 8 == 3) w.spawnParticle( - "portal", - x + rnd.nextDouble(), - y + rnd.nextDouble(), - z + rnd.nextDouble(), - MathUtils.randomDouble(rnd), - MathUtils.randomDouble(rnd), - MathUtils.randomDouble(rnd)); + "portal", + x + rnd.nextDouble(), + y + rnd.nextDouble(), + z + rnd.nextDouble(), + MathUtils.randomDouble(rnd), + MathUtils.randomDouble(rnd), + MathUtils.randomDouble(rnd)); } public Item getItemDropped(int meta, Random rnd, int fortune) { @@ -150,7 +150,9 @@ public void updateTick(World w, int x, int y, int z, Random rnd) { Class c = entry.entityClass; if (EntityLiving.class.isAssignableFrom(c)) { try { - EntityLiving el = EntityLiving.class.cast(c.getConstructor(World.class).newInstance(w)); + EntityLiving el = EntityLiving.class.cast( + c.getConstructor(World.class) + .newInstance(w)); while (--y >= dy - 6) { el.setPositionAndRotation(x + 0.5D, y, z + 0.5D, 0, 0); if (el.getCanSpawnHere()) { @@ -160,9 +162,9 @@ public void updateTick(World w, int x, int y, int z, Random rnd) { } } catch (Exception e) { FMLLog.warning( - "[TB]Tried to create an entity of class " + c - + " but failed! The exception is listed below:", - new Object[0]); + "[TB]Tried to create an entity of class " + c + + " but failed! The exception is listed below:", + new Object[0]); e.printStackTrace(); } } @@ -176,21 +178,22 @@ public void updateTick(World w, int x, int y, int z, Random rnd) { Block b = w.getBlock(x, y, z); if (!b.isAir(w, x, y, z)) { boolean netheric = b instanceof BlockNetherrack || b instanceof BlockSoulSand - || b == Blocks.quartz_ore; + || b == Blocks.quartz_ore; if (netheric && rnd.nextDouble() <= 0.05D) { BiomeGenBase hellBiome = BiomeGenBase.hell; @SuppressWarnings("unchecked") List l = rnd.nextBoolean() - ? hellBiome.getSpawnableList(EnumCreatureType.creature) - : hellBiome.getSpawnableList(EnumCreatureType.monster); + ? hellBiome.getSpawnableList(EnumCreatureType.creature) + : hellBiome.getSpawnableList(EnumCreatureType.monster); if (l != null && !l.isEmpty()) { SpawnListEntry entry = l.get(rnd.nextInt(l.size())); if (entry != null && entry.entityClass != null) { Class c = entry.entityClass; if (EntityLiving.class.isAssignableFrom(c)) { try { - EntityLiving el = EntityLiving.class - .cast(c.getConstructor(World.class).newInstance(w)); + EntityLiving el = EntityLiving.class.cast( + c.getConstructor(World.class) + .newInstance(w)); el.setPositionAndRotation(x + 0.5D, y + 1, z + 0.5D, 0, 0); el.onSpawnWithEgg(null); @@ -202,9 +205,9 @@ public void updateTick(World w, int x, int y, int z, Random rnd) { } catch (Exception e) { FMLLog.warning( - "[TB]Tried to create an entity of class " + c - + " but failed! The exception is listed below:", - new Object[0]); + "[TB]Tried to create an entity of class " + c + + " but failed! The exception is listed below:", + new Object[0]); e.printStackTrace(); } } @@ -214,9 +217,9 @@ public void updateTick(World w, int x, int y, int z, Random rnd) { break; } else { boolean flag = b instanceof BlockDirt || b instanceof BlockGrass - || b instanceof BlockGravel - || b instanceof BlockSand - || b instanceof BlockStone; + || b instanceof BlockGravel + || b instanceof BlockSand + || b instanceof BlockStone; if (!flag) { ItemStack stk = new ItemStack(b, 1, w.getBlockMetadata(x, y, z)); if (OreDictionary.getOreIDs(stk) != null && OreDictionary.getOreIDs(stk).length > 0) { @@ -226,9 +229,9 @@ public void updateTick(World w, int x, int y, int z, Random rnd) { String ore = OreDictionary.getOreName(id); if (ore != null && !ore.isEmpty()) { flag = ore.contains("dirt") || ore.contains("grass") - || ore.contains("sand") - || ore.contains("gravel") - || ore.contains("stone"); + || ore.contains("sand") + || ore.contains("gravel") + || ore.contains("stone"); if (flag) break OreDict; } } @@ -238,7 +241,7 @@ public void updateTick(World w, int x, int y, int z, Random rnd) { if (flag) { double random = rnd.nextDouble(); Block setTo = random <= 0.6D ? Blocks.netherrack - : random <= 0.9D ? Blocks.soul_sand : Blocks.quartz_ore; + : random <= 0.9D ? Blocks.soul_sand : Blocks.quartz_ore; w.setBlock(x, y, z, setTo, 0, 3); break; } @@ -256,16 +259,17 @@ public void updateTick(World w, int x, int y, int z, Random rnd) { BiomeGenBase hellBiome = BiomeGenBase.sky; @SuppressWarnings("unchecked") List l = rnd.nextBoolean() - ? hellBiome.getSpawnableList(EnumCreatureType.creature) - : hellBiome.getSpawnableList(EnumCreatureType.monster); + ? hellBiome.getSpawnableList(EnumCreatureType.creature) + : hellBiome.getSpawnableList(EnumCreatureType.monster); if (l != null && !l.isEmpty()) { SpawnListEntry entry = l.get(rnd.nextInt(l.size())); if (entry != null && entry.entityClass != null) { Class c = entry.entityClass; if (EntityLiving.class.isAssignableFrom(c)) { try { - EntityLiving el = EntityLiving.class - .cast(c.getConstructor(World.class).newInstance(w)); + EntityLiving el = EntityLiving.class.cast( + c.getConstructor(World.class) + .newInstance(w)); el.setPositionAndRotation(x + 0.5D, y + 1, z + 0.5D, 0, 0); el.onSpawnWithEgg(null); @@ -277,9 +281,9 @@ public void updateTick(World w, int x, int y, int z, Random rnd) { } catch (Exception e) { FMLLog.warning( - "[TB]Tried to create an entity of class " + c - + " but failed! The exception is listed below:", - new Object[0]); + "[TB]Tried to create an entity of class " + c + + " but failed! The exception is listed below:", + new Object[0]); e.printStackTrace(); } } @@ -289,9 +293,9 @@ public void updateTick(World w, int x, int y, int z, Random rnd) { break; } else { boolean flag = b instanceof BlockDirt || b instanceof BlockGrass - || b instanceof BlockGravel - || b instanceof BlockSand - || b instanceof BlockStone && !(b instanceof BlockObsidian) && !(b == Blocks.end_stone); + || b instanceof BlockGravel + || b instanceof BlockSand + || b instanceof BlockStone && !(b instanceof BlockObsidian) && !(b == Blocks.end_stone); if (!flag) { ItemStack stk = new ItemStack(b, 1, w.getBlockMetadata(x, y, z)); if (OreDictionary.getOreIDs(stk) != null && OreDictionary.getOreIDs(stk).length > 0) { @@ -301,9 +305,9 @@ public void updateTick(World w, int x, int y, int z, Random rnd) { String ore = OreDictionary.getOreName(id); if (ore != null && !ore.isEmpty()) { flag = ore.contains("dirt") || ore.contains("grass") - || ore.contains("sand") - || ore.contains("gravel") - || ore.contains("stone"); + || ore.contains("sand") + || ore.contains("gravel") + || ore.contains("stone"); if (flag) break OreDict; } } diff --git a/src/main/java/tb/common/block/BlockTBPlant.java b/src/main/java/tb/common/block/BlockTBPlant.java index ec2ff9c..4911d9d 100644 --- a/src/main/java/tb/common/block/BlockTBPlant.java +++ b/src/main/java/tb/common/block/BlockTBPlant.java @@ -92,10 +92,12 @@ private float calculateGrowth(World w, int x, int y, int z) { for (int i1 = z - 1; i1 <= z + 1; ++i1) { float f1 = 0.0F; - if (w.getBlock(l, y - 1, i1).canSustainPlant(w, l, y - 1, i1, ForgeDirection.UP, this)) { + if (w.getBlock(l, y - 1, i1) + .canSustainPlant(w, l, y - 1, i1, ForgeDirection.UP, this)) { f1 = 1.0F; - if (w.getBlock(l, y - 1, i1).isFertile(w, l, y - 1, i1)) { + if (w.getBlock(l, y - 1, i1) + .isFertile(w, l, y - 1, i1)) { f1 = 3.0F; } } @@ -131,11 +133,11 @@ public boolean func_149852_a(World w, Random r, int x, int y, int z) { @Override public void func_149853_b(World w, Random r, int x, int y, int z) { w.setBlockMetadataWithNotify( - x, - y, - z, - Math.min(growthStages - 1, w.getBlockMetadata(x, y, z) + r.nextInt(3) + 1), - 3); + x, + y, + z, + Math.min(growthStages - 1, w.getBlockMetadata(x, y, z) + r.nextInt(3) + 1), + 3); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/tb/common/block/BlockTBSapling.java b/src/main/java/tb/common/block/BlockTBSapling.java index fb65a55..53a95b5 100644 --- a/src/main/java/tb/common/block/BlockTBSapling.java +++ b/src/main/java/tb/common/block/BlockTBSapling.java @@ -22,10 +22,10 @@ public class BlockTBSapling extends BlockSapling { public IIcon[] icons = new IIcon[8]; public static final String[] names = new String[] { "goldenOakSapling", "peacefullTreeSapling", "netherTreeSapling", - "enderTreeSapling" }; + "enderTreeSapling" }; public static final String[] textures = new String[] { "thaumicbases:goldenOak/sapling", - "thaumicbases:peacefullTree/sapling", "thaumicbases:netherTree/sapling", "thaumicbases:enderTree/sapling" }; + "thaumicbases:peacefullTree/sapling", "thaumicbases:netherTree/sapling", "thaumicbases:enderTree/sapling" }; @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { diff --git a/src/main/java/tb/common/block/BlockThaumicAnvil.java b/src/main/java/tb/common/block/BlockThaumicAnvil.java index c414a5a..508d790 100644 --- a/src/main/java/tb/common/block/BlockThaumicAnvil.java +++ b/src/main/java/tb/common/block/BlockThaumicAnvil.java @@ -40,7 +40,7 @@ public void registerBlockIcons(IIconRegister p_149651_1_) { } public boolean onBlockActivated(World w, int x, int y, int z, EntityPlayer p, int side, float vecX, float vecY, - float vecZ) { + float vecZ) { if (w.isRemote) return true; p.openGui(TBCore.instance, 0x421921, w, x, y, z); diff --git a/src/main/java/tb/common/block/BlockVoidAnvil.java b/src/main/java/tb/common/block/BlockVoidAnvil.java index fd4d4a3..819acf8 100644 --- a/src/main/java/tb/common/block/BlockVoidAnvil.java +++ b/src/main/java/tb/common/block/BlockVoidAnvil.java @@ -65,7 +65,7 @@ public void registerBlockIcons(IIconRegister p_149651_1_) { } public boolean onBlockActivated(World w, int x, int y, int z, EntityPlayer p, int side, float vecX, float vecY, - float vecZ) { + float vecZ) { if (w.isRemote) return true; p.openGui(TBCore.instance, 0x421920, w, x, y, z); diff --git a/src/main/java/tb/common/enchantment/EnchantmentElderKnowledge.java b/src/main/java/tb/common/enchantment/EnchantmentElderKnowledge.java index dc87d99..ebeeaeb 100644 --- a/src/main/java/tb/common/enchantment/EnchantmentElderKnowledge.java +++ b/src/main/java/tb/common/enchantment/EnchantmentElderKnowledge.java @@ -19,7 +19,7 @@ public int getMaxLevel() { public boolean canApplyTogether(Enchantment ench) { return !(ench instanceof EnchantmentElderKnowledge) && !(ench instanceof EnchantmentMagicTouch) - && !(ench instanceof EnchantmentTainted) - && !(ench instanceof EnchantmentVaporising); + && !(ench instanceof EnchantmentTainted) + && !(ench instanceof EnchantmentVaporising); } } diff --git a/src/main/java/tb/common/enchantment/EnchantmentEldritchBane.java b/src/main/java/tb/common/enchantment/EnchantmentEldritchBane.java index 698b772..d857dc2 100644 --- a/src/main/java/tb/common/enchantment/EnchantmentEldritchBane.java +++ b/src/main/java/tb/common/enchantment/EnchantmentEldritchBane.java @@ -20,8 +20,8 @@ public int getMinEnchantability(int lvl) { public boolean canApplyTogether(Enchantment ench) { return this != ench && ench != Enchantment.smite - && ench != Enchantment.baneOfArthropods - && ench != Enchantment.sharpness - && !(ench instanceof EnchantmentDamage); + && ench != Enchantment.baneOfArthropods + && ench != Enchantment.sharpness + && !(ench instanceof EnchantmentDamage); } } diff --git a/src/main/java/tb/common/enchantment/EnchantmentHandler.java b/src/main/java/tb/common/enchantment/EnchantmentHandler.java index 3db799b..d5a7c9c 100644 --- a/src/main/java/tb/common/enchantment/EnchantmentHandler.java +++ b/src/main/java/tb/common/enchantment/EnchantmentHandler.java @@ -46,7 +46,7 @@ public class EnchantmentHandler { @SubscribeEvent public void itemExpire(ItemExpireEvent event) { if (event.entityItem != null && event.entityItem.getEntityItem() != null - && !event.entityItem.worldObj.isRemote) { + && !event.entityItem.worldObj.isRemote) { int x = MathHelper.floor_double(event.entityItem.posX); int y = MathHelper.floor_double(event.entityItem.posY); int z = MathHelper.floor_double(event.entityItem.posZ); @@ -56,18 +56,20 @@ public void itemExpire(ItemExpireEvent event) { if (b != null && b instanceof BlockAiry) { TileEntity t = w.getTileEntity(x, y, z); if (t != null && t instanceof TileNode) { - if (TileNode.class.cast(t).getNodeType() == NodeType.TAINTED) { + if (TileNode.class.cast(t) + .getNodeType() == NodeType.TAINTED) { if (is.getItem() instanceof ItemSword) { if (EnchantmentHelper.getEnchantmentLevel(TBEnchant.tainted.effectId, is) <= 0) { LinkedHashMap lhm = (LinkedHashMap) EnchantmentHelper - .getEnchantments(is); + .getEnchantments(is); boolean canApply = true; if (!lhm.isEmpty()) { - Iterator $i = lhm.keySet().iterator(); + Iterator $i = lhm.keySet() + .iterator(); while ($i.hasNext()) { int i = $i.next(); if (i < Enchantment.enchantmentsList.length - && Enchantment.enchantmentsList[i] != null) { + && Enchantment.enchantmentsList[i] != null) { Enchantment ench = Enchantment.enchantmentsList[i]; if (!ench.canApplyTogether(TBEnchant.tainted)) { canApply = false; @@ -92,22 +94,23 @@ public void itemExpire(ItemExpireEvent event) { @SubscribeEvent public void onMobDeath(LivingDeathEvent event) { if (event.entityLiving != null && !event.entityLiving.worldObj.isRemote - && event.source != null - && event.source.getSourceOfDamage() != null - && event.source.getSourceOfDamage() instanceof EntityPlayer) { + && event.source != null + && event.source.getSourceOfDamage() != null + && event.source.getSourceOfDamage() instanceof EntityPlayer) { EntityPlayer player = EntityPlayer.class.cast(event.source.getSourceOfDamage()); EntityLivingBase dyingMob = event.entityLiving; ItemStack currentItem = player.getCurrentEquippedItem(); if (currentItem != null) { if (EnchantmentHelper.getEnchantmentLevel(TBEnchant.elderKnowledge.effectId, currentItem) > 0) { int enchLevel = EnchantmentHelper - .getEnchantmentLevel(TBEnchant.elderKnowledge.effectId, currentItem); + .getEnchantmentLevel(TBEnchant.elderKnowledge.effectId, currentItem); if (player.worldObj.rand.nextInt(Math.max(1, 7 - enchLevel)) == 0) { EntityTags eTags = null; for (int i = 0; i < ThaumcraftApi.scanEntities.size(); ++i) { EntityTags tags = ThaumcraftApi.scanEntities.get(i); if (tags != null && EntityList.getEntityString(dyingMob) != null - && EntityList.getEntityString(dyingMob).equalsIgnoreCase(tags.entityName)) { + && EntityList.getEntityString(dyingMob) + .equalsIgnoreCase(tags.entityName)) { eTags = tags; break; } @@ -130,12 +133,12 @@ public void onMobDeath(LivingDeathEvent event) { for (Aspect aspect : aspects.getAspects()) if (event.entityLiving.worldObj.rand.nextBoolean()) { EntityAspectOrb orb = new EntityAspectOrb( - event.entityLiving.worldObj, - event.entityLiving.posX, - event.entityLiving.posY, - event.entityLiving.posZ, - aspect, - 1 + event.entityLiving.worldObj.rand.nextInt(aspects.getAmount(aspect))); + event.entityLiving.worldObj, + event.entityLiving.posX, + event.entityLiving.posY, + event.entityLiving.posZ, + aspect, + 1 + event.entityLiving.worldObj.rand.nextInt(aspects.getAmount(aspect))); event.entityLiving.worldObj.spawnEntityInWorld(orb); } @@ -153,13 +156,13 @@ public void onMobDeath(LivingDeathEvent event) { size = Math.max(1, size / 2); ItemStack stack = new ItemStack(ConfigItems.itemCrystalEssence, size, 0); ((ItemCrystalEssence) stack.getItem()) - .setAspects(stack, new AspectList().add(aspect, 1)); + .setAspects(stack, new AspectList().add(aspect, 1)); EntityItem cEs = new EntityItem( - event.entity.worldObj, - event.entityLiving.posX, - event.entityLiving.posY + event.entityLiving.getEyeHeight(), - event.entityLiving.posZ, - stack); + event.entity.worldObj, + event.entityLiving.posX, + event.entityLiving.posY + event.entityLiving.getEyeHeight(), + event.entityLiving.posZ, + stack); event.entity.worldObj.spawnEntityInWorld(cEs); } if (event.entity.worldObj.rand.nextInt(2 + enchLevel) == 0) break; @@ -173,9 +176,9 @@ public void onMobDeath(LivingDeathEvent event) { @SubscribeEvent public void onMobDamage(LivingHurtEvent event) { if (event.entityLiving != null && !event.entityLiving.worldObj.isRemote - && event.source != null - && event.source.getSourceOfDamage() != null - && event.source.getSourceOfDamage() instanceof EntityPlayer) { + && event.source != null + && event.source.getSourceOfDamage() != null + && event.source.getSourceOfDamage() instanceof EntityPlayer) { EntityPlayer player = EntityPlayer.class.cast(event.source.getSourceOfDamage()); EntityLivingBase mob = event.entityLiving; ItemStack currentItem = player.getCurrentEquippedItem(); @@ -183,7 +186,7 @@ public void onMobDamage(LivingHurtEvent event) { if (mob instanceof EntityEnderman || mob instanceof IEldritchMob) { if (EnchantmentHelper.getEnchantmentLevel(TBEnchant.eldritchBane.effectId, currentItem) > 0) { int enchLevel = EnchantmentHelper - .getEnchantmentLevel(TBEnchant.eldritchBane.effectId, currentItem); + .getEnchantmentLevel(TBEnchant.eldritchBane.effectId, currentItem); event.ammount += enchLevel * 5F; } } diff --git a/src/main/java/tb/common/enchantment/EnchantmentMagicTouch.java b/src/main/java/tb/common/enchantment/EnchantmentMagicTouch.java index 62e75f2..c1b9bd6 100644 --- a/src/main/java/tb/common/enchantment/EnchantmentMagicTouch.java +++ b/src/main/java/tb/common/enchantment/EnchantmentMagicTouch.java @@ -15,7 +15,7 @@ public int getMaxLevel() { public boolean canApplyTogether(Enchantment ench) { return !(ench instanceof EnchantmentElderKnowledge) && !(ench instanceof EnchantmentMagicTouch) - && !(ench instanceof EnchantmentTainted) - && !(ench instanceof EnchantmentVaporising); + && !(ench instanceof EnchantmentTainted) + && !(ench instanceof EnchantmentVaporising); } } diff --git a/src/main/java/tb/common/enchantment/EnchantmentTainted.java b/src/main/java/tb/common/enchantment/EnchantmentTainted.java index 721037e..416dac7 100644 --- a/src/main/java/tb/common/enchantment/EnchantmentTainted.java +++ b/src/main/java/tb/common/enchantment/EnchantmentTainted.java @@ -16,8 +16,8 @@ public int getMaxLevel() { public boolean canApplyTogether(Enchantment ench) { return !(ench instanceof EnchantmentElderKnowledge) && !(ench instanceof EnchantmentMagicTouch) - && !(ench instanceof EnchantmentTainted) - && !(ench instanceof EnchantmentVaporising); + && !(ench instanceof EnchantmentTainted) + && !(ench instanceof EnchantmentVaporising); } // do I even want to know why this is here? diff --git a/src/main/java/tb/common/enchantment/EnchantmentVaporising.java b/src/main/java/tb/common/enchantment/EnchantmentVaporising.java index 2337109..d07b42d 100644 --- a/src/main/java/tb/common/enchantment/EnchantmentVaporising.java +++ b/src/main/java/tb/common/enchantment/EnchantmentVaporising.java @@ -15,7 +15,7 @@ public int getMaxLevel() { public boolean canApplyTogether(Enchantment ench) { return !(ench instanceof EnchantmentElderKnowledge) && !(ench instanceof EnchantmentMagicTouch) - && !(ench instanceof EnchantmentTainted) - && !(ench instanceof EnchantmentVaporising); + && !(ench instanceof EnchantmentTainted) + && !(ench instanceof EnchantmentVaporising); } } diff --git a/src/main/java/tb/common/entity/EntityAIAvoidCampfire.java b/src/main/java/tb/common/entity/EntityAIAvoidCampfire.java index 37895cd..d633249 100644 --- a/src/main/java/tb/common/entity/EntityAIAvoidCampfire.java +++ b/src/main/java/tb/common/entity/EntityAIAvoidCampfire.java @@ -39,10 +39,10 @@ public EntityAIAvoidCampfire(EntityCreature creature) { public boolean shouldExecute() { if (isScared) { Vec3 vec3 = RandomPositionGenerator.findRandomTargetBlockAwayFrom( - this.entityObj, - 16, - 10, - Vec3.createVectorHelper(campfireX + 0.5D, campfireY, campfireZ + 0.5D)); + this.entityObj, + 16, + 10, + Vec3.createVectorHelper(campfireX + 0.5D, campfireY, campfireZ + 0.5D)); if (vec3 == null) return false; @@ -53,14 +53,15 @@ public boolean shouldExecute() { } public boolean continueExecuting() { - return !this.entityObj.getNavigator().noPath() && scareTimer > 0; + return !this.entityObj.getNavigator() + .noPath() && scareTimer > 0; } public void resetTask() {} public void updateTask() { if (entityPathNavigate != null - && (entityPathNavigate.getPath() == null || entityPathNavigate.getPath() != entityPathEntity)) { + && (entityPathNavigate.getPath() == null || entityPathNavigate.getPath() != entityPathEntity)) { this.entityPathNavigate.setPath(this.entityPathEntity, nearSpeed); } @@ -68,9 +69,11 @@ public void updateTask() { if (scareTimer <= 0) isScared = false; if (this.entityObj.getDistanceSq(campfireX + 0.5D, campfireY, campfireZ + 0.5D) < 49.0D) { - this.entityObj.getNavigator().setSpeed(this.nearSpeed); + this.entityObj.getNavigator() + .setSpeed(this.nearSpeed); } else { - this.entityObj.getNavigator().setSpeed(this.farSpeed); + this.entityObj.getNavigator() + .setSpeed(this.farSpeed); } } diff --git a/src/main/java/tb/common/entity/EntityRevolverBullet.java b/src/main/java/tb/common/entity/EntityRevolverBullet.java index 3eb3f7a..b95b715 100644 --- a/src/main/java/tb/common/entity/EntityRevolverBullet.java +++ b/src/main/java/tb/common/entity/EntityRevolverBullet.java @@ -39,11 +39,11 @@ public EntityRevolverBullet(World w, EntityLivingBase shooter) { boolean allowNoclip = false; float speedIndex = 1; for (Pair p : upgrades) { - if (!allowNoclip) - allowNoclip = p.getFirst().bulletNoclip((EntityPlayer) shooter, revolver, p.getSecond()); + if (!allowNoclip) allowNoclip = p.getFirst() + .bulletNoclip((EntityPlayer) shooter, revolver, p.getSecond()); speedIndex = (float) p.getFirst() - .modifySpeed((EntityPlayer) shooter, revolver, speedIndex, p.getSecond()); + .modifySpeed((EntityPlayer) shooter, revolver, speedIndex, p.getSecond()); if (p.getFirst() == RevolverUpgrade.primal) isPrimal = true; } @@ -62,11 +62,8 @@ public EntityRevolverBullet(World w, EntityLivingBase shooter) { public void onUpdate() { if (this.worldObj.isRemote) Thaumcraft.proxy.sparkle((float) posX, (float) posY, (float) posZ, 4); - if (this.worldObj.isRemote) Thaumcraft.proxy.sparkle( - (float) (posX - motionX / 20), - (float) (posY - motionY / 20), - (float) (posZ - motionZ / 20), - 4); + if (this.worldObj.isRemote) Thaumcraft.proxy + .sparkle((float) (posX - motionX / 20), (float) (posY - motionY / 20), (float) (posZ - motionZ / 20), 4); if (this.ticksExisted >= 200) // <- loop exit for primal this.setDead(); @@ -96,22 +93,22 @@ protected void onImpact(MovingObjectPosition object) { int meta = this.worldObj.getBlockMetadata(object.blockX, object.blockY, object.blockZ); for (int i = 0; i < 100; ++i) this.worldObj.spawnParticle( - "blockcrack_" + Block.getIdFromBlock(b) + "_" + meta, - object.blockX + worldObj.rand.nextDouble(), - object.blockY + worldObj.rand.nextDouble(), - object.blockZ + worldObj.rand.nextDouble(), - 0, - 0, - 0); + "blockcrack_" + Block.getIdFromBlock(b) + "_" + meta, + object.blockX + worldObj.rand.nextDouble(), + object.blockY + worldObj.rand.nextDouble(), + object.blockZ + worldObj.rand.nextDouble(), + 0, + 0, + 0); worldObj.playSound( - object.blockX + 0.5D, - object.blockY + 0.5D, - object.blockZ + 0.5D, - b.stepSound.getBreakSound(), - 1, - 1, - false); + object.blockX + 0.5D, + object.blockY + 0.5D, + object.blockZ + 0.5D, + b.stepSound.getBreakSound(), + 1, + 1, + false); } } if (object.typeOfHit == MovingObjectType.ENTITY) { @@ -119,11 +116,11 @@ protected void onImpact(MovingObjectPosition object) { if (e instanceof EntityLivingBase && e != this.shooter && !(e instanceof EntityRevolverBullet)) { EntityLivingBase elb = (EntityLivingBase) e; float initialDamage = 14; - for (Pair p : upgrades) - initialDamage = p.getFirst().modifyDamage_start(elb, revolver, initialDamage, p.getSecond()); + for (Pair p : upgrades) initialDamage = p.getFirst() + .modifyDamage_start(elb, revolver, initialDamage, p.getSecond()); - for (Pair p : upgrades) - initialDamage = p.getFirst().modifyDamage_end(elb, revolver, initialDamage, p.getSecond()); + for (Pair p : upgrades) initialDamage = p.getFirst() + .modifyDamage_end(elb, revolver, initialDamage, p.getSecond()); elb.attackEntityFrom(new RevolverDamage("revolver"), initialDamage); @@ -131,8 +128,9 @@ protected void onImpact(MovingObjectPosition object) { for (Pair p : upgrades) { if (destroy) destroy = p.getFirst() - .afterhit(elb, (EntityPlayer) shooter, revolver, initialDamage, p.getSecond()); - else p.getFirst().afterhit(elb, (EntityPlayer) shooter, revolver, initialDamage, p.getSecond()); + .afterhit(elb, (EntityPlayer) shooter, revolver, initialDamage, p.getSecond()); + else p.getFirst() + .afterhit(elb, (EntityPlayer) shooter, revolver, initialDamage, p.getSecond()); } if (destroy) this.setDead(); diff --git a/src/main/java/tb/common/event/WorldGenBigOak.java b/src/main/java/tb/common/event/WorldGenBigOak.java index 5d9fb61..84a91bb 100644 --- a/src/main/java/tb/common/event/WorldGenBigOak.java +++ b/src/main/java/tb/common/event/WorldGenBigOak.java @@ -34,7 +34,7 @@ public class WorldGenBigOak extends WorldGenAbstractTree { public int trunkMeta; public WorldGenBigOak(boolean doBlockNotify, int minHeight, int metaWood, int metaLeaves, int treeSize, Block tree, - Block leaves) { + Block leaves) { super(doBlockNotify); trunkMeta = metaWood; leavesMeta = metaLeaves; @@ -89,8 +89,8 @@ void generateLeafNodeList() { if (this.checkBlockLine(aint1, aint2) == -1) { int[] aint3 = new int[] { this.basePos[0], this.basePos[1], this.basePos[2] }; double d3 = Math.sqrt( - Math.pow((double) Math.abs(this.basePos[0] - aint1[0]), 2.0D) - + Math.pow((double) Math.abs(this.basePos[2] - aint1[2]), 2.0D)); + Math.pow((double) Math.abs(this.basePos[0] - aint1[0]), 2.0D) + + Math.pow((double) Math.abs(this.basePos[2] - aint1[2]), 2.0D)); double d4 = d3 * this.branchSlope; if ((double) aint1[1] - d4 > (double) l) { @@ -119,7 +119,7 @@ void generateLeafNodeList() { } void func_150529_a(int p_150529_1_, int p_150529_2_, int p_150529_3_, float p_150529_4_, byte p_150529_5_, - Block p_150529_6_) { + Block p_150529_6_) { int l = (int) ((double) p_150529_4_ + 0.618D); byte b1 = otherCoordPairs[p_150529_5_]; byte b2 = otherCoordPairs[p_150529_5_ + 3]; @@ -142,16 +142,16 @@ void func_150529_a(int p_150529_1_, int p_150529_2_, int p_150529_3_, float p_15 Block block1 = this.worldObj.getBlock(aint1[0], aint1[1], aint1[2]); if (!block1.isAir(worldObj, aint1[0], aint1[1], aint1[2]) - && !block1.isLeaves(worldObj, aint1[0], aint1[1], aint1[2])) { + && !block1.isLeaves(worldObj, aint1[0], aint1[1], aint1[2])) { ++j1; } else { this.setBlockAndNotifyAdequately( - this.worldObj, - aint1[0], - aint1[1], - aint1[2], - p_150529_6_, - this.leavesMeta); + this.worldObj, + aint1[0], + aint1[1], + aint1[2], + p_150529_6_, + this.leavesMeta); ++j1; } } @@ -185,8 +185,8 @@ float layerSize(int p_76490_1_) { float leafSize(int p_76495_1_) { return p_76495_1_ >= 0 && p_76495_1_ < this.leafDistanceLimit - ? (p_76495_1_ != 0 && p_76495_1_ != this.leafDistanceLimit - 1 ? 3.0F : 2.0F) - : -1.0F; + ? (p_76495_1_ != 0 && p_76495_1_ != this.leafDistanceLimit - 1 ? 3.0F : 2.0F) + : -1.0F; } /** @@ -377,12 +377,12 @@ boolean validTreeLocation() { Block block = this.worldObj.getBlock(this.basePos[0], this.basePos[1] - 1, this.basePos[2]); boolean isSoil = block.canSustainPlant( - worldObj, - basePos[0], - basePos[1] - 1, - basePos[2], - ForgeDirection.UP, - (IPlantable) TBBlocks.sapling); + worldObj, + basePos[0], + basePos[1] - 1, + basePos[2], + ForgeDirection.UP, + (IPlantable) TBBlocks.sapling); if (!isSoil) { return false; } else { diff --git a/src/main/java/tb/common/event/WorldGenOak.java b/src/main/java/tb/common/event/WorldGenOak.java index 5362304..67bcb5f 100644 --- a/src/main/java/tb/common/event/WorldGenOak.java +++ b/src/main/java/tb/common/event/WorldGenOak.java @@ -18,7 +18,7 @@ public class WorldGenOak extends WorldGenTrees { public int minTreeHeight; public WorldGenOak(boolean doBlockNotify, int minHeight, int metaWood, int metaLeaves, boolean doVines, Block tree, - Block leaves) { + Block leaves) { super(doBlockNotify, minHeight, metaWood, metaLeaves, doVines); trunkMeta = metaWood; leavesMeta = metaLeaves; @@ -67,7 +67,7 @@ public boolean generate(World w, Random rnd, int x, int y, int z) { Block block2 = w.getBlock(x, y - 1, z); boolean isSoil = block2 - .canSustainPlant(w, x, y - 1, z, ForgeDirection.UP, (BlockSapling) Blocks.sapling); + .canSustainPlant(w, x, y - 1, z, ForgeDirection.UP, (BlockSapling) Blocks.sapling); if (isSoil && y < 256 - height - 1) { block2.onPlantGrow(w, x, y - 1, z, x, y, z); b0 = 3; @@ -92,12 +92,12 @@ public boolean generate(World w, Random rnd, int x, int y, int z) { if (block1.isAir(w, i2, k1, k2) || block1.isLeaves(w, i2, k1, k2)) { this.setBlockAndNotifyAdequately( - w, - i2, - k1, - k2, - this.leavesBlock, - this.leavesMeta); + w, + i2, + k1, + k2, + this.leavesBlock, + this.leavesMeta); } } } diff --git a/src/main/java/tb/common/inventory/ContainerRevolver.java b/src/main/java/tb/common/inventory/ContainerRevolver.java index 28dc355..fde91b7 100644 --- a/src/main/java/tb/common/inventory/ContainerRevolver.java +++ b/src/main/java/tb/common/inventory/ContainerRevolver.java @@ -61,8 +61,7 @@ public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int slot) { if (slot == 0) { if (!this.input.isItemValidForSlot(slot, stackInSlot) - || !mergeItemStack(stackInSlot, 1, this.inventorySlots.size(), true, 64)) - return null; + || !mergeItemStack(stackInSlot, 1, this.inventorySlots.size(), true, 64)) return null; } else if (!this.input.isItemValidForSlot(slot, stackInSlot) || !mergeItemStack(stackInSlot, 0, 1, false, 1)) return null; @@ -79,7 +78,7 @@ public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4Entity InventoryPlayer inventoryplayer = par4EntityPlayer.inventory; if (par1 != 0 || this.input.isItemValidForSlot(par1, inventoryplayer.getItemStack()) - || (par1 == 0 && inventoryplayer.getItemStack() == null)) + || (par1 == 0 && inventoryplayer.getItemStack() == null)) return super.slotClick(par1, par2, par3, par4EntityPlayer); return null; @@ -100,16 +99,18 @@ public void onContainerClosed(EntityPlayer p) { NBTTagCompound var4 = new NBTTagCompound(); var3.writeToNBT(var4); this.stack.setTagInfo("jar", var4); - this.stack.getTagCompound().setBoolean("hasJar", true); + this.stack.getTagCompound() + .setBoolean("hasJar", true); } else { this.stack.setTagInfo("jar", new NBTTagCompound()); - this.stack.getTagCompound().setBoolean("hasJar", false); + this.stack.getTagCompound() + .setBoolean("hasJar", false); } if (this.player == null) return; - if (this.player.getHeldItem() != null && this.player.getHeldItem().isItemEqual(this.stack)) - this.player.setCurrentItemOrArmor(0, this.stack); + if (this.player.getHeldItem() != null && this.player.getHeldItem() + .isItemEqual(this.stack)) this.player.setCurrentItemOrArmor(0, this.stack); this.player.inventory.markDirty(); } @@ -129,8 +130,8 @@ protected boolean mergeItemStack(ItemStack par1ItemStack, int par2, int par3, bo ItemStack var8 = var7.getStack(); if (var8 != null && var8.getItem() == par1ItemStack.getItem() - && (!par1ItemStack.getHasSubtypes() || par1ItemStack.getItemDamage() == var8.getItemDamage()) - && ItemStack.areItemStackTagsEqual(par1ItemStack, var8)) { + && (!par1ItemStack.getHasSubtypes() || par1ItemStack.getItemDamage() == var8.getItemDamage()) + && ItemStack.areItemStackTagsEqual(par1ItemStack, var8)) { int var9 = var8.stackSize + par1ItemStack.stackSize; if (var9 <= Math.min(par1ItemStack.getMaxStackSize(), limit)) { diff --git a/src/main/java/tb/common/inventory/ContainerThaumicAnvil.java b/src/main/java/tb/common/inventory/ContainerThaumicAnvil.java index 5d82c3e..09af493 100644 --- a/src/main/java/tb/common/inventory/ContainerThaumicAnvil.java +++ b/src/main/java/tb/common/inventory/ContainerThaumicAnvil.java @@ -69,9 +69,9 @@ public boolean isItemValid(ItemStack stk) { public boolean canTakeStack(EntityPlayer p_82869_1_) { return (p_82869_1_.capabilities.isCreativeMode - || p_82869_1_.experienceLevel >= ContainerThaumicAnvil.this.maximumCost) - && ContainerThaumicAnvil.this.maximumCost > 0 - && this.getHasStack(); + || p_82869_1_.experienceLevel >= ContainerThaumicAnvil.this.maximumCost) + && ContainerThaumicAnvil.this.maximumCost > 0 + && this.getHasStack(); } public void onPickupFromSlot(EntityPlayer p_82870_1_, ItemStack p_82870_2_) { @@ -80,10 +80,10 @@ public void onPickupFromSlot(EntityPlayer p_82870_1_, ItemStack p_82870_2_) { } float breakChance = ForgeHooks.onAnvilRepair( - p_82870_1_, - p_82870_2_, - ContainerThaumicAnvil.this.inputSlots.getStackInSlot(0), - ContainerThaumicAnvil.this.inputSlots.getStackInSlot(1)) / 3; + p_82870_1_, + p_82870_2_, + ContainerThaumicAnvil.this.inputSlots.getStackInSlot(0), + ContainerThaumicAnvil.this.inputSlots.getStackInSlot(1)) / 3; ContainerThaumicAnvil.this.inputSlots.setInventorySlotContents(0, (ItemStack) null); @@ -91,7 +91,7 @@ public void onPickupFromSlot(EntityPlayer p_82870_1_, ItemStack p_82870_2_) { ItemStack itemstack1 = ContainerThaumicAnvil.this.inputSlots.getStackInSlot(1); if (itemstack1 != null - && itemstack1.stackSize > ContainerThaumicAnvil.this.stackSizeToBeUsedInRepair) { + && itemstack1.stackSize > ContainerThaumicAnvil.this.stackSizeToBeUsedInRepair) { itemstack1.stackSize -= ContainerThaumicAnvil.this.stackSizeToBeUsedInRepair; ContainerThaumicAnvil.this.inputSlots.setInventorySlotContents(1, itemstack1); } else { @@ -104,8 +104,9 @@ public void onPickupFromSlot(EntityPlayer p_82870_1_, ItemStack p_82870_2_) { ContainerThaumicAnvil.this.maximumCost = 0; if (!p_82870_1_.capabilities.isCreativeMode && !fw.isRemote - && fw.getBlock(fx, fy, fz) == TBBlocks.thaumicAnvil - && p_82870_1_.getRNG().nextFloat() < breakChance) { + && fw.getBlock(fx, fy, fz) == TBBlocks.thaumicAnvil + && p_82870_1_.getRNG() + .nextFloat() < breakChance) { int i1 = fw.getBlockMetadata(fx, fy, fz); int k = i1 & 3; int l = i1 >> 2; @@ -173,10 +174,11 @@ public void updateRepairOutput() { if (itemstack2 != null) { if (!ForgeHooks.onAnvilChange(this, itemstack, itemstack2, outputSlot, repairedItemName, k2)) return; - flag = itemstack2.getItem() == Items.enchanted_book - && Items.enchanted_book.func_92110_g(itemstack2).tagCount() > 0; + flag = itemstack2.getItem() == Items.enchanted_book && Items.enchanted_book.func_92110_g(itemstack2) + .tagCount() > 0; - if (itemstack1.isItemStackDamageable() && itemstack1.getItem().getIsRepairable(itemstack, itemstack2)) { + if (itemstack1.isItemStackDamageable() && itemstack1.getItem() + .getIsRepairable(itemstack, itemstack2)) { k = Math.min(itemstack1.getItemDamageForDisplay(), itemstack1.getMaxDamage() / 4); if (k <= 0) { @@ -195,7 +197,7 @@ public void updateRepairOutput() { this.stackSizeToBeUsedInRepair = l; } else { if (!flag - && (itemstack1.getItem() != itemstack2.getItem() || !itemstack1.isItemStackDamageable())) { + && (itemstack1.getItem() != itemstack2.getItem() || !itemstack1.isItemStackDamageable())) { this.outputSlot.setInventorySlotContents(0, (ItemStack) null); this.maximumCost = 0; return; @@ -219,13 +221,14 @@ public void updateRepairOutput() { } Map map1 = EnchantmentHelper.getEnchantments(itemstack2); - iterator1 = map1.keySet().iterator(); + iterator1 = map1.keySet() + .iterator(); while (iterator1.hasNext()) { i1 = ((Integer) iterator1.next()).intValue(); enchantment = Enchantment.enchantmentsList[i1]; k1 = map.containsKey(Integer.valueOf(i1)) ? ((Integer) map.get(Integer.valueOf(i1))).intValue() - : 0; + : 0; l1 = ((Integer) map1.get(Integer.valueOf(i1))).intValue(); int i3; @@ -244,7 +247,8 @@ public void updateRepairOutput() { flag1 = true; } - Iterator iterator = map.keySet().iterator(); + Iterator iterator = map.keySet() + .iterator(); while (iterator.hasNext()) { int j2 = ((Integer) iterator.next()).intValue(); @@ -322,7 +326,8 @@ public void updateRepairOutput() { k = 0; - for (iterator1 = map.keySet().iterator(); iterator1.hasNext(); k2 += k + k1 * l1) { + for (iterator1 = map.keySet() + .iterator(); iterator1.hasNext(); k2 += k + k1 * l1) { i1 = ((Integer) iterator1.next()).intValue(); enchantment = Enchantment.enchantmentsList[i1]; k1 = ((Integer) map.get(Integer.valueOf(i1))).intValue(); @@ -359,7 +364,8 @@ public void updateRepairOutput() { k2 = Math.max(1, k2 / 2); } - if (flag && !itemstack1.getItem().isBookEnchantable(itemstack1, itemstack2)) itemstack1 = null; + if (flag && !itemstack1.getItem() + .isBookEnchantable(itemstack1, itemstack2)) itemstack1 = null; this.maximumCost = k2 + i; @@ -428,8 +434,7 @@ public void onContainerClosed(EntityPlayer p_75134_1_) { public boolean canInteractWith(EntityPlayer p_75145_1_) { return this.w.getBlock(this.x, this.y, this.z) != TBBlocks.thaumicAnvil ? false - : p_75145_1_.getDistanceSq((double) this.x + 0.5D, (double) this.y + 0.5D, (double) this.z + 0.5D) - <= 64.0D; + : p_75145_1_.getDistanceSq((double) this.x + 0.5D, (double) this.y + 0.5D, (double) this.z + 0.5D) <= 64.0D; } public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) { @@ -473,8 +478,10 @@ public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) { public void updateItemName(String p_82850_1_) { this.repairedItemName = p_82850_1_; - if (this.getSlot(2).getHasStack()) { - ItemStack itemstack = this.getSlot(2).getStack(); + if (this.getSlot(2) + .getHasStack()) { + ItemStack itemstack = this.getSlot(2) + .getStack(); if (StringUtils.isBlank(p_82850_1_)) { itemstack.func_135074_t(); diff --git a/src/main/java/tb/common/inventory/ContainerVoidAnvil.java b/src/main/java/tb/common/inventory/ContainerVoidAnvil.java index 6f9c863..79531b0 100644 --- a/src/main/java/tb/common/inventory/ContainerVoidAnvil.java +++ b/src/main/java/tb/common/inventory/ContainerVoidAnvil.java @@ -69,9 +69,9 @@ public boolean isItemValid(ItemStack stk) { public boolean canTakeStack(EntityPlayer p_82869_1_) { return (p_82869_1_.capabilities.isCreativeMode - || p_82869_1_.experienceLevel >= ContainerVoidAnvil.this.maximumCost) - && ContainerVoidAnvil.this.maximumCost > 0 - && this.getHasStack(); + || p_82869_1_.experienceLevel >= ContainerVoidAnvil.this.maximumCost) + && ContainerVoidAnvil.this.maximumCost > 0 + && this.getHasStack(); } public void onPickupFromSlot(EntityPlayer p_82870_1_, ItemStack p_82870_2_) { @@ -80,10 +80,10 @@ public void onPickupFromSlot(EntityPlayer p_82870_1_, ItemStack p_82870_2_) { } float breakChance = ForgeHooks.onAnvilRepair( - p_82870_1_, - p_82870_2_, - ContainerVoidAnvil.this.inputSlots.getStackInSlot(0), - ContainerVoidAnvil.this.inputSlots.getStackInSlot(1)); + p_82870_1_, + p_82870_2_, + ContainerVoidAnvil.this.inputSlots.getStackInSlot(0), + ContainerVoidAnvil.this.inputSlots.getStackInSlot(1)); ContainerVoidAnvil.this.inputSlots.setInventorySlotContents(0, (ItemStack) null); @@ -91,7 +91,7 @@ public void onPickupFromSlot(EntityPlayer p_82870_1_, ItemStack p_82870_2_) { ItemStack itemstack1 = ContainerVoidAnvil.this.inputSlots.getStackInSlot(1); if (itemstack1 != null - && itemstack1.stackSize > ContainerVoidAnvil.this.stackSizeToBeUsedInRepair) { + && itemstack1.stackSize > ContainerVoidAnvil.this.stackSizeToBeUsedInRepair) { itemstack1.stackSize -= ContainerVoidAnvil.this.stackSizeToBeUsedInRepair; ContainerVoidAnvil.this.inputSlots.setInventorySlotContents(1, itemstack1); } else { @@ -104,8 +104,9 @@ public void onPickupFromSlot(EntityPlayer p_82870_1_, ItemStack p_82870_2_) { ContainerVoidAnvil.this.maximumCost = 0; if (!p_82870_1_.capabilities.isCreativeMode && !wrld.isRemote - && wrld.getBlock(ax, ay, az) == TBBlocks.thaumicAnvil - && p_82870_1_.getRNG().nextFloat() < breakChance) { + && wrld.getBlock(ax, ay, az) == TBBlocks.thaumicAnvil + && p_82870_1_.getRNG() + .nextFloat() < breakChance) { int i1 = wrld.getBlockMetadata(ax, ay, az); int k = i1 & 3; int l = i1 >> 2; @@ -173,10 +174,11 @@ public void updateRepairOutput() { if (itemstack2 != null) { if (!ForgeHooks.onAnvilChange(this, itemstack, itemstack2, outputSlot, repairedItemName, k2)) return; - flag = itemstack2.getItem() == Items.enchanted_book - && Items.enchanted_book.func_92110_g(itemstack2).tagCount() > 0; + flag = itemstack2.getItem() == Items.enchanted_book && Items.enchanted_book.func_92110_g(itemstack2) + .tagCount() > 0; - if (itemstack1.isItemStackDamageable() && itemstack1.getItem().getIsRepairable(itemstack, itemstack2)) { + if (itemstack1.isItemStackDamageable() && itemstack1.getItem() + .getIsRepairable(itemstack, itemstack2)) { k = Math.min(itemstack1.getItemDamageForDisplay(), itemstack1.getMaxDamage() / 4); if (k <= 0) { @@ -195,7 +197,7 @@ public void updateRepairOutput() { this.stackSizeToBeUsedInRepair = l; } else { if (!flag - && (itemstack1.getItem() != itemstack2.getItem() || !itemstack1.isItemStackDamageable())) { + && (itemstack1.getItem() != itemstack2.getItem() || !itemstack1.isItemStackDamageable())) { this.outputSlot.setInventorySlotContents(0, (ItemStack) null); this.maximumCost = 0; return; @@ -219,13 +221,14 @@ public void updateRepairOutput() { } Map map1 = EnchantmentHelper.getEnchantments(itemstack2); - iterator1 = map1.keySet().iterator(); + iterator1 = map1.keySet() + .iterator(); while (iterator1.hasNext()) { i1 = ((Integer) iterator1.next()).intValue(); enchantment = Enchantment.enchantmentsList[i1]; k1 = map.containsKey(Integer.valueOf(i1)) ? ((Integer) map.get(Integer.valueOf(i1))).intValue() - : 0; + : 0; l1 = ((Integer) map1.get(Integer.valueOf(i1))).intValue(); int i3; @@ -244,7 +247,8 @@ public void updateRepairOutput() { flag1 = true; } - Iterator iterator = map.keySet().iterator(); + Iterator iterator = map.keySet() + .iterator(); while (iterator.hasNext()) { int j2 = ((Integer) iterator.next()).intValue(); @@ -322,7 +326,8 @@ public void updateRepairOutput() { k = 0; - for (iterator1 = map.keySet().iterator(); iterator1.hasNext(); k2 += k + k1 * l1) { + for (iterator1 = map.keySet() + .iterator(); iterator1.hasNext(); k2 += k + k1 * l1) { i1 = ((Integer) iterator1.next()).intValue(); enchantment = Enchantment.enchantmentsList[i1]; k1 = ((Integer) map.get(Integer.valueOf(i1))).intValue(); @@ -359,7 +364,8 @@ public void updateRepairOutput() { k2 = Math.max(1, k2 / 2); } - if (flag && !itemstack1.getItem().isBookEnchantable(itemstack1, itemstack2)) itemstack1 = null; + if (flag && !itemstack1.getItem() + .isBookEnchantable(itemstack1, itemstack2)) itemstack1 = null; this.maximumCost = 3; @@ -416,8 +422,7 @@ public void onContainerClosed(EntityPlayer p_75134_1_) { public boolean canInteractWith(EntityPlayer p_75145_1_) { return this.w.getBlock(this.x, this.y, this.z) != TBBlocks.voidAnvil ? false - : p_75145_1_.getDistanceSq((double) this.x + 0.5D, (double) this.y + 0.5D, (double) this.z + 0.5D) - <= 64.0D; + : p_75145_1_.getDistanceSq((double) this.x + 0.5D, (double) this.y + 0.5D, (double) this.z + 0.5D) <= 64.0D; } public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) { @@ -461,8 +466,10 @@ public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) { public void updateItemName(String p_82850_1_) { this.repairedItemName = p_82850_1_; - if (this.getSlot(2).getHasStack()) { - ItemStack itemstack = this.getSlot(2).getStack(); + if (this.getSlot(2) + .getHasStack()) { + ItemStack itemstack = this.getSlot(2) + .getStack(); if (StringUtils.isBlank(p_82850_1_)) { itemstack.func_135074_t(); diff --git a/src/main/java/tb/common/item/ItemBloodyArmor.java b/src/main/java/tb/common/item/ItemBloodyArmor.java index e8528eb..d262e6d 100644 --- a/src/main/java/tb/common/item/ItemBloodyArmor.java +++ b/src/main/java/tb/common/item/ItemBloodyArmor.java @@ -32,7 +32,7 @@ public ItemBloodyArmor(ArmorMaterial mat, int aType) { public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return slot == 2 ? "thaumicbases:textures/items/armor/bloody/bloody_2.png" - : "thaumicbases:textures/items/armor/bloody/bloody_1.png"; + : "thaumicbases:textures/items/armor/bloody/bloody_1.png"; } @Override @@ -55,10 +55,10 @@ public EnumRarity getRarity(ItemStack itemstack) { @SuppressWarnings({ "unchecked", "rawtypes" }) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add( - EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tc.visdiscount") - + ": " - + getVisDiscount(stack, player, null) - + "%"); + EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tc.visdiscount") + + ": " + + getVisDiscount(stack, player, null) + + "%"); super.addInformation(stack, player, list, par4); } @@ -69,32 +69,32 @@ public Multimap getAttributeModifiers(ItemStack stack) { switch (aType) { case 1: { map.put( - SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), - new AttributeModifier( - UUID.fromString("96042c45-dfe3-4366-b93b-84663c4d828d"), - "maxHealth", - 0.2F, - 2)); + SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), + new AttributeModifier( + UUID.fromString("96042c45-dfe3-4366-b93b-84663c4d828d"), + "maxHealth", + 0.2F, + 2)); break; } case 2: { map.put( - SharedMonsterAttributes.knockbackResistance.getAttributeUnlocalizedName(), - new AttributeModifier( - UUID.fromString("e4e1d8b2-87f2-44f5-8f24-e1876060a04c"), - "knockback", - 0.5F, - 2)); + SharedMonsterAttributes.knockbackResistance.getAttributeUnlocalizedName(), + new AttributeModifier( + UUID.fromString("e4e1d8b2-87f2-44f5-8f24-e1876060a04c"), + "knockback", + 0.5F, + 2)); break; } case 3: { map.put( - SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), - new AttributeModifier( - UUID.fromString("f6d1384c-74c3-4cce-9a80-11b91dbd4ff4"), - "moveSpeed", - 0.1F, - 2)); + SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), + new AttributeModifier( + UUID.fromString("f6d1384c-74c3-4cce-9a80-11b91dbd4ff4"), + "moveSpeed", + 0.1F, + 2)); break; } } diff --git a/src/main/java/tb/common/item/ItemCastingBracelet.java b/src/main/java/tb/common/item/ItemCastingBracelet.java index 55579aa..c7ed106 100644 --- a/src/main/java/tb/common/item/ItemCastingBracelet.java +++ b/src/main/java/tb/common/item/ItemCastingBracelet.java @@ -32,30 +32,28 @@ public class ItemCastingBracelet extends ItemWandCasting // <- I hope no one wil { public static String[] names = new String[] { "iron", "gold", "greatwood", "thaumium", "silverwood", "reed", "bone", - "obsidian", "blaze", "ice", "quartz", "void", "primal" }; + "obsidian", "blaze", "ice", "quartz", "void", "primal" }; public static ResourceLocation[] braceletTextures = new ResourceLocation[] { - loc("thaumcraft", "textures/blocks/metalbase.png"), loc("thaumcraft", "textures/blocks/goldbase.png"), - loc("thaumcraft", "textures/blocks/planks_greatwood.png"), - loc("thaumcraft", "textures/blocks/thaumiumblock.png"), - loc("thaumcraft", "textures/blocks/planks_silverwood.png"), - loc("thaumicbases", "textures/blocks/sugarcaneblock.png"), - loc("thaumicbases", "textures/blocks/boneblock.png"), loc("minecraft", "textures/blocks/obsidian.png"), - loc("thaumicbases", "textures/blocks/blazeblock.png"), loc("minecraft", "textures/blocks/ice_packed.png"), - loc("minecraft", "textures/blocks/quartz_block_bottom.png"), - loc("thaumicbases", "textures/blocks/voidblock.png"), loc("thaumcraft", "textures/blocks/deco_3.png") }; + loc("thaumcraft", "textures/blocks/metalbase.png"), loc("thaumcraft", "textures/blocks/goldbase.png"), + loc("thaumcraft", "textures/blocks/planks_greatwood.png"), + loc("thaumcraft", "textures/blocks/thaumiumblock.png"), + loc("thaumcraft", "textures/blocks/planks_silverwood.png"), + loc("thaumicbases", "textures/blocks/sugarcaneblock.png"), loc("thaumicbases", "textures/blocks/boneblock.png"), + loc("minecraft", "textures/blocks/obsidian.png"), loc("thaumicbases", "textures/blocks/blazeblock.png"), + loc("minecraft", "textures/blocks/ice_packed.png"), loc("minecraft", "textures/blocks/quartz_block_bottom.png"), + loc("thaumicbases", "textures/blocks/voidblock.png"), loc("thaumcraft", "textures/blocks/deco_3.png") }; public static WandCap[] caps = new WandCap[] { ConfigItems.WAND_CAP_IRON, ConfigItems.WAND_CAP_GOLD, - ConfigItems.WAND_CAP_GOLD, TBItems.WAND_CAP_THAUMINITE, ConfigItems.WAND_CAP_THAUMIUM, - ConfigItems.WAND_CAP_THAUMIUM, ConfigItems.WAND_CAP_THAUMIUM, ConfigItems.WAND_CAP_THAUMIUM, - ConfigItems.WAND_CAP_THAUMIUM, ConfigItems.WAND_CAP_THAUMIUM, ConfigItems.WAND_CAP_THAUMIUM, - ConfigItems.WAND_CAP_THAUMIUM, ConfigItems.WAND_CAP_VOID }; + ConfigItems.WAND_CAP_GOLD, TBItems.WAND_CAP_THAUMINITE, ConfigItems.WAND_CAP_THAUMIUM, + ConfigItems.WAND_CAP_THAUMIUM, ConfigItems.WAND_CAP_THAUMIUM, ConfigItems.WAND_CAP_THAUMIUM, + ConfigItems.WAND_CAP_THAUMIUM, ConfigItems.WAND_CAP_THAUMIUM, ConfigItems.WAND_CAP_THAUMIUM, + ConfigItems.WAND_CAP_THAUMIUM, ConfigItems.WAND_CAP_VOID }; public static WandRod[] rods = new WandRod[] { ConfigItems.WAND_ROD_WOOD, ConfigItems.WAND_ROD_WOOD, - ConfigItems.WAND_ROD_GREATWOOD, TBItems.WAND_ROD_THAUMIUM, ConfigItems.WAND_ROD_SILVERWOOD, - ConfigItems.WAND_ROD_REED, ConfigItems.WAND_ROD_BONE, ConfigItems.WAND_ROD_OBSIDIAN, - ConfigItems.WAND_ROD_BLAZE, ConfigItems.WAND_ROD_ICE, ConfigItems.WAND_ROD_QUARTZ, TBItems.WAND_ROD_VOID, - ConfigItems.STAFF_ROD_PRIMAL }; + ConfigItems.WAND_ROD_GREATWOOD, TBItems.WAND_ROD_THAUMIUM, ConfigItems.WAND_ROD_SILVERWOOD, + ConfigItems.WAND_ROD_REED, ConfigItems.WAND_ROD_BONE, ConfigItems.WAND_ROD_OBSIDIAN, ConfigItems.WAND_ROD_BLAZE, + ConfigItems.WAND_ROD_ICE, ConfigItems.WAND_ROD_QUARTZ, TBItems.WAND_ROD_VOID, ConfigItems.STAFF_ROD_PRIMAL }; public static int[] capacity = new int[] { 10, 15, 17, 20, 23, 23, 25, 25, 25, 25, 25, 27, 30 }; @@ -135,9 +133,8 @@ public String getUnlocalizedName(ItemStack stk) { public float getConsumptionModifier(ItemStack is, EntityPlayer player, Aspect aspect, boolean crafting) { float consumptionModifier = 0.5F; - if ((getCap(is).getSpecialCostModifierAspects() != null) - && (getCap(is).getSpecialCostModifierAspects().contains(aspect))) - consumptionModifier = getCap(is).getSpecialCostModifier() / 1.5F; + if ((getCap(is).getSpecialCostModifierAspects() != null) && (getCap(is).getSpecialCostModifierAspects() + .contains(aspect))) consumptionModifier = getCap(is).getSpecialCostModifier() / 1.5F; else consumptionModifier = getCap(is).getBaseCostModifier() / 1.5F; if (player != null) consumptionModifier -= WandManager.getTotalVisDiscount(player, aspect); @@ -150,14 +147,14 @@ public float getConsumptionModifier(ItemStack is, EntityPlayer player, Aspect as @Override public WandRod getRod(ItemStack stack) { return stack.getItemDamage() == 3 ? TBItems.WAND_ROD_THAUMIUM - : stack.getItemDamage() == 11 ? TBItems.WAND_ROD_VOID - : rods[Math.min(rods.length - 1, stack.getItemDamage())]; + : stack.getItemDamage() == 11 ? TBItems.WAND_ROD_VOID + : rods[Math.min(rods.length - 1, stack.getItemDamage())]; } @Override public WandCap getCap(ItemStack stack) { return stack.getItemDamage() == 3 ? TBItems.WAND_CAP_THAUMINITE - : caps[Math.min(caps.length - 1, stack.getItemDamage())]; + : caps[Math.min(caps.length - 1, stack.getItemDamage())]; } public boolean isStaff(ItemStack stack) { diff --git a/src/main/java/tb/common/item/ItemConcentratedTaint.java b/src/main/java/tb/common/item/ItemConcentratedTaint.java index 014bf60..5209849 100644 --- a/src/main/java/tb/common/item/ItemConcentratedTaint.java +++ b/src/main/java/tb/common/item/ItemConcentratedTaint.java @@ -37,7 +37,7 @@ public class ItemConcentratedTaint extends Item { public boolean onItemUse(ItemStack stk, EntityPlayer user, World w, int x, int y, int z, int side, float vecX, - float vecY, float vecZ) { + float vecY, float vecZ) { --stk.stackSize; w.playSound(x, y, z, "break.glass", 1, 1, false); @@ -45,7 +45,8 @@ public boolean onItemUse(ItemStack stk, EntityPlayer user, World w, int x, int y if (b == ConfigBlocks.blockAiry) { TileEntity tile = w.getTileEntity(x, y, z); if (tile instanceof INode) { - INode.class.cast(tile).setNodeType(NodeType.TAINTED); + INode.class.cast(tile) + .setNodeType(NodeType.TAINTED); return true; } } @@ -55,8 +56,8 @@ public boolean onItemUse(ItemStack stk, EntityPlayer user, World w, int x, int y int dZ = z + MathHelper.floor_double(MathUtils.randomDouble(w.rand) * 16); int dY = y + w.rand.nextInt(2) - w.rand.nextInt(2); MiscUtils.changeBiome(w, ThaumcraftWorldGenerator.biomeTaint, dX, dZ); - if (w.isBlockNormalCubeDefault(dX, dY - 1, dZ, false) - && w.getBlock(dX, dY, dZ).isReplaceable(w, dX, dY, dZ)) { + if (w.isBlockNormalCubeDefault(dX, dY - 1, dZ, false) && w.getBlock(dX, dY, dZ) + .isReplaceable(w, dX, dY, dZ)) { w.setBlock(dX, dY, dZ, ConfigBlocks.blockTaintFibres, 0, 3); } Thaumcraft.proxy.bottleTaintBreak(w, dX, dY, dZ); @@ -79,11 +80,11 @@ public boolean itemInteractionForEntity(ItemStack stk, EntityPlayer user, Entity if (armor != null) { ItemStack newArmor = armor.copy(); EntityItem actualArmor = new EntityItem( - victum.worldObj, - victum.posX, - victum.posY, - victum.posZ, - newArmor); + victum.worldObj, + victum.posX, + victum.posY, + victum.posZ, + newArmor); actualArmor.delayBeforeCanPickup = 1200; if (!victum.worldObj.isRemote) victum.worldObj.spawnEntityInWorld(actualArmor); @@ -135,24 +136,27 @@ public ItemStack onEaten(ItemStack stack, World w, EntityPlayer player) { if (player.posY > 6) { player.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("tb.txt.howlBelow")).setChatStyle( - new ChatStyle().setColor(EnumChatFormatting.DARK_PURPLE).setItalic(true))); + new ChatComponentText(StatCollector.translateToLocal("tb.txt.howlBelow")).setChatStyle( + new ChatStyle().setColor(EnumChatFormatting.DARK_PURPLE) + .setItalic(true))); TBUtils.addWarpToPlayer(player, 6, 0); } else { if (player.worldObj.provider != null && player.worldObj.provider.dimensionId == -1) { player.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("tb.txt.taintDevelop")).setChatStyle( - new ChatStyle().setColor(EnumChatFormatting.DARK_PURPLE).setItalic(true))); + new ChatComponentText(StatCollector.translateToLocal("tb.txt.taintDevelop")).setChatStyle( + new ChatStyle().setColor(EnumChatFormatting.DARK_PURPLE) + .setItalic(true))); TBUtils.addWarpToPlayer(player, 18, 0); TBUtils.addWarpToPlayer(player, 6, 1); TBUtils.addWarpToPlayer(player, 1, 2); if (!ResearchManager.isResearchComplete(player.getCommandSenderName(), "TB.TaintProgress")) PacketHandler.INSTANCE - .sendTo(new PacketResearchComplete("@TB.TaintProgress"), (EntityPlayerMP) player); + .sendTo(new PacketResearchComplete("@TB.TaintProgress"), (EntityPlayerMP) player); } else { player.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("tb.txt.howlDeeper")).setChatStyle( - new ChatStyle().setColor(EnumChatFormatting.DARK_PURPLE).setItalic(true))); + new ChatComponentText(StatCollector.translateToLocal("tb.txt.howlDeeper")).setChatStyle( + new ChatStyle().setColor(EnumChatFormatting.DARK_PURPLE) + .setItalic(true))); TBUtils.addWarpToPlayer(player, 12, 0); } } diff --git a/src/main/java/tb/common/item/ItemHerobrinesScythe.java b/src/main/java/tb/common/item/ItemHerobrinesScythe.java index 945ded2..535fd05 100644 --- a/src/main/java/tb/common/item/ItemHerobrinesScythe.java +++ b/src/main/java/tb/common/item/ItemHerobrinesScythe.java @@ -58,20 +58,21 @@ public void addInformation(ItemStack stack, EntityPlayer player, List lst, boole public void onUpdate(ItemStack stk, World w, Entity entity, int slot, boolean held) { super.onUpdate(stk, w, entity, slot, held); if ((stk.isItemDamaged()) && (entity != null) - && (entity.ticksExisted % 20 == 0) - && ((entity instanceof EntityLivingBase))) - stk.damageItem(-1, (EntityLivingBase) entity); + && (entity.ticksExisted % 20 == 0) + && ((entity instanceof EntityLivingBase))) stk.damageItem(-1, (EntityLivingBase) entity); } @SuppressWarnings("unchecked") public static void attack(EntityPlayer attacker, List doNotAttack, EntityLivingBase attacked) { - AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox( + AxisAlignedBB aabb = AxisAlignedBB + .getBoundingBox( attacked.posX - 1, attacked.posY - 1, attacked.posZ - 1, attacked.posX + 1, attacked.posY + 1, - attacked.posZ + 1).expand(6, 6, 6); + attacked.posZ + 1) + .expand(6, 6, 6); List mobs = attacked.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, aabb); @@ -82,23 +83,23 @@ public static void attack(EntityPlayer attacker, List doNotAtt if (!mobs.isEmpty()) { while (!mobs.isEmpty()) { int index = rnd.nextInt(mobs.size()); - if (mobs.get(index) != null && mobs.get(index).isEntityAlive() - && mobs.get(index) instanceof IMob - && !(mobs.get(index) instanceof EntityPlayer)) { + if (mobs.get(index) != null && mobs.get(index) + .isEntityAlive() && mobs.get(index) instanceof IMob && !(mobs.get(index) instanceof EntityPlayer)) { performPlayerAttackAt(attacker, mobs.get(index)); TBCore.proxy.lightning( - attacker.worldObj, - attacked.posX, - attacked.posY + rnd.nextDouble() * attacked.getEyeHeight(), - attacked.posZ, - mobs.get(index).posX, - mobs.get(index).posY + rnd.nextDouble() * mobs.get(index).getEyeHeight(), - mobs.get(index).posZ, - 20, - 2F, - 10, - 0); + attacker.worldObj, + attacked.posX, + attacked.posY + rnd.nextDouble() * attacked.getEyeHeight(), + attacked.posZ, + mobs.get(index).posX, + mobs.get(index).posY + rnd.nextDouble() * mobs.get(index) + .getEyeHeight(), + mobs.get(index).posZ, + 20, + 2F, + 10, + 0); attacker.worldObj.playSoundAtEntity(mobs.get(index), "thaumcraft:zap", 1F, 0.8F); doNotAttack.add(mobs.get(index)); @@ -137,7 +138,8 @@ public static void performPlayerAttackAt(EntityPlayer p, Entity p_71059_1_) { if (p_71059_1_.canAttackWithItem()) { if (!p_71059_1_.hitByEntity(p)) { - float f = (float) p.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue(); + float f = (float) p.getEntityAttribute(SharedMonsterAttributes.attackDamage) + .getAttributeValue(); int i = 0; float f1 = 0.0F; @@ -152,11 +154,11 @@ public static void performPlayerAttackAt(EntityPlayer p, Entity p_71059_1_) { if (f > 0.0F || f1 > 0.0F) { boolean flag = p.fallDistance > 0.0F && !p.onGround - && !p.isOnLadder() - && !p.isInWater() - && !p.isPotionActive(Potion.blindness) - && p.ridingEntity == null - && p_71059_1_ instanceof EntityLivingBase; + && !p.isOnLadder() + && !p.isInWater() + && !p.isPotionActive(Potion.blindness) + && p.ridingEntity == null + && p_71059_1_ instanceof EntityLivingBase; if (flag && f > 0.0F) { f *= 1.5F; @@ -176,11 +178,9 @@ public static void performPlayerAttackAt(EntityPlayer p, Entity p_71059_1_) { if (flag2) { if (i > 0) { p_71059_1_.addVelocity( - (double) (-MathHelper.sin(p.rotationYaw * (float) Math.PI / 180.0F) * (float) i - * 0.5F), - 0.1D, - (double) (MathHelper.cos(p.rotationYaw * (float) Math.PI / 180.0F) * (float) i - * 0.5F)); + (double) (-MathHelper.sin(p.rotationYaw * (float) Math.PI / 180.0F) * (float) i * 0.5F), + 0.1D, + (double) (MathHelper.cos(p.rotationYaw * (float) Math.PI / 180.0F) * (float) i * 0.5F)); p.motionX *= 0.6D; p.motionZ *= 0.6D; p.setSprinting(false); @@ -250,19 +250,15 @@ public Multimap getAttributeModifiers(ItemStack stack) { Multimap attribs = HashMultimap.create(); attribs.put( - SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier( - UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF"), - "Weapon modifier", - 14.5F, - 0)); + SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier( + UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF"), + "Weapon modifier", + 14.5F, + 0)); attribs.put( - SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), - new AttributeModifier( - UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CE"), - "Speed modifier", - 0.5F, - 2)); + SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), + new AttributeModifier(UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CE"), "Speed modifier", 0.5F, 2)); return attribs; } diff --git a/src/main/java/tb/common/item/ItemKnoseFragment.java b/src/main/java/tb/common/item/ItemKnoseFragment.java index 2338dcc..686da7a 100644 --- a/src/main/java/tb/common/item/ItemKnoseFragment.java +++ b/src/main/java/tb/common/item/ItemKnoseFragment.java @@ -21,11 +21,11 @@ public class ItemKnoseFragment extends Item { public static final String names[] = new String[] { "air", "fire", "aqua", "terra", "order", "entropy", "mixed", - "tainted" }; + "tainted" }; public static final AspectList[] addedAspects = new AspectList[] { lst(8, Aspect.AIR), lst(8, Aspect.FIRE), - lst(8, Aspect.WATER), lst(8, Aspect.EARTH), lst(8, Aspect.ORDER), lst(8, Aspect.ENTROPY), - lst(2, Aspect.FIRE, Aspect.WATER, Aspect.EARTH, Aspect.AIR, Aspect.ORDER, Aspect.ENTROPY) }; + lst(8, Aspect.WATER), lst(8, Aspect.EARTH), lst(8, Aspect.ORDER), lst(8, Aspect.ENTROPY), + lst(2, Aspect.FIRE, Aspect.WATER, Aspect.EARTH, Aspect.AIR, Aspect.ORDER, Aspect.ENTROPY) }; public static IIcon[] icons = new IIcon[names.length]; @@ -69,15 +69,17 @@ public ItemStack onItemRightClick(ItemStack stk, World w, EntityPlayer player) { int meta = stk.getItemDamage(); if (!player.worldObj.isRemote) if (meta < 7) { for (int i = 0; i < addedAspects[meta].size(); ++i) TBUtils.addAspectToKnowledgePool( - player, - addedAspects[meta].getAspects()[i], - (short) addedAspects[meta].getAmount(addedAspects[meta].getAspects()[i])); + player, + addedAspects[meta].getAspects()[i], + (short) addedAspects[meta].getAmount(addedAspects[meta].getAspects()[i])); } else { // if(!ResearchManager.isResearchComplete(player.getCommandSenderName(), "TB.TaintMinor")) // PacketHandler.INSTANCE.sendTo(new PacketResearchComplete("@TB.TaintMinor"), (EntityPlayerMP)player); int overhaulAddedAspects = 0; - for (int i = 0; i < Aspect.getCompoundAspects().size(); ++i) { - Aspect a = Aspect.getCompoundAspects().get(i); + for (int i = 0; i < Aspect.getCompoundAspects() + .size(); ++i) { + Aspect a = Aspect.getCompoundAspects() + .get(i); if (a == Aspect.TAINT) { TBUtils.addAspectToKnowledgePool(player, a, (short) 8); TBUtils.addWarpToPlayer(player, 2, 0); diff --git a/src/main/java/tb/common/item/ItemKnoseSeeds.java b/src/main/java/tb/common/item/ItemKnoseSeeds.java index 7a9b1fa..7724105 100644 --- a/src/main/java/tb/common/item/ItemKnoseSeeds.java +++ b/src/main/java/tb/common/item/ItemKnoseSeeds.java @@ -18,7 +18,7 @@ public ItemKnoseSeeds(Block crop, Block soil) { } public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, - float fx, float fy, float fz) { + float fx, float fy, float fz) { if (side != 1) { return false; } else diff --git a/src/main/java/tb/common/item/ItemMortarAndPestle.java b/src/main/java/tb/common/item/ItemMortarAndPestle.java index 6443d4f..cba41d7 100644 --- a/src/main/java/tb/common/item/ItemMortarAndPestle.java +++ b/src/main/java/tb/common/item/ItemMortarAndPestle.java @@ -16,7 +16,7 @@ public boolean hasContainerItem(ItemStack stack) { public ItemStack getContainerItem(ItemStack itemStack) { return itemStack.getItemDamage() >= itemStack.getMaxDamage() ? null - : new ItemStack(itemStack.getItem(), 1, itemStack.getItemDamage() + 1); + : new ItemStack(itemStack.getItem(), 1, itemStack.getItemDamage() + 1); } public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { diff --git a/src/main/java/tb/common/item/ItemNodeFoci.java b/src/main/java/tb/common/item/ItemNodeFoci.java index 6be41d2..88dfc7b 100644 --- a/src/main/java/tb/common/item/ItemNodeFoci.java +++ b/src/main/java/tb/common/item/ItemNodeFoci.java @@ -12,7 +12,7 @@ public class ItemNodeFoci extends Item { public static final String names[] = new String[] { "brightness", "destruction", "efficiency", "hunger", - "instability", "purity", "sinister", "speed", "stability", "taint" }; + "instability", "purity", "sinister", "speed", "stability", "taint" }; public ItemNodeFoci() { super(); diff --git a/src/main/java/tb/common/item/ItemPyrofluidBucket.java b/src/main/java/tb/common/item/ItemPyrofluidBucket.java index c9a1b34..b6ff061 100644 --- a/src/main/java/tb/common/item/ItemPyrofluidBucket.java +++ b/src/main/java/tb/common/item/ItemPyrofluidBucket.java @@ -17,7 +17,7 @@ public ItemPyrofluidBucket() { } public boolean onItemUse(ItemStack stk, EntityPlayer player, World w, int x, int y, int z, int side, float vecX, - float vecY, float vecZ) { + float vecY, float vecZ) { ForgeDirection dir = ForgeDirection.VALID_DIRECTIONS[side]; w.setBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, TBBlocks.pyrofluid, 0, 3); player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(Items.bucket, 1, 0)); diff --git a/src/main/java/tb/common/item/ItemRevolver.java b/src/main/java/tb/common/item/ItemRevolver.java index dd755c6..afde818 100644 --- a/src/main/java/tb/common/item/ItemRevolver.java +++ b/src/main/java/tb/common/item/ItemRevolver.java @@ -37,8 +37,10 @@ public class ItemRevolver extends Item implements IRepairable, IWarpingGear { public static void addUpgrade(ItemStack stk, RevolverUpgrade upgrade, int level) { - if (stk.hasTagCompound() && stk.getTagCompound().hasKey("tb.upgrades")) { - NBTTagList upgrades = stk.getTagCompound().getTagList("tb.upgrades", 10); + if (stk.hasTagCompound() && stk.getTagCompound() + .hasKey("tb.upgrades")) { + NBTTagList upgrades = stk.getTagCompound() + .getTagList("tb.upgrades", 10); for (int i = 0; i < upgrades.tagCount(); ++i) { NBTTagCompound tag = upgrades.getCompoundTagAt(i); int id = tag.getInteger("id"); @@ -57,23 +59,26 @@ public static void addUpgrade(ItemStack stk, RevolverUpgrade upgrade, int level) } else { if (!stk.hasTagCompound()) stk.setTagCompound(new NBTTagCompound()); - if (!stk.getTagCompound().hasKey("tb.upgrades")) - stk.getTagCompound().setTag("tb.upgrades", new NBTTagList()); + if (!stk.getTagCompound() + .hasKey("tb.upgrades")) + stk.getTagCompound() + .setTag("tb.upgrades", new NBTTagList()); addUpgrade(stk, upgrade, level); } } public static int getUpgradeLevel(ItemStack stk, RevolverUpgrade upgrade) { - if (stk.hasTagCompound() && stk.getTagCompound().hasKey("tb.upgrades")) { - NBTTagList upgrades = stk.getTagCompound().getTagList("tb.upgrades", 10); + if (stk.hasTagCompound() && stk.getTagCompound() + .hasKey("tb.upgrades")) { + NBTTagList upgrades = stk.getTagCompound() + .getTagList("tb.upgrades", 10); for (int i = 0; i < upgrades.tagCount(); ++i) { NBTTagCompound tag = upgrades.getCompoundTagAt(i); int id = tag.getInteger("id"); int level = tag.getInteger("level"); if (id < RevolverUpgrade.allUpgrades.length && RevolverUpgrade.allUpgrades[id] != null - && RevolverUpgrade.allUpgrades[id].equals(upgrade)) - return level; + && RevolverUpgrade.allUpgrades[id].equals(upgrade)) return level; } } @@ -83,8 +88,10 @@ public static int getUpgradeLevel(ItemStack stk, RevolverUpgrade upgrade) { public static ArrayList> getAllUpgradesFor(ItemStack stk) { ArrayList> retLst = new ArrayList>(); - if (stk.hasTagCompound() && stk.getTagCompound().hasKey("tb.upgrades")) { - NBTTagList upgrades = stk.getTagCompound().getTagList("tb.upgrades", 10); + if (stk.hasTagCompound() && stk.getTagCompound() + .hasKey("tb.upgrades")) { + NBTTagList upgrades = stk.getTagCompound() + .getTagList("tb.upgrades", 10); for (int i = 0; i < upgrades.tagCount(); ++i) { NBTTagCompound tag = upgrades.getCompoundTagAt(i); int id = tag.getInteger("id"); @@ -107,7 +114,8 @@ public ItemStack onItemRightClick(ItemStack stk, World w, EntityPlayer user) { if (!stk.hasTagCompound()) stk.setTagCompound(new NBTTagCompound()); - if (stk.getTagCompound().getInteger("shots") > 0) { + if (stk.getTagCompound() + .getInteger("shots") > 0) { EntityRevolverBullet b = new EntityRevolverBullet(w, user); if (!w.isRemote) w.spawnEntityInWorld(b); @@ -116,24 +124,30 @@ public ItemStack onItemRightClick(ItemStack stk, World w, EntityPlayer user) { TBNetworkManager.playSoundOnServer(w, "thaumicbases:revolver.shot", user.posX, user.posY, user.posZ, 3, 1F); - stk.getTagCompound().setDouble("barrelRotation", stk.getTagCompound().getDouble("barrelRotation") + 45); + stk.getTagCompound() + .setDouble( + "barrelRotation", + stk.getTagCompound() + .getDouble("barrelRotation") + 45); - stk.getTagCompound().setInteger("shots", stk.getTagCompound().getInteger("shots") - 1); + stk.getTagCompound() + .setInteger( + "shots", + stk.getTagCompound() + .getInteger("shots") - 1); } else { - if (stk.hasTagCompound() && stk.getTagCompound().hasKey("jar")) { + if (stk.hasTagCompound() && stk.getTagCompound() + .hasKey("jar")) { ItemStack jar = ItemStack.loadItemStackFromNBT(stk.stackTagCompound.getCompoundTag("jar")); if (jar == null) { - TBNetworkManager.playSoundOnServer( - w, - "thaumicbases:revolver.click", - user.posX, - user.posY, - user.posZ, - 3, - 2F); + TBNetworkManager + .playSoundOnServer(w, "thaumicbases:revolver.click", user.posX, user.posY, user.posZ, 3, 2F); stk.getTagCompound() - .setDouble("barrelRotation", stk.getTagCompound().getDouble("barrelRotation") + 45); + .setDouble( + "barrelRotation", + stk.getTagCompound() + .getDouble("barrelRotation") + 45); return super.onItemRightClick(stk, w, user); } @@ -148,7 +162,8 @@ public ItemStack onItemRightClick(ItemStack stk, World w, EntityPlayer user) { int addedShots = hasPrimal ? 1 : 2; for (Pair p : upgrades) { - addedShots = p.getFirst().modifyShots(user, stk, p.getSecond(), addedShots, hasPrimal); + addedShots = p.getFirst() + .modifyShots(user, stk, p.getSecond(), addedShots, hasPrimal); } boolean addShots = false; @@ -170,15 +185,10 @@ public ItemStack onItemRightClick(ItemStack stk, World w, EntityPlayer user) { } if (addShots) { - stk.getTagCompound().setInteger("shots", addedShots < 0 ? 1 : addedShots); - TBNetworkManager.playSoundOnServer( - w, - "thaumicbases:revolver.reload", - user.posX, - user.posY, - user.posZ, - 3, - 2F); + stk.getTagCompound() + .setInteger("shots", addedShots < 0 ? 1 : addedShots); + TBNetworkManager + .playSoundOnServer(w, "thaumicbases:revolver.reload", user.posX, user.posY, user.posZ, 3, 2F); } if (aspects.visSize() > 0) { @@ -194,7 +204,7 @@ public ItemStack onItemRightClick(ItemStack stk, World w, EntityPlayer user) { } } else { TBNetworkManager - .playSoundOnServer(w, "thaumicbases:revolver.click", user.posX, user.posY, user.posZ, 3, 2F); + .playSoundOnServer(w, "thaumicbases:revolver.click", user.posX, user.posY, user.posZ, 3, 2F); } } return super.onItemRightClick(stk, w, user); @@ -204,8 +214,9 @@ public boolean onEntitySwing(EntityLivingBase entityLiving, ItemStack stack) { if (!entityLiving.worldObj.isRemote) { if (entityLiving instanceof EntityPlayer) { if (EntityPlayer.class.cast(entityLiving).openContainer instanceof ContainerPlayer - && entityLiving.isSneaking()) { - EntityPlayer.class.cast(entityLiving).openGui( + && entityLiving.isSneaking()) { + EntityPlayer.class.cast(entityLiving) + .openGui( TBCore.instance, 0x421919, entityLiving.worldObj, @@ -221,7 +232,8 @@ public boolean onEntitySwing(EntityLivingBase entityLiving, ItemStack stack) { @SuppressWarnings({ "rawtypes", "unchecked" }) public void addInformation(ItemStack stk, EntityPlayer p, List lst, boolean isCurrentItem) { super.addInformation(stk, p, lst, isCurrentItem); - iLabel: if (stk.hasTagCompound() && stk.getTagCompound().hasKey("jar")) { + iLabel: if (stk.hasTagCompound() && stk.getTagCompound() + .hasKey("jar")) { ItemStack jar = ItemStack.loadItemStackFromNBT(stk.stackTagCompound.getCompoundTag("jar")); try { @@ -237,12 +249,14 @@ public void addInformation(ItemStack stk, EntityPlayer p, List lst, boolean isCu // ... } } - if (stk.hasTagCompound() && stk.getTagCompound().hasKey("tb.upgrades")) { + if (stk.hasTagCompound() && stk.getTagCompound() + .hasKey("tb.upgrades")) { ArrayList> upgrades = getAllUpgradesFor(stk); for (Pair pr : upgrades) { lst.add( - pr.getFirst().getName() + " " - + StatCollector.translateToLocal("enchantment.level." + pr.getSecond())); + pr.getFirst() + .getName() + " " + + StatCollector.translateToLocal("enchantment.level." + pr.getSecond())); } } } @@ -257,12 +271,12 @@ public Multimap getAttributeModifiers(ItemStack stack) { HashMultimap retMap = HashMultimap.create(); retMap.put( - SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier( - field_111210_e, - "Weapon modifier", - 5.0F + (getUpgradeLevel(stack, RevolverUpgrade.heavy) * 2), - 0)); + SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier( + field_111210_e, + "Weapon modifier", + 5.0F + (getUpgradeLevel(stack, RevolverUpgrade.heavy) * 2), + 0)); return retMap; } @@ -271,13 +285,14 @@ public void onUpdate(ItemStack stk, World w, Entity entity, int slot, boolean he super.onUpdate(stk, w, entity, slot, held); int u = getUpgradeLevel(stk, RevolverUpgrade.uvoid); if (u > 0) if ((stk.isItemDamaged()) && (entity != null) - && (entity.ticksExisted % 100 / u == 0) - && ((entity instanceof EntityLivingBase))) - stk.damageItem(-1, (EntityLivingBase) entity); + && (entity.ticksExisted % 100 / u == 0) + && ((entity instanceof EntityLivingBase))) stk.damageItem(-1, (EntityLivingBase) entity); if (stk.getTagCompound() != null) { - double rotation = stk.getTagCompound().getDouble("barrelRotation"); - double renderedRotation = stk.getTagCompound().getDouble("renderedRotation"); + double rotation = stk.getTagCompound() + .getDouble("barrelRotation"); + double renderedRotation = stk.getTagCompound() + .getDouble("renderedRotation"); if (rotation >= 3600000) rotation -= 3600000; @@ -287,8 +302,10 @@ public void onUpdate(ItemStack stk, World w, Entity entity, int slot, boolean he renderedRotation = Math.min(rotation, renderedRotation); - stk.getTagCompound().setDouble("barrelRotation", rotation); - stk.getTagCompound().setDouble("renderedRotation", renderedRotation); + stk.getTagCompound() + .setDouble("barrelRotation", rotation); + stk.getTagCompound() + .setDouble("renderedRotation", renderedRotation); } } diff --git a/src/main/java/tb/common/item/ItemRosehipSyrup.java b/src/main/java/tb/common/item/ItemRosehipSyrup.java index d668885..6e96f7a 100644 --- a/src/main/java/tb/common/item/ItemRosehipSyrup.java +++ b/src/main/java/tb/common/item/ItemRosehipSyrup.java @@ -65,7 +65,7 @@ public ItemStack onEaten(ItemStack stack, World w, EntityPlayer player) { public static int processPotion(EntityPlayer p, PotionEffect effect) { if (effect != null && effect.getPotionID() < Potion.potionTypes.length - && Potion.potionTypes[effect.getPotionID()] != null) { + && Potion.potionTypes[effect.getPotionID()] != null) { if (isBadEffect(Potion.potionTypes[effect.getPotionID()])) return effect.getPotionID(); if (canDecreaseLevel(Potion.potionTypes[effect.getPotionID()])) { @@ -82,21 +82,21 @@ public static int processPotion(EntityPlayer p, PotionEffect effect) { public static boolean isBadEffect(Potion p) { return p != null && (p == Potion.blindness || p == Potion.confusion - || p == Potion.digSlowdown - || p == Potion.hunger - || p == Potion.moveSlowdown - || p == Potion.poison - || p == Potion.weakness - || p == Potion.wither); + || p == Potion.digSlowdown + || p == Potion.hunger + || p == Potion.moveSlowdown + || p == Potion.poison + || p == Potion.weakness + || p == Potion.wither); } public static boolean canDecreaseLevel(Potion p) { int id = p.getId(); return p != null && (id == Config.potionBlurredID || id == Config.potionInfVisExhaustID - || id == Config.potionTaintPoisonID - || id == Config.potionThaumarhiaID - || id == Config.potionUnHungerID - || id == Config.potionVisExhaustID); + || id == Config.potionTaintPoisonID + || id == Config.potionThaumarhiaID + || id == Config.potionUnHungerID + || id == Config.potionVisExhaustID); } public static void reflectPotionEffect(EntityPlayer p, PotionEffect effect) { diff --git a/src/main/java/tb/common/item/ItemSmokingPipe.java b/src/main/java/tb/common/item/ItemSmokingPipe.java index 6c851cf..652bb13 100644 --- a/src/main/java/tb/common/item/ItemSmokingPipe.java +++ b/src/main/java/tb/common/item/ItemSmokingPipe.java @@ -47,13 +47,13 @@ public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { double y = player.posY + player.getEyeHeight() + look.yCoord / 5; double z = player.posZ + look.zCoord / 5; if (count < 32) player.worldObj.spawnParticle( - isSilverwood ? "explode" : "smoke", - x, - y, - z, - look.xCoord / 10, - look.yCoord / 10, - look.zCoord / 10); + isSilverwood ? "explode" : "smoke", + x, + y, + z, + look.xCoord / 10, + look.yCoord / 10, + look.zCoord / 10); } public ItemStack onEaten(ItemStack stack, World w, EntityPlayer player) { @@ -77,13 +77,13 @@ public ItemStack onEaten(ItemStack stack, World w, EntityPlayer player) { double z = player.posZ + look.zCoord / 5; player.worldObj.spawnParticle( - isSilverwood ? "explode" : "smoke", - x, - y, - z, - look.xCoord / 10, - look.yCoord / 10, - look.zCoord / 10); + isSilverwood ? "explode" : "smoke", + x, + y, + z, + look.xCoord / 10, + look.yCoord / 10, + look.zCoord / 10); } return stack; diff --git a/src/main/java/tb/common/item/ItemThauminiteArmor.java b/src/main/java/tb/common/item/ItemThauminiteArmor.java index b8f7da3..6644ce1 100644 --- a/src/main/java/tb/common/item/ItemThauminiteArmor.java +++ b/src/main/java/tb/common/item/ItemThauminiteArmor.java @@ -25,7 +25,7 @@ public ItemThauminiteArmor(ArmorMaterial mat, int aType) { public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return slot == 2 ? "thaumicbases:textures/items/armor/thauminite/thauminite_2.png" - : "thaumicbases:textures/items/armor/thauminite/thauminite_1.png"; + : "thaumicbases:textures/items/armor/thauminite/thauminite_1.png"; } @Override @@ -43,10 +43,10 @@ public int getRunicCharge(ItemStack itemstack) { @SuppressWarnings({ "unchecked", "rawtypes" }) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add( - EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tc.visdiscount") - + ": " - + getVisDiscount(stack, player, null) - + "%"); + EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tc.visdiscount") + + ": " + + getVisDiscount(stack, player, null) + + "%"); super.addInformation(stack, player, list, par4); } } diff --git a/src/main/java/tb/common/item/ItemVoidFlintAndSteel.java b/src/main/java/tb/common/item/ItemVoidFlintAndSteel.java index b2646d8..e6a0721 100644 --- a/src/main/java/tb/common/item/ItemVoidFlintAndSteel.java +++ b/src/main/java/tb/common/item/ItemVoidFlintAndSteel.java @@ -20,9 +20,8 @@ public EnumRarity getRarity(ItemStack itemstack) { public void onUpdate(ItemStack stk, World w, Entity entity, int slot, boolean held) { super.onUpdate(stk, w, entity, slot, held); if ((stk.isItemDamaged()) && (entity != null) - && (entity.ticksExisted % 20 == 0) - && ((entity instanceof EntityLivingBase))) - stk.damageItem(-1, (EntityLivingBase) entity); + && (entity.ticksExisted % 20 == 0) + && ((entity instanceof EntityLivingBase))) stk.damageItem(-1, (EntityLivingBase) entity); } public int getWarp(ItemStack itemstack, EntityPlayer player) { diff --git a/src/main/java/tb/common/item/ItemVoidShears.java b/src/main/java/tb/common/item/ItemVoidShears.java index e0af5c0..aed7926 100644 --- a/src/main/java/tb/common/item/ItemVoidShears.java +++ b/src/main/java/tb/common/item/ItemVoidShears.java @@ -20,9 +20,8 @@ public EnumRarity getRarity(ItemStack itemstack) { public void onUpdate(ItemStack stk, World w, Entity entity, int slot, boolean held) { super.onUpdate(stk, w, entity, slot, held); if ((stk.isItemDamaged()) && (entity != null) - && (entity.ticksExisted % 20 == 0) - && ((entity instanceof EntityLivingBase))) - stk.damageItem(-1, (EntityLivingBase) entity); + && (entity.ticksExisted % 20 == 0) + && ((entity instanceof EntityLivingBase))) stk.damageItem(-1, (EntityLivingBase) entity); } public int getWarp(ItemStack itemstack, EntityPlayer player) { diff --git a/src/main/java/tb/common/item/TBResource.java b/src/main/java/tb/common/item/TBResource.java index f0a40ed..36790dd 100644 --- a/src/main/java/tb/common/item/TBResource.java +++ b/src/main/java/tb/common/item/TBResource.java @@ -19,8 +19,8 @@ public TBResource() { } public static final String names[] = new String[] { "nuggetthauminite", "thauminite/thauminite_ingot", - "thauminite/wand_cap_thauminite", "thaumium_wand_core", "void_wand_core", "aurelia_petal", "briar_seedbag", - "tobacco_leaves", "bloodycloth" }; + "thauminite/wand_cap_thauminite", "thaumium_wand_core", "void_wand_core", "aurelia_petal", "briar_seedbag", + "tobacco_leaves", "bloodycloth" }; public static IIcon[] icons = new IIcon[names.length]; diff --git a/src/main/java/tb/common/item/TBTobacco.java b/src/main/java/tb/common/item/TBTobacco.java index 10d4d73..c5ddc98 100644 --- a/src/main/java/tb/common/item/TBTobacco.java +++ b/src/main/java/tb/common/item/TBTobacco.java @@ -29,8 +29,7 @@ public TBTobacco() { } public static final String names[] = new String[] { "tobacco_pile", "tobacco_eldritch", "tobacco_fighting", - "tobacco_hunger", "tobacco_knowledge", "tobacco_mining", "tobacco_sanity", "tobacco_tainted", - "tobacco_wispy" }; + "tobacco_hunger", "tobacco_knowledge", "tobacco_mining", "tobacco_sanity", "tobacco_tainted", "tobacco_wispy" }; public void performTobaccoEffect(EntityPlayer smoker, int metadata, boolean isSilverwood) { switch (metadata) { @@ -59,7 +58,8 @@ public void performTobaccoEffect(EntityPlayer smoker, int metadata, boolean isSi } case 3: { if (!smoker.worldObj.isRemote) { - smoker.getFoodStats().addStats(3, 3); + smoker.getFoodStats() + .addStats(3, 3); if (!isSilverwood && smoker.worldObj.rand.nextFloat() <= 0.4F) smoker.addPotionEffect(new PotionEffect(Potion.confusion.id, 200, 0, true)); } @@ -127,7 +127,9 @@ public void performTobaccoEffect(EntityPlayer smoker, int metadata, boolean isSi EntityWisp wisp = new EntityWisp(smoker.worldObj); wisp.setPositionAndRotation(smoker.posX, smoker.posY, smoker.posZ, 0, 0); if (!smoker.worldObj.isRemote) { - wisp.setType(aspects.get(smoker.worldObj.rand.nextInt(aspects.size())).getTag()); + wisp.setType( + aspects.get(smoker.worldObj.rand.nextInt(aspects.size())) + .getTag()); smoker.worldObj.spawnEntityInWorld(wisp); } break; diff --git a/src/main/java/tb/common/item/foci/FociActivation.java b/src/main/java/tb/common/item/foci/FociActivation.java index 6d7d449..4443b42 100644 --- a/src/main/java/tb/common/item/foci/FociActivation.java +++ b/src/main/java/tb/common/item/foci/FociActivation.java @@ -38,7 +38,8 @@ public String getSortingHelper(ItemStack focusstack) { } public AspectList getVisCost(ItemStack focusstack) { - return new AspectList().add(Aspect.ORDER, 5).add(Aspect.EARTH, 10); + return new AspectList().add(Aspect.ORDER, 5) + .add(Aspect.EARTH, 10); } public int getActivationCooldown(ItemStack focusstack) { @@ -50,7 +51,7 @@ public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int ra } public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlayer player, - MovingObjectPosition movingobjectposition) { + MovingObjectPosition movingobjectposition) { if (wandstack == null) return wandstack; @@ -58,24 +59,30 @@ public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlaye if (player.isSneaking()) { if (movingobjectposition != null && movingobjectposition.typeOfHit == MovingObjectType.BLOCK) { - NBTTagCompound fociTag = MiscUtils.getStackTag(wandstack).getCompoundTag("focus").getCompoundTag("tag"); + NBTTagCompound fociTag = MiscUtils.getStackTag(wandstack) + .getCompoundTag("focus") + .getCompoundTag("tag"); fociTag.setInteger("blockX", movingobjectposition.blockX); fociTag.setInteger("blockY", movingobjectposition.blockY); fociTag.setInteger("blockZ", movingobjectposition.blockZ); fociTag.setInteger("dim", player.dimension); - ((NBTTagCompound) (MiscUtils.getStackTag(wandstack).getTag("focus"))).setTag("tag", fociTag); + ((NBTTagCompound) (MiscUtils.getStackTag(wandstack) + .getTag("focus"))).setTag("tag", fociTag); player.swingItem(); WandManager.consumeVisFromInventory(player, new AspectList().add(Aspect.ORDER, 100)); } } else { - NBTTagCompound fociTag = MiscUtils.getStackTag(wandstack).getCompoundTag("focus").getCompoundTag("tag"); + NBTTagCompound fociTag = MiscUtils.getStackTag(wandstack) + .getCompoundTag("focus") + .getCompoundTag("tag"); if (fociTag.hasKey("blockX")) { int x = fociTag.getInteger("blockX"); int y = fociTag.getInteger("blockY"); int z = fociTag.getInteger("blockZ"); - ItemStack foci = ItemStack - .loadItemStackFromNBT(MiscUtils.getStackTag(wandstack).getCompoundTag("focus")); + ItemStack foci = ItemStack.loadItemStackFromNBT( + MiscUtils.getStackTag(wandstack) + .getCompoundTag("focus")); int potencyLevel = this.getUpgradeLevel(foci, FocusUpgradeType.potency); @@ -86,8 +93,9 @@ public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlaye int aspectCost = 10; if (!WandManager.consumeVisFromInventory( - player, - new AspectList().add(Aspect.EARTH, aspectCost).add(Aspect.ORDER, aspectCost / 2))) + player, + new AspectList().add(Aspect.EARTH, aspectCost) + .add(Aspect.ORDER, aspectCost / 2))) return wandstack; if (range > maxRange) { @@ -99,8 +107,8 @@ public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlaye int dim = fociTag.getInteger("dim"); if (dim != player.dimension) { - if (player.worldObj.isRemote) player.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("tb.txt.wrongDimension"))); + if (player.worldObj.isRemote) player + .addChatMessage(new ChatComponentText(StatCollector.translateToLocal("tb.txt.wrongDimension"))); return wandstack; } else { if (world.checkChunksExist(x - 1, y - 1, z - 1, x + 1, y + 1, z + 1)) { @@ -108,15 +116,15 @@ public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlaye Block b = world.getBlock(x, y, z); Vec3 vec = player.getLookVec(); b.onBlockActivated( - world, - x, - y, - z, - player, - 0, - (float) vec.xCoord, - (float) vec.yCoord, - (float) vec.zCoord); + world, + x, + y, + z, + player, + 0, + (float) vec.xCoord, + (float) vec.yCoord, + (float) vec.zCoord); } } } diff --git a/src/main/java/tb/common/item/foci/FociDrain.java b/src/main/java/tb/common/item/foci/FociDrain.java index 17dfdbb..0d34fd0 100644 --- a/src/main/java/tb/common/item/foci/FociDrain.java +++ b/src/main/java/tb/common/item/foci/FociDrain.java @@ -59,7 +59,7 @@ public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int ra switch (rank) { case 3: { return new FocusUpgradeType[] { FocusUpgradeType.frugal, TBFociUpgrades.aquatic, - TBFociUpgrades.netheric }; + TBFociUpgrades.netheric }; } default: { return new FocusUpgradeType[] { FocusUpgradeType.frugal }; @@ -68,14 +68,16 @@ public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int ra } public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlayer player, - MovingObjectPosition movingobjectposition) { + MovingObjectPosition movingobjectposition) { player.setItemInUse(wandstack, 2147483647); return wandstack; } public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player, int count) { - ItemStack foci = ItemStack.loadItemStackFromNBT(MiscUtils.getStackTag(wandstack).getCompoundTag("focus")); + ItemStack foci = ItemStack.loadItemStackFromNBT( + MiscUtils.getStackTag(wandstack) + .getCompoundTag("focus")); if (!WandManager.consumeVisFromInventory(player, this.getVisCost(foci))) { player.stopUsingItem(); @@ -87,8 +89,8 @@ public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player, int count float f2 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * f; double d0 = player.prevPosX + (player.posX - player.prevPosX) * (double) f; double d1 = player.prevPosY + (player.posY - player.prevPosY) * (double) f - + (double) (player.worldObj.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() - : player.getEyeHeight()); + + (double) (player.worldObj.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() + : player.getEyeHeight()); double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; Vec3 vec3 = Vec3.createVectorHelper(d0, d1, d2); float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); @@ -110,58 +112,57 @@ public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player, int count if (b != null) { if (b == Blocks.water) { if (player.worldObj.isRemote) beam = Thaumcraft.proxy.beamCont( - player.worldObj, - player, - pos.hitVec.xCoord, - pos.hitVec.yCoord, - pos.hitVec.zCoord, - 1, - 0x5555ff, - true, - 2, - beam, - 2); + player.worldObj, + player, + pos.hitVec.xCoord, + pos.hitVec.yCoord, + pos.hitVec.zCoord, + 1, + 0x5555ff, + true, + 2, + beam, + 2); if (this.getUpgradeLevel(foci, TBFociUpgrades.aquatic) > 0 || player.ticksExisted % 5 == 0) { b.onBlockDestroyedByPlayer( - player.worldObj, - pos.blockX, - pos.blockY, - pos.blockZ, - player.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ)); + player.worldObj, + pos.blockX, + pos.blockY, + pos.blockZ, + player.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ)); player.worldObj.setBlock(pos.blockX, pos.blockY, pos.blockZ, Blocks.air, 0, 2); player.worldObj.playSound( - pos.blockX + 0.5D, - pos.blockY + 0.5D, - pos.blockZ + 0.5D, - b.stepSound.getBreakSound(), - 1, - 1, - false); + pos.blockX + 0.5D, + pos.blockY + 0.5D, + pos.blockZ + 0.5D, + b.stepSound.getBreakSound(), + 1, + 1, + false); for (int i = 0; i < 100; ++i) player.worldObj.spawnParticle( - "blockcrack_" + Block.getIdFromBlock(b) + "_" + meta, - pos.blockX + player.worldObj.rand.nextDouble(), - pos.blockY + player.worldObj.rand.nextDouble(), - pos.blockZ + player.worldObj.rand.nextDouble(), - 0, - 0, - 0); + "blockcrack_" + Block.getIdFromBlock(b) + "_" + meta, + pos.blockX + player.worldObj.rand.nextDouble(), + pos.blockY + player.worldObj.rand.nextDouble(), + pos.blockZ + player.worldObj.rand.nextDouble(), + 0, + 0, + 0); if (this.getUpgradeLevel(foci, TBFociUpgrades.aquatic) > 0 - && player.worldObj.rand.nextDouble() < 0.4D) { + && player.worldObj.rand.nextDouble() < 0.4D) { ItemStack waterCrystal = new ItemStack(ConfigItems.itemCrystalEssence, 1, 0); ItemCrystalEssence cEssence = (ItemCrystalEssence) waterCrystal.getItem(); cEssence.setAspects( - waterCrystal, - new AspectList().add( - (player.worldObj.rand.nextDouble() < 0.1D ? Aspect.POISON : Aspect.WATER), - 1)); + waterCrystal, + new AspectList() + .add((player.worldObj.rand.nextDouble() < 0.1D ? Aspect.POISON : Aspect.WATER), 1)); EntityItem crystal = new EntityItem( - player.worldObj, - pos.blockX + 0.5D, - pos.blockY + 0.5D, - pos.blockZ + 0.5D, - waterCrystal); + player.worldObj, + pos.blockX + 0.5D, + pos.blockY + 0.5D, + pos.blockZ + 0.5D, + waterCrystal); if (!player.worldObj.isRemote) player.worldObj.spawnEntityInWorld(crystal); } } @@ -169,43 +170,43 @@ public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player, int count if (b == Blocks.lava && this.getUpgradeLevel(foci, TBFociUpgrades.netheric) > 0) { if (player.worldObj.isRemote) beam = Thaumcraft.proxy.beamCont( - player.worldObj, - player, - pos.hitVec.xCoord, - pos.hitVec.yCoord, - pos.hitVec.zCoord, - 1, - 0xff5555, - true, - 2, - beam, - 2); + player.worldObj, + player, + pos.hitVec.xCoord, + pos.hitVec.yCoord, + pos.hitVec.zCoord, + 1, + 0xff5555, + true, + 2, + beam, + 2); if (player.ticksExisted % 5 == 0 - && WandManager.consumeVisFromInventory(player, new AspectList().add(Aspect.FIRE, 3))) { + && WandManager.consumeVisFromInventory(player, new AspectList().add(Aspect.FIRE, 3))) { b.onBlockDestroyedByPlayer( - player.worldObj, - pos.blockX, - pos.blockY, - pos.blockZ, - player.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ)); + player.worldObj, + pos.blockX, + pos.blockY, + pos.blockZ, + player.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ)); player.worldObj.setBlock(pos.blockX, pos.blockY, pos.blockZ, Blocks.air, 0, 2); player.worldObj.playSound( - pos.blockX + 0.5D, - pos.blockY + 0.5D, - pos.blockZ + 0.5D, - b.stepSound.getBreakSound(), - 1, - 1, - false); + pos.blockX + 0.5D, + pos.blockY + 0.5D, + pos.blockZ + 0.5D, + b.stepSound.getBreakSound(), + 1, + 1, + false); for (int i = 0; i < 100; ++i) player.worldObj.spawnParticle( - "blockcrack_" + Block.getIdFromBlock(b) + "_" + meta, - pos.blockX + player.worldObj.rand.nextDouble(), - pos.blockY + player.worldObj.rand.nextDouble(), - pos.blockZ + player.worldObj.rand.nextDouble(), - 0, - 0, - 0); + "blockcrack_" + Block.getIdFromBlock(b) + "_" + meta, + pos.blockX + player.worldObj.rand.nextDouble(), + pos.blockY + player.worldObj.rand.nextDouble(), + pos.blockZ + player.worldObj.rand.nextDouble(), + 0, + 0, + 0); } } } diff --git a/src/main/java/tb/common/item/foci/FociExperience.java b/src/main/java/tb/common/item/foci/FociExperience.java index e70c557..0440ab1 100644 --- a/src/main/java/tb/common/item/foci/FociExperience.java +++ b/src/main/java/tb/common/item/foci/FociExperience.java @@ -55,7 +55,8 @@ public boolean isVisCostPerTick(ItemStack focusstack) { } public AspectList getVisCost(ItemStack focusstack) { - return new AspectList().add(Aspect.ORDER, 500).add(Aspect.ENTROPY, 500); + return new AspectList().add(Aspect.ORDER, 500) + .add(Aspect.ENTROPY, 500); } public WandFocusAnimation getAnimation(ItemStack focusstack) { @@ -67,16 +68,16 @@ public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int ra switch (rank) { case 3: { return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal, - TBFociUpgrades.vaporizing, TBFociUpgrades.decomposing }; + TBFociUpgrades.vaporizing, TBFociUpgrades.decomposing }; } case 5: { if (this.getUpgradeLevel(focusstack, TBFociUpgrades.decomposing) > 0) return new FocusUpgradeType[] { - FocusUpgradeType.potency, FocusUpgradeType.frugal, TBFociUpgrades.decomposing }; + FocusUpgradeType.potency, FocusUpgradeType.frugal, TBFociUpgrades.decomposing }; else if (this.getUpgradeLevel(focusstack, TBFociUpgrades.vaporizing) > 0) return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal, - TBFociUpgrades.vaporizing }; + TBFociUpgrades.vaporizing }; else return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal, - TBFociUpgrades.vaporizing, TBFociUpgrades.decomposing }; + TBFociUpgrades.vaporizing, TBFociUpgrades.decomposing }; } default: { return new FocusUpgradeType[] { FocusUpgradeType.frugal, FocusUpgradeType.potency }; @@ -86,9 +87,11 @@ else if (this.getUpgradeLevel(focusstack, TBFociUpgrades.vaporizing) > 0) @SuppressWarnings("unchecked") public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlayer player, - MovingObjectPosition movingobjectposition) { + MovingObjectPosition movingobjectposition) { - ItemStack foci = ItemStack.loadItemStackFromNBT(MiscUtils.getStackTag(wandstack).getCompoundTag("focus")); + ItemStack foci = ItemStack.loadItemStackFromNBT( + MiscUtils.getStackTag(wandstack) + .getCompoundTag("focus")); int vaporisingLevel = this.getUpgradeLevel(foci, TBFociUpgrades.vaporizing); int decomposingLevel = this.getUpgradeLevel(foci, TBFociUpgrades.decomposing); @@ -97,14 +100,14 @@ public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlaye Vec3 vec = player.getLookVec(); ArrayList mobs = (ArrayList) world.getEntitiesWithinAABBExcludingEntity( - player, - AxisAlignedBB.getBoundingBox( - player.posX + vec.xCoord - 0.3D, - player.posY + player.getEyeHeight() + vec.yCoord - 0.3D, - player.posZ + vec.zCoord - 0.3D, - player.posX + vec.xCoord + 0.3D, - player.posY + player.getEyeHeight() + vec.yCoord + 0.3D, - player.posZ + vec.zCoord + 0.3D)); + player, + AxisAlignedBB.getBoundingBox( + player.posX + vec.xCoord - 0.3D, + player.posY + player.getEyeHeight() + vec.yCoord - 0.3D, + player.posZ + vec.zCoord - 0.3D, + player.posX + vec.xCoord + 0.3D, + player.posY + player.getEyeHeight() + vec.yCoord + 0.3D, + player.posZ + vec.zCoord + 0.3D)); if (mobs != null && !mobs.isEmpty()) { Entity e = mobs.get(world.rand.nextInt(mobs.size())); @@ -117,8 +120,8 @@ public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlaye double hp = eaten.getHealth(); if (WandManager.consumeVisFromInventory( - player, - TBThaumonomicon.primals(MathHelper.floor_double(hp * 100 / decomposingLevel)))) { + player, + TBThaumonomicon.primals(MathHelper.floor_double(hp * 100 / decomposingLevel)))) { eaten.attackEntityFrom(DamageSource.outOfWorld, Integer.MAX_VALUE); int xp = MathHelper.floor_double(hp * 3); @@ -133,11 +136,11 @@ public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlaye if (movingobjectposition != null && movingobjectposition.typeOfHit == MovingObjectType.BLOCK) { Block b = world - .getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); + .getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); int meta = world.getBlockMetadata( - movingobjectposition.blockX, - movingobjectposition.blockY, - movingobjectposition.blockZ); + movingobjectposition.blockX, + movingobjectposition.blockY, + movingobjectposition.blockZ); int xp = b.getExpDrop(world, meta, this.getUpgradeLevel(foci, FocusUpgradeType.potency)); if (xp <= 0) xp = this.getUpgradeLevel(foci, FocusUpgradeType.potency) + 1; @@ -146,10 +149,9 @@ public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlaye if (b.getBlockHardness(world, pos.blockX, pos.blockY, pos.blockZ) <= 0) return wandstack; if (!WandManager.consumeVisFromInventory( - player, - TBThaumonomicon.primals( - MathHelper.floor_double( - b.getBlockHardness(world, pos.blockX, pos.blockY, pos.blockZ) * 100)))) + player, + TBThaumonomicon.primals( + MathHelper.floor_double(b.getBlockHardness(world, pos.blockX, pos.blockY, pos.blockZ) * 100)))) return wandstack; if (vaporisingLevel > 0) { @@ -157,7 +159,7 @@ public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlaye if (doWork) { if (ThaumcraftApi.exists(Item.getItemFromBlock(b), meta)) { AspectList aspects = ThaumcraftCraftingManager - .getObjectTags(new ItemStack(Item.getItemFromBlock(b), 1, meta)); + .getObjectTags(new ItemStack(Item.getItemFromBlock(b), 1, meta)); if (aspects != null && aspects.size() > 0) { for (int i = 0; i < aspects.getAspects().length; ++i) { Aspect a = aspects.getAspects()[i]; @@ -168,11 +170,11 @@ public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlaye cEssence.setAspects(crystalStack, new AspectList().add(a, amount)); EntityItem crystal = new EntityItem( - player.worldObj, - pos.blockX + 0.5D, - pos.blockY + 0.5D, - pos.blockZ + 0.5D, - crystalStack); + player.worldObj, + pos.blockX + 0.5D, + pos.blockY + 0.5D, + pos.blockZ + 0.5D, + crystalStack); if (!player.worldObj.isRemote) player.worldObj.spawnEntityInWorld(crystal); } } @@ -181,28 +183,28 @@ public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlaye } b.onBlockDestroyedByPlayer( - player.worldObj, - pos.blockX, - pos.blockY, - pos.blockZ, - player.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ)); + player.worldObj, + pos.blockX, + pos.blockY, + pos.blockZ, + player.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ)); player.worldObj.setBlock(pos.blockX, pos.blockY, pos.blockZ, Blocks.air, 0, 3); player.worldObj.playSound( - pos.blockX + 0.5D, - pos.blockY + 0.5D, - pos.blockZ + 0.5D, - b.stepSound.getBreakSound(), - 1, - 1, - false); + pos.blockX + 0.5D, + pos.blockY + 0.5D, + pos.blockZ + 0.5D, + b.stepSound.getBreakSound(), + 1, + 1, + false); for (int i = 0; i < 100; ++i) player.worldObj.spawnParticle( - "blockcrack_" + Block.getIdFromBlock(b) + "_" + meta, - pos.blockX + player.worldObj.rand.nextDouble(), - pos.blockY + player.worldObj.rand.nextDouble(), - pos.blockZ + player.worldObj.rand.nextDouble(), - 0, - 0, - 0); + "blockcrack_" + Block.getIdFromBlock(b) + "_" + meta, + pos.blockX + player.worldObj.rand.nextDouble(), + pos.blockY + player.worldObj.rand.nextDouble(), + pos.blockZ + player.worldObj.rand.nextDouble(), + 0, + 0, + 0); xp *= 2; diff --git a/src/main/java/tb/common/item/foci/FociFlux.java b/src/main/java/tb/common/item/foci/FociFlux.java index c22d355..7ddf1c3 100644 --- a/src/main/java/tb/common/item/foci/FociFlux.java +++ b/src/main/java/tb/common/item/foci/FociFlux.java @@ -62,16 +62,16 @@ public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int ra switch (rank) { case 3: { return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal, - TBFociUpgrades.warping, TBFociUpgrades.crystalization }; + TBFociUpgrades.warping, TBFociUpgrades.crystalization }; } case 5: { if (this.getUpgradeLevel(focusstack, TBFociUpgrades.warping) > 0) return new FocusUpgradeType[] { - FocusUpgradeType.potency, FocusUpgradeType.frugal, TBFociUpgrades.calming }; + FocusUpgradeType.potency, FocusUpgradeType.frugal, TBFociUpgrades.calming }; else if (this.getUpgradeLevel(focusstack, TBFociUpgrades.crystalization) > 0) return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal, - TBFociUpgrades.crystalization }; + TBFociUpgrades.crystalization }; else return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal, - TBFociUpgrades.warping, TBFociUpgrades.crystalization }; + TBFociUpgrades.warping, TBFociUpgrades.crystalization }; } default: { return new FocusUpgradeType[] { FocusUpgradeType.frugal, FocusUpgradeType.potency }; @@ -80,14 +80,16 @@ else if (this.getUpgradeLevel(focusstack, TBFociUpgrades.crystalization) > 0) } public ItemStack onFocusRightClick(ItemStack wandstack, World world, EntityPlayer player, - MovingObjectPosition movingobjectposition) { + MovingObjectPosition movingobjectposition) { player.setItemInUse(wandstack, 2147483647); return wandstack; } public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player, int count) { - ItemStack foci = ItemStack.loadItemStackFromNBT(MiscUtils.getStackTag(wandstack).getCompoundTag("focus")); + ItemStack foci = ItemStack.loadItemStackFromNBT( + MiscUtils.getStackTag(wandstack) + .getCompoundTag("focus")); int potencyLevel = this.getUpgradeLevel(foci, FocusUpgradeType.potency); @@ -99,8 +101,8 @@ public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player, int count float f = 1.0F; double d0 = player.prevPosX + (player.posX - player.prevPosX) * (double) f; double d1 = player.prevPosY + (player.posY - player.prevPosY) * (double) f - + (double) (player.worldObj.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() - : player.getEyeHeight()); + + (double) (player.worldObj.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() + : player.getEyeHeight()); double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) f; Vec3 vec3 = Vec3.createVectorHelper(d0, d1, d2); @@ -112,17 +114,17 @@ public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player, int count Vec3 lookVec = player.getLookVec(); if (player.worldObj.isRemote) beam = Thaumcraft.proxy.beamCont( - player.worldObj, - player, - player.posX + lookVec.xCoord * 2, - player.posY + player.getEyeHeight() + lookVec.yCoord * 2, - player.posZ + lookVec.zCoord * 2, - 6, - 0xff00ff, - true, - 2, - beam, - 2); + player.worldObj, + player, + player.posX + lookVec.xCoord * 2, + player.posY + player.getEyeHeight() + lookVec.yCoord * 2, + player.posZ + lookVec.zCoord * 2, + 6, + 0xff00ff, + true, + 2, + beam, + 2); if (potencyLevel == 5 || player.ticksExisted % 10 - potencyLevel * 2 == 0) for (int i = 0; i < d3; ++i) { Vec3 addedVec = vec3.addVector(lookVec.xCoord * i, lookVec.yCoord * i, lookVec.zCoord * i); @@ -139,13 +141,13 @@ public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player, int count player.worldObj.setBlock(x, y, z, Blocks.air, 0, 2); player.worldObj.playSound(x + 0.5D, y + 0.5D, z + 0.5D, b.stepSound.getBreakSound(), 1, 1, false); for (int j = 0; j < 100; ++j) player.worldObj.spawnParticle( - "blockcrack_" + Block.getIdFromBlock(b) + "_" + player.worldObj.getBlockMetadata(x, y, z), - x + player.worldObj.rand.nextDouble(), - y + player.worldObj.rand.nextDouble(), - z + player.worldObj.rand.nextDouble(), - 0, - 0, - 0); + "blockcrack_" + Block.getIdFromBlock(b) + "_" + player.worldObj.getBlockMetadata(x, y, z), + x + player.worldObj.rand.nextDouble(), + y + player.worldObj.rand.nextDouble(), + z + player.worldObj.rand.nextDouble(), + 0, + 0, + 0); if (!player.worldObj.isRemote) { if (this.getUpgradeLevel(foci, TBFociUpgrades.calming) > 0) { @@ -166,11 +168,11 @@ public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player, int count ItemCrystalEssence cEssence = (ItemCrystalEssence) potentiaCrystal.getItem(); cEssence.setAspects(potentiaCrystal, new AspectList().add(Aspect.ENERGY, 1)); EntityItem crystal = new EntityItem( - player.worldObj, - x + 0.5D, - y + 0.5D, - z + 0.5D, - potentiaCrystal); + player.worldObj, + x + 0.5D, + y + 0.5D, + z + 0.5D, + potentiaCrystal); if (!player.worldObj.isRemote) player.worldObj.spawnEntityInWorld(crystal); } @@ -183,15 +185,14 @@ public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player, int count ItemStack potentiaCrystal = new ItemStack(ConfigItems.itemCrystalEssence, 1, 0); ItemCrystalEssence cEssence = (ItemCrystalEssence) potentiaCrystal.getItem(); cEssence.setAspects( - potentiaCrystal, - new AspectList() - .add(allAspects.get(player.worldObj.rand.nextInt(allAspects.size())), 1)); + potentiaCrystal, + new AspectList().add(allAspects.get(player.worldObj.rand.nextInt(allAspects.size())), 1)); EntityItem crystal = new EntityItem( - player.worldObj, - x + 0.5D, - y + 0.5D, - z + 0.5D, - potentiaCrystal); + player.worldObj, + x + 0.5D, + y + 0.5D, + z + 0.5D, + potentiaCrystal); if (!player.worldObj.isRemote) player.worldObj.spawnEntityInWorld(crystal); } diff --git a/src/main/java/tb/common/itemblock/ItemBlockCrystal.java b/src/main/java/tb/common/itemblock/ItemBlockCrystal.java index 9a555cb..c368493 100644 --- a/src/main/java/tb/common/itemblock/ItemBlockCrystal.java +++ b/src/main/java/tb/common/itemblock/ItemBlockCrystal.java @@ -14,8 +14,8 @@ public ItemBlockCrystal(Block b) { } public String getUnlocalizedName(ItemStack stk) { - return super.getUnlocalizedName(stk) + (stk.getItemDamage() >= 8 ? BlockCrystalBlock.names[7] - : BlockCrystalBlock.names[stk.getItemDamage()]); + return super.getUnlocalizedName(stk) + + (stk.getItemDamage() >= 8 ? BlockCrystalBlock.names[7] : BlockCrystalBlock.names[stk.getItemDamage()]); } public int getMetadata(int meta) { diff --git a/src/main/java/tb/common/itemblock/ItemBlockSlab_0.java b/src/main/java/tb/common/itemblock/ItemBlockSlab_0.java index e481de5..78b438f 100644 --- a/src/main/java/tb/common/itemblock/ItemBlockSlab_0.java +++ b/src/main/java/tb/common/itemblock/ItemBlockSlab_0.java @@ -10,10 +10,10 @@ public class ItemBlockSlab_0 extends ItemSlab { public ItemBlockSlab_0(Block b) { this( - b, - (BlockSlab) TBBlocks.genericSlab, - (BlockSlab) TBBlocks.genericSlab_full, - b == TBBlocks.genericSlab_full); + b, + (BlockSlab) TBBlocks.genericSlab, + (BlockSlab) TBBlocks.genericSlab_full, + b == TBBlocks.genericSlab_full); } public ItemBlockSlab_0(Block block, BlockSlab slab, BlockSlab doubleSlab, boolean isFullSlab) { diff --git a/src/main/java/tb/common/itemblock/ItemBlockSlab_1.java b/src/main/java/tb/common/itemblock/ItemBlockSlab_1.java index 9a5f395..24fad65 100644 --- a/src/main/java/tb/common/itemblock/ItemBlockSlab_1.java +++ b/src/main/java/tb/common/itemblock/ItemBlockSlab_1.java @@ -10,10 +10,10 @@ public class ItemBlockSlab_1 extends ItemSlab { public ItemBlockSlab_1(Block b) { this( - b, - (BlockSlab) TBBlocks.crystalSlab, - (BlockSlab) TBBlocks.crystalSlab_full, - b == TBBlocks.crystalSlab_full); + b, + (BlockSlab) TBBlocks.crystalSlab, + (BlockSlab) TBBlocks.crystalSlab_full, + b == TBBlocks.crystalSlab_full); } public ItemBlockSlab_1(Block block, BlockSlab slab, BlockSlab doubleSlab, boolean isFullSlab) { diff --git a/src/main/java/tb/common/itemblock/ItemBlockSpike.java b/src/main/java/tb/common/itemblock/ItemBlockSpike.java index 4555610..b15f3c6 100644 --- a/src/main/java/tb/common/itemblock/ItemBlockSpike.java +++ b/src/main/java/tb/common/itemblock/ItemBlockSpike.java @@ -18,7 +18,7 @@ public ItemBlockSpike(Block b) { public String getUnlocalizedName(ItemStack stk) { return super.getUnlocalizedName(stk) - + (stk.getItemDamage() >= 6 ? BlockSpike.spikeNames[5] : BlockSpike.spikeNames[stk.getItemDamage()]); + + (stk.getItemDamage() >= 6 ? BlockSpike.spikeNames[5] : BlockSpike.spikeNames[stk.getItemDamage()]); } public int getMetadata(int meta) { diff --git a/src/main/java/tb/common/tile/TileAdvAlchemicalFurnace.java b/src/main/java/tb/common/tile/TileAdvAlchemicalFurnace.java index fb29307..8b6275b 100644 --- a/src/main/java/tb/common/tile/TileAdvAlchemicalFurnace.java +++ b/src/main/java/tb/common/tile/TileAdvAlchemicalFurnace.java @@ -37,9 +37,10 @@ public void writeToNBT(NBTTagCompound tag) { public void updateEntity() { if (this.furnaceBurnTime == 0) { - isFuelAlumentum = this.getStackInSlot(1) != null - && this.getStackInSlot(1).getItem() == ConfigItems.itemResource - && this.getStackInSlot(1).getItemDamage() == 0; + isFuelAlumentum = this.getStackInSlot(1) != null && this.getStackInSlot(1) + .getItem() == ConfigItems.itemResource + && this.getStackInSlot(1) + .getItemDamage() == 0; } try { if (fieldCount != null && (this.isFuelAlumentum || !TBConfig.makeRequireAlumentum)) { @@ -54,7 +55,7 @@ public void updateEntity() { // making sure to take remainders only from positives since java believes in negative remainders for // negative dividends int maxMeaningfulBonus = (furnaceUpdateStep - (currentCount + 1) % furnaceUpdateStep) - % furnaceUpdateStep; + % furnaceUpdateStep; int bonusCount = TBConfig.speedMultiplierForFurnace - 1; int nextCount = currentCount + Math.min(bonusCount, maxMeaningfulBonus); diff --git a/src/main/java/tb/common/tile/TileBrazier.java b/src/main/java/tb/common/tile/TileBrazier.java index 802f065..a033758 100644 --- a/src/main/java/tb/common/tile/TileBrazier.java +++ b/src/main/java/tb/common/tile/TileBrazier.java @@ -62,9 +62,9 @@ public void updateEntity() { if (!this.worldObj.isRemote) { List creatures = this.worldObj.getEntitiesWithinAABB( - EntityCreature.class, - AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1) - .expand(12, 6, 12)); + EntityCreature.class, + AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1) + .expand(12, 6, 12)); for (EntityCreature c : creatures) { if (!(c instanceof IMob)) continue; diff --git a/src/main/java/tb/common/tile/TileCampfire.java b/src/main/java/tb/common/tile/TileCampfire.java index 51e9726..ae151e6 100644 --- a/src/main/java/tb/common/tile/TileCampfire.java +++ b/src/main/java/tb/common/tile/TileCampfire.java @@ -121,9 +121,9 @@ public void updateEntity() { if (!this.worldObj.isRemote) { List creatures = this.worldObj.getEntitiesWithinAABB( - EntityCreature.class, - AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1) - .expand(12, 6, 12)); + EntityCreature.class, + AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1) + .expand(12, 6, 12)); for (EntityCreature c : creatures) { if (!(c instanceof IMob)) continue; diff --git a/src/main/java/tb/common/tile/TileEntityDeconstructor.java b/src/main/java/tb/common/tile/TileEntityDeconstructor.java index 482853c..f562b9d 100644 --- a/src/main/java/tb/common/tile/TileEntityDeconstructor.java +++ b/src/main/java/tb/common/tile/TileEntityDeconstructor.java @@ -74,13 +74,13 @@ public Packet getDescriptionPacket() { @SuppressWarnings("unchecked") public void updateEntity() { if (!this.worldObj.isRemote && tickTime == 0) MiscUtils.sendPacketToAllAround( - worldObj, - getDescriptionPacket(), - xCoord, - yCoord, - zCoord, - worldObj.provider.dimensionId, - 16); + worldObj, + getDescriptionPacket(), + xCoord, + yCoord, + zCoord, + worldObj.provider.dimensionId, + 16); int additionalStability = 0; @@ -94,8 +94,8 @@ public void updateEntity() { if (placerName == null || placerName.isEmpty() || placerName.contains("no placer")) return; List entities = this.worldObj.getEntitiesWithinAABB( - Entity.class, - AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); + Entity.class, + AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); if (!entities.isEmpty()) { Entity e = entities.get(0); if (e != null && !e.isDead) { @@ -117,11 +117,12 @@ public void updateEntity() { AspectList primals = ResearchManager.reduceToPrimals(aspectsCompound); Aspect a = null; if (this.worldObj.rand.nextInt(40) < primals.visSize()) a = primals - .getAspects()[this.worldObj.rand.nextInt(primals.getAspects().length)]; + .getAspects()[this.worldObj.rand.nextInt(primals.getAspects().length)]; if (!this.worldObj.isRemote && a != null) { - EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager() - .func_152612_a(placerName); + EntityPlayerMP player = MinecraftServer.getServer() + .getConfigurationManager() + .func_152612_a(placerName); if (player != null) { double distance = player.getDistance(xCoord + 0.5D, yCoord, zCoord + 0.5D); @@ -133,15 +134,15 @@ public void updateEntity() { } } Thaumcraft.proxy.blockRunes( - worldObj, - xCoord, - yCoord + MathUtils.randomDouble(this.worldObj.rand) * 0.5D, - zCoord, - 1, - 0.5F, - 0.5F, - 8, - 0); + worldObj, + xCoord, + yCoord + MathUtils.randomDouble(this.worldObj.rand) * 0.5D, + zCoord, + 1, + 0.5F, + 0.5F, + 8, + 0); return; } } @@ -163,8 +164,9 @@ public void updateEntity() { Aspect a = aspectsCompound.getAspects()[this.worldObj.rand.nextInt(aspectsCompound.size())]; if (!this.worldObj.isRemote) { - EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager() - .func_152612_a(placerName); + EntityPlayerMP player = MinecraftServer.getServer() + .getConfigurationManager() + .func_152612_a(placerName); if (player != null) { double distance = player.getDistance(xCoord + 0.5D, yCoord, zCoord + 0.5D); @@ -175,15 +177,15 @@ public void updateEntity() { } } Thaumcraft.proxy.blockRunes( - worldObj, - xCoord, - yCoord + MathUtils.randomDouble(this.worldObj.rand) * 0.5D, - zCoord, - 1, - 0.5F, - 0.5F, - 8, - 0); + worldObj, + xCoord, + yCoord + MathUtils.randomDouble(this.worldObj.rand) * 0.5D, + zCoord, + 1, + 0.5F, + 0.5F, + 8, + 0); return; } } diff --git a/src/main/java/tb/common/tile/TileNodeLinker.java b/src/main/java/tb/common/tile/TileNodeLinker.java index bb4fc1d..0e11d2f 100644 --- a/src/main/java/tb/common/tile/TileNodeLinker.java +++ b/src/main/java/tb/common/tile/TileNodeLinker.java @@ -62,13 +62,13 @@ public void updateEntity() { int z = MathHelper.floor_double(linkCoord.z); if (this.worldObj.getTileEntity(x, y, z) instanceof TileNodeLinker - && TileNodeLinker.class.cast(this.worldObj.getTileEntity(x, y, z)).linkCoord == null) { + && TileNodeLinker.class.cast(this.worldObj.getTileEntity(x, y, z)).linkCoord == null) { if (this.worldObj.getBlock(xCoord, yCoord - 1, zCoord) == ConfigBlocks.blockAiry - && this.worldObj.getBlock(x, y - 1, z) == ConfigBlocks.blockAiry) { + && this.worldObj.getBlock(x, y - 1, z) == ConfigBlocks.blockAiry) { if (this.worldObj.getTileEntity(xCoord, yCoord - 1, zCoord) instanceof INode - && this.worldObj.getTileEntity(x, y - 1, z) instanceof INode) { + && this.worldObj.getTileEntity(x, y - 1, z) instanceof INode) { if (this.worldObj.getBlockMetadata(xCoord, yCoord - 1, zCoord) == 0 - && this.worldObj.getBlockMetadata(x, y - 1, z) == 0) { + && this.worldObj.getBlockMetadata(x, y - 1, z) == 0) { double sX = linkCoord.x + 0.5D; double sY = linkCoord.y + 0.825D; double sZ = linkCoord.z + 0.5D; @@ -81,42 +81,44 @@ public void updateEntity() { Thaumcraft.proxy.beam(worldObj, sX, sY, sZ, eX, eY, eZ, 1, 0xffffff, false, 1, 1); if (this.worldObj.isRemote) Thaumcraft.proxy.nodeBolt( - worldObj, - (float) sX, - (float) (sY - 1.3F), - (float) sZ, - (float) sX, - (float) sY - 0.6F, - (float) sZ); + worldObj, + (float) sX, + (float) (sY - 1.3F), + (float) sZ, + (float) sX, + (float) sY - 0.6F, + (float) sZ); if (this.worldObj.isRemote) Thaumcraft.proxy.nodeBolt( - worldObj, - (float) eX, - (float) eY - 0.6F, - (float) eZ, - (float) eX, - (float) eY - 1.3F, - (float) eZ); + worldObj, + (float) eX, + (float) eY - 0.6F, + (float) eZ, + (float) eX, + (float) eY - 1.3F, + (float) eZ); if (syncTimer % 10 == 0 && !this.worldObj.isRemote) { TileNode reciever = (TileNode) this.worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); TileNode transmitter = (TileNode) this.worldObj.getTileEntity(x, y - 1, z); boolean isPushPerm = this.worldObj.rand.nextDouble() < 0.3D ? true - : transmitter.getAspects().visSize() > 0 ? false : true; + : transmitter.getAspects() + .visSize() > 0 ? false : true; AspectList pullFrom = isPushPerm ? transmitter.getAspectsBase() - : transmitter.getAspects(); + : transmitter.getAspects(); AspectList pushTo = isPushPerm ? reciever.getAspectsBase() : reciever.getAspects(); if (pullFrom.visSize() <= 0) { this.worldObj.setBlockToAir(x, y - 1, z); return; } else { Aspect randomAspect = pullFrom.getAspects()[this.worldObj.rand - .nextInt(pullFrom.getAspects().length)]; + .nextInt(pullFrom.getAspects().length)]; if (isPushPerm) { if (this.worldObj.rand.nextDouble() <= 0.7D) { if (instabilityCheck()) { pushTo.add(randomAspect, 1); - reciever.getAspects().add(randomAspect, 1); + reciever.getAspects() + .add(randomAspect, 1); } pullFrom.reduce(randomAspect, 1); } else { @@ -124,8 +126,9 @@ public void updateEntity() { } ++instability; } else { - if (pushTo.getAmount(randomAspect) > 0 && pushTo.getAmount(randomAspect) - <= reciever.getAspectsBase().getAmount(randomAspect)) { + if (pushTo.getAmount(randomAspect) > 0 + && pushTo.getAmount(randomAspect) <= reciever.getAspectsBase() + .getAmount(randomAspect)) { if (instabilityCheck()) pushTo.add(randomAspect, 1); pullFrom.reduce(randomAspect, 1); @@ -154,17 +157,17 @@ public boolean instabilityCheck() { int rnd = this.worldObj.rand.nextInt(this.instability); if (rnd == 49) { // if a block of Ichorium is above dont explode or harm node - if (!OreDictionary.doesOreNameExist("blockIchorium") || (OreDictionary.getOres("blockIchorium") != null - && !(OreDictionary.getOres("blockIchorium").contains( - new ItemStack(this.worldObj.getBlock(this.xCoord, this.yCoord + 1, this.zCoord)))))) + if (!OreDictionary.doesOreNameExist("blockIchorium") + || (OreDictionary.getOres("blockIchorium") != null && !(OreDictionary.getOres("blockIchorium") + .contains(new ItemStack(this.worldObj.getBlock(this.xCoord, this.yCoord + 1, this.zCoord)))))) instability -= explodeTransmitter(); } else { if (rnd >= 45) { // if a block of Ichorium is above dont explode or harm node - if (!OreDictionary.doesOreNameExist("blockIchorium") || (OreDictionary.getOres("blockIchorium") - != null - && !(OreDictionary.getOres("blockIchorium").contains( - new ItemStack(this.worldObj.getBlock(this.xCoord, this.yCoord + 1, this.zCoord)))))) + if (!OreDictionary.doesOreNameExist("blockIchorium") + || (OreDictionary.getOres("blockIchorium") != null && !(OreDictionary.getOres("blockIchorium") + .contains( + new ItemStack(this.worldObj.getBlock(this.xCoord, this.yCoord + 1, this.zCoord)))))) instability -= harmTransmitter(); } else { if (rnd >= 31) { @@ -214,19 +217,19 @@ public int zap() { int y = side ? MathHelper.floor_double(linkCoord.y) : yCoord; int z = side ? MathHelper.floor_double(linkCoord.z) : zCoord; List players = this.worldObj.getEntitiesWithinAABB( - EntityPlayer.class, - AxisAlignedBB.getBoundingBox(x - 5, y - 6, z - 5, x + 5, y + 4, z + 5)); + EntityPlayer.class, + AxisAlignedBB.getBoundingBox(x - 5, y - 6, z - 5, x + 5, y + 4, z + 5)); if (!players.isEmpty()) { EntityPlayer target = players.get(worldObj.rand.nextInt(players.size())); PacketHandler.INSTANCE.sendToAllAround( - new PacketFXBlockZap( - x + 0.5F, - y - 0.5F, - z + 0.5F, - (float) target.posX, - (float) target.posY + target.height / 2.0F, - (float) target.posZ), - new TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord, this.zCoord, 32.0D)); + new PacketFXBlockZap( + x + 0.5F, + y - 0.5F, + z + 0.5F, + (float) target.posX, + (float) target.posY + target.height / 2.0F, + (float) target.posZ), + new TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord, this.zCoord, 32.0D)); target.attackEntityFrom(DamageSource.magic, 4 + this.worldObj.rand.nextInt(4)); return 5; } @@ -246,7 +249,9 @@ public int wisp() { EntityWisp wisp = new EntityWisp(worldObj); wisp.setPositionAndRotation(x + 0.5D, y - 0.5D, z + 0.5D, 0, 0); - wisp.setType(aspects.get(worldObj.rand.nextInt(aspects.size())).getTag()); + wisp.setType( + aspects.get(worldObj.rand.nextInt(aspects.size())) + .getTag()); worldObj.spawnEntityInWorld(wisp); return 9; @@ -284,11 +289,15 @@ public int explodeTransmitter() { } public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - if (pkt.func_148857_g().hasKey("coordsX")) { + if (pkt.func_148857_g() + .hasKey("coordsX")) { linkCoord = new Coord3D( - pkt.func_148857_g().getFloat("coordsX"), - pkt.func_148857_g().getFloat("coordsY"), - pkt.func_148857_g().getFloat("coordsZ")); + pkt.func_148857_g() + .getFloat("coordsX"), + pkt.func_148857_g() + .getFloat("coordsY"), + pkt.func_148857_g() + .getFloat("coordsZ")); } else linkCoord = null; } @@ -312,7 +321,7 @@ public void writeToNBT(NBTTagCompound tag) { @Override public int onWandRightClick(World paramWorld, ItemStack paramItemStack, EntityPlayer paramEntityPlayer, - int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5) { + int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5) { // TODO Auto-generated method stub return 0; } @@ -322,34 +331,42 @@ public ItemStack onWandRightClick(World paramWorld, ItemStack paramItemStack, En paramEntityPlayer.swingItem(); if (!paramItemStack.hasTagCompound()) paramItemStack.setTagCompound(new NBTTagCompound()); - if (paramItemStack.getTagCompound().hasKey("linkCoordX")) { - float x = paramItemStack.getTagCompound().getFloat("linkCoordX"); - float y = paramItemStack.getTagCompound().getFloat("linkCoordY"); - float z = paramItemStack.getTagCompound().getFloat("linkCoordZ"); + if (paramItemStack.getTagCompound() + .hasKey("linkCoordX")) { + float x = paramItemStack.getTagCompound() + .getFloat("linkCoordX"); + float y = paramItemStack.getTagCompound() + .getFloat("linkCoordY"); + float z = paramItemStack.getTagCompound() + .getFloat("linkCoordZ"); if (this.worldObj.getTileEntity( - MathHelper.floor_double(x), - MathHelper.floor_double(y), - MathHelper.floor_double(z)) instanceof TileNodeLinker) { - TileNodeLinker tile = (TileNodeLinker) this.worldObj.getTileEntity( - MathHelper.floor_double(x), - MathHelper.floor_double(y), - MathHelper.floor_double(z)); + MathHelper.floor_double(x), + MathHelper.floor_double(y), + MathHelper.floor_double(z)) instanceof TileNodeLinker) { + TileNodeLinker tile = (TileNodeLinker) this.worldObj + .getTileEntity(MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z)); tile.linkCoord = new Coord3D(xCoord, yCoord, zCoord); - paramItemStack.getTagCompound().removeTag("linkCoordX"); - paramItemStack.getTagCompound().removeTag("linkCoordY"); - paramItemStack.getTagCompound().removeTag("linkCoordZ"); - if (paramWorld.isRemote) paramEntityPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("tb.txt.linkEstabilished"))); + paramItemStack.getTagCompound() + .removeTag("linkCoordX"); + paramItemStack.getTagCompound() + .removeTag("linkCoordY"); + paramItemStack.getTagCompound() + .removeTag("linkCoordZ"); + if (paramWorld.isRemote) paramEntityPlayer + .addChatMessage(new ChatComponentText(StatCollector.translateToLocal("tb.txt.linkEstabilished"))); return paramItemStack; } } - paramItemStack.getTagCompound().setFloat("linkCoordX", xCoord); - paramItemStack.getTagCompound().setFloat("linkCoordY", yCoord); - paramItemStack.getTagCompound().setFloat("linkCoordZ", zCoord); + paramItemStack.getTagCompound() + .setFloat("linkCoordX", xCoord); + paramItemStack.getTagCompound() + .setFloat("linkCoordY", yCoord); + paramItemStack.getTagCompound() + .setFloat("linkCoordZ", zCoord); if (paramWorld.isRemote) paramEntityPlayer - .addChatMessage(new ChatComponentText(StatCollector.translateToLocal("tb.txt.linkStarted"))); + .addChatMessage(new ChatComponentText(StatCollector.translateToLocal("tb.txt.linkStarted"))); return paramItemStack; } @@ -362,7 +379,7 @@ public void onUsingWandTick(ItemStack paramItemStack, EntityPlayer paramEntityPl @Override public void onWandStoppedUsing(ItemStack paramItemStack, World paramWorld, EntityPlayer paramEntityPlayer, - int paramInt) { + int paramInt) { // TODO Auto-generated method stub } diff --git a/src/main/java/tb/common/tile/TileNodeManipulator.java b/src/main/java/tb/common/tile/TileNodeManipulator.java index a64ffdb..4558e27 100644 --- a/src/main/java/tb/common/tile/TileNodeManipulator.java +++ b/src/main/java/tb/common/tile/TileNodeManipulator.java @@ -115,15 +115,16 @@ private void applyDestructionEffect() { } increaseWorkTime(); if (!this.worldObj.isRemote && workTime % 200 == 0) { - Aspect[] aspects = node.getAspects().getAspects(); + Aspect[] aspects = node.getAspects() + .getAspects(); Aspect aspect = aspects[this.worldObj.rand.nextInt(aspects.length)]; EntityAspectOrb aspectOrb = new EntityAspectOrb( - worldObj, - xCoord + 0.5D, - yCoord - 0.5D, - zCoord + 0.5D, - aspect, - 1); + worldObj, + xCoord + 0.5D, + yCoord - 0.5D, + zCoord + 0.5D, + aspect, + 1); this.worldObj.spawnEntityInWorld(aspectOrb); } } @@ -143,7 +144,10 @@ private void applyEfficiencyEffect() { node.addToContainer(aspect, previousAmount - currentAmount); } } - previousNodeAspects.put(aspect, node.getAspects().getAmount(aspect)); + previousNodeAspects.put( + aspect, + node.getAspects() + .getAmount(aspect)); } } } @@ -168,13 +172,14 @@ private void applySpeedEffect() { if (isNodeChanged) { MiscUtils.sendPacketToAllAround( - worldObj, - this.worldObj.getTileEntity(xCoord, yCoord - 1, zCoord).getDescriptionPacket(), - xCoord, - yCoord, - zCoord, - this.worldObj.provider.dimensionId, - 6); + worldObj, + this.worldObj.getTileEntity(xCoord, yCoord - 1, zCoord) + .getDescriptionPacket(), + xCoord, + yCoord, + zCoord, + this.worldObj.provider.dimensionId, + 6); } } } @@ -248,18 +253,18 @@ public void updateEntity() { // Graphic if (this.worldObj.isRemote && workTime != 0) { Thaumcraft.proxy.beam( - this.worldObj, - xCoord + 0.5D, - yCoord + 0.5D, - zCoord + 0.5D, - xCoord + 0.5D, - yCoord - 0.5D, - zCoord + 0.5D, - 2, - getColor(effect), - false, - 0.5F, - 2); + this.worldObj, + xCoord + 0.5D, + yCoord + 0.5D, + zCoord + 0.5D, + xCoord + 0.5D, + yCoord - 0.5D, + zCoord + 0.5D, + 2, + getColor(effect), + false, + 0.5F, + 2); } // Logic @@ -336,7 +341,7 @@ public void writeToNBT(NBTTagCompound tag) { @Override public int onWandRightClick(World world, ItemStack wandstack, EntityPlayer player, int x, int y, int z, int side, - int md) { + int md) { return 0; } diff --git a/src/main/java/tb/common/tile/TileOverchanter.java b/src/main/java/tb/common/tile/TileOverchanter.java index a551264..366a373 100644 --- a/src/main/java/tb/common/tile/TileOverchanter.java +++ b/src/main/java/tb/common/tile/TileOverchanter.java @@ -69,28 +69,22 @@ public void updateEntity() { // renderedLightning = new Lightning(this.worldObj.rand, new Coord3D(0,0,0), new // Coord3D(MathUtils.randomDouble(this.worldObj.rand)/50,MathUtils.randomDouble(this.worldObj.rand)/50,MathUtils.randomDouble(this.worldObj.rand)/50), // 0.3F, 1,0,1); - this.worldObj.playSoundEffect( - this.xCoord, - this.yCoord, - this.zCoord, - "thaumcraft:infuserstart", - 1F, - 1.0F); + this.worldObj + .playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "thaumcraft:infuserstart", 1F, 1.0F); if (EssentiaHandler.drainEssentia(this, Aspect.MAGIC, ForgeDirection.UNKNOWN, 8, false)) { ++enchantingTime; if (enchantingTime >= 16 && !this.xpAbsorbed) { List players = this.worldObj.getEntitiesWithinAABB( - EntityPlayer.class, - AxisAlignedBB - .getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1) - .expand(6, 3, 6)); + EntityPlayer.class, + AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1) + .expand(6, 3, 6)); if (!players.isEmpty()) { for (int i = 0; i < players.size(); ++i) { EntityPlayer p = players.get(i); if (p.experienceLevel >= 30) { p.attackEntityFrom(DamageSource.magic, 8); this.worldObj - .playSoundEffect(p.posX, p.posY, p.posZ, "thaumcraft:zap", 1F, 1.0F); + .playSoundEffect(p.posX, p.posY, p.posZ, "thaumcraft:zap", 1F, 1.0F); p.experienceLevel -= 30; xpAbsorbed = true; break; @@ -127,7 +121,7 @@ public void updateEntity() { enchantingTime = 0; // renderedLightning = null; this.worldObj - .playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "thaumcraft:wand", 1F, 1F); + .playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "thaumcraft:wand", 1F, 1F); } } else { @@ -140,8 +134,8 @@ public void updateEntity() { public boolean canStartEnchanting() { if (!this.isEnchantingStarted) if (this.inventory != null) { - if (this.inventory.getEnchantmentTagList() != null - && this.inventory.getEnchantmentTagList().tagCount() > 0) { + if (this.inventory.getEnchantmentTagList() != null && this.inventory.getEnchantmentTagList() + .tagCount() > 0) { if (findEnchantment(inventory) != -1) { return true; } @@ -154,7 +148,7 @@ public boolean canStartEnchanting() { public int findEnchantment(ItemStack enchanted) { NBTTagCompound stackTag = MiscUtils.getStackTag(inventory); LinkedHashMap ench = (LinkedHashMap) EnchantmentHelper - .getEnchantments(enchanted); + .getEnchantments(enchanted); Set keys = ench.keySet(); Iterator $i = keys.iterator(); @@ -174,9 +168,12 @@ public int findEnchantment(ItemStack enchanted) { } public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - enchantingTime = pkt.func_148857_g().getInteger("0"); - xpAbsorbed = pkt.func_148857_g().getBoolean("1"); - isEnchantingStarted = pkt.func_148857_g().getBoolean("2"); + enchantingTime = pkt.func_148857_g() + .getInteger("0"); + xpAbsorbed = pkt.func_148857_g() + .getBoolean("1"); + isEnchantingStarted = pkt.func_148857_g() + .getBoolean("2"); } @Override @@ -251,7 +248,7 @@ public int getInventoryStackLimit() { @Override public boolean isUseableByPlayer(EntityPlayer player) { return player.dimension == this.worldObj.provider.dimensionId - && this.worldObj.blockExists(xCoord, yCoord, zCoord); + && this.worldObj.blockExists(xCoord, yCoord, zCoord); } @Override @@ -292,7 +289,7 @@ public void writeToNBT(NBTTagCompound tag) { @Override public int onWandRightClick(World world, ItemStack wandstack, EntityPlayer player, int x, int y, int z, int side, - int md) { + int md) { if (canStartEnchanting()) { isEnchantingStarted = true; player.swingItem(); diff --git a/src/main/java/tb/common/tile/TileRelocator.java b/src/main/java/tb/common/tile/TileRelocator.java index e904d8c..6d3b3b1 100644 --- a/src/main/java/tb/common/tile/TileRelocator.java +++ b/src/main/java/tb/common/tile/TileRelocator.java @@ -22,7 +22,7 @@ public class TileRelocator extends TileEntity implements IWandable { @SuppressWarnings("unchecked") public void updateEntity() { ForgeDirection orientation = ForgeDirection.values()[this.worldObj.getBlockMetadata(xCoord, yCoord, zCoord) - % 6]; + % 6]; ForgeDirection opposite = orientation.getOpposite(); if (firstTick || checkCount % 100 == 0) { @@ -30,26 +30,28 @@ public void updateEntity() { firstTick = false; int cont = 0; while (worldObj.getBlock( - xCoord + opposite.offsetX * cont, - yCoord + opposite.offsetY * cont, - zCoord + opposite.offsetZ * cont) instanceof BlockRelocator) { + xCoord + opposite.offsetX * cont, + yCoord + opposite.offsetY * cont, + zCoord + opposite.offsetZ * cont) instanceof BlockRelocator) { ++cont; } int cnt = 1; while (cnt <= cont * 10 && (worldObj.isAirBlock( - xCoord + orientation.offsetX * cnt, - yCoord + orientation.offsetY * cnt, - zCoord + orientation.offsetZ * cnt) - || !worldObj.getBlock( - xCoord + orientation.offsetX * cnt, - yCoord + orientation.offsetY * cnt, - zCoord + orientation.offsetZ * cnt).isNormalCube( - worldObj, - xCoord + orientation.offsetX * cnt, - yCoord + orientation.offsetY * cnt, - zCoord + orientation.offsetZ * cnt))) { + xCoord + orientation.offsetX * cnt, + yCoord + orientation.offsetY * cnt, + zCoord + orientation.offsetZ * cnt) + || !worldObj + .getBlock( + xCoord + orientation.offsetX * cnt, + yCoord + orientation.offsetY * cnt, + zCoord + orientation.offsetZ * cnt) + .isNormalCube( + worldObj, + xCoord + orientation.offsetX * cnt, + yCoord + orientation.offsetY * cnt, + zCoord + orientation.offsetZ * cnt))) { ++power; ++cnt; @@ -58,23 +60,23 @@ public void updateEntity() { if (!isBlockPowered()) { if (!this.worldObj - .getBlock(xCoord + orientation.offsetX, yCoord + orientation.offsetY, zCoord + orientation.offsetZ) - .isSideSolid(worldObj, xCoord, yCoord, zCoord, opposite)) { + .getBlock(xCoord + orientation.offsetX, yCoord + orientation.offsetY, zCoord + orientation.offsetZ) + .isSideSolid(worldObj, xCoord, yCoord, zCoord, opposite)) { int meta = this.worldObj.getBlockMetadata(xCoord, yCoord, zCoord) % 6; boolean attract = this.worldObj.getBlockMetadata(xCoord, yCoord, zCoord) > 5; AxisAlignedBB aabb = null; if (meta == 0) aabb = AxisAlignedBB - .getBoundingBox(xCoord, yCoord - power, zCoord, xCoord + 1, yCoord + 1, zCoord + 1); + .getBoundingBox(xCoord, yCoord - power, zCoord, xCoord + 1, yCoord + 1, zCoord + 1); if (meta == 1) aabb = AxisAlignedBB - .getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1 + power, zCoord + 1); + .getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1 + power, zCoord + 1); if (meta == 2) aabb = AxisAlignedBB - .getBoundingBox(xCoord, yCoord, zCoord - power, xCoord + 1, yCoord + 1, zCoord + 1); + .getBoundingBox(xCoord, yCoord, zCoord - power, xCoord + 1, yCoord + 1, zCoord + 1); if (meta == 3) aabb = AxisAlignedBB - .getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1 + power); + .getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1 + power); if (meta == 4) aabb = AxisAlignedBB - .getBoundingBox(xCoord - power, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1); + .getBoundingBox(xCoord - power, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1); if (meta == 5) aabb = AxisAlignedBB - .getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1 + power, yCoord + 1, zCoord + 1); + .getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1 + power, yCoord + 1, zCoord + 1); List affected = this.worldObj.getEntitiesWithinAABB(Entity.class, aabb); @@ -130,7 +132,7 @@ public void updateEntity() { @Override public int onWandRightClick(World paramWorld, ItemStack paramItemStack, EntityPlayer paramEntityPlayer, - int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5) { + int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5) { paramEntityPlayer.swingItem(); paramWorld.playSound(xCoord, yCoord, zCoord, "thaumcraft:cameraticks", 1, 1, false); if (!paramEntityPlayer.isSneaking()) { @@ -139,7 +141,7 @@ public int onWandRightClick(World paramWorld, ItemStack paramItemStack, EntityPl } else { int meta = paramWorld.getBlockMetadata(xCoord, yCoord, zCoord) > 5 ? 6 : 0; paramWorld - .setBlockMetadataWithNotify(xCoord, yCoord, zCoord, meta + ForgeDirection.OPPOSITES[paramInt4], 3); + .setBlockMetadataWithNotify(xCoord, yCoord, zCoord, meta + ForgeDirection.OPPOSITES[paramInt4], 3); } return 0; } @@ -154,10 +156,10 @@ public void onUsingWandTick(ItemStack paramItemStack, EntityPlayer paramEntityPl @Override public void onWandStoppedUsing(ItemStack paramItemStack, World paramWorld, EntityPlayer paramEntityPlayer, - int paramInt) {} + int paramInt) {} public boolean isBlockPowered() { return this.worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord) - || this.worldObj.getBlockPowerInput(xCoord, yCoord, zCoord) > 0; + || this.worldObj.getBlockPowerInput(xCoord, yCoord, zCoord) > 0; } } diff --git a/src/main/java/tb/core/TBCore.java b/src/main/java/tb/core/TBCore.java index fec9cba..b65076a 100644 --- a/src/main/java/tb/core/TBCore.java +++ b/src/main/java/tb/core/TBCore.java @@ -2,7 +2,6 @@ import static tb.core.TBCore.*; -import java.io.IOException; import java.util.ArrayList; import net.minecraftforge.common.MinecraftForge; @@ -57,8 +56,13 @@ public class TBCore { public void preInit(FMLPreInitializationEvent event) { instance = this; try { - Core.registerModAbsolute(getClass(), name, event.getModConfigurationDirectory().getAbsolutePath(), cfg); - } catch (IOException e) { + Core.registerModAbsolute( + getClass(), + name, + event.getModConfigurationDirectory() + .getAbsolutePath(), + cfg); + } catch (Exception e) { e.printStackTrace(); } setupModInfo(event.getModMetadata()); diff --git a/src/main/java/tb/init/FakeResearchItem.java b/src/main/java/tb/init/FakeResearchItem.java index f136159..1db079f 100644 --- a/src/main/java/tb/init/FakeResearchItem.java +++ b/src/main/java/tb/init/FakeResearchItem.java @@ -15,7 +15,7 @@ public class FakeResearchItem extends ResearchItem { public ResearchItem origResearch; public FakeResearchItem(final String name, final String cat, final String origin, final String originCategory, - final int x, final int y, final ResourceLocation icon) { + final int x, final int y, final ResourceLocation icon) { super(name, cat, new AspectList(), x, y, 1, icon); this.origResearch = ResearchCategories.getResearch(origin); this.addSiblingToOriginal(); @@ -24,7 +24,7 @@ public FakeResearchItem(final String name, final String cat, final String origin } public FakeResearchItem(final String name, final String cat, final String origin, final String originCategory, - final int x, final int y, final ItemStack icon) { + final int x, final int y, final ItemStack icon) { super(name, cat, new AspectList(), x, y, 1, icon); this.origResearch = ResearchCategories.getResearch(origin); this.addSiblingToOriginal(); @@ -37,7 +37,7 @@ protected void addSiblingToOriginal() { this.origResearch.setSiblings(new String[] { this.key }); } else { final String[] newSiblings = Arrays - .copyOf(this.origResearch.siblings, this.origResearch.siblings.length + 1); + .copyOf(this.origResearch.siblings, this.origResearch.siblings.length + 1); newSiblings[this.origResearch.siblings.length] = this.key; this.origResearch.setSiblings(newSiblings); } diff --git a/src/main/java/tb/init/TBBlocks.java b/src/main/java/tb/init/TBBlocks.java index f5ef47d..ad1813d 100644 --- a/src/main/java/tb/init/TBBlocks.java +++ b/src/main/java/tb/init/TBBlocks.java @@ -62,105 +62,159 @@ public class TBBlocks { public static final Class core = TBCore.class; public static Block quicksilverBlock = new TBBlock(Material.iron, false).stabilise() - .setBlockName("quicksilverBlock").setBlockTextureName("thaumicbases:quicksilverBlock").setHardness(1F); - public static Block quicksilverBrick = new TBBlock(Material.rock, true).stabilise().setBlockName("quicksilverBrick") - .setBlockTextureName("thaumicbases:quicksilverBrick").setHardness(1F); + .setBlockName("quicksilverBlock") + .setBlockTextureName("thaumicbases:quicksilverBlock") + .setHardness(1F); + public static Block quicksilverBrick = new TBBlock(Material.rock, true).stabilise() + .setBlockName("quicksilverBrick") + .setBlockTextureName("thaumicbases:quicksilverBrick") + .setHardness(1F); public static Block crystalBlock = new BlockCrystalBlock().setBlockName("crystalBlock") - .setBlockTextureName("thaumicbases:crystal/mixed"); - public static Block dustBlock = new TBBlock(Material.sand, false).stabilise().setStepSound(Block.soundTypeSand) - .setBlockName("salisMundusBlock").setBlockTextureName("thaumicbases:dust_block").setHardness(1F); - public static Block pyrofluid = new BlockPyrofluid().setBlockName("pyrofluid").setLightLevel(1); - public static Block thauminiteBlock = new TBBlock(Material.iron, false).stabilise().setBlockName("thauminiteBlock") - .setBlockTextureName("thaumicbases:thauminiteblock").setHardness(2F); + .setBlockTextureName("thaumicbases:crystal/mixed"); + public static Block dustBlock = new TBBlock(Material.sand, false).stabilise() + .setStepSound(Block.soundTypeSand) + .setBlockName("salisMundusBlock") + .setBlockTextureName("thaumicbases:dust_block") + .setHardness(1F); + public static Block pyrofluid = new BlockPyrofluid().setBlockName("pyrofluid") + .setLightLevel(1); + public static Block thauminiteBlock = new TBBlock(Material.iron, false).stabilise() + .setBlockName("thauminiteBlock") + .setBlockTextureName("thaumicbases:thauminiteblock") + .setHardness(2F); public static Block eldritchArk = new TBBlockDeco(Material.rock, false).setBlockName("eldritchArk") - .setBlockTextureName("thaumicbases:eldritchArk").setHardness(3F); + .setBlockTextureName("thaumicbases:eldritchArk") + .setHardness(3F); public static Block ironGreatwood = new TBBlockDeco(Material.wood, false).setBlockName("ironGreatwood") - .setBlockTextureName("thaumicbases:ironGreatwood").setHardness(1F).setStepSound(Block.soundTypeWood); + .setBlockTextureName("thaumicbases:ironGreatwood") + .setHardness(1F) + .setStepSound(Block.soundTypeWood); public static Block plax = new BlockTBPlant(8, 4, true).setBlockName("plax") - .setBlockTextureName("thaumicbases:plax/"); + .setBlockTextureName("thaumicbases:plax/"); public static Block aureliaPetal = new BlockAureliaLeaf().setBlockName("aureliaPetal") - .setBlockTextureName("thaumicbases:aurelia/petal").setHardness(0).setStepSound(Block.soundTypeGrass); + .setBlockTextureName("thaumicbases:aurelia/petal") + .setHardness(0) + .setStepSound(Block.soundTypeGrass); public static Block aurelia = new BlockAureliaPlant().setBlockName("aurelia") - .setBlockTextureName("thaumicbases:aurelia/").setHardness(0).setStepSound(Block.soundTypeGrass); + .setBlockTextureName("thaumicbases:aurelia/") + .setHardness(0) + .setStepSound(Block.soundTypeGrass); public static Block metalleat = new BlockTBPlant(8, 8, true).setBlockName("metalleat") - .setBlockTextureName("thaumicbases:metalleat/"); + .setBlockTextureName("thaumicbases:metalleat/"); public static Block lucrite = new BlockLucritePlant(8, 16, true).setBlockName("lucrite") - .setBlockTextureName("thaumicbases:lucrite/"); + .setBlockTextureName("thaumicbases:lucrite/"); public static Block knose = new BlockKnose(4, 16, false).setBlockName("knose") - .setBlockTextureName("thaumicbases:knoze/"); + .setBlockTextureName("thaumicbases:knoze/"); public static Block sweed = new BlockSweed(4, 4, false).setBlockName("sweed") - .setBlockTextureName("thaumicbases:sweed/"); + .setBlockTextureName("thaumicbases:sweed/"); public static Block lazullia = new BlockTBPlant(8, 16, true).setBlockName("lazullia") - .setBlockTextureName("thaumicbases:lazullia/"); + .setBlockTextureName("thaumicbases:lazullia/"); public static Block rainbowCactus = new BlockRainbowCactus().setBlockName("rainbowCactus") - .setBlockTextureName("thaumicbases:rainbowCacti/").setStepSound(Block.soundTypeCloth).setHardness(0.5F); + .setBlockTextureName("thaumicbases:rainbowCacti/") + .setStepSound(Block.soundTypeCloth) + .setHardness(0.5F); public static Block redlonStem = new BlockRedlonStem(Blocks.redstone_block).setBlockName("redlonStem") - .setBlockTextureName("thaumicbases:redlon/redlon").setStepSound(Block.soundTypeGrass); + .setBlockTextureName("thaumicbases:redlon/redlon") + .setStepSound(Block.soundTypeGrass); public static Block ashroom = new BlockAshroom(4, 8, false).setBlockName("ashroom") - .setBlockTextureName("thaumicbases:aspectshroom/"); - public static Block flaxium = new BlockFlaxium().setBlockName("flaxium").setBlockTextureName("thaumicbases:flaxium") - .setStepSound(Block.soundTypeGrass); + .setBlockTextureName("thaumicbases:aspectshroom/"); + public static Block flaxium = new BlockFlaxium().setBlockName("flaxium") + .setBlockTextureName("thaumicbases:flaxium") + .setStepSound(Block.soundTypeGrass); public static Block glieonia = new BlockTBPlant(4, 12, false).setBlockName("glieonia") - .setBlockTextureName("thaumicbases:glieonia/"); - public static Block briar = new BlockBriar(8, 4).setBlockName("briar").setBlockTextureName("thaumicbases:briar/") - .setStepSound(Block.soundTypeGrass); + .setBlockTextureName("thaumicbases:glieonia/"); + public static Block briar = new BlockBriar(8, 4).setBlockName("briar") + .setBlockTextureName("thaumicbases:briar/") + .setStepSound(Block.soundTypeGrass); public static Block tobacco = new BlockTBPlant(8, 16, true).setBlockName("tobacco") - .setBlockTextureName("thaumicbases:tobacco/"); + .setBlockTextureName("thaumicbases:tobacco/"); public static Block voidPlant = new BlockTBPlant(4, 32, true).setBlockName("voidPlant") - .setBlockTextureName("thaumicbases:voidPlant/"); + .setBlockTextureName("thaumicbases:voidPlant/"); - public static Block spike = new BlockSpike().setBlockName("spike").setHardness(3).setResistance(3) - .setStepSound(Block.soundTypeMetal); - public static Block overchanter = new BlockOverchanter().setBlockName("overchanter").setHardness(5) - .setResistance(5); + public static Block spike = new BlockSpike().setBlockName("spike") + .setHardness(3) + .setResistance(3) + .setStepSound(Block.soundTypeMetal); + public static Block overchanter = new BlockOverchanter().setBlockName("overchanter") + .setHardness(5) + .setResistance(5); public static Block sapling = new BlockTBSapling(); public static Block genLeaves = new BlockTBLeaves(); public static Block cryingObsidian = new BlockCryingObelisk().setBlockName("cryingObsidian") - .setBlockTextureName("thaumicbases:cryingObelisk/").setHardness(10).setResistance(10); + .setBlockTextureName("thaumicbases:cryingObelisk/") + .setHardness(10) + .setResistance(10); public static Block oldCobble = new TBBlockDeco(Material.rock, false).setBlockName("TBoldCobblestone") - .setBlockTextureName("thaumicbases:cobblestone").setHardness(1).setResistance(1); + .setBlockTextureName("thaumicbases:cobblestone") + .setHardness(1) + .setResistance(1); public static Block oldCobbleMossy = new TBBlockDeco(Material.rock, false).setBlockName("TBoldCobblestoneMossy") - .setBlockTextureName("thaumicbases:cobblestone_mossy").setHardness(1).setResistance(1); + .setBlockTextureName("thaumicbases:cobblestone_mossy") + .setHardness(1) + .setResistance(1); public static Block oldGravel = new BlockFalling(Material.sand).setBlockName("TBoldGravel") - .setBlockTextureName("thaumicbases:gravel").setHardness(0.6F).setResistance(0) - .setStepSound(Block.soundTypeGravel); + .setBlockTextureName("thaumicbases:gravel") + .setHardness(0.6F) + .setResistance(0) + .setStepSound(Block.soundTypeGravel); public static Block advAlchFurnace = new BlockAdvAlchemicalFurnace().setBlockName("advAlchFurnace"); public static Block entityDeconstructor = new BlockEntityDeconstructor().setBlockName("entityDeconstructor") - .setBlockTextureName("thaumicbases:entityDeconstructor/block").setHardness(1); + .setBlockTextureName("thaumicbases:entityDeconstructor/block") + .setHardness(1); public static Block oldBrick = new TBBlockDeco(Material.rock, false).setBlockName("TBoldBricks") - .setBlockTextureName("thaumicbases:brick").setHardness(1).setResistance(1); + .setBlockTextureName("thaumicbases:brick") + .setHardness(1) + .setResistance(1); public static Block oldLapis = new TBBlockDeco(Material.rock, false).setBlockName("TBoldLapis") - .setBlockTextureName("thaumicbases:lapis_block").setHardness(1).setResistance(1); + .setBlockTextureName("thaumicbases:lapis_block") + .setHardness(1) + .setResistance(1); public static Block oldIron = new TBSidedBlock(Material.rock, false).setBlockName("TBoldIron") - .setBlockTextureName("thaumicbases:iron_block").setHardness(1).setResistance(1); + .setBlockTextureName("thaumicbases:iron_block") + .setHardness(1) + .setResistance(1); public static Block oldGold = new TBSidedBlock(Material.rock, false).setBlockName("TBoldGold") - .setBlockTextureName("thaumicbases:gold_block").setHardness(1).setResistance(1); + .setBlockTextureName("thaumicbases:gold_block") + .setHardness(1) + .setResistance(1); public static Block oldDiamond = new TBSidedBlock(Material.rock, false).setBlockName("TBoldDiamond") - .setBlockTextureName("thaumicbases:diamond_block").setHardness(1).setResistance(1); + .setBlockTextureName("thaumicbases:diamond_block") + .setHardness(1) + .setResistance(1); public static Block genLogs = new BlockTBLog(); - public static Block nodeManipulator = new BlockNodeManipulator().setBlockName("nodeManipulator").setHardness(1); - public static Block genericSlab = new BlockHalfSlab(false, Material.rock).setHardness(1).setResistance(10) - .setBlockName("tb.slab."); - public static Block genericSlab_full = new BlockHalfSlab(true, Material.rock).setHardness(1).setResistance(10) - .setBlockName("tb.slab."); + public static Block nodeManipulator = new BlockNodeManipulator().setBlockName("nodeManipulator") + .setHardness(1); + public static Block genericSlab = new BlockHalfSlab(false, Material.rock).setHardness(1) + .setResistance(10) + .setBlockName("tb.slab."); + public static Block genericSlab_full = new BlockHalfSlab(true, Material.rock).setHardness(1) + .setResistance(10) + .setBlockName("tb.slab."); public static Block crystalSlab = new BlockCrystalSlab(false, Material.glass).setBlockName("tb.crystalslab."); public static Block crystalSlab_full = new BlockCrystalSlab(true, Material.glass).setBlockName("tb.crystalslab."); public static Block relocator = new BlockRelocator().setBlockName("thaumicRelocator"); public static Block voidBlock = new BlockVoid().setBlockName("tb.voidblock"); public static Block thaumicAnvil = new BlockThaumicAnvil().setBlockName("thaumicAnvil") - .setBlockTextureName("thaumicbases:thaumiumAnvil/").setHardness(6).setResistance(16) - .setStepSound(Block.soundTypeAnvil); + .setBlockTextureName("thaumicbases:thaumiumAnvil/") + .setHardness(6) + .setResistance(16) + .setStepSound(Block.soundTypeAnvil); public static Block voidAnvil = new BlockVoidAnvil().setBlockName("voidAnvil") - .setBlockTextureName("thaumicbases:voidAnvil/"); + .setBlockTextureName("thaumicbases:voidAnvil/"); public static Block enderPlanks = new TBBlockDeco(Material.wood, false).setBlockName("enderPlanks") - .setBlockTextureName("thaumicbases:enderTree/planks").setHardness(2).setResistance(45) - .setStepSound(Block.soundTypeWood); - public static Block nodeLinker = new BlockNodeLinker().setBlockName("nodeLinker").setHardness(1); + .setBlockTextureName("thaumicbases:enderTree/planks") + .setHardness(2) + .setResistance(45) + .setStepSound(Block.soundTypeWood); + public static Block nodeLinker = new BlockNodeLinker().setBlockName("nodeLinker") + .setHardness(1); public static Block campfire = new BlockCampfire().setBlockName("tb.campfire") - .setBlockTextureName("thaumicbases:campfire").setLightLevel(1); - public static Block braizer = new BlockBrazier().setBlockName("tb.brazier").setBlockTextureName("cobblestone") - .setLightLevel(1); + .setBlockTextureName("thaumicbases:campfire") + .setLightLevel(1); + public static Block braizer = new BlockBrazier().setBlockName("tb.brazier") + .setBlockTextureName("cobblestone") + .setLightLevel(1); public static void setup() { // storage blocks diff --git a/src/main/java/tb/init/TBEnchant.java b/src/main/java/tb/init/TBEnchant.java index 6df2873..b0021f7 100644 --- a/src/main/java/tb/init/TBEnchant.java +++ b/src/main/java/tb/init/TBEnchant.java @@ -19,55 +19,64 @@ public class TBEnchant { public static void setup() { elderKnowledge = new EnchantmentElderKnowledge(TBConfig.elderKnowledgeID, 12, EnumEnchantmentType.weapon) - .setName("elderKnowledge"); + .setName("elderKnowledge"); eldritchBane = new EnchantmentEldritchBane(TBConfig.eldritchBaneID, 7, EnumEnchantmentType.weapon) - .setName("eldritchBane"); + .setName("eldritchBane"); magicTouch = new EnchantmentMagicTouch(TBConfig.magicTouchID, 11, EnumEnchantmentType.weapon) - .setName("magicTouch"); + .setName("magicTouch"); tainted = new EnchantmentTainted(TBConfig.taintedID, 9, EnumEnchantmentType.weapon).setName("tainted"); vaporising = new EnchantmentVaporising(TBConfig.vaporisingID, 6, EnumEnchantmentType.weapon) - .setName("vaporising"); + .setName("vaporising"); if (Loader.isModLoaded("ThaumicTinkerer") && TBConfig.enableTTCompathability) { try { Class c = Class.forName("thaumic.tinkerer.common.enchantment.core.EnchantmentManager"); Method reg = c.getMethod( - "registerExponentialCostData", - Enchantment.class, - String.class, - boolean.class, - AspectList.class); + "registerExponentialCostData", + Enchantment.class, + String.class, + boolean.class, + AspectList.class); reg.invoke( - null, - elderKnowledge, - "thaumicbases:textures/enchantments/elder_knowledge.png", - false, - new AspectList().add(Aspect.AIR, 8).add(Aspect.ORDER, 12).add(Aspect.EARTH, 16)); + null, + elderKnowledge, + "thaumicbases:textures/enchantments/elder_knowledge.png", + false, + new AspectList().add(Aspect.AIR, 8) + .add(Aspect.ORDER, 12) + .add(Aspect.EARTH, 16)); reg.invoke( - null, - eldritchBane, - "thaumicbases:textures/enchantments/eldritch_bane.png", - false, - new AspectList().add(Aspect.FIRE, 12).add(Aspect.ENTROPY, 12).add(Aspect.ORDER, 8)); + null, + eldritchBane, + "thaumicbases:textures/enchantments/eldritch_bane.png", + false, + new AspectList().add(Aspect.FIRE, 12) + .add(Aspect.ENTROPY, 12) + .add(Aspect.ORDER, 8)); reg.invoke( - null, - magicTouch, - "thaumicbases:textures/enchantments/magic_touched.png", - false, - new AspectList().add(Aspect.FIRE, 16).add(Aspect.ORDER, 16).add(Aspect.WATER, 8) - .add(Aspect.ENTROPY, 12)); + null, + magicTouch, + "thaumicbases:textures/enchantments/magic_touched.png", + false, + new AspectList().add(Aspect.FIRE, 16) + .add(Aspect.ORDER, 16) + .add(Aspect.WATER, 8) + .add(Aspect.ENTROPY, 12)); reg.invoke( - null, - tainted, - "thaumicbases:textures/enchantments/tainted.png", - false, - new AspectList().add(Aspect.FIRE, 12).add(Aspect.ENTROPY, 16)); + null, + tainted, + "thaumicbases:textures/enchantments/tainted.png", + false, + new AspectList().add(Aspect.FIRE, 12) + .add(Aspect.ENTROPY, 16)); reg.invoke( - null, - vaporising, - "thaumicbases:textures/enchantments/vaporising.png", - false, - new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.ORDER, 12).add(Aspect.FIRE, 16)); + null, + vaporising, + "thaumicbases:textures/enchantments/vaporising.png", + false, + new AspectList().add(Aspect.ENTROPY, 8) + .add(Aspect.ORDER, 12) + .add(Aspect.FIRE, 16)); } catch (Exception e) { System.out.println("[ThaumicBases]Unable to add ThaumicTinkerer integration - mod not found"); return; diff --git a/src/main/java/tb/init/TBFociUpgrades.java b/src/main/java/tb/init/TBFociUpgrades.java index 8f133f2..3918663 100644 --- a/src/main/java/tb/init/TBFociUpgrades.java +++ b/src/main/java/tb/init/TBFociUpgrades.java @@ -12,45 +12,56 @@ public class TBFociUpgrades { public static void init() {} public static FocusUpgradeType aquatic = new FocusUpgradeType( - TBConfig.aquaticFociUID, - new ResourceLocation("thaumicbases", "textures/items/foci/drain/aquatic.png"), - "tb.foci.aquatic.name", - "tb.foci.aquatic.desc", - new AspectList().add(Aspect.WATER, 16).add(Aspect.ORDER, 16)); + TBConfig.aquaticFociUID, + new ResourceLocation("thaumicbases", "textures/items/foci/drain/aquatic.png"), + "tb.foci.aquatic.name", + "tb.foci.aquatic.desc", + new AspectList().add(Aspect.WATER, 16) + .add(Aspect.ORDER, 16)); public static FocusUpgradeType netheric = new FocusUpgradeType( - TBConfig.nethericFociUID, - new ResourceLocation("thaumicbases", "textures/items/foci/drain/netheric.png"), - "tb.foci.netheric.name", - "tb.foci.netheric.desc", - new AspectList().add(Aspect.FIRE, 16).add(Aspect.ENTROPY, 16)); + TBConfig.nethericFociUID, + new ResourceLocation("thaumicbases", "textures/items/foci/drain/netheric.png"), + "tb.foci.netheric.name", + "tb.foci.netheric.desc", + new AspectList().add(Aspect.FIRE, 16) + .add(Aspect.ENTROPY, 16)); public static FocusUpgradeType decomposing = new FocusUpgradeType( - TBConfig.decomposingFociUID, - new ResourceLocation("thaumicbases", "textures/items/foci/experience/decomposing.png"), - "tb.foci.decomposing.name", - "tb.foci.decomposing.desc", - new AspectList().add(Aspect.ENTROPY, 16).add(Aspect.EARTH, 16)); + TBConfig.decomposingFociUID, + new ResourceLocation("thaumicbases", "textures/items/foci/experience/decomposing.png"), + "tb.foci.decomposing.name", + "tb.foci.decomposing.desc", + new AspectList().add(Aspect.ENTROPY, 16) + .add(Aspect.EARTH, 16)); public static FocusUpgradeType vaporizing = new FocusUpgradeType( - TBConfig.vaporisingFociUID, - new ResourceLocation("thaumicbases", "textures/items/foci/experience/vaporizing.png"), - "tb.foci.vaporizing.name", - "tb.foci.vaporizing.desc", - new AspectList().add(Aspect.ENTROPY, 16).add(Aspect.ORDER, 16).add(Aspect.AIR, 16)); + TBConfig.vaporisingFociUID, + new ResourceLocation("thaumicbases", "textures/items/foci/experience/vaporizing.png"), + "tb.foci.vaporizing.name", + "tb.foci.vaporizing.desc", + new AspectList().add(Aspect.ENTROPY, 16) + .add(Aspect.ORDER, 16) + .add(Aspect.AIR, 16)); public static FocusUpgradeType warping = new FocusUpgradeType( - TBConfig.warpingFociUID, - new ResourceLocation("thaumicbases", "textures/items/foci/flux/warping.png"), - "tb.foci.warping.name", - "tb.foci.warping.desc", - new AspectList().add(Aspect.ENTROPY, 16).add(Aspect.FIRE, 16).add(Aspect.AIR, 16)); + TBConfig.warpingFociUID, + new ResourceLocation("thaumicbases", "textures/items/foci/flux/warping.png"), + "tb.foci.warping.name", + "tb.foci.warping.desc", + new AspectList().add(Aspect.ENTROPY, 16) + .add(Aspect.FIRE, 16) + .add(Aspect.AIR, 16)); public static FocusUpgradeType crystalization = new FocusUpgradeType( - TBConfig.crystalizationFociUID, - new ResourceLocation("thaumicbases", "textures/items/foci/flux/crystalization.png"), - "tb.foci.crystalization.name", - "tb.foci.crystalization.desc", - new AspectList().add(Aspect.ORDER, 16).add(Aspect.EARTH, 16).add(Aspect.WATER, 16)); + TBConfig.crystalizationFociUID, + new ResourceLocation("thaumicbases", "textures/items/foci/flux/crystalization.png"), + "tb.foci.crystalization.name", + "tb.foci.crystalization.desc", + new AspectList().add(Aspect.ORDER, 16) + .add(Aspect.EARTH, 16) + .add(Aspect.WATER, 16)); public static FocusUpgradeType calming = new FocusUpgradeType( - TBConfig.calmingFociUID, - new ResourceLocation("thaumicbases", "textures/items/foci/flux/calming.png"), - "tb.foci.calming.name", - "tb.foci.calming.desc", - new AspectList().add(Aspect.WATER, 16).add(Aspect.ORDER, 16).add(Aspect.EARTH, 16)); + TBConfig.calmingFociUID, + new ResourceLocation("thaumicbases", "textures/items/foci/flux/calming.png"), + "tb.foci.calming.name", + "tb.foci.calming.desc", + new AspectList().add(Aspect.WATER, 16) + .add(Aspect.ORDER, 16) + .add(Aspect.EARTH, 16)); } diff --git a/src/main/java/tb/init/TBItems.java b/src/main/java/tb/init/TBItems.java index 3cf53dc..465e554 100644 --- a/src/main/java/tb/init/TBItems.java +++ b/src/main/java/tb/init/TBItems.java @@ -52,99 +52,120 @@ public class TBItems { public static ToolMaterial thauminite = EnumHelper.addToolMaterial("THAUMINITE", 3, 974, 7F, 2.8F, 15); public static ArmorMaterial thauminiteA = EnumHelper - .addArmorMaterial("ATHAUMINITE", 27, new int[] { 3, 8, 6, 3 }, 17); + .addArmorMaterial("ATHAUMINITE", 27, new int[] { 3, 8, 6, 3 }, 17); public static ArmorMaterial bloodyA = EnumHelper.addArmorMaterial("TBBLOODY", 21, new int[] { 2, 6, 5, 2 }, 21); public static Item thauminiteAxe = new ItemThauminiteAxe(thauminite).setUnlocalizedName("thauminiteAxe") - .setTextureName("thaumicbases:thauminite/thauminiteaxe"); + .setTextureName("thaumicbases:thauminite/thauminiteaxe"); public static Item thauminiteHoe = new ItemThauminiteHoe(thauminite).setUnlocalizedName("thauminiteHoe") - .setTextureName("thaumicbases:thauminite/thauminitehoe"); + .setTextureName("thaumicbases:thauminite/thauminitehoe"); public static Item thauminitePickaxe = new ItemThauminitePickaxe(thauminite).setUnlocalizedName("thauminitePickaxe") - .setTextureName("thaumicbases:thauminite/thauminitepick"); + .setTextureName("thaumicbases:thauminite/thauminitepick"); public static Item thauminiteShears = new ItemThauminiteShears().setUnlocalizedName("thauminiteShears") - .setTextureName("thaumicbases:thauminite/thauminiteshears").setFull3D().setMaxStackSize(1) - .setMaxDamage(974); + .setTextureName("thaumicbases:thauminite/thauminiteshears") + .setFull3D() + .setMaxStackSize(1) + .setMaxDamage(974); public static Item thauminiteShovel = new ItemThauminiteShovel(thauminite).setUnlocalizedName("thauminiteShovel") - .setTextureName("thaumicbases:thauminite/thauminiteshovel"); + .setTextureName("thaumicbases:thauminite/thauminiteshovel"); public static Item thauminiteSword = new ItemThauminiteSword(thauminite).setUnlocalizedName("thauminiteSword") - .setTextureName("thaumicbases:thauminite/thauminitesword"); + .setTextureName("thaumicbases:thauminite/thauminitesword"); public static Item thauminiteHelmet = new ItemThauminiteArmor(thauminiteA, 0).setUnlocalizedName("thauminiteHelmet") - .setTextureName("thaumicbases:thauminite/thauminitehelm"); + .setTextureName("thaumicbases:thauminite/thauminitehelm"); public static Item thauminiteChest = new ItemThauminiteArmor(thauminiteA, 1).setUnlocalizedName("thauminiteChest") - .setTextureName("thaumicbases:thauminite/thauminitechest"); + .setTextureName("thaumicbases:thauminite/thauminitechest"); public static Item thauminiteLeggings = new ItemThauminiteArmor(thauminiteA, 2).setUnlocalizedName("thauminiteLegs") - .setTextureName("thaumicbases:thauminite/thauminitelegs"); + .setTextureName("thaumicbases:thauminite/thauminitelegs"); public static Item thauminiteBoots = new ItemThauminiteArmor(thauminiteA, 3).setUnlocalizedName("thauminiteBoots") - .setTextureName("thaumicbases:thauminite/thauminiteboots"); + .setTextureName("thaumicbases:thauminite/thauminiteboots"); public static Item pyroBucket = new ItemPyrofluidBucket().setUnlocalizedName("pyrofluidBucket") - .setTextureName("thaumicbases:bucket_blazing_fluid"); + .setTextureName("thaumicbases:bucket_blazing_fluid"); public static Item plaxSeed = new ItemSeeds(TBBlocks.plax, Blocks.farmland).setUnlocalizedName("plaxSeeds") - .setTextureName("thaumicbases:plax_seeds"); + .setTextureName("thaumicbases:plax_seeds"); public static Item metalleatSeeds = new ItemSeeds(TBBlocks.metalleat, Blocks.farmland) - .setUnlocalizedName("metalleatSeeds").setTextureName("thaumicbases:metalleat_seeds"); + .setUnlocalizedName("metalleatSeeds") + .setTextureName("thaumicbases:metalleat_seeds"); public static Item lucriteSeeds = new ItemSeeds(TBBlocks.lucrite, Blocks.farmland) - .setUnlocalizedName("lucriteSeeds").setTextureName("thaumicbases:lucrite_seeds"); + .setUnlocalizedName("lucriteSeeds") + .setTextureName("thaumicbases:lucrite_seeds"); // TODO ROSA public static Item knoseFragment = new ItemKnoseFragment().setUnlocalizedName("knoseFragment.") - .setTextureName("thaumicbases:knose/"); + .setTextureName("thaumicbases:knose/"); public static Item knoseSeed = new ItemKnoseSeeds(TBBlocks.knose, TBBlocks.crystalBlock) - .setUnlocalizedName("knoseSeed").setTextureName("thaumicbases:knose_seed"); + .setUnlocalizedName("knoseSeed") + .setTextureName("thaumicbases:knose_seed"); public static Item sweedSeeds = new ItemKnoseSeeds(TBBlocks.sweed, Blocks.grass).setUnlocalizedName("sweedSeeds") - .setTextureName("thaumicbases:seeds_sweed"); + .setTextureName("thaumicbases:seeds_sweed"); public static Item lazulliaSeeds = new ItemSeeds(TBBlocks.lazullia, Blocks.farmland) - .setUnlocalizedName("lazulliaSeeds").setTextureName("thaumicbases:lazullia_seeds"); + .setUnlocalizedName("lazulliaSeeds") + .setTextureName("thaumicbases:lazullia_seeds"); public static Item redlonSeeds = new ItemSeeds(TBBlocks.redlonStem, Blocks.farmland) - .setUnlocalizedName("redlonSeeds").setTextureName("thaumicbases:redlon_seed"); + .setUnlocalizedName("redlonSeeds") + .setTextureName("thaumicbases:redlon_seed"); public static Item glieoniaSeed = new ItemKnoseSeeds(TBBlocks.glieonia, Blocks.grass) - .setUnlocalizedName("glieoniaSeed").setTextureName("thaumicbases:glieonia_seed"); + .setUnlocalizedName("glieoniaSeed") + .setTextureName("thaumicbases:glieonia_seed"); public static Item rosehipSyrup = new ItemRosehipSyrup().setUnlocalizedName("rosehipSyrup") - .setTextureName("thaumicbases:rosehip_syrup").setMaxStackSize(16); + .setTextureName("thaumicbases:rosehip_syrup") + .setMaxStackSize(16); public static Item voidSeed = new ItemSeeds(TBBlocks.voidPlant, Blocks.farmland).setUnlocalizedName("voidSeed") - .setTextureName("thaumicbases:void_seed"); + .setTextureName("thaumicbases:void_seed"); public static Item tobaccoSeeds = new ItemSeeds(TBBlocks.tobacco, Blocks.farmland) - .setUnlocalizedName("tobaccoSeeds").setTextureName("thaumicbases:tobacco_seeds"); + .setUnlocalizedName("tobaccoSeeds") + .setTextureName("thaumicbases:tobacco_seeds"); public static Item mortar = new ItemMortarAndPestle().setUnlocalizedName("mortar") - .setTextureName("thaumicbases:mortar"); + .setTextureName("thaumicbases:mortar"); public static Item tobacco = new TBTobacco().setUnlocalizedName("tobacco"); public static Item greatwoodPipe = new ItemSmokingPipe(false).setUnlocalizedName("greatwoodPipe") - .setTextureName("thaumicbases:smokingPipe"); + .setTextureName("thaumicbases:smokingPipe"); public static Item silverwoodPipe = new ItemSmokingPipe(true).setUnlocalizedName("silverwoodPipe") - .setTextureName("thaumicbases:smokingPipe_silverwood"); + .setTextureName("thaumicbases:smokingPipe_silverwood"); public static Item bloodyChest = new ItemBloodyArmor(bloodyA, 1).setUnlocalizedName("bloodyChest") - .setTextureName("thaumicbases:bloodyRobes/bloodychest"); + .setTextureName("thaumicbases:bloodyRobes/bloodychest"); public static Item bloodyLeggings = new ItemBloodyArmor(bloodyA, 2).setUnlocalizedName("bloodyLegs") - .setTextureName("thaumicbases:bloodyRobes/bloodylegs"); + .setTextureName("thaumicbases:bloodyRobes/bloodylegs"); public static Item bloodyBoots = new ItemBloodyArmor(bloodyA, 3).setUnlocalizedName("bloodyBoots") - .setTextureName("thaumicbases:bloodyRobes/bloodyboots"); + .setTextureName("thaumicbases:bloodyRobes/bloodyboots"); public static Item concentratedTaint = new ItemConcentratedTaint().setUnlocalizedName("concentratedTaint") - .setTextureName("thaumicbases:concentratedTaint").setMaxStackSize(1); + .setTextureName("thaumicbases:concentratedTaint") + .setMaxStackSize(1); public static Item fociActivation = new FociActivation().setUnlocalizedName("activationFoci") - .setTextureName("thaumicbases:foci/activation/foci"); + .setTextureName("thaumicbases:foci/activation/foci"); public static Item fociDrain = new FociDrain().setUnlocalizedName("drainFoci") - .setTextureName("thaumicbases:foci/drain/foci"); + .setTextureName("thaumicbases:foci/drain/foci"); public static Item fociExperience = new FociExperience().setUnlocalizedName("experienceFoci") - .setTextureName("thaumicbases:foci/experience/foci"); + .setTextureName("thaumicbases:foci/experience/foci"); public static Item fociFlux = new FociFlux().setUnlocalizedName("fluxFoci") - .setTextureName("thaumicbases:foci/flux/foci"); + .setTextureName("thaumicbases:foci/flux/foci"); public static Item nodeFoci = new ItemNodeFoci().setUnlocalizedName("nodeFoci."); public static Item voidShears = new ItemVoidShears().setTextureName("thaumicbases:shears") - .setUnlocalizedName("tb.voidShears").setFull3D().setMaxDamage(184).setFull3D().setMaxStackSize(1); + .setUnlocalizedName("tb.voidShears") + .setFull3D() + .setMaxDamage(184) + .setFull3D() + .setMaxStackSize(1); public static Item voidFAS = new ItemVoidFlintAndSteel().setTextureName("thaumicbases:flint_and_steel") - .setUnlocalizedName("tb.voidFAS").setFull3D().setMaxDamage(184).setFull3D().setMaxStackSize(1); - - public static Item revolver = new ItemRevolver().setMaxDamage(1561).setMaxStackSize(1).setFull3D() - .setUnlocalizedName("tb.revolver"); + .setUnlocalizedName("tb.voidFAS") + .setFull3D() + .setMaxDamage(184) + .setFull3D() + .setMaxStackSize(1); + + public static Item revolver = new ItemRevolver().setMaxDamage(1561) + .setMaxStackSize(1) + .setFull3D() + .setUnlocalizedName("tb.revolver"); public static Item castingBracelet = new ItemCastingBracelet().setUnlocalizedName("tb.bracelet"); public static WandCap WAND_CAP_THAUMINITE; @@ -231,22 +252,22 @@ public static void setup() { OreDictionary.registerOre("ingotThauminite", new ItemStack(resource, 1, 1)); WAND_CAP_THAUMINITE = new WandCap("thauminite", 0.85F, new ItemStack(resource, 1, 2), 6); - WAND_CAP_THAUMINITE.setTexture( - new ResourceLocation("thaumicbases", "textures/items/thauminite/wand_cap_thauminite_uv.png")); + WAND_CAP_THAUMINITE + .setTexture(new ResourceLocation("thaumicbases", "textures/items/thauminite/wand_cap_thauminite_uv.png")); WAND_ROD_THAUMIUM = new WandRod( - "tbthaumium", - 80, - new ItemStack(resource, 1, 3), - 6, - new WandRodPrimalOnUpdate(), - new ResourceLocation("thaumicbases", "textures/items/wand_rod_thaumium_uv.png")); + "tbthaumium", + 80, + new ItemStack(resource, 1, 3), + 6, + new WandRodPrimalOnUpdate(), + new ResourceLocation("thaumicbases", "textures/items/wand_rod_thaumium_uv.png")); WAND_ROD_VOID = new WandRod( - "tbvoid", - 160, - new ItemStack(resource, 1, 4), - 16, - new WandRodPrimalOnUpdate(), - new ResourceLocation("thaumicbases", "textures/items/wand_rod_void_uv.png")); + "tbvoid", + 160, + new ItemStack(resource, 1, 4), + 16, + new WandRodPrimalOnUpdate(), + new ResourceLocation("thaumicbases", "textures/items/wand_rod_void_uv.png")); } } diff --git a/src/main/java/tb/init/TBRecipes.java b/src/main/java/tb/init/TBRecipes.java index 0211385..f7d0e54 100644 --- a/src/main/java/tb/init/TBRecipes.java +++ b/src/main/java/tb/init/TBRecipes.java @@ -26,56 +26,55 @@ public static void setup() { OreDictionary.registerOre("obsidian", Blocks.obsidian); ShapelessOreRecipe qBl = new ShapelessOreRecipe( - new ItemStack(TBBlocks.quicksilverBlock), - new Object[] { "quicksilver", "quicksilver", "quicksilver", "quicksilver", "quicksilver", "quicksilver", - "quicksilver", "quicksilver", "quicksilver" }); + new ItemStack(TBBlocks.quicksilverBlock), + new Object[] { "quicksilver", "quicksilver", "quicksilver", "quicksilver", "quicksilver", "quicksilver", + "quicksilver", "quicksilver", "quicksilver" }); ShapelessOreRecipe qSi = new ShapelessOreRecipe( - new ItemStack(ConfigItems.itemResource, 9, 3), - new Object[] { "blockQuicksilver" }); + new ItemStack(ConfigItems.itemResource, 9, 3), + new Object[] { "blockQuicksilver" }); ShapelessOreRecipe qBr = new ShapelessOreRecipe( - new ItemStack(TBBlocks.quicksilverBrick, 4, 0), - new Object[] { "blockQuicksilver", "blockQuicksilver", "blockQuicksilver", "blockQuicksilver" }); + new ItemStack(TBBlocks.quicksilverBrick, 4, 0), + new Object[] { "blockQuicksilver", "blockQuicksilver", "blockQuicksilver", "blockQuicksilver" }); ShapelessOreRecipe smB = new ShapelessOreRecipe( - new ItemStack(ConfigItems.itemResource, 9, 14), - new Object[] { "blockSalisMundus" }); + new ItemStack(ConfigItems.itemResource, 9, 14), + new Object[] { "blockSalisMundus" }); ShapelessOreRecipe tnU = new ShapelessOreRecipe( - new ItemStack(TBItems.resource, 9, 0), - new Object[] { new ItemStack(TBItems.resource, 1, 1) }); + new ItemStack(TBItems.resource, 9, 0), + new Object[] { new ItemStack(TBItems.resource, 1, 1) }); ShapelessOreRecipe tnI = new ShapelessOreRecipe( - new ItemStack(TBItems.resource, 1, 1), - new Object[] { new ItemStack(TBItems.resource, 1, 0), new ItemStack(TBItems.resource, 1, 0), - new ItemStack(TBItems.resource, 1, 0), new ItemStack(TBItems.resource, 1, 0), - new ItemStack(TBItems.resource, 1, 0), new ItemStack(TBItems.resource, 1, 0), - new ItemStack(TBItems.resource, 1, 0), new ItemStack(TBItems.resource, 1, 0), - new ItemStack(TBItems.resource, 1, 0) }); + new ItemStack(TBItems.resource, 1, 1), + new Object[] { new ItemStack(TBItems.resource, 1, 0), new ItemStack(TBItems.resource, 1, 0), + new ItemStack(TBItems.resource, 1, 0), new ItemStack(TBItems.resource, 1, 0), + new ItemStack(TBItems.resource, 1, 0), new ItemStack(TBItems.resource, 1, 0), + new ItemStack(TBItems.resource, 1, 0), new ItemStack(TBItems.resource, 1, 0), + new ItemStack(TBItems.resource, 1, 0) }); ShapelessOreRecipe tnB = new ShapelessOreRecipe( - new ItemStack(TBBlocks.thauminiteBlock, 1, 0), - new Object[] { "ingotThauminite", "ingotThauminite", "ingotThauminite", "ingotThauminite", - "ingotThauminite", "ingotThauminite", "ingotThauminite", "ingotThauminite", - "ingotThauminite" }); + new ItemStack(TBBlocks.thauminiteBlock, 1, 0), + new Object[] { "ingotThauminite", "ingotThauminite", "ingotThauminite", "ingotThauminite", + "ingotThauminite", "ingotThauminite", "ingotThauminite", "ingotThauminite", "ingotThauminite" }); ShapelessOreRecipe tiB = new ShapelessOreRecipe( - new ItemStack(TBItems.resource, 9, 1), - new Object[] { TBBlocks.thauminiteBlock }); + new ItemStack(TBItems.resource, 9, 1), + new Object[] { TBBlocks.thauminiteBlock }); ShapelessOreRecipe biP = new ShapelessOreRecipe( - new ItemStack(Blocks.planks, 4, 2), - new Object[] { new ItemStack(TBBlocks.genLogs, 1, 0) }); + new ItemStack(Blocks.planks, 4, 2), + new Object[] { new ItemStack(TBBlocks.genLogs, 1, 0) }); ShapelessOreRecipe spP = new ShapelessOreRecipe( - new ItemStack(Blocks.planks, 4, 1), - new Object[] { new ItemStack(TBBlocks.genLogs, 1, 1) }); + new ItemStack(Blocks.planks, 4, 1), + new Object[] { new ItemStack(TBBlocks.genLogs, 1, 1) }); ShapelessOreRecipe enP = new ShapelessOreRecipe( - new ItemStack(TBBlocks.enderPlanks, 4, 0), - new Object[] { new ItemStack(TBBlocks.genLogs, 1, 2) }); + new ItemStack(TBBlocks.enderPlanks, 4, 0), + new Object[] { new ItemStack(TBBlocks.genLogs, 1, 2) }); ShapedOreRecipe eAr = new ShapedOreRecipe( - new ItemStack(TBBlocks.eldritchArk, 4, 0), - new Object[] { "@#@", "#$#", "@#@", '@', "nuggetGold", '#', "obsidian", '$', - new ItemStack(ConfigBlocks.blockCrystal, 1, 4) }); + new ItemStack(TBBlocks.eldritchArk, 4, 0), + new Object[] { "@#@", "#$#", "@#@", '@', "nuggetGold", '#', "obsidian", '$', + new ItemStack(ConfigBlocks.blockCrystal, 1, 4) }); ShapedOreRecipe iGw = new ShapedOreRecipe( - new ItemStack(TBBlocks.ironGreatwood, 4, 0), - new Object[] { "@#@", "#$#", "@#@", '@', "nuggetIron", '#', - new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), '$', - new ItemStack(ConfigBlocks.blockCrystal, 1, 4) }); + new ItemStack(TBBlocks.ironGreatwood, 4, 0), + new Object[] { "@#@", "#$#", "@#@", '@', "nuggetIron", '#', + new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), '$', + new ItemStack(ConfigBlocks.blockCrystal, 1, 4) }); GameRegistry.addSmelting(new ItemStack(TBBlocks.genLogs, 1, 0), new ItemStack(Items.coal, 1, 1), 0.15F); GameRegistry.addSmelting(new ItemStack(TBBlocks.genLogs, 1, 1), new ItemStack(Items.coal, 1, 1), 0.15F); @@ -110,16 +109,16 @@ public static void setup() { for (int i = 0; i < BlockHalfSlab.parents.length; ++i) { ShapedOreRecipe slabRec = new ShapedOreRecipe( - new ItemStack(TBBlocks.genericSlab, 6, i), - new Object[] { "###", '#', BlockHalfSlab.parents[i] }); + new ItemStack(TBBlocks.genericSlab, 6, i), + new Object[] { "###", '#', BlockHalfSlab.parents[i] }); slabs.add(slabRec); GameRegistry.addRecipe(slabRec); } for (int i = 0; i < 8; ++i) { ShapedOreRecipe slabRec = new ShapedOreRecipe( - new ItemStack(TBBlocks.crystalSlab, 6, i), - new Object[] { "###", '#', new ItemStack(TBBlocks.crystalBlock, 1, i) }); + new ItemStack(TBBlocks.crystalSlab, 6, i), + new Object[] { "###", '#', new ItemStack(TBBlocks.crystalBlock, 1, i) }); slabs.add(slabRec); GameRegistry.addRecipe(slabRec); } diff --git a/src/main/java/tb/init/TBThaumonomicon.java b/src/main/java/tb/init/TBThaumonomicon.java index 87d7996..d44ebb4 100644 --- a/src/main/java/tb/init/TBThaumonomicon.java +++ b/src/main/java/tb/init/TBThaumonomicon.java @@ -34,621 +34,732 @@ public class TBThaumonomicon { public static final String catName = "THAUMICBASES"; public static final ResourceLocation icon = new ResourceLocation( - "thaumicbases", - "textures/thaumonomicon/bases1.png"); + "thaumicbases", + "textures/thaumonomicon/bases1.png"); public static final ResourceLocation back = new ResourceLocation( - "thaumicbases", - "textures/thaumonomicon/background.png"); + "thaumicbases", + "textures/thaumonomicon/background.png"); @SuppressWarnings({ "unchecked" }) public static void setup() { OreDictionary.registerOre("pestleAndMortar", new ItemStack(TBItems.mortar, 1, OreDictionary.WILDCARD_VALUE)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.pyrofluid, 1, OreDictionary.WILDCARD_VALUE), - new AspectList().add(Aspect.FIRE, 16).add(Aspect.MAGIC, 8).add(Aspect.LIGHT, 6)); + new ItemStack(TBBlocks.pyrofluid, 1, OreDictionary.WILDCARD_VALUE), + new AspectList().add(Aspect.FIRE, 16) + .add(Aspect.MAGIC, 8) + .add(Aspect.LIGHT, 6)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.ironGreatwood, 1, OreDictionary.WILDCARD_VALUE), - new AspectList().add(Aspect.TREE, 1).add(Aspect.METAL, 1)); + new ItemStack(TBBlocks.ironGreatwood, 1, OreDictionary.WILDCARD_VALUE), + new AspectList().add(Aspect.TREE, 1) + .add(Aspect.METAL, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.plaxSeed), - new AspectList().add(Aspect.CROP, 1).add(Aspect.CLOTH, 1)); + new ItemStack(TBItems.plaxSeed), + new AspectList().add(Aspect.CROP, 1) + .add(Aspect.CLOTH, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.aurelia, 1, OreDictionary.WILDCARD_VALUE), - new AspectList().add(Aspect.PLANT, 1).add(Aspect.AURA, 3).add(Aspect.LIGHT, 1).add(Aspect.SENSES, 1) - .add(Aspect.LIFE, 1)); + new ItemStack(TBBlocks.aurelia, 1, OreDictionary.WILDCARD_VALUE), + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.AURA, 3) + .add(Aspect.LIGHT, 1) + .add(Aspect.SENSES, 1) + .add(Aspect.LIFE, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.aureliaPetal, 1, OreDictionary.WILDCARD_VALUE), - new AspectList().add(Aspect.PLANT, 1).add(Aspect.AURA, 6).add(Aspect.SENSES, 1)); + new ItemStack(TBBlocks.aureliaPetal, 1, OreDictionary.WILDCARD_VALUE), + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.AURA, 6) + .add(Aspect.SENSES, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.resource, 1, 5), - new AspectList().add(Aspect.PLANT, 1).add(Aspect.AURA, 6)); + new ItemStack(TBItems.resource, 1, 5), + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.AURA, 6)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.resource, 1, 6), - new AspectList().add(Aspect.PLANT, 1).add(Aspect.HEAL, 1)); + new ItemStack(TBItems.resource, 1, 6), + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.HEAL, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.resource, 1, 7), - new AspectList().add(Aspect.PLANT, 1).add(Aspect.MAN, 1)); + new ItemStack(TBItems.resource, 1, 7), + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.MAN, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.tobacco, 1, 0), - new AspectList().add(Aspect.PLANT, 1).add(Aspect.MAN, 1).add(Aspect.ENTROPY, 0)); + new ItemStack(TBItems.tobacco, 1, 0), + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.MAN, 1) + .add(Aspect.ENTROPY, 0)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.mortar, 1, OreDictionary.WILDCARD_VALUE), - new AspectList().add(Aspect.TREE, 6).add(Aspect.TOOL, 1)); + new ItemStack(TBItems.mortar, 1, OreDictionary.WILDCARD_VALUE), + new AspectList().add(Aspect.TREE, 6) + .add(Aspect.TOOL, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.knoseFragment, 1, 0), - new AspectList().add(Aspect.PLANT, 1).add(Aspect.AIR, 6)); + new ItemStack(TBItems.knoseFragment, 1, 0), + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.AIR, 6)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.knoseFragment, 1, 1), - new AspectList().add(Aspect.PLANT, 1).add(Aspect.FIRE, 6)); + new ItemStack(TBItems.knoseFragment, 1, 1), + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.FIRE, 6)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.knoseFragment, 1, 2), - new AspectList().add(Aspect.PLANT, 1).add(Aspect.WATER, 6)); + new ItemStack(TBItems.knoseFragment, 1, 2), + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.WATER, 6)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.knoseFragment, 1, 3), - new AspectList().add(Aspect.PLANT, 1).add(Aspect.EARTH, 6)); + new ItemStack(TBItems.knoseFragment, 1, 3), + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.EARTH, 6)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.knoseFragment, 1, 4), - new AspectList().add(Aspect.PLANT, 1).add(Aspect.ORDER, 6)); + new ItemStack(TBItems.knoseFragment, 1, 4), + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.ORDER, 6)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.knoseFragment, 1, 5), - new AspectList().add(Aspect.PLANT, 1).add(Aspect.ENTROPY, 6)); + new ItemStack(TBItems.knoseFragment, 1, 5), + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.ENTROPY, 6)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.knoseFragment, 1, 6), - new AspectList().add(Aspect.PLANT, 1).add(primals(2))); + new ItemStack(TBItems.knoseFragment, 1, 6), + new AspectList().add(Aspect.PLANT, 1) + .add(primals(2))); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.knoseFragment, 1, 7), - new AspectList().add(Aspect.PLANT, 1).add(Aspect.TAINT, 6)); + new ItemStack(TBItems.knoseFragment, 1, 7), + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.TAINT, 6)); boolean isFMLoaded = Loader.isModLoaded("ForbiddenMagic"); Aspect nether = Aspect.FIRE; if (isFMLoaded) nether = Aspect.getAspect("infernus"); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.genLeaves, 1, 0), - new int[] { 0, 8 }, - new AspectList().add(Aspect.PLANT, 1)); + new ItemStack(TBBlocks.genLeaves, 1, 0), + new int[] { 0, 8 }, + new AspectList().add(Aspect.PLANT, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.genLeaves, 1, 1), - new int[] { 1, 9 }, - new AspectList().add(Aspect.PLANT, 1).add(Aspect.LIFE, 1)); + new ItemStack(TBBlocks.genLeaves, 1, 1), + new int[] { 1, 9 }, + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.LIFE, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.genLeaves, 1, 2), - new int[] { 2, 10 }, - new AspectList().add(Aspect.PLANT, 1).add(nether, 1)); + new ItemStack(TBBlocks.genLeaves, 1, 2), + new int[] { 2, 10 }, + new AspectList().add(Aspect.PLANT, 1) + .add(nether, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.genLeaves, 1, 3), - new int[] { 3, 11 }, - new AspectList().add(Aspect.PLANT, 1).add(Aspect.ELDRITCH, 1)); + new ItemStack(TBBlocks.genLeaves, 1, 3), + new int[] { 3, 11 }, + new AspectList().add(Aspect.PLANT, 1) + .add(Aspect.ELDRITCH, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.genLogs, 1, 0), - new int[] { 0, 4, 8 }, - new AspectList().add(Aspect.TREE, 3).add(Aspect.HEAL, 1).add(Aspect.LIFE, 1)); + new ItemStack(TBBlocks.genLogs, 1, 0), + new int[] { 0, 4, 8 }, + new AspectList().add(Aspect.TREE, 3) + .add(Aspect.HEAL, 1) + .add(Aspect.LIFE, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.genLogs, 1, 1), - new int[] { 1, 5, 9 }, - new AspectList().add(Aspect.TREE, 3).add(Aspect.FIRE, 1).add(nether, 1)); + new ItemStack(TBBlocks.genLogs, 1, 1), + new int[] { 1, 5, 9 }, + new AspectList().add(Aspect.TREE, 3) + .add(Aspect.FIRE, 1) + .add(nether, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.genLogs, 1, 2), - new int[] { 2, 6, 10 }, - new AspectList().add(Aspect.TREE, 3).add(Aspect.ELDRITCH, 1).add(Aspect.VOID, 1)); + new ItemStack(TBBlocks.genLogs, 1, 2), + new int[] { 2, 6, 10 }, + new AspectList().add(Aspect.TREE, 3) + .add(Aspect.ELDRITCH, 1) + .add(Aspect.VOID, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.sapling, 1, 0), - new int[] { 0, 8 }, - new AspectList().add(Aspect.PLANT, 3).add(Aspect.GREED, 1)); + new ItemStack(TBBlocks.sapling, 1, 0), + new int[] { 0, 8 }, + new AspectList().add(Aspect.PLANT, 3) + .add(Aspect.GREED, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.sapling, 1, 1), - new int[] { 1, 9 }, - new AspectList().add(Aspect.PLANT, 3).add(Aspect.LIFE, 1)); + new ItemStack(TBBlocks.sapling, 1, 1), + new int[] { 1, 9 }, + new AspectList().add(Aspect.PLANT, 3) + .add(Aspect.LIFE, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.sapling, 1, 2), - new int[] { 2, 10 }, - new AspectList().add(Aspect.PLANT, 3).add(nether, 1)); + new ItemStack(TBBlocks.sapling, 1, 2), + new int[] { 2, 10 }, + new AspectList().add(Aspect.PLANT, 3) + .add(nether, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBBlocks.sapling, 1, 3), - new int[] { 3, 11 }, - new AspectList().add(Aspect.PLANT, 3).add(Aspect.ELDRITCH, 1)); + new ItemStack(TBBlocks.sapling, 1, 3), + new int[] { 3, 11 }, + new AspectList().add(Aspect.PLANT, 3) + .add(Aspect.ELDRITCH, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(TBItems.fociExperience, 1, 0), - new AspectList().add(Aspect.METAL, 24).add(Aspect.GREED, 17).add(Aspect.CRYSTAL, 12) - .add(Aspect.EARTH, 7).add(Aspect.VOID, 5).add(Aspect.HUNGER, 5)); + new ItemStack(TBItems.fociExperience, 1, 0), + new AspectList().add(Aspect.METAL, 24) + .add(Aspect.GREED, 17) + .add(Aspect.CRYSTAL, 12) + .add(Aspect.EARTH, 7) + .add(Aspect.VOID, 5) + .add(Aspect.HUNGER, 5)); ResearchCategories.registerCategory(catName, icon, back); CrucibleRecipe wool3Rec = new CrucibleRecipe( - "TB.AdvancedEntropy", - new ItemStack(Items.string, 3, 0), - new ItemStack(Blocks.wool, 1, OreDictionary.WILDCARD_VALUE), - new AspectList().add(Aspect.ENTROPY, 1)); + "TB.AdvancedEntropy", + new ItemStack(Items.string, 3, 0), + new ItemStack(Blocks.wool, 1, OreDictionary.WILDCARD_VALUE), + new AspectList().add(Aspect.ENTROPY, 1)); CrucibleRecipe sandstone3Rec = new CrucibleRecipe( - "TB.AdvancedEntropy", - new ItemStack(Blocks.sand, 3, 0), - new ItemStack(Blocks.sandstone, 1, OreDictionary.WILDCARD_VALUE), - new AspectList().add(Aspect.ENTROPY, 1)); + "TB.AdvancedEntropy", + new ItemStack(Blocks.sand, 3, 0), + new ItemStack(Blocks.sandstone, 1, OreDictionary.WILDCARD_VALUE), + new AspectList().add(Aspect.ENTROPY, 1)); CrucibleRecipe blaze3Rec = new CrucibleRecipe( - "TB.AdvancedEntropy", - new ItemStack(Items.blaze_powder, 3, 0), - new ItemStack(Items.blaze_rod, 1, 0), - new AspectList().add(Aspect.ENTROPY, 1)); + "TB.AdvancedEntropy", + new ItemStack(Items.blaze_powder, 3, 0), + new ItemStack(Items.blaze_rod, 1, 0), + new AspectList().add(Aspect.ENTROPY, 1)); CrucibleRecipe wool4Rec = new CrucibleRecipe( - "TB.MasterEntropy", - new ItemStack(Items.string, 4, 0), - new ItemStack(Blocks.wool, 1, OreDictionary.WILDCARD_VALUE), - new AspectList().add(Aspect.ENTROPY, 1).add(Aspect.CRAFT, 1)); + "TB.MasterEntropy", + new ItemStack(Items.string, 4, 0), + new ItemStack(Blocks.wool, 1, OreDictionary.WILDCARD_VALUE), + new AspectList().add(Aspect.ENTROPY, 1) + .add(Aspect.CRAFT, 1)); CrucibleRecipe sandstone4Rec = new CrucibleRecipe( - "TB.MasterEntropy", - new ItemStack(Blocks.sand, 4, 0), - new ItemStack(Blocks.sandstone, 1, OreDictionary.WILDCARD_VALUE), - new AspectList().add(Aspect.ENTROPY, 1).add(Aspect.CRAFT, 1)); + "TB.MasterEntropy", + new ItemStack(Blocks.sand, 4, 0), + new ItemStack(Blocks.sandstone, 1, OreDictionary.WILDCARD_VALUE), + new AspectList().add(Aspect.ENTROPY, 1) + .add(Aspect.CRAFT, 1)); CrucibleRecipe blaze4Rec = new CrucibleRecipe( - "TB.MasterEntropy", - new ItemStack(Items.blaze_powder, 4, 0), - new ItemStack(Items.blaze_rod, 1, 0), - new AspectList().add(Aspect.ENTROPY, 1).add(Aspect.CRAFT, 1)); + "TB.MasterEntropy", + new ItemStack(Items.blaze_powder, 4, 0), + new ItemStack(Items.blaze_rod, 1, 0), + new AspectList().add(Aspect.ENTROPY, 1) + .add(Aspect.CRAFT, 1)); CrucibleRecipe glassSand = new CrucibleRecipe( - "TB.StrongEntropy", - new ItemStack(Blocks.sand, 1, 0), - "blockGlass", - new AspectList().add(Aspect.ENTROPY, 1)); + "TB.StrongEntropy", + new ItemStack(Blocks.sand, 1, 0), + "blockGlass", + new AspectList().add(Aspect.ENTROPY, 1)); CrucibleRecipe gravelSand = new CrucibleRecipe( - "TB.StrongEntropy", - new ItemStack(Blocks.sand, 1, 0), - new ItemStack(Blocks.gravel), - new AspectList().add(Aspect.ENTROPY, 1)); + "TB.StrongEntropy", + new ItemStack(Blocks.sand, 1, 0), + new ItemStack(Blocks.gravel), + new AspectList().add(Aspect.ENTROPY, 1)); CrucibleRecipe barsIron = new CrucibleRecipe( - "TB.StrongEntropy", - new ItemStack(ConfigItems.itemNugget, 3, 0), - new ItemStack(Blocks.iron_bars), - new AspectList().add(Aspect.ENTROPY, 1)); + "TB.StrongEntropy", + new ItemStack(ConfigItems.itemNugget, 3, 0), + new ItemStack(Blocks.iron_bars), + new AspectList().add(Aspect.ENTROPY, 1)); CrucibleRecipe arrows = new CrucibleRecipe( - "TB.SimpleDublication", - new ItemStack(Items.arrow, 2, 0), - new ItemStack(Items.arrow, 1, 0), - new AspectList().add(Aspect.WEAPON, 1)); + "TB.SimpleDublication", + new ItemStack(Items.arrow, 2, 0), + new ItemStack(Items.arrow, 1, 0), + new AspectList().add(Aspect.WEAPON, 1)); CrucibleRecipe snowball = new CrucibleRecipe( - "TB.SimpleDublication", - new ItemStack(Items.snowball, 2, 0), - new ItemStack(Items.snowball, 1, 0), - new AspectList().add(Aspect.COLD, 1)); + "TB.SimpleDublication", + new ItemStack(Items.snowball, 2, 0), + new ItemStack(Items.snowball, 1, 0), + new AspectList().add(Aspect.COLD, 1)); CrucibleRecipe redstone = new CrucibleRecipe( - "TB.SimpleDublication", - new ItemStack(Items.redstone, 2, 0), - new ItemStack(Items.redstone, 1, 0), - new AspectList().add(Aspect.MECHANISM, 1).add(Aspect.ENERGY, 1)); + "TB.SimpleDublication", + new ItemStack(Items.redstone, 2, 0), + new ItemStack(Items.redstone, 1, 0), + new AspectList().add(Aspect.MECHANISM, 1) + .add(Aspect.ENERGY, 1)); CrucibleRecipe amber = new CrucibleRecipe( - "TB.Amber", - new ItemStack(ConfigItems.itemResource, 1, 6), - new ItemStack(Blocks.sapling, 1, 1), - new AspectList().add(Aspect.TRAP, 2)); + "TB.Amber", + new ItemStack(ConfigItems.itemResource, 1, 6), + new ItemStack(Blocks.sapling, 1, 1), + new AspectList().add(Aspect.TRAP, 2)); CrucibleRecipe cinnabar = new CrucibleRecipe( - "TB.Quicksilver", - new ItemStack(ConfigItems.itemResource, 3, 3), - new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), - new AspectList().add(Aspect.ORDER, 1).add(Aspect.POISON, 1)); + "TB.Quicksilver", + new ItemStack(ConfigItems.itemResource, 3, 3), + new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), + new AspectList().add(Aspect.ORDER, 1) + .add(Aspect.POISON, 1)); CrucibleRecipe salisMundis = new CrucibleRecipe( - "TB.SM", - new ItemStack(ConfigItems.itemResource, 2, 14), - new ItemStack(ConfigItems.itemResource, 1, 14), - new AspectList().add(primals(2)).add(Aspect.MAGIC, 3)); + "TB.SM", + new ItemStack(ConfigItems.itemResource, 2, 14), + new ItemStack(ConfigItems.itemResource, 1, 14), + new AspectList().add(primals(2)) + .add(Aspect.MAGIC, 3)); CrucibleRecipe chiseledBricks = new CrucibleRecipe( - "TB.AlchemyRestoration", - new ItemStack(Blocks.stonebrick, 1, 3), - new ItemStack(Blocks.stonebrick, 1, 0), - new AspectList().add(Aspect.ORDER, 1)); + "TB.AlchemyRestoration", + new ItemStack(Blocks.stonebrick, 1, 3), + new ItemStack(Blocks.stonebrick, 1, 0), + new AspectList().add(Aspect.ORDER, 1)); CrucibleRecipe gravel2Cobble = new CrucibleRecipe( - "TB.AlchemyRestoration", - new ItemStack(Blocks.cobblestone, 1, 0), - new ItemStack(Blocks.gravel, 1, 0), - new AspectList().add(Aspect.ORDER, 1)); + "TB.AlchemyRestoration", + new ItemStack(Blocks.cobblestone, 1, 0), + new ItemStack(Blocks.gravel, 1, 0), + new AspectList().add(Aspect.ORDER, 1)); CrucibleRecipe icePacking = new CrucibleRecipe( - "TB.AlchemyRestoration", - new ItemStack(Blocks.packed_ice, 1, 0), - new ItemStack(Blocks.ice, 1, 0), - new AspectList().add(Aspect.EARTH, 1).add(Aspect.COLD, 3)); + "TB.AlchemyRestoration", + new ItemStack(Blocks.packed_ice, 1, 0), + new ItemStack(Blocks.ice, 1, 0), + new AspectList().add(Aspect.EARTH, 1) + .add(Aspect.COLD, 3)); CrucibleRecipe blazepowderRest = new CrucibleRecipe( - "TB.Backprocessing", - new ItemStack(Items.blaze_rod, 1, 0), - new ItemStack(Items.blaze_powder, 1, 0), - new AspectList().add(Aspect.ORDER, 6).add(Aspect.FIRE, 3).add(Aspect.MAGIC, 2).add(Aspect.CRAFT, 8) - .add(Aspect.EXCHANGE, 6).add(Aspect.ENERGY, 3)); + "TB.Backprocessing", + new ItemStack(Items.blaze_rod, 1, 0), + new ItemStack(Items.blaze_powder, 1, 0), + new AspectList().add(Aspect.ORDER, 6) + .add(Aspect.FIRE, 3) + .add(Aspect.MAGIC, 2) + .add(Aspect.CRAFT, 8) + .add(Aspect.EXCHANGE, 6) + .add(Aspect.ENERGY, 3)); CrucibleRecipe boneRest = new CrucibleRecipe( - "TB.Backprocessing", - new ItemStack(Items.bone, 1, 0), - new ItemStack(Items.dye, 1, 15), - new AspectList().add(Aspect.ORDER, 2).add(Aspect.SENSES, 6).add(Aspect.CRAFT, 2).add(Aspect.EXCHANGE, 1) - .add(Aspect.DEATH, 4)); + "TB.Backprocessing", + new ItemStack(Items.bone, 1, 0), + new ItemStack(Items.dye, 1, 15), + new AspectList().add(Aspect.ORDER, 2) + .add(Aspect.SENSES, 6) + .add(Aspect.CRAFT, 2) + .add(Aspect.EXCHANGE, 1) + .add(Aspect.DEATH, 4)); CrucibleRecipe sugarRest = new CrucibleRecipe( - "TB.Backprocessing", - new ItemStack(Items.reeds, 1, 0), - new ItemStack(Items.sugar, 1, 0), - new AspectList().add(Aspect.ORDER, 1).add(Aspect.LIFE, 2)); + "TB.Backprocessing", + new ItemStack(Items.reeds, 1, 0), + new ItemStack(Items.sugar, 1, 0), + new AspectList().add(Aspect.ORDER, 1) + .add(Aspect.LIFE, 2)); CrucibleRecipe cactiRest = new CrucibleRecipe( - "TB.Backprocessing", - new ItemStack(Blocks.cactus, 1, 0), - new ItemStack(Items.dye, 1, 2), - new AspectList().add(Aspect.ORDER, 1).add(Aspect.LIFE, 2).add(Aspect.EARTH, 1)); + "TB.Backprocessing", + new ItemStack(Blocks.cactus, 1, 0), + new ItemStack(Items.dye, 1, 2), + new AspectList().add(Aspect.ORDER, 1) + .add(Aspect.LIFE, 2) + .add(Aspect.EARTH, 1)); CrucibleRecipe pyrofluidRec = new CrucibleRecipe( - "TB.Pyrofluid", - new ItemStack(TBItems.pyroBucket, 1, 0), - new ItemStack(Items.lava_bucket, 1, 0), - new AspectList().add(Aspect.FIRE, 24).add(Aspect.MAGIC, 8)); + "TB.Pyrofluid", + new ItemStack(TBItems.pyroBucket, 1, 0), + new ItemStack(Items.lava_bucket, 1, 0), + new AspectList().add(Aspect.FIRE, 24) + .add(Aspect.MAGIC, 8)); InfusionEnchantmentRecipe elderKnowledgeEnch = new InfusionEnchantmentRecipe( - "TB.ElderKnowledge", - TBEnchant.elderKnowledge, - 2, - new AspectList().add(Aspect.MAGIC, 8).add(Aspect.MIND, 8).add(Aspect.WEAPON, 8), - new ItemStack[] { new ItemStack(Items.paper, 1, 0), new ItemStack(Items.paper, 1, 0), - new ItemStack(Items.paper, 1, 0), new ItemStack(ConfigItems.itemZombieBrain, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "TB.ElderKnowledge", + TBEnchant.elderKnowledge, + 2, + new AspectList().add(Aspect.MAGIC, 8) + .add(Aspect.MIND, 8) + .add(Aspect.WEAPON, 8), + new ItemStack[] { new ItemStack(Items.paper, 1, 0), new ItemStack(Items.paper, 1, 0), + new ItemStack(Items.paper, 1, 0), new ItemStack(ConfigItems.itemZombieBrain, 1, 0), + new ItemStack(ConfigItems.itemResource, 1, 14) }); InfusionEnchantmentRecipe elderBaneEnch = new InfusionEnchantmentRecipe( - "TB.Eldritchbane", - TBEnchant.eldritchBane, - 2, - new AspectList().add(Aspect.DEATH, 8).add(Aspect.ELDRITCH, 8).add(Aspect.WEAPON, 8), - new ItemStack[] { new ItemStack(Items.ender_pearl, 1, 0), new ItemStack(Items.ender_eye, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "TB.Eldritchbane", + TBEnchant.eldritchBane, + 2, + new AspectList().add(Aspect.DEATH, 8) + .add(Aspect.ELDRITCH, 8) + .add(Aspect.WEAPON, 8), + new ItemStack[] { new ItemStack(Items.ender_pearl, 1, 0), new ItemStack(Items.ender_eye, 1, 0), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14) }); InfusionEnchantmentRecipe magicTouchEnch = new InfusionEnchantmentRecipe( - "TB.MagicTouch", - TBEnchant.magicTouch, - 2, - new AspectList().add(Aspect.MAGIC, 8).add(Aspect.AURA, 8).add(Aspect.WEAPON, 8), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(Items.paper, 1, 0) }); + "TB.MagicTouch", + TBEnchant.magicTouch, + 2, + new AspectList().add(Aspect.MAGIC, 8) + .add(Aspect.AURA, 8) + .add(Aspect.WEAPON, 8), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(Items.paper, 1, 0) }); InfusionEnchantmentRecipe vaporisingEnch = new InfusionEnchantmentRecipe( - "TB.Vaporising", - TBEnchant.vaporising, - 2, - new AspectList().add(Aspect.MAGIC, 8).add(Aspect.CRYSTAL, 8).add(Aspect.TRAP, 8), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.diamond, 1, 0) }); + "TB.Vaporising", + TBEnchant.vaporising, + 2, + new AspectList().add(Aspect.MAGIC, 8) + .add(Aspect.CRYSTAL, 8) + .add(Aspect.TRAP, 8), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.diamond, 1, 0) }); InfusionEnchantmentRecipe taintedEnch = new InfusionEnchantmentRecipe( - "TB.Tainted", - TBEnchant.tainted, - 5, - new AspectList().add(Aspect.TAINT, 16), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 11), - new ItemStack(ConfigItems.itemResource, 1, 12), - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "TB.Tainted", + TBEnchant.tainted, + 5, + new AspectList().add(Aspect.TAINT, 16), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 11), + new ItemStack(ConfigItems.itemResource, 1, 12), new ItemStack(ConfigItems.itemResource, 1, 14) }); ShapelessArcaneRecipe salisMundusBlockRec = new ShapelessArcaneRecipe( - "TB.SMB", - TBBlocks.dustBlock, - new AspectList().add(primals(1)), - new Object[] { new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "TB.SMB", + TBBlocks.dustBlock, + new AspectList().add(primals(1)), + new Object[] { new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14) }); // thauminite CrucibleRecipe thauminiteRec = new CrucibleRecipe( - "TB.Thauminite", - new ItemStack(TBItems.resource, 8, 0), - new ItemStack(ConfigItems.itemResource, 1, 2), - new AspectList().add(Aspect.METAL, 4).add(Aspect.CRYSTAL, 8).add(Aspect.MAGIC, 2)); + "TB.Thauminite", + new ItemStack(TBItems.resource, 8, 0), + new ItemStack(ConfigItems.itemResource, 1, 2), + new AspectList().add(Aspect.METAL, 4) + .add(Aspect.CRYSTAL, 8) + .add(Aspect.MAGIC, 2)); ShapedArcaneRecipe[] toolsRec = new ShapedArcaneRecipe[10]; ItemStack tiG = new ItemStack(TBItems.resource, 1, 1); toolsRec[0] = new ShapedArcaneRecipe( - "TB.Thauminite", - TBItems.thauminiteAxe, - primals(15), - new Object[] { "##", "#|", " |", '#', tiG, '|', "stickWood" }); + "TB.Thauminite", + TBItems.thauminiteAxe, + primals(15), + new Object[] { "##", "#|", " |", '#', tiG, '|', "stickWood" }); toolsRec[1] = new ShapedArcaneRecipe( - "TB.Thauminite", - TBItems.thauminiteHoe, - primals(15), - new Object[] { "##", " |", " |", '#', tiG, '|', "stickWood" }); + "TB.Thauminite", + TBItems.thauminiteHoe, + primals(15), + new Object[] { "##", " |", " |", '#', tiG, '|', "stickWood" }); toolsRec[2] = new ShapedArcaneRecipe( - "TB.Thauminite", - TBItems.thauminiteShovel, - primals(15), - new Object[] { "#", "|", "|", '#', tiG, '|', "stickWood" }); + "TB.Thauminite", + TBItems.thauminiteShovel, + primals(15), + new Object[] { "#", "|", "|", '#', tiG, '|', "stickWood" }); toolsRec[3] = new ShapedArcaneRecipe( - "TB.Thauminite", - TBItems.thauminiteSword, - primals(15), - new Object[] { "#", "#", "|", '#', tiG, '|', "stickWood" }); + "TB.Thauminite", + TBItems.thauminiteSword, + primals(15), + new Object[] { "#", "#", "|", '#', tiG, '|', "stickWood" }); toolsRec[4] = new ShapedArcaneRecipe( - "TB.Thauminite", - TBItems.thauminiteShears, - primals(15), - new Object[] { " #", "# ", '#', tiG }); + "TB.Thauminite", + TBItems.thauminiteShears, + primals(15), + new Object[] { " #", "# ", '#', tiG }); toolsRec[5] = new ShapedArcaneRecipe( - "TB.Thauminite", - TBItems.thauminitePickaxe, - primals(15), - new Object[] { "###", " | ", " | ", '#', tiG, '|', "stickWood" }); + "TB.Thauminite", + TBItems.thauminitePickaxe, + primals(15), + new Object[] { "###", " | ", " | ", '#', tiG, '|', "stickWood" }); toolsRec[6] = new ShapedArcaneRecipe( - "TB.Thauminite", - TBItems.thauminiteHelmet, - primals(25), - new Object[] { "###", "# #", '#', tiG }); + "TB.Thauminite", + TBItems.thauminiteHelmet, + primals(25), + new Object[] { "###", "# #", '#', tiG }); toolsRec[7] = new ShapedArcaneRecipe( - "TB.Thauminite", - TBItems.thauminiteChest, - primals(25), - new Object[] { "# #", "###", "###", '#', tiG }); + "TB.Thauminite", + TBItems.thauminiteChest, + primals(25), + new Object[] { "# #", "###", "###", '#', tiG }); toolsRec[8] = new ShapedArcaneRecipe( - "TB.Thauminite", - TBItems.thauminiteLeggings, - primals(25), - new Object[] { "###", "# #", "# #", '#', tiG }); + "TB.Thauminite", + TBItems.thauminiteLeggings, + primals(25), + new Object[] { "###", "# #", "# #", '#', tiG }); toolsRec[9] = new ShapedArcaneRecipe( - "TB.Thauminite", - TBItems.thauminiteBoots, - primals(25), - new Object[] { "# #", "# #", '#', tiG }); + "TB.Thauminite", + TBItems.thauminiteBoots, + primals(25), + new Object[] { "# #", "# #", '#', tiG }); ShapedArcaneRecipe thauminiteCaps = new ShapedArcaneRecipe( - "CAP_thauminite", - new ItemStack(TBItems.resource, 1, 2), - primals(25), - new Object[] { "###", "#@#", "@@@", '#', new ItemStack(TBItems.resource, 1, 0), '@', - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "CAP_thauminite", + new ItemStack(TBItems.resource, 1, 2), + primals(25), + new Object[] { "###", "#@#", "@@@", '#', new ItemStack(TBItems.resource, 1, 0), '@', + new ItemStack(ConfigItems.itemResource, 1, 14) }); ShapedArcaneRecipe thaumicWandCore = new ShapedArcaneRecipe( - "ROD_tbthaumium", - new ItemStack(TBItems.resource, 1, 3), - primals(50), - new Object[] { " @#", "@#@", "#@ ", '#', new ItemStack(ConfigItems.itemResource, 1, 2), '@', - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "ROD_tbthaumium", + new ItemStack(TBItems.resource, 1, 3), + primals(50), + new Object[] { " @#", "@#@", "#@ ", '#', new ItemStack(ConfigItems.itemResource, 1, 2), '@', + new ItemStack(ConfigItems.itemResource, 1, 14) }); CrucibleRecipe[] shards = new CrucibleRecipe[6]; if (Loader.isModLoaded("gregtech")) { shards[0] = new CrucibleRecipe( - "TB.OreDestruction", - new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 0), - new ItemStack(GameRegistry.findBlock("gregtech", "gt.blockores"), 1, 540), - new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.MAGIC, 1).add(Aspect.AIR, 3)); + "TB.OreDestruction", + new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 0), + new ItemStack(GameRegistry.findBlock("gregtech", "gt.blockores"), 1, 540), + new AspectList().add(Aspect.ENTROPY, 2) + .add(Aspect.MAGIC, 1) + .add(Aspect.AIR, 3)); shards[1] = new CrucibleRecipe( - "TB.OreDestruction", - new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 1), - new ItemStack(GameRegistry.findBlock("gregtech", "gt.blockores"), 1, 541), - new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.MAGIC, 1).add(Aspect.FIRE, 3)); + "TB.OreDestruction", + new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 1), + new ItemStack(GameRegistry.findBlock("gregtech", "gt.blockores"), 1, 541), + new AspectList().add(Aspect.ENTROPY, 2) + .add(Aspect.MAGIC, 1) + .add(Aspect.FIRE, 3)); shards[2] = new CrucibleRecipe( - "TB.OreDestruction", - new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 2), - new ItemStack(GameRegistry.findBlock("gregtech", "gt.blockores"), 1, 543), - new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.MAGIC, 1).add(Aspect.WATER, 3)); + "TB.OreDestruction", + new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 2), + new ItemStack(GameRegistry.findBlock("gregtech", "gt.blockores"), 1, 543), + new AspectList().add(Aspect.ENTROPY, 2) + .add(Aspect.MAGIC, 1) + .add(Aspect.WATER, 3)); shards[3] = new CrucibleRecipe( - "TB.OreDestruction", - new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 3), - new ItemStack(GameRegistry.findBlock("gregtech", "gt.blockores"), 1, 542), - new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.MAGIC, 1).add(Aspect.EARTH, 3)); + "TB.OreDestruction", + new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 3), + new ItemStack(GameRegistry.findBlock("gregtech", "gt.blockores"), 1, 542), + new AspectList().add(Aspect.ENTROPY, 2) + .add(Aspect.MAGIC, 1) + .add(Aspect.EARTH, 3)); shards[4] = new CrucibleRecipe( - "TB.OreDestruction", - new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 4), - new ItemStack(GameRegistry.findBlock("gregtech", "gt.blockores"), 1, 545), - new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.MAGIC, 1).add(Aspect.ORDER, 3)); + "TB.OreDestruction", + new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 4), + new ItemStack(GameRegistry.findBlock("gregtech", "gt.blockores"), 1, 545), + new AspectList().add(Aspect.ENTROPY, 2) + .add(Aspect.MAGIC, 1) + .add(Aspect.ORDER, 3)); shards[5] = new CrucibleRecipe( - "TB.OreDestruction", - new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 5), - new ItemStack(GameRegistry.findBlock("gregtech", "gt.blockores"), 1, 544), - new AspectList().add(Aspect.MAGIC, 1).add(Aspect.ENTROPY, 5)); + "TB.OreDestruction", + new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, 5), + new ItemStack(GameRegistry.findBlock("gregtech", "gt.blockores"), 1, 544), + new AspectList().add(Aspect.MAGIC, 1) + .add(Aspect.ENTROPY, 5)); } else { for (int i = 0; i < 6; ++i) shards[i] = new CrucibleRecipe( - "TB.OreDestruction", - new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, i), - new ItemStack(ConfigBlocks.blockCustomOre, 1, 1 + i), - new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.MAGIC, 1).add(getPrimalForLoop(i), 3)); + "TB.OreDestruction", + new ItemStack(ConfigItems.itemShard, TBConfig.shardsFromOre, i), + new ItemStack(ConfigBlocks.blockCustomOre, 1, 1 + i), + new AspectList().add(Aspect.ENTROPY, 2) + .add(Aspect.MAGIC, 1) + .add(getPrimalForLoop(i), 3)); } CrucibleRecipe[] cBlocks = new CrucibleRecipe[7]; for (int i = 0; i < 7; ++i) if (i < 6) cBlocks[i] = new CrucibleRecipe( - "TB.CrystalBlocks", - new ItemStack(TBBlocks.crystalBlock, 1, i), - new ItemStack(ConfigBlocks.blockCrystal, 1, i), - new AspectList().add(primals(1)).add(Aspect.CRAFT, 2).add(getPrimalForLoop(i), 2)); + "TB.CrystalBlocks", + new ItemStack(TBBlocks.crystalBlock, 1, i), + new ItemStack(ConfigBlocks.blockCrystal, 1, i), + new AspectList().add(primals(1)) + .add(Aspect.CRAFT, 2) + .add(getPrimalForLoop(i), 2)); else cBlocks[i] = new CrucibleRecipe( - "TB.CrystalBlocks", - new ItemStack(TBBlocks.crystalBlock, 1, i), - new ItemStack(ConfigBlocks.blockCrystal, 1, i), - new AspectList().add(primals(1)).add(Aspect.CRAFT, 2).add(primals(1))); + "TB.CrystalBlocks", + new ItemStack(TBBlocks.crystalBlock, 1, i), + new ItemStack(ConfigBlocks.blockCrystal, 1, i), + new AspectList().add(primals(1)) + .add(Aspect.CRAFT, 2) + .add(primals(1))); CrucibleRecipe[] cTaintedBlocks = new CrucibleRecipe[7]; for (int i = 0; i < 7; ++i) if (i < 6) cTaintedBlocks[i] = new CrucibleRecipe( - "TB.CrystalBlocks", - new ItemStack(TBBlocks.crystalBlock, 1, 7), - new ItemStack(ConfigBlocks.blockCrystal, 1, i), - new AspectList().add(primals(1)).add(Aspect.CRAFT, 2).add(getPrimalForLoop(i), 2).add(Aspect.TAINT, 2)); + "TB.CrystalBlocks", + new ItemStack(TBBlocks.crystalBlock, 1, 7), + new ItemStack(ConfigBlocks.blockCrystal, 1, i), + new AspectList().add(primals(1)) + .add(Aspect.CRAFT, 2) + .add(getPrimalForLoop(i), 2) + .add(Aspect.TAINT, 2)); else cTaintedBlocks[i] = new CrucibleRecipe( - "TB.CrystalBlocks", - new ItemStack(TBBlocks.crystalBlock, 1, 7), - new ItemStack(ConfigBlocks.blockCrystal, 1, i), - new AspectList().add(primals(1)).add(Aspect.CRAFT, 2).add(primals(1)).add(Aspect.TAINT, 2)); + "TB.CrystalBlocks", + new ItemStack(TBBlocks.crystalBlock, 1, 7), + new ItemStack(ConfigBlocks.blockCrystal, 1, i), + new AspectList().add(primals(1)) + .add(Aspect.CRAFT, 2) + .add(primals(1)) + .add(Aspect.TAINT, 2)); InfusionRecipe voidRodRecipe = new InfusionRecipe( - "ROD_tbvoid", - new ItemStack(TBItems.resource, 1, 4), - 6, - new AspectList().add(Aspect.ELDRITCH, 64).add(Aspect.VOID, 64).add(Aspect.MAGIC, 64) - .add(Aspect.AURA, 24).add(Aspect.ENERGY, 24), - new ItemStack(TBItems.resource, 1, 3), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 16), - new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 16), - new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(TBBlocks.dustBlock, 1, 0), - new ItemStack(TBBlocks.dustBlock, 1, 0), new ItemStack(TBBlocks.crystalBlock, 1, 7), - new ItemStack(TBBlocks.crystalBlock, 1, 7) }); + "ROD_tbvoid", + new ItemStack(TBItems.resource, 1, 4), + 6, + new AspectList().add(Aspect.ELDRITCH, 64) + .add(Aspect.VOID, 64) + .add(Aspect.MAGIC, 64) + .add(Aspect.AURA, 24) + .add(Aspect.ENERGY, 24), + new ItemStack(TBItems.resource, 1, 3), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 16), + new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 16), + new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(TBBlocks.dustBlock, 1, 0), new ItemStack(TBBlocks.crystalBlock, 1, 7), + new ItemStack(TBBlocks.crystalBlock, 1, 7) }); InfusionRecipe drainFociRec = new InfusionRecipe( - "TB.Foci.Drain", - new ItemStack(TBItems.fociDrain), - 0, - new AspectList().add(Aspect.WATER, 3).add(Aspect.VOID, 6), - new ItemStack(ConfigItems.itemFocusExcavation, 1, 0), - new ItemStack[] { new ItemStack(Items.bucket), new ItemStack(Items.bucket), - new ItemStack(ConfigBlocks.blockJar, 1, 3), new ItemStack(ConfigBlocks.blockJar, 1, 3) }); + "TB.Foci.Drain", + new ItemStack(TBItems.fociDrain), + 0, + new AspectList().add(Aspect.WATER, 3) + .add(Aspect.VOID, 6), + new ItemStack(ConfigItems.itemFocusExcavation, 1, 0), + new ItemStack[] { new ItemStack(Items.bucket), new ItemStack(Items.bucket), + new ItemStack(ConfigBlocks.blockJar, 1, 3), new ItemStack(ConfigBlocks.blockJar, 1, 3) }); InfusionRecipe expFociRec = new InfusionRecipe( - "TB.Foci.Experience", - new ItemStack(TBItems.fociExperience), - 5, - new AspectList().add(Aspect.GREED, 32).add(Aspect.VOID, 32).add(Aspect.MIND, 16).add(Aspect.HUNGER, 32) - .add(Aspect.MINE, 8), - new ItemStack(ConfigItems.itemFocusExcavation, 1, 0), - new ItemStack[] { new ItemStack(Items.gold_ingot), new ItemStack(Items.gold_ingot), - new ItemStack(Items.emerald), new ItemStack(Items.emerald), - new ItemStack(Items.iron_axe, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(Items.iron_pickaxe, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(Items.iron_shovel, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(Items.shears, 1, OreDictionary.WILDCARD_VALUE) }); + "TB.Foci.Experience", + new ItemStack(TBItems.fociExperience), + 5, + new AspectList().add(Aspect.GREED, 32) + .add(Aspect.VOID, 32) + .add(Aspect.MIND, 16) + .add(Aspect.HUNGER, 32) + .add(Aspect.MINE, 8), + new ItemStack(ConfigItems.itemFocusExcavation, 1, 0), + new ItemStack[] { new ItemStack(Items.gold_ingot), new ItemStack(Items.gold_ingot), + new ItemStack(Items.emerald), new ItemStack(Items.emerald), + new ItemStack(Items.iron_axe, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(Items.iron_pickaxe, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(Items.iron_shovel, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(Items.shears, 1, OreDictionary.WILDCARD_VALUE) }); InfusionRecipe fluxFociRec = new InfusionRecipe( - "TB.Foci.Flux", - new ItemStack(TBItems.fociFlux), - 3, - new AspectList().add(Aspect.WATER, 16).add(Aspect.VOID, 16).add(Aspect.ORDER, 16), - new ItemStack(Items.diamond, 1, 0), - new ItemStack[] { new ItemStack(ConfigItems.itemShard, 1, 6), - new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigBlocks.blockStoneDevice, 1, 14), - new ItemStack(ConfigBlocks.blockJar, 1, 3) }); + "TB.Foci.Flux", + new ItemStack(TBItems.fociFlux), + 3, + new AspectList().add(Aspect.WATER, 16) + .add(Aspect.VOID, 16) + .add(Aspect.ORDER, 16), + new ItemStack(Items.diamond, 1, 0), + new ItemStack[] { new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigItems.itemShard, 1, 6), + new ItemStack(ConfigBlocks.blockStoneDevice, 1, 14), new ItemStack(ConfigBlocks.blockJar, 1, 3) }); InfusionRecipe activationFociRec = new InfusionRecipe( - "TB.Foci.Activation", - new ItemStack(TBItems.fociActivation), - 0, - new AspectList().add(Aspect.TRAVEL, 8).add(Aspect.SENSES, 8).add(Aspect.MOTION, 8), - new ItemStack(ConfigItems.itemResource, 1, 10), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 9), - new ItemStack(ConfigItems.itemResource, 1, 9), new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "TB.Foci.Activation", + new ItemStack(TBItems.fociActivation), + 0, + new AspectList().add(Aspect.TRAVEL, 8) + .add(Aspect.SENSES, 8) + .add(Aspect.MOTION, 8), + new ItemStack(ConfigItems.itemResource, 1, 10), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 9), + new ItemStack(ConfigItems.itemResource, 1, 9), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigItems.itemResource, 1, 14) }); Block[] recBlocks = new Block[] { Blocks.cobblestone, Blocks.gravel, Blocks.mossy_cobblestone, - Blocks.iron_block, Blocks.diamond_block, Blocks.lapis_block, Blocks.gold_block, Blocks.brick_block }; + Blocks.iron_block, Blocks.diamond_block, Blocks.lapis_block, Blocks.gold_block, Blocks.brick_block }; Block[] recResult = new Block[] { TBBlocks.oldCobble, TBBlocks.oldGravel, TBBlocks.oldCobbleMossy, - TBBlocks.oldIron, TBBlocks.oldDiamond, TBBlocks.oldLapis, TBBlocks.oldGold, TBBlocks.oldBrick }; + TBBlocks.oldIron, TBBlocks.oldDiamond, TBBlocks.oldLapis, TBBlocks.oldGold, TBBlocks.oldBrick }; ShapedArcaneRecipe[] oldRec = new ShapedArcaneRecipe[recResult.length]; for (int i = 0; i < oldRec.length; ++i) oldRec[i] = new ShapedArcaneRecipe( - "TB.DecoBlocks", - new ItemStack(recResult[i], 8, 0), - new AspectList().add(Aspect.ENTROPY, 5), - new Object[] { "###", "#@#", "###", '#', recBlocks[i], '@', - new ItemStack(ConfigBlocks.blockCrystal, 1, 5) }); + "TB.DecoBlocks", + new ItemStack(recResult[i], 8, 0), + new AspectList().add(Aspect.ENTROPY, 5), + new Object[] { "###", "#@#", "###", '#', recBlocks[i], '@', + new ItemStack(ConfigBlocks.blockCrystal, 1, 5) }); ShapedArcaneRecipe advFurnaceRecipe = new ShapedArcaneRecipe( - "TB.AdvAlc", - TBBlocks.advAlchFurnace, - new AspectList().add(Aspect.WATER, 20).add(Aspect.FIRE, 20).add(Aspect.AIR, 10), - new Object[] { "# #", "#@#", "$$$", '#', new ItemStack(ConfigItems.itemResource, 1, 2), '@', - new ItemStack(ConfigBlocks.blockStoneDevice, 1, 0), '$', - new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 0) }); + "TB.AdvAlc", + TBBlocks.advAlchFurnace, + new AspectList().add(Aspect.WATER, 20) + .add(Aspect.FIRE, 20) + .add(Aspect.AIR, 10), + new Object[] { "# #", "#@#", "$$$", '#', new ItemStack(ConfigItems.itemResource, 1, 2), '@', + new ItemStack(ConfigBlocks.blockStoneDevice, 1, 0), '$', + new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 0) }); InfusionRecipe cryingObsidianRec = new InfusionRecipe( - "TB.CryingObs", - new ItemStack(TBBlocks.cryingObsidian, 1, 0), - 2, - new AspectList().add(Aspect.TRAVEL, 16).add(Aspect.LIFE, 16).add(Aspect.SOUL, 16), - new ItemStack(Blocks.obsidian), - new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.bed), - new ItemStack(TBBlocks.oldLapis), new ItemStack(TBBlocks.oldLapis) }); + "TB.CryingObs", + new ItemStack(TBBlocks.cryingObsidian, 1, 0), + 2, + new AspectList().add(Aspect.TRAVEL, 16) + .add(Aspect.LIFE, 16) + .add(Aspect.SOUL, 16), + new ItemStack(Blocks.obsidian), + new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.bed), new ItemStack(TBBlocks.oldLapis), + new ItemStack(TBBlocks.oldLapis) }); InfusionRecipe overchanterRec = new InfusionRecipe( - "TB.Overchanter", - new ItemStack(TBBlocks.overchanter, 1, 0), - 4, - new AspectList().add(primals(32)).add(Aspect.MAGIC, 32).add(Aspect.MECHANISM, 32).add(Aspect.MIND, 16), - new ItemStack(Blocks.enchanting_table), - new ItemStack[] { new ItemStack(TBBlocks.crystalBlock, 1, 0), - new ItemStack(TBBlocks.crystalBlock, 1, 1), new ItemStack(TBBlocks.crystalBlock, 1, 2), - new ItemStack(TBBlocks.crystalBlock, 1, 3), new ItemStack(TBBlocks.crystalBlock, 1, 4), - new ItemStack(TBBlocks.crystalBlock, 1, 5), new ItemStack(TBBlocks.crystalBlock, 1, 6), - new ItemStack(TBBlocks.crystalBlock, 1, 6), new ItemStack(TBBlocks.dustBlock, 1, 0), - new ItemStack(TBBlocks.dustBlock, 1, 0), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4), - new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4) }); + "TB.Overchanter", + new ItemStack(TBBlocks.overchanter, 1, 0), + 4, + new AspectList().add(primals(32)) + .add(Aspect.MAGIC, 32) + .add(Aspect.MECHANISM, 32) + .add(Aspect.MIND, 16), + new ItemStack(Blocks.enchanting_table), + new ItemStack[] { new ItemStack(TBBlocks.crystalBlock, 1, 0), new ItemStack(TBBlocks.crystalBlock, 1, 1), + new ItemStack(TBBlocks.crystalBlock, 1, 2), new ItemStack(TBBlocks.crystalBlock, 1, 3), + new ItemStack(TBBlocks.crystalBlock, 1, 4), new ItemStack(TBBlocks.crystalBlock, 1, 5), + new ItemStack(TBBlocks.crystalBlock, 1, 6), new ItemStack(TBBlocks.crystalBlock, 1, 6), + new ItemStack(TBBlocks.dustBlock, 1, 0), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4), + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4) }); ShapedArcaneRecipe relocatorRec = new ShapedArcaneRecipe( - "TB.Relocator", - new ItemStack(TBBlocks.relocator, 1, 0), - new AspectList().add(Aspect.AIR, 5).add(Aspect.EARTH, 15).add(Aspect.WATER, 5), - new Object[] { "GAG", "ENE", "GWG", 'G', new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), 'A', - "shardAir", 'E', "shardEarth", 'W', "shardWater", 'N', - new ItemStack(ConfigItems.itemResource, 1, 1) }); + "TB.Relocator", + new ItemStack(TBBlocks.relocator, 1, 0), + new AspectList().add(Aspect.AIR, 5) + .add(Aspect.EARTH, 15) + .add(Aspect.WATER, 5), + new Object[] { "GAG", "ENE", "GWG", 'G', new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), 'A', + "shardAir", 'E', "shardEarth", 'W', "shardWater", 'N', new ItemStack(ConfigItems.itemResource, 1, 1) }); ShapedArcaneRecipe irelocatorRec = new ShapedArcaneRecipe( - "TB.Relocator", - new ItemStack(TBBlocks.relocator, 1, 6), - new AspectList().add(Aspect.AIR, 5).add(Aspect.EARTH, 15).add(Aspect.WATER, 5), - new Object[] { "GAG", "ENE", "GWG", 'G', new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), 'A', - "shardAir", 'E', "shardEarth", 'W', "shardWater", 'N', - new ItemStack(ConfigItems.itemResource, 1, 0) }); + "TB.Relocator", + new ItemStack(TBBlocks.relocator, 1, 6), + new AspectList().add(Aspect.AIR, 5) + .add(Aspect.EARTH, 15) + .add(Aspect.WATER, 5), + new Object[] { "GAG", "ENE", "GWG", 'G', new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), 'A', + "shardAir", 'E', "shardEarth", 'W', "shardWater", 'N', new ItemStack(ConfigItems.itemResource, 1, 0) }); ShapedArcaneRecipe thaumicAnvilRec = new ShapedArcaneRecipe( - "TB.ThaumicAnvil", - new ItemStack(TBBlocks.thaumicAnvil, 1, 0), - primals(25), - new Object[] { "###", " $ ", "$$$", '#', new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4), '$', - new ItemStack(ConfigItems.itemResource, 1, 2) }); + "TB.ThaumicAnvil", + new ItemStack(TBBlocks.thaumicAnvil, 1, 0), + primals(25), + new Object[] { "###", " $ ", "$$$", '#', new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4), '$', + new ItemStack(ConfigItems.itemResource, 1, 2) }); InfusionRecipe voidAnvilRec = new InfusionRecipe( - "TB.VoidAnvil", - new ItemStack(TBBlocks.voidAnvil, 1, 0), - 3, - new AspectList().add(Aspect.CRAFT, 32).add(Aspect.TOOL, 24).add(Aspect.WEAPON, 24) - .add(Aspect.ORDER, 48), - new ItemStack(TBBlocks.thaumicAnvil, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack[] { new ItemStack(TBBlocks.voidBlock), new ItemStack(TBBlocks.voidBlock), - new ItemStack(TBBlocks.voidBlock), new ItemStack(TBBlocks.voidBlock), - new ItemStack(TBBlocks.voidBlock) }); + "TB.VoidAnvil", + new ItemStack(TBBlocks.voidAnvil, 1, 0), + 3, + new AspectList().add(Aspect.CRAFT, 32) + .add(Aspect.TOOL, 24) + .add(Aspect.WEAPON, 24) + .add(Aspect.ORDER, 48), + new ItemStack(TBBlocks.thaumicAnvil, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack[] { new ItemStack(TBBlocks.voidBlock), new ItemStack(TBBlocks.voidBlock), + new ItemStack(TBBlocks.voidBlock), new ItemStack(TBBlocks.voidBlock), + new ItemStack(TBBlocks.voidBlock) }); ShapedArcaneRecipe campfireRec = new ShapedArcaneRecipe( - "TB.Campfire", - new ItemStack(TBBlocks.campfire), - new AspectList().add(Aspect.FIRE, 5).add(Aspect.ENTROPY, 3), - new Object[] { "SSS", "COC", "GGG", 'S', "stickWood", 'C', "cobblestone", 'O', - new ItemStack(Items.coal, 1, OreDictionary.WILDCARD_VALUE), 'G', Blocks.gravel }); + "TB.Campfire", + new ItemStack(TBBlocks.campfire), + new AspectList().add(Aspect.FIRE, 5) + .add(Aspect.ENTROPY, 3), + new Object[] { "SSS", "COC", "GGG", 'S', "stickWood", 'C', "cobblestone", 'O', + new ItemStack(Items.coal, 1, OreDictionary.WILDCARD_VALUE), 'G', Blocks.gravel }); ShapedArcaneRecipe brazierRec = new ShapedArcaneRecipe( - "TB.Brazier", - new ItemStack(TBBlocks.braizer), - new AspectList().add(Aspect.FIRE, 5).add(Aspect.ENTROPY, 3), - new Object[] { "SCS", " V ", "SSS", 'S', new ItemStack(ConfigBlocks.blockSlabStone, 1, 0), 'C', - new ItemStack(Items.coal, 1, OreDictionary.WILDCARD_VALUE), 'V', - new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6) }); + "TB.Brazier", + new ItemStack(TBBlocks.braizer), + new AspectList().add(Aspect.FIRE, 5) + .add(Aspect.ENTROPY, 3), + new Object[] { "SCS", " V ", "SSS", 'S', new ItemStack(ConfigBlocks.blockSlabStone, 1, 0), 'C', + new ItemStack(Items.coal, 1, OreDictionary.WILDCARD_VALUE), 'V', + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6) }); ShapedOreRecipe voidBlockRec = new ShapedOreRecipe( - new ItemStack(TBBlocks.voidBlock, 1, 0), - new Object[] { "###", "###", "###", '#', new ItemStack(ConfigItems.itemResource, 1, 16) }); + new ItemStack(TBBlocks.voidBlock, 1, 0), + new Object[] { "###", "###", "###", '#', new ItemStack(ConfigItems.itemResource, 1, 16) }); ShapelessOreRecipe voidIngotRec = new ShapelessOreRecipe( - new ItemStack(ConfigItems.itemResource, 9, 16), - new ItemStack(TBBlocks.voidBlock)); + new ItemStack(ConfigItems.itemResource, 9, 16), + new ItemStack(TBBlocks.voidBlock)); // TODO recipes @@ -663,63 +774,63 @@ public static void setup() { // copy(ResearchCategories.getResearchList("ELDRITCH").research.get("VOIDMETAL"),"TB.VOIDMETAL",catName,15,1).setConcealed().setHidden().registerResearchItem(); new FakeResearchItem( - "TB.CRUCIBLE", - "THAUMICBASES", - "CRUCIBLE", - "ALCHEMY", - 0, - 3, - ResearchCategories.getResearch("CRUCIBLE").icon_item).registerResearchItem(); + "TB.CRUCIBLE", + "THAUMICBASES", + "CRUCIBLE", + "ALCHEMY", + 0, + 3, + ResearchCategories.getResearch("CRUCIBLE").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.THAUMIUM", - "THAUMICBASES", - "THAUMIUM", - "ALCHEMY", - 8, - 0, - ResearchCategories.getResearch("THAUMIUM").icon_item).registerResearchItem(); + "TB.THAUMIUM", + "THAUMICBASES", + "THAUMIUM", + "ALCHEMY", + 8, + 0, + ResearchCategories.getResearch("THAUMIUM").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.DISTILESSENTIA", - "THAUMICBASES", - "DISTILESSENTIA", - "ALCHEMY", - 6, - 2, - ResearchCategories.getResearch("DISTILESSENTIA").icon_item).registerResearchItem(); + "TB.DISTILESSENTIA", + "THAUMICBASES", + "DISTILESSENTIA", + "ALCHEMY", + 6, + 2, + ResearchCategories.getResearch("DISTILESSENTIA").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.INFUSION", - "THAUMICBASES", - "INFUSION", - "ARTIFICE", - 0, - -3, - ResearchCategories.getResearch("INFUSION").icon_item).registerResearchItem(); + "TB.INFUSION", + "THAUMICBASES", + "INFUSION", + "ARTIFICE", + 0, + -3, + ResearchCategories.getResearch("INFUSION").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.BELLOWS", - "THAUMICBASES", - "BELLOWS", - "ARTIFICE", - 6, - 3, - ResearchCategories.getResearch("BELLOWS").icon_item).registerResearchItem(); + "TB.BELLOWS", + "THAUMICBASES", + "BELLOWS", + "ARTIFICE", + 6, + 3, + ResearchCategories.getResearch("BELLOWS").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.LEVITATOR", - "THAUMICBASES", - "LEVITATOR", - "ARTIFICE", - 6, - 5, - ResearchCategories.getResearch("LEVITATOR").icon_item).registerResearchItem(); + "TB.LEVITATOR", + "THAUMICBASES", + "LEVITATOR", + "ARTIFICE", + 6, + 5, + ResearchCategories.getResearch("LEVITATOR").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.VOIDMETAL", - "THAUMICBASES", - "VOIDMETAL", - "ELDRITCH", - 15, - 1, - ResearchCategories.getResearch("VOIDMETAL").icon_item).registerResearchItem(); + "TB.VOIDMETAL", + "THAUMICBASES", + "VOIDMETAL", + "ELDRITCH", + 15, + 1, + ResearchCategories.getResearch("VOIDMETAL").icon_item).registerResearchItem(); // -2,-18 // 5,-3 @@ -728,500 +839,588 @@ public static void setup() { slabs = TBRecipes.slabs.toArray(slabs); new ResearchItem( - "TB.DecoBlocks", - catName, - new AspectList(), - 0, - 2, - 0, - new ItemStack(TBBlocks.quicksilverBlock, 1, 0)) - .setRound().setAutoUnlock() - .setPages( - new ResearchPage("tb.rec.decoBlocks.page.0"), - new ResearchPage(TBRecipes.recipes.get("quicksilverBlock")), - new ResearchPage(TBRecipes.recipes.get("quicksilver")), - new ResearchPage(TBRecipes.recipes.get("quicksilverBrick")), - new ResearchPage(TBRecipes.recipes.get("eldritchArk")), - new ResearchPage(TBRecipes.recipes.get("ironGreatwood")), - new ResearchPage(oldRec), - new ResearchPage(slabs)) - .registerResearchItem(); + "TB.DecoBlocks", + catName, + new AspectList(), + 0, + 2, + 0, + new ItemStack(TBBlocks.quicksilverBlock, 1, 0)).setRound() + .setAutoUnlock() + .setPages( + new ResearchPage("tb.rec.decoBlocks.page.0"), + new ResearchPage(TBRecipes.recipes.get("quicksilverBlock")), + new ResearchPage(TBRecipes.recipes.get("quicksilver")), + new ResearchPage(TBRecipes.recipes.get("quicksilverBrick")), + new ResearchPage(TBRecipes.recipes.get("eldritchArk")), + new ResearchPage(TBRecipes.recipes.get("ironGreatwood")), + new ResearchPage(oldRec), + new ResearchPage(slabs)) + .registerResearchItem(); new ResearchItem( - "TB.AdvancedEntropy", - catName, - new AspectList().add(Aspect.ENTROPY, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3), - -3, - 2, - 1, - new ItemStack(Items.blaze_powder, 1, 0)) - .setParents("TB.CRUCIBLE") - .setPages( - new ResearchPage("tb.rec.advEntr.page.0"), - new ResearchPage(wool3Rec), - new ResearchPage(sandstone3Rec), - new ResearchPage(blaze3Rec)) - .registerResearchItem(); + "TB.AdvancedEntropy", + catName, + new AspectList().add(Aspect.ENTROPY, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.CRAFT, 3), + -3, + 2, + 1, + new ItemStack(Items.blaze_powder, 1, 0)).setParents("TB.CRUCIBLE") + .setPages( + new ResearchPage("tb.rec.advEntr.page.0"), + new ResearchPage(wool3Rec), + new ResearchPage(sandstone3Rec), + new ResearchPage(blaze3Rec)) + .registerResearchItem(); new ResearchItem( - "TB.AlchemyRestoration", - catName, - new AspectList().add(Aspect.ORDER, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3), - -3, - 4, - 1, - new ItemStack(Blocks.packed_ice, 1, 0)) - .setParents("TB.CRUCIBLE") - .setPages( - new ResearchPage("tb.rec.alcRest.page.0"), - new ResearchPage(chiseledBricks), - new ResearchPage(gravel2Cobble), - new ResearchPage(icePacking)) - .registerResearchItem(); + "TB.AlchemyRestoration", + catName, + new AspectList().add(Aspect.ORDER, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.CRAFT, 3), + -3, + 4, + 1, + new ItemStack(Blocks.packed_ice, 1, 0)).setParents("TB.CRUCIBLE") + .setPages( + new ResearchPage("tb.rec.alcRest.page.0"), + new ResearchPage(chiseledBricks), + new ResearchPage(gravel2Cobble), + new ResearchPage(icePacking)) + .registerResearchItem(); new ResearchItem( - "TB.Pyrofluid", - catName, - new AspectList().add(Aspect.FIRE, 16).add(Aspect.MAGIC, 6).add(Aspect.ELDRITCH, 8).add(Aspect.GREED, 6), - 1, - 6, - 4, - new ItemStack(TBItems.pyroBucket, 1, 0)).setParents("TB.CRUCIBLE") - .setPages(new ResearchPage("tb.rec.pyrofluid.page.0"), new ResearchPage(pyrofluidRec)) - .registerResearchItem(); + "TB.Pyrofluid", + catName, + new AspectList().add(Aspect.FIRE, 16) + .add(Aspect.MAGIC, 6) + .add(Aspect.ELDRITCH, 8) + .add(Aspect.GREED, 6), + 1, + 6, + 4, + new ItemStack(TBItems.pyroBucket, 1, 0)).setParents("TB.CRUCIBLE") + .setPages(new ResearchPage("tb.rec.pyrofluid.page.0"), new ResearchPage(pyrofluidRec)) + .registerResearchItem(); new ResearchItem( - "TB.CrystalBlocks", - catName, - new AspectList().add(primals(8)), - -4, - 5, - 1, - new ItemStack(TBBlocks.crystalBlock, 1, OreDictionary.WILDCARD_VALUE)) - .setParents("TB.AlchemyRestoration") - .setPages( - new ResearchPage("tb.rec.cBlocks.page.0"), - new ResearchPage(cBlocks), - new ResearchPage(cTaintedBlocks)) - .registerResearchItem(); + "TB.CrystalBlocks", + catName, + new AspectList().add(primals(8)), + -4, + 5, + 1, + new ItemStack(TBBlocks.crystalBlock, 1, OreDictionary.WILDCARD_VALUE)).setParents("TB.AlchemyRestoration") + .setPages( + new ResearchPage("tb.rec.cBlocks.page.0"), + new ResearchPage(cBlocks), + new ResearchPage(cTaintedBlocks)) + .registerResearchItem(); new ResearchItem( - "TB.Backprocessing", - catName, - new AspectList().add(Aspect.ORDER, 8).add(Aspect.EXCHANGE, 8).add(Aspect.CRAFT, 8), - -6, - 3, - 1, - new ItemStack(Items.reeds, 1, 0)).setParents("TB.AlchemyRestoration", "TB.AdvancedEntropy") - .setSecondary().setConcealed() - .setPages( - new ResearchPage("tb.rec.backProc.page.0"), - new ResearchPage(blazepowderRest), - new ResearchPage(boneRest), - new ResearchPage(sugarRest), - new ResearchPage(cactiRest)) - .registerResearchItem(); + "TB.Backprocessing", + catName, + new AspectList().add(Aspect.ORDER, 8) + .add(Aspect.EXCHANGE, 8) + .add(Aspect.CRAFT, 8), + -6, + 3, + 1, + new ItemStack(Items.reeds, 1, 0)).setParents("TB.AlchemyRestoration", "TB.AdvancedEntropy") + .setSecondary() + .setConcealed() + .setPages( + new ResearchPage("tb.rec.backProc.page.0"), + new ResearchPage(blazepowderRest), + new ResearchPage(boneRest), + new ResearchPage(sugarRest), + new ResearchPage(cactiRest)) + .registerResearchItem(); // 0, -3 new ResearchItem( - "TB.MasterEntropy", - catName, - new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.MAGIC, 4).add(Aspect.GREED, 2), - -5, - 1, - 3, - new ItemStack(Items.string, 1, 0)) - .setParents("TB.AdvancedEntropy") - .setPages( - new ResearchPage("tb.rec.mastEntr.page.0"), - new ResearchPage(wool4Rec), - new ResearchPage(sandstone4Rec), - new ResearchPage(blaze4Rec)) - .registerResearchItem(); + "TB.MasterEntropy", + catName, + new AspectList().add(Aspect.ENTROPY, 8) + .add(Aspect.MAGIC, 4) + .add(Aspect.GREED, 2), + -5, + 1, + 3, + new ItemStack(Items.string, 1, 0)).setParents("TB.AdvancedEntropy") + .setPages( + new ResearchPage("tb.rec.mastEntr.page.0"), + new ResearchPage(wool4Rec), + new ResearchPage(sandstone4Rec), + new ResearchPage(blaze4Rec)) + .registerResearchItem(); new ResearchItem( - "TB.StrongEntropy", - catName, - new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.WEAPON, 2), - -1, - 1, - 3, - new ItemStack(Blocks.sand, 1, 0)) - .setParents("TB.AdvancedEntropy").setSecondary() - .setPages( - new ResearchPage("tb.rec.strEntr.page.0"), - new ResearchPage(glassSand), - new ResearchPage(gravelSand), - new ResearchPage(barsIron)) - .registerResearchItem(); + "TB.StrongEntropy", + catName, + new AspectList().add(Aspect.ENTROPY, 2) + .add(Aspect.WEAPON, 2), + -1, + 1, + 3, + new ItemStack(Blocks.sand, 1, 0)).setParents("TB.AdvancedEntropy") + .setSecondary() + .setPages( + new ResearchPage("tb.rec.strEntr.page.0"), + new ResearchPage(glassSand), + new ResearchPage(gravelSand), + new ResearchPage(barsIron)) + .registerResearchItem(); new ResearchItem( - "TB.SimpleDublication", - catName, - new AspectList().add(Aspect.EXCHANGE, 6).add(Aspect.ORDER, 6), - 3, - 5, - 1, - new ItemStack(Items.arrow, 1, 0)) - .setParents("TB.CRUCIBLE").setSecondary() - .setPages( - new ResearchPage("tb.rec.simDup.page.0"), - new ResearchPage(arrows), - new ResearchPage(snowball), - new ResearchPage(redstone)) - .registerResearchItem(); + "TB.SimpleDublication", + catName, + new AspectList().add(Aspect.EXCHANGE, 6) + .add(Aspect.ORDER, 6), + 3, + 5, + 1, + new ItemStack(Items.arrow, 1, 0)).setParents("TB.CRUCIBLE") + .setSecondary() + .setPages( + new ResearchPage("tb.rec.simDup.page.0"), + new ResearchPage(arrows), + new ResearchPage(snowball), + new ResearchPage(redstone)) + .registerResearchItem(); new ResearchItem( - "TB.Amber", - catName, - new AspectList().add(Aspect.TRAP, 6).add(Aspect.ORDER, 6), - 3, - 4, - 1, - new ItemStack(ConfigItems.itemResource, 1, 6)).setParents("TB.CRUCIBLE").setSecondary() - .setPages(new ResearchPage("tb.rec.amber.page.0"), new ResearchPage(amber)) - .registerResearchItem(); + "TB.Amber", + catName, + new AspectList().add(Aspect.TRAP, 6) + .add(Aspect.ORDER, 6), + 3, + 4, + 1, + new ItemStack(ConfigItems.itemResource, 1, 6)).setParents("TB.CRUCIBLE") + .setSecondary() + .setPages(new ResearchPage("tb.rec.amber.page.0"), new ResearchPage(amber)) + .registerResearchItem(); new ResearchItem( - "TB.Quicksilver", - catName, - new AspectList().add(Aspect.TREE, 6).add(Aspect.ORDER, 6), - 3, - 2, - 1, - new ItemStack(ConfigItems.itemResource, 1, 3)).setParents("TB.CRUCIBLE").setSecondary() - .setPages(new ResearchPage("tb.rec.cinnabar.page.0"), new ResearchPage(cinnabar)) - .registerResearchItem(); + "TB.Quicksilver", + catName, + new AspectList().add(Aspect.TREE, 6) + .add(Aspect.ORDER, 6), + 3, + 2, + 1, + new ItemStack(ConfigItems.itemResource, 1, 3)).setParents("TB.CRUCIBLE") + .setSecondary() + .setPages(new ResearchPage("tb.rec.cinnabar.page.0"), new ResearchPage(cinnabar)) + .registerResearchItem(); new ResearchItem( - "TB.Thauminite", - catName, - new AspectList().add(Aspect.METAL, 4).add(Aspect.MAGIC, 3).add(Aspect.CRYSTAL, 8).add(Aspect.CRAFT, 2), - 6, - -1, - 2, - new ItemStack(TBItems.resource, 1, 1)) - .setParents("TB.THAUMIUM").setConcealed() - .setPages( - new ResearchPage("tb.rec.thauminite.page.0"), - new ResearchPage(thauminiteRec), - new ResearchPage(TBRecipes.recipes.get("thauminiteIngot")), - new ResearchPage(TBRecipes.recipes.get("thauminiteNugget")), - new ResearchPage(TBRecipes.recipes.get("thauminiteBlock")), - new ResearchPage(toolsRec)) - .registerResearchItem(); + "TB.Thauminite", + catName, + new AspectList().add(Aspect.METAL, 4) + .add(Aspect.MAGIC, 3) + .add(Aspect.CRYSTAL, 8) + .add(Aspect.CRAFT, 2), + 6, + -1, + 2, + new ItemStack(TBItems.resource, 1, 1)).setParents("TB.THAUMIUM") + .setConcealed() + .setPages( + new ResearchPage("tb.rec.thauminite.page.0"), + new ResearchPage(thauminiteRec), + new ResearchPage(TBRecipes.recipes.get("thauminiteIngot")), + new ResearchPage(TBRecipes.recipes.get("thauminiteNugget")), + new ResearchPage(TBRecipes.recipes.get("thauminiteBlock")), + new ResearchPage(toolsRec)) + .registerResearchItem(); new ResearchItem( - "ROD_tbthaumium", - catName, - new AspectList().add(Aspect.METAL, 4).add(Aspect.MAGIC, 3).add(Aspect.AURA, 4).add(Aspect.CRAFT, 2) - .add(Aspect.MAN, 6), - 10, - -1, - 2, - new ItemStack(TBItems.resource, 1, 3)).setParents("TB.THAUMIUM").setConcealed() - .setPages(new ResearchPage("tb.rec.thaumRod.page.0"), new ResearchPage(thaumicWandCore)) - .registerResearchItem(); + "ROD_tbthaumium", + catName, + new AspectList().add(Aspect.METAL, 4) + .add(Aspect.MAGIC, 3) + .add(Aspect.AURA, 4) + .add(Aspect.CRAFT, 2) + .add(Aspect.MAN, 6), + 10, + -1, + 2, + new ItemStack(TBItems.resource, 1, 3)).setParents("TB.THAUMIUM") + .setConcealed() + .setPages(new ResearchPage("tb.rec.thaumRod.page.0"), new ResearchPage(thaumicWandCore)) + .registerResearchItem(); new ResearchItem( - "ROD_tbvoid", - catName, - new AspectList().add(Aspect.ELDRITCH, 4).add(Aspect.MAGIC, 3).add(Aspect.AURA, 4).add(Aspect.VOID, 2) - .add(Aspect.MIND, 6), - 13, - -1, - 4, - new ItemStack(TBItems.resource, 1, 4)).setParents("ROD_tbthaumium", "TB.VOIDMETAL").setConcealed() - .setSpecial() - .setPages(new ResearchPage("tb.rec.voidRod.page.0"), new ResearchPage(voidRodRecipe)) - .registerResearchItem(); + "ROD_tbvoid", + catName, + new AspectList().add(Aspect.ELDRITCH, 4) + .add(Aspect.MAGIC, 3) + .add(Aspect.AURA, 4) + .add(Aspect.VOID, 2) + .add(Aspect.MIND, 6), + 13, + -1, + 4, + new ItemStack(TBItems.resource, 1, 4)).setParents("ROD_tbthaumium", "TB.VOIDMETAL") + .setConcealed() + .setSpecial() + .setPages(new ResearchPage("tb.rec.voidRod.page.0"), new ResearchPage(voidRodRecipe)) + .registerResearchItem(); new ResearchItem( - "CAP_thauminite", - catName, - new AspectList().add(Aspect.METAL, 4).add(Aspect.MAGIC, 3).add(Aspect.AURA, 4), - 5, - 0, - 2, - new ItemStack(TBItems.resource, 1, 2)).setParents("TB.Thauminite").setConcealed() - .setPages(new ResearchPage("tb.rec.capthauminite.page.0"), new ResearchPage(thauminiteCaps)) - .registerResearchItem(); + "CAP_thauminite", + catName, + new AspectList().add(Aspect.METAL, 4) + .add(Aspect.MAGIC, 3) + .add(Aspect.AURA, 4), + 5, + 0, + 2, + new ItemStack(TBItems.resource, 1, 2)).setParents("TB.Thauminite") + .setConcealed() + .setPages(new ResearchPage("tb.rec.capthauminite.page.0"), new ResearchPage(thauminiteCaps)) + .registerResearchItem(); new ResearchItem( - "TB.SM", - catName, - new AspectList().add(primals(4)), - 3, - 3, - 1, - new ItemStack(ConfigItems.itemResource, 1, 14)).setParents("TB.CRUCIBLE", "TB.Quicksilver", "TB.Amber") - .setSecondary().setConcealed() - .setPages(new ResearchPage("tb.rec.sm.page.0"), new ResearchPage(salisMundis)) - .registerResearchItem(); + "TB.SM", + catName, + new AspectList().add(primals(4)), + 3, + 3, + 1, + new ItemStack(ConfigItems.itemResource, 1, 14)).setParents("TB.CRUCIBLE", "TB.Quicksilver", "TB.Amber") + .setSecondary() + .setConcealed() + .setPages(new ResearchPage("tb.rec.sm.page.0"), new ResearchPage(salisMundis)) + .registerResearchItem(); new ResearchItem( - "TB.SMB", - catName, - new AspectList().add(primals(6)).add(Aspect.CRAFT, 2), - 4, - 3, - 1, - new ItemStack(TBBlocks.dustBlock)).setParents("TB.SM").setConcealed() - .setPages(new ResearchPage("tb.rec.smb.page.0"), new ResearchPage(salisMundusBlockRec)) - .registerResearchItem(); + "TB.SMB", + catName, + new AspectList().add(primals(6)) + .add(Aspect.CRAFT, 2), + 4, + 3, + 1, + new ItemStack(TBBlocks.dustBlock)).setParents("TB.SM") + .setConcealed() + .setPages(new ResearchPage("tb.rec.smb.page.0"), new ResearchPage(salisMundusBlockRec)) + .registerResearchItem(); new ResearchItem( - "TB.OreDestruction", - catName, - new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.MAGIC, 4).add(Aspect.ORDER, 1).add(Aspect.FIRE, 1) - .add(Aspect.AIR, 1).add(Aspect.EARTH, 1).add(Aspect.WATER, 1), - -7, - 1, - 3, - new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE)).setParents("TB.MasterEntropy") - .setPages(new ResearchPage("tb.rec.oreDestr.page.0"), new ResearchPage(shards)) - .registerResearchItem(); + "TB.OreDestruction", + catName, + new AspectList().add(Aspect.ENTROPY, 8) + .add(Aspect.MAGIC, 4) + .add(Aspect.ORDER, 1) + .add(Aspect.FIRE, 1) + .add(Aspect.AIR, 1) + .add(Aspect.EARTH, 1) + .add(Aspect.WATER, 1), + -7, + 1, + 3, + new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE)).setParents("TB.MasterEntropy") + .setPages(new ResearchPage("tb.rec.oreDestr.page.0"), new ResearchPage(shards)) + .registerResearchItem(); // copy(ResearchCategories.getResearchList("ARTIFICE").research.get("INFUSIONENCHANTMENT"), // "TB.INFUSIONENCHANTMENT", catName, 0, 8).setHidden().registerResearchItem(); new FakeResearchItem( - "TB.INFUSIONENCHANTMENT", - "THAUMICBASES", - "INFUSIONENCHANTMENT", - "ARTIFICE", - 0, - 8, - ResearchCategories.getResearch("INFUSIONENCHANTMENT").icon_resource).registerResearchItem(); + "TB.INFUSIONENCHANTMENT", + "THAUMICBASES", + "INFUSIONENCHANTMENT", + "ARTIFICE", + 0, + 8, + ResearchCategories.getResearch("INFUSIONENCHANTMENT").icon_resource).registerResearchItem(); new ResearchItem( - "TB.ElderKnowledge", - catName, - new AspectList().add(Aspect.MAGIC, 8).add(Aspect.MIND, 8).add(Aspect.WEAPON, 8), - -2, - 8, - 1, - new ResourceLocation("thaumicbases", "textures/enchantments/elder_knowledge.png")) - .setParents("TB.INFUSIONENCHANTMENT").setSecondary().setConcealed() - .setPages(new ResearchPage("tb.rec.enchantments.ewisdom"), new ResearchPage(elderKnowledgeEnch)) - .registerResearchItem(); + "TB.ElderKnowledge", + catName, + new AspectList().add(Aspect.MAGIC, 8) + .add(Aspect.MIND, 8) + .add(Aspect.WEAPON, 8), + -2, + 8, + 1, + new ResourceLocation("thaumicbases", "textures/enchantments/elder_knowledge.png")) + .setParents("TB.INFUSIONENCHANTMENT") + .setSecondary() + .setConcealed() + .setPages(new ResearchPage("tb.rec.enchantments.ewisdom"), new ResearchPage(elderKnowledgeEnch)) + .registerResearchItem(); new ResearchItem( - "TB.EldritchBane", - catName, - new AspectList().add(Aspect.DEATH, 8).add(Aspect.ELDRITCH, 8).add(Aspect.WEAPON, 8), - -1, - 10, - 1, - new ResourceLocation("thaumicbases", "textures/enchantments/eldritch_bane.png")) - .setParents("TB.INFUSIONENCHANTMENT").setSecondary().setConcealed() - .setPages(new ResearchPage("tb.rec.enchantments.ebane"), new ResearchPage(elderBaneEnch)) - .registerResearchItem(); + "TB.EldritchBane", + catName, + new AspectList().add(Aspect.DEATH, 8) + .add(Aspect.ELDRITCH, 8) + .add(Aspect.WEAPON, 8), + -1, + 10, + 1, + new ResourceLocation("thaumicbases", "textures/enchantments/eldritch_bane.png")) + .setParents("TB.INFUSIONENCHANTMENT") + .setSecondary() + .setConcealed() + .setPages(new ResearchPage("tb.rec.enchantments.ebane"), new ResearchPage(elderBaneEnch)) + .registerResearchItem(); new ResearchItem( - "TB.MagicTouch", - catName, - new AspectList().add(Aspect.MAGIC, 8).add(Aspect.AURA, 8).add(Aspect.WEAPON, 8), - -1, - 6, - 1, - new ResourceLocation("thaumicbases", "textures/enchantments/magic_touched.png")) - .setParents("TB.INFUSIONENCHANTMENT").setSecondary().setConcealed() - .setPages( - new ResearchPage("tb.rec.enchantments.magictouched"), - new ResearchPage(magicTouchEnch)) - .registerResearchItem(); + "TB.MagicTouch", + catName, + new AspectList().add(Aspect.MAGIC, 8) + .add(Aspect.AURA, 8) + .add(Aspect.WEAPON, 8), + -1, + 6, + 1, + new ResourceLocation("thaumicbases", "textures/enchantments/magic_touched.png")) + .setParents("TB.INFUSIONENCHANTMENT") + .setSecondary() + .setConcealed() + .setPages(new ResearchPage("tb.rec.enchantments.magictouched"), new ResearchPage(magicTouchEnch)) + .registerResearchItem(); new ResearchItem( - "TB.Vaporising", - catName, - new AspectList().add(Aspect.MAGIC, 8).add(Aspect.CRYSTAL, 8).add(Aspect.TRAP, 8), - -3, - 7, - 1, - new ResourceLocation("thaumicbases", "textures/enchantments/vaporising.png")) - .setParents("TB.INFUSIONENCHANTMENT").setSecondary().setConcealed() - .setPages(new ResearchPage("tb.rec.enchantments.vaporising"), new ResearchPage(vaporisingEnch)) - .registerResearchItem(); + "TB.Vaporising", + catName, + new AspectList().add(Aspect.MAGIC, 8) + .add(Aspect.CRYSTAL, 8) + .add(Aspect.TRAP, 8), + -3, + 7, + 1, + new ResourceLocation("thaumicbases", "textures/enchantments/vaporising.png")) + .setParents("TB.INFUSIONENCHANTMENT") + .setSecondary() + .setConcealed() + .setPages(new ResearchPage("tb.rec.enchantments.vaporising"), new ResearchPage(vaporisingEnch)) + .registerResearchItem(); new ResearchItem( - "TB.Tainted", - catName, - new AspectList().add(Aspect.TAINT, 16), - -3, - 9, - 1, - new ResourceLocation("thaumicbases", "textures/enchantments/tainted.png")) - .setParents("TB.INFUSIONENCHANTMENT").setSecondary().setConcealed() - .setPages(new ResearchPage("tb.rec.enchantments.taint"), new ResearchPage(taintedEnch)) - .registerResearchItem(); + "TB.Tainted", + catName, + new AspectList().add(Aspect.TAINT, 16), + -3, + 9, + 1, + new ResourceLocation("thaumicbases", "textures/enchantments/tainted.png")) + .setParents("TB.INFUSIONENCHANTMENT") + .setSecondary() + .setConcealed() + .setPages(new ResearchPage("tb.rec.enchantments.taint"), new ResearchPage(taintedEnch)) + .registerResearchItem(); new ResearchItem( - "TB.Foci.Drain", - catName, - new AspectList().add(Aspect.WATER, 6).add(Aspect.VOID, 3), - -3, - -2, - 0, - new ItemStack(TBItems.fociDrain)).setParents("TB.INFUSION") - .setParentsHidden("FOCUSEXCAVATION", "JARVOID").setConcealed().setSecondary() - .setPages( - new ResearchPage("tb.rec.drainFoci.page.0"), - new ResearchPage(drainFociRec), - new ResearchPage("tb.rec.drainFoci.page.1"), - new ResearchPage("tb.rec.drainFoci.page.2")) - .registerResearchItem(); + "TB.Foci.Drain", + catName, + new AspectList().add(Aspect.WATER, 6) + .add(Aspect.VOID, 3), + -3, + -2, + 0, + new ItemStack(TBItems.fociDrain)).setParents("TB.INFUSION") + .setParentsHidden("FOCUSEXCAVATION", "JARVOID") + .setConcealed() + .setSecondary() + .setPages( + new ResearchPage("tb.rec.drainFoci.page.0"), + new ResearchPage(drainFociRec), + new ResearchPage("tb.rec.drainFoci.page.1"), + new ResearchPage("tb.rec.drainFoci.page.2")) + .registerResearchItem(); new ResearchItem( - "TB.Foci.Experience", - catName, - new AspectList().add(Aspect.GREED, 16).add(Aspect.HUNGER, 16).add(Aspect.MINE, 2).add(Aspect.MIND, 8), - -2, - -5, - 1, - new ItemStack(TBItems.fociExperience)).setParents("TB.INFUSION").setParentsHidden("FOCUSEXCAVATION") - .setConcealed() - .setPages( - new ResearchPage("tb.rec.expFoci.page.0"), - new ResearchPage(expFociRec), - new ResearchPage("tb.rec.expFoci.page.1"), - new ResearchPage("tb.rec.expFoci.page.2")) - .registerResearchItem(); + "TB.Foci.Experience", + catName, + new AspectList().add(Aspect.GREED, 16) + .add(Aspect.HUNGER, 16) + .add(Aspect.MINE, 2) + .add(Aspect.MIND, 8), + -2, + -5, + 1, + new ItemStack(TBItems.fociExperience)).setParents("TB.INFUSION") + .setParentsHidden("FOCUSEXCAVATION") + .setConcealed() + .setPages( + new ResearchPage("tb.rec.expFoci.page.0"), + new ResearchPage(expFociRec), + new ResearchPage("tb.rec.expFoci.page.1"), + new ResearchPage("tb.rec.expFoci.page.2")) + .registerResearchItem(); new ResearchItem( - "TB.Foci.Flux", - catName, - new AspectList().add(Aspect.WATER, 4).add(Aspect.ORDER, 4).add(Aspect.VOID, 4), - -2, - -1, - 0, - new ItemStack(TBItems.fociFlux)).setParents("TB.INFUSION").setParentsHidden("JARVOID", "FLUXSCRUB") - .setConcealed().setSecondary() - .setPages( - new ResearchPage("tb.rec.fluxFoci.page.0"), - new ResearchPage(fluxFociRec), - new ResearchPage("tb.rec.fluxFoci.page.1"), - new ResearchPage("tb.rec.fluxFoci.page.2"), - new ResearchPage("tb.rec.fluxFoci.page.3")) - .registerResearchItem(); + "TB.Foci.Flux", + catName, + new AspectList().add(Aspect.WATER, 4) + .add(Aspect.ORDER, 4) + .add(Aspect.VOID, 4), + -2, + -1, + 0, + new ItemStack(TBItems.fociFlux)).setParents("TB.INFUSION") + .setParentsHidden("JARVOID", "FLUXSCRUB") + .setConcealed() + .setSecondary() + .setPages( + new ResearchPage("tb.rec.fluxFoci.page.0"), + new ResearchPage(fluxFociRec), + new ResearchPage("tb.rec.fluxFoci.page.1"), + new ResearchPage("tb.rec.fluxFoci.page.2"), + new ResearchPage("tb.rec.fluxFoci.page.3")) + .registerResearchItem(); new ResearchItem( - "TB.Foci.Activation", - catName, - new AspectList().add(Aspect.TRAVEL, 4).add(Aspect.MOTION, 4).add(Aspect.SENSES, 4), - -3, - -4, - 0, - new ItemStack(TBItems.fociActivation)).setParents("TB.INFUSION").setParentsHidden("MIRRORHAND") - .setConcealed().setSecondary() - .setPages( - new ResearchPage("tb.rec.actFoci.page.0"), - new ResearchPage(activationFociRec), - new ResearchPage("tb.rec.actFoci.page.1")) - .registerResearchItem(); + "TB.Foci.Activation", + catName, + new AspectList().add(Aspect.TRAVEL, 4) + .add(Aspect.MOTION, 4) + .add(Aspect.SENSES, 4), + -3, + -4, + 0, + new ItemStack(TBItems.fociActivation)).setParents("TB.INFUSION") + .setParentsHidden("MIRRORHAND") + .setConcealed() + .setSecondary() + .setPages( + new ResearchPage("tb.rec.actFoci.page.0"), + new ResearchPage(activationFociRec), + new ResearchPage("tb.rec.actFoci.page.1")) + .registerResearchItem(); new ResearchItem( - "TB.AdvAlc", - catName, - new AspectList().add(Aspect.MOTION, 16).add(Aspect.AIR, 16).add(Aspect.FIRE, 8).add(Aspect.CRAFT, 4), - 8, - 2, - 2, - new ItemStack(TBBlocks.advAlchFurnace)).setParents("TB.THAUMIUM", "TB.DISTILESSENTIA", "TB.BELLOWS") - .setPages(new ResearchPage("tb.rec.advAlc.page.0"), new ResearchPage(advFurnaceRecipe)) - .registerResearchItem(); + "TB.AdvAlc", + catName, + new AspectList().add(Aspect.MOTION, 16) + .add(Aspect.AIR, 16) + .add(Aspect.FIRE, 8) + .add(Aspect.CRAFT, 4), + 8, + 2, + 2, + new ItemStack(TBBlocks.advAlchFurnace)).setParents("TB.THAUMIUM", "TB.DISTILESSENTIA", "TB.BELLOWS") + .setPages(new ResearchPage("tb.rec.advAlc.page.0"), new ResearchPage(advFurnaceRecipe)) + .registerResearchItem(); new ResearchItem( - "TB.CryingObs", - catName, - new AspectList().add(Aspect.TRAVEL, 8).add(Aspect.LIFE, 8).add(Aspect.SOUL, 8), - 3, - -4, - 2, - new ItemStack(TBBlocks.cryingObsidian, 1, 0)).setParents("TB.INFUSION").setConcealed() - .setPages(new ResearchPage("tb.rec.cryingObs.page.0"), new ResearchPage(cryingObsidianRec)) - .registerResearchItem(); + "TB.CryingObs", + catName, + new AspectList().add(Aspect.TRAVEL, 8) + .add(Aspect.LIFE, 8) + .add(Aspect.SOUL, 8), + 3, + -4, + 2, + new ItemStack(TBBlocks.cryingObsidian, 1, 0)).setParents("TB.INFUSION") + .setConcealed() + .setPages(new ResearchPage("tb.rec.cryingObs.page.0"), new ResearchPage(cryingObsidianRec)) + .registerResearchItem(); new ResearchItem( - "TB.Overchanter", - catName, - new AspectList().add(primals(8)).add(Aspect.MIND, 8).add(Aspect.MAGIC, 8), - -5, - -3, - 3, - new ItemStack(TBBlocks.overchanter, 1, 0)) - .setParents("TB.INFUSION").setConcealed() - .setPages( - new ResearchPage("tb.rec.overchanter.page.0"), - new ResearchPage("tb.rec.overchanter.page.1"), - new ResearchPage("tb.rec.overchanter.page.2"), - new ResearchPage(overchanterRec)) - .registerResearchItem(); + "TB.Overchanter", + catName, + new AspectList().add(primals(8)) + .add(Aspect.MIND, 8) + .add(Aspect.MAGIC, 8), + -5, + -3, + 3, + new ItemStack(TBBlocks.overchanter, 1, 0)).setParents("TB.INFUSION") + .setConcealed() + .setPages( + new ResearchPage("tb.rec.overchanter.page.0"), + new ResearchPage("tb.rec.overchanter.page.1"), + new ResearchPage("tb.rec.overchanter.page.2"), + new ResearchPage(overchanterRec)) + .registerResearchItem(); new ResearchItem( - "TB.Relocator", - catName, - new AspectList().add(Aspect.MOTION, 4).add(Aspect.AIR, 4).add(Aspect.VOID, 4), - 6, - 7, - 1, - new ItemStack(TBBlocks.relocator, 1, 0)) - .setParents("TB.LEVITATOR").setConcealed() - .setPages( - new ResearchPage("tb.rec.relocator.page.0"), - new ResearchPage(relocatorRec), - new ResearchPage(irelocatorRec)) - .registerResearchItem(); + "TB.Relocator", + catName, + new AspectList().add(Aspect.MOTION, 4) + .add(Aspect.AIR, 4) + .add(Aspect.VOID, 4), + 6, + 7, + 1, + new ItemStack(TBBlocks.relocator, 1, 0)).setParents("TB.LEVITATOR") + .setConcealed() + .setPages( + new ResearchPage("tb.rec.relocator.page.0"), + new ResearchPage(relocatorRec), + new ResearchPage(irelocatorRec)) + .registerResearchItem(); new ResearchItem( - "TB.ThaumicAnvil", - catName, - new AspectList().add(Aspect.METAL, 4).add(Aspect.CRAFT, 3), - 10, - 2, - 2, - new ItemStack(TBBlocks.thaumicAnvil, 1, 0)).setParents("TB.THAUMIUM").setConcealed() - .setPages(new ResearchPage("tb.rec.thaumicAnvil.page.0"), new ResearchPage(thaumicAnvilRec)) - .registerResearchItem(); + "TB.ThaumicAnvil", + catName, + new AspectList().add(Aspect.METAL, 4) + .add(Aspect.CRAFT, 3), + 10, + 2, + 2, + new ItemStack(TBBlocks.thaumicAnvil, 1, 0)).setParents("TB.THAUMIUM") + .setConcealed() + .setPages(new ResearchPage("tb.rec.thaumicAnvil.page.0"), new ResearchPage(thaumicAnvilRec)) + .registerResearchItem(); new ResearchItem( - "TB.VoidAnvil", - catName, - new AspectList().add(Aspect.METAL, 4).add(Aspect.CRAFT, 3).add(Aspect.TOOL, 4).add(Aspect.ELDRITCH, 4), - 13, - 2, - 2, - new ItemStack(TBBlocks.voidAnvil, 1, 0)) - .setParents("TB.VOIDMETAL", "TB.ThaumicAnvil").setConcealed() - .setPages( - new ResearchPage("tb.rec.voidAnvil.page.0"), - new ResearchPage("tb.rec.voidAnvil.page.1"), - new ResearchPage(voidAnvilRec)) - .registerResearchItem(); + "TB.VoidAnvil", + catName, + new AspectList().add(Aspect.METAL, 4) + .add(Aspect.CRAFT, 3) + .add(Aspect.TOOL, 4) + .add(Aspect.ELDRITCH, 4), + 13, + 2, + 2, + new ItemStack(TBBlocks.voidAnvil, 1, 0)).setParents("TB.VOIDMETAL", "TB.ThaumicAnvil") + .setConcealed() + .setPages( + new ResearchPage("tb.rec.voidAnvil.page.0"), + new ResearchPage("tb.rec.voidAnvil.page.1"), + new ResearchPage(voidAnvilRec)) + .registerResearchItem(); new ResearchItem( - "TB.Campfire", - catName, - new AspectList().add(Aspect.FIRE, 3).add(Aspect.MIND, 3).add(Aspect.ENTROPY, 3), - 9, - 5, - 1, - new ItemStack(TBBlocks.campfire, 1, 0)).setRound() - .setPages(new ResearchPage("tb.rec.campfire.page.0"), new ResearchPage(campfireRec)) - .registerResearchItem(); + "TB.Campfire", + catName, + new AspectList().add(Aspect.FIRE, 3) + .add(Aspect.MIND, 3) + .add(Aspect.ENTROPY, 3), + 9, + 5, + 1, + new ItemStack(TBBlocks.campfire, 1, 0)).setRound() + .setPages(new ResearchPage("tb.rec.campfire.page.0"), new ResearchPage(campfireRec)) + .registerResearchItem(); new ResearchItem( - "TB.Brazier", - catName, - new AspectList().add(Aspect.FIRE, 3).add(Aspect.MIND, 3).add(Aspect.ENTROPY, 3).add(Aspect.MAGIC, 3) - .add(Aspect.MOTION, 3), - 9, - 7, - 0, - new ItemStack(TBBlocks.braizer, 1, 0)).setParents("TB.Campfire").setSecondary() - .setPages(new ResearchPage("tb.rec.brazier.page.0"), new ResearchPage(brazierRec)) - .registerResearchItem(); + "TB.Brazier", + catName, + new AspectList().add(Aspect.FIRE, 3) + .add(Aspect.MIND, 3) + .add(Aspect.ENTROPY, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.MOTION, 3), + 9, + 7, + 0, + new ItemStack(TBBlocks.braizer, 1, 0)).setParents("TB.Campfire") + .setSecondary() + .setPages(new ResearchPage("tb.rec.brazier.page.0"), new ResearchPage(brazierRec)) + .registerResearchItem(); // TODO last recipes // -4,-14 @@ -1236,47 +1435,80 @@ public static void setup() { ThaumcraftApi.addWarpToResearch("TB.VoidAnvil", 2); // Add new crudible recips - ThaumcraftApi.getCraftingRecipes().add(wool3Rec); - ThaumcraftApi.getCraftingRecipes().add(sandstone3Rec); - ThaumcraftApi.getCraftingRecipes().add(blaze3Rec); - ThaumcraftApi.getCraftingRecipes().add(wool4Rec); - ThaumcraftApi.getCraftingRecipes().add(sandstone4Rec); - ThaumcraftApi.getCraftingRecipes().add(blaze4Rec); - ThaumcraftApi.getCraftingRecipes().add(glassSand); - ThaumcraftApi.getCraftingRecipes().add(gravelSand); - ThaumcraftApi.getCraftingRecipes().add(barsIron); - ThaumcraftApi.getCraftingRecipes().add(arrows); - ThaumcraftApi.getCraftingRecipes().add(snowball); - ThaumcraftApi.getCraftingRecipes().add(redstone); - ThaumcraftApi.getCraftingRecipes().add(amber); + ThaumcraftApi.getCraftingRecipes() + .add(wool3Rec); + ThaumcraftApi.getCraftingRecipes() + .add(sandstone3Rec); + ThaumcraftApi.getCraftingRecipes() + .add(blaze3Rec); + ThaumcraftApi.getCraftingRecipes() + .add(wool4Rec); + ThaumcraftApi.getCraftingRecipes() + .add(sandstone4Rec); + ThaumcraftApi.getCraftingRecipes() + .add(blaze4Rec); + ThaumcraftApi.getCraftingRecipes() + .add(glassSand); + ThaumcraftApi.getCraftingRecipes() + .add(gravelSand); + ThaumcraftApi.getCraftingRecipes() + .add(barsIron); + ThaumcraftApi.getCraftingRecipes() + .add(arrows); + ThaumcraftApi.getCraftingRecipes() + .add(snowball); + ThaumcraftApi.getCraftingRecipes() + .add(redstone); + ThaumcraftApi.getCraftingRecipes() + .add(amber); // Infusion enchants - ThaumcraftApi.getCraftingRecipes().add(elderKnowledgeEnch); - ThaumcraftApi.getCraftingRecipes().add(elderBaneEnch); - ThaumcraftApi.getCraftingRecipes().add(magicTouchEnch); - ThaumcraftApi.getCraftingRecipes().add(vaporisingEnch); - ThaumcraftApi.getCraftingRecipes().add(taintedEnch); + ThaumcraftApi.getCraftingRecipes() + .add(elderKnowledgeEnch); + ThaumcraftApi.getCraftingRecipes() + .add(elderBaneEnch); + ThaumcraftApi.getCraftingRecipes() + .add(magicTouchEnch); + ThaumcraftApi.getCraftingRecipes() + .add(vaporisingEnch); + ThaumcraftApi.getCraftingRecipes() + .add(taintedEnch); // - ThaumcraftApi.getCraftingRecipes().add(cinnabar); - ThaumcraftApi.getCraftingRecipes().add(salisMundis); - ThaumcraftApi.getCraftingRecipes().add(chiseledBricks); - ThaumcraftApi.getCraftingRecipes().add(gravel2Cobble); - ThaumcraftApi.getCraftingRecipes().add(icePacking); - ThaumcraftApi.getCraftingRecipes().add(blazepowderRest); - ThaumcraftApi.getCraftingRecipes().add(boneRest); - ThaumcraftApi.getCraftingRecipes().add(sugarRest); - ThaumcraftApi.getCraftingRecipes().add(cactiRest); - - ThaumcraftApi.getCraftingRecipes().add(salisMundusBlockRec); - - ThaumcraftApi.getCraftingRecipes().add(thauminiteRec); - ThaumcraftApi.getCraftingRecipes().add(thauminiteCaps); - - ThaumcraftApi.getCraftingRecipes().add(pyrofluidRec); - - ThaumcraftApi.getCraftingRecipes().add(thaumicWandCore); - ThaumcraftApi.getCraftingRecipes().add(voidRodRecipe); + ThaumcraftApi.getCraftingRecipes() + .add(cinnabar); + ThaumcraftApi.getCraftingRecipes() + .add(salisMundis); + ThaumcraftApi.getCraftingRecipes() + .add(chiseledBricks); + ThaumcraftApi.getCraftingRecipes() + .add(gravel2Cobble); + ThaumcraftApi.getCraftingRecipes() + .add(icePacking); + ThaumcraftApi.getCraftingRecipes() + .add(blazepowderRest); + ThaumcraftApi.getCraftingRecipes() + .add(boneRest); + ThaumcraftApi.getCraftingRecipes() + .add(sugarRest); + ThaumcraftApi.getCraftingRecipes() + .add(cactiRest); + + ThaumcraftApi.getCraftingRecipes() + .add(salisMundusBlockRec); + + ThaumcraftApi.getCraftingRecipes() + .add(thauminiteRec); + ThaumcraftApi.getCraftingRecipes() + .add(thauminiteCaps); + + ThaumcraftApi.getCraftingRecipes() + .add(pyrofluidRec); + + ThaumcraftApi.getCraftingRecipes() + .add(thaumicWandCore); + ThaumcraftApi.getCraftingRecipes() + .add(voidRodRecipe); // TODO Tobacco if (TBConfig.allowTobacco) { @@ -1287,247 +1519,304 @@ public static void setup() { ThaumcraftApi.addWarpToItem(new ItemStack(TBItems.tobacco, 1, 1), 1); ShapelessArcaneRecipe saturatingTobaccoRec = new ShapelessArcaneRecipe( - "TB.Tobacco.Saturating", - new ItemStack(TBItems.tobacco, 1, 3), - new AspectList().add(Aspect.EARTH, 10).add(Aspect.FIRE, 10).add(Aspect.WATER, 10), - new Object[] { new ItemStack(TBItems.tobacco, 1, 0), new ItemStack(Items.pumpkin_seeds) }); + "TB.Tobacco.Saturating", + new ItemStack(TBItems.tobacco, 1, 3), + new AspectList().add(Aspect.EARTH, 10) + .add(Aspect.FIRE, 10) + .add(Aspect.WATER, 10), + new Object[] { new ItemStack(TBItems.tobacco, 1, 0), new ItemStack(Items.pumpkin_seeds) }); ShapelessArcaneRecipe saturatingTobaccoRecM = new ShapelessArcaneRecipe( - "TB.Tobacco.Saturating", - new ItemStack(TBItems.tobacco, 1, 3), - new AspectList().add(Aspect.EARTH, 10).add(Aspect.FIRE, 10).add(Aspect.WATER, 10), - new Object[] { new ItemStack(TBItems.tobacco, 1, 0), new ItemStack(Items.melon_seeds) }); + "TB.Tobacco.Saturating", + new ItemStack(TBItems.tobacco, 1, 3), + new AspectList().add(Aspect.EARTH, 10) + .add(Aspect.FIRE, 10) + .add(Aspect.WATER, 10), + new Object[] { new ItemStack(TBItems.tobacco, 1, 0), new ItemStack(Items.melon_seeds) }); // Seeds CrucibleRecipe tobaccoSeedRec = new CrucibleRecipe( - "TB.Tobacco", - new ItemStack(TBItems.tobaccoSeeds, 1, 0), - new ItemStack(Items.wheat_seeds, 1, 0), - new AspectList().add(Aspect.MIND, 4).add(Aspect.WATER, 4).add(Aspect.MAN, 4).add(Aspect.CROP, 4)); + "TB.Tobacco", + new ItemStack(TBItems.tobaccoSeeds, 1, 0), + new ItemStack(Items.wheat_seeds, 1, 0), + new AspectList().add(Aspect.MIND, 4) + .add(Aspect.WATER, 4) + .add(Aspect.MAN, 4) + .add(Aspect.CROP, 4)); // M&P ShapelessArcaneRecipe pestleRecipe = new ShapelessArcaneRecipe( - "TB.Tobacco", - TBItems.mortar, - new AspectList().add(primals(4)), - new Object[] { new ItemStack(Items.bowl), new ItemStack(Items.stick), - new ItemStack(Blocks.wooden_slab), new ItemStack(Blocks.wooden_slab), - new ItemStack(Blocks.wooden_slab) }); + "TB.Tobacco", + TBItems.mortar, + new AspectList().add(primals(4)), + new Object[] { new ItemStack(Items.bowl), new ItemStack(Items.stick), new ItemStack(Blocks.wooden_slab), + new ItemStack(Blocks.wooden_slab), new ItemStack(Blocks.wooden_slab) }); ShapelessArcaneRecipe genTobaccoRec = new ShapelessArcaneRecipe( - "TB.Tobacco", - new ItemStack(TBItems.tobacco, 1, 0), - new AspectList().add(Aspect.ORDER, 1).add(Aspect.ENTROPY, 1), - new Object[] { "pestleAndMortar", new ItemStack(TBItems.resource, 1, 7) }); + "TB.Tobacco", + new ItemStack(TBItems.tobacco, 1, 0), + new AspectList().add(Aspect.ORDER, 1) + .add(Aspect.ENTROPY, 1), + new Object[] { "pestleAndMortar", new ItemStack(TBItems.resource, 1, 7) }); // GW pipe ShapedArcaneRecipe pipeRecipe = new ShapedArcaneRecipe( - "TB.Tobacco", - TBItems.greatwoodPipe, - new AspectList().add(primals(4)), - new Object[] { "#@ ", " ##", '#', new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), '@', - new ItemStack(ConfigItems.itemResource, 1, 14) }); - - new ResearchItem( - "TB.Tobacco", - catName, - new AspectList().add(Aspect.CROP, 4).add(Aspect.HARVEST, 4).add(Aspect.MAN, 4).add(Aspect.MIND, 4), - 11, - -7, - 3, - new ItemStack(TBItems.greatwoodPipe, 1, 0)) - .setParentsHidden("TB.Plax").setConcealed() - .setPages( - new ResearchPage("tb.rec.tobacco.page.0"), - new ResearchPage(tobaccoSeedRec), - new ResearchPage("tb.rec.tobacco.page.1"), - new ResearchPage(pipeRecipe), - new ResearchPage(pestleRecipe), - new ResearchPage(genTobaccoRec), - new ResearchPage("tb.rec.tobacco.page.2")) - .registerResearchItem(); + "TB.Tobacco", + TBItems.greatwoodPipe, + new AspectList().add(primals(4)), + new Object[] { "#@ ", " ##", '#', new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 6), '@', + new ItemStack(ConfigItems.itemResource, 1, 14) }); + + new ResearchItem( + "TB.Tobacco", + catName, + new AspectList().add(Aspect.CROP, 4) + .add(Aspect.HARVEST, 4) + .add(Aspect.MAN, 4) + .add(Aspect.MIND, 4), + 11, + -7, + 3, + new ItemStack(TBItems.greatwoodPipe, 1, 0)).setParentsHidden("TB.Plax") + .setConcealed() + .setPages( + new ResearchPage("tb.rec.tobacco.page.0"), + new ResearchPage(tobaccoSeedRec), + new ResearchPage("tb.rec.tobacco.page.1"), + new ResearchPage(pipeRecipe), + new ResearchPage(pestleRecipe), + new ResearchPage(genTobaccoRec), + new ResearchPage("tb.rec.tobacco.page.2")) + .registerResearchItem(); // SW Pipe InfusionRecipe silverwoodPipeRec = new InfusionRecipe( - "TB.SilverwoodPipe", - new ItemStack(TBItems.silverwoodPipe, 1, 0), - 4, - new AspectList().add(Aspect.AURA, 8).add(Aspect.ORDER, 32).add(Aspect.HEAL, 16), - new ItemStack(TBItems.greatwoodPipe, 1, 0), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 7), - new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 7), - new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 7), - new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 7), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 2) }); - - new ResearchItem( - "TB.SilverwoodPipe", - catName, - new AspectList().add(Aspect.ORDER, 8).add(Aspect.HEAL, 8).add(Aspect.AURA, 8), - 13, - -9, - 1, - new ItemStack(TBItems.silverwoodPipe, 1, 0)).setParents("TB.Tobacco") - .setParentsHidden("TB.INFUSION").setConcealed() - .setPages(new ResearchPage("tb.rec.silverPipe.page.0"), new ResearchPage(silverwoodPipeRec)) - .registerResearchItem(); + "TB.SilverwoodPipe", + new ItemStack(TBItems.silverwoodPipe, 1, 0), + 4, + new AspectList().add(Aspect.AURA, 8) + .add(Aspect.ORDER, 32) + .add(Aspect.HEAL, 16), + new ItemStack(TBItems.greatwoodPipe, 1, 0), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 7), + new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 7), + new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 7), + new ItemStack(ConfigBlocks.blockWoodenDevice, 1, 7), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 2) }); + + new ResearchItem( + "TB.SilverwoodPipe", + catName, + new AspectList().add(Aspect.ORDER, 8) + .add(Aspect.HEAL, 8) + .add(Aspect.AURA, 8), + 13, + -9, + 1, + new ItemStack(TBItems.silverwoodPipe, 1, 0)).setParents("TB.Tobacco") + .setParentsHidden("TB.INFUSION") + .setConcealed() + .setPages(new ResearchPage("tb.rec.silverPipe.page.0"), new ResearchPage(silverwoodPipeRec)) + .registerResearchItem(); // InfusionRecipe eldritchTobacoRec = new InfusionRecipe( - "TB.Tobacco.Eldritch", - new ItemStack(TBItems.tobacco, 1, 1), - 1, - new AspectList().add(Aspect.ELDRITCH, 4).add(Aspect.DEATH, 1), - new ItemStack(TBItems.tobacco, 1, 0), - new ItemStack[] { new ItemStack(Items.ender_eye, 1, 0), new ItemStack(Items.arrow, 1, 0) }); + "TB.Tobacco.Eldritch", + new ItemStack(TBItems.tobacco, 1, 1), + 1, + new AspectList().add(Aspect.ELDRITCH, 4) + .add(Aspect.DEATH, 1), + new ItemStack(TBItems.tobacco, 1, 0), + new ItemStack[] { new ItemStack(Items.ender_eye, 1, 0), new ItemStack(Items.arrow, 1, 0) }); InfusionRecipe wispyTobaccoRec = new InfusionRecipe( - "TB.Tobacco.Wispy", - new ItemStack(TBItems.tobacco, 1, 8), - 1, - new AspectList().add(Aspect.AURA, 4).add(Aspect.MAGIC, 6), - new ItemStack(TBItems.tobacco, 1, 0), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemCrystalEssence, 1, OreDictionary.WILDCARD_VALUE) }); + "TB.Tobacco.Wispy", + new ItemStack(TBItems.tobacco, 1, 8), + 1, + new AspectList().add(Aspect.AURA, 4) + .add(Aspect.MAGIC, 6), + new ItemStack(TBItems.tobacco, 1, 0), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigItems.itemCrystalEssence, 1, OreDictionary.WILDCARD_VALUE) }); CrucibleRecipe angryTobaccoRec = new CrucibleRecipe( - "TB.Tobacco.Angry", - new ItemStack(TBItems.tobacco, 1, 2), - new ItemStack(TBItems.tobacco, 1, 0), - new AspectList().add(Aspect.WEAPON, 4).add(Aspect.HUNGER, 4)); + "TB.Tobacco.Angry", + new ItemStack(TBItems.tobacco, 1, 2), + new ItemStack(TBItems.tobacco, 1, 0), + new AspectList().add(Aspect.WEAPON, 4) + .add(Aspect.HUNGER, 4)); CrucibleRecipe miningTobaccoRec = new CrucibleRecipe( - "TB.Tobacco.Mining", - new ItemStack(TBItems.tobacco, 1, 5), - new ItemStack(TBItems.tobacco, 1, 0), - new AspectList().add(Aspect.MINE, 4).add(Aspect.MOTION, 4)); + "TB.Tobacco.Mining", + new ItemStack(TBItems.tobacco, 1, 5), + new ItemStack(TBItems.tobacco, 1, 0), + new AspectList().add(Aspect.MINE, 4) + .add(Aspect.MOTION, 4)); CrucibleRecipe wisdomTobaccoRec = new CrucibleRecipe( - "TB.Tobacco.Wisdom", - new ItemStack(TBItems.tobacco, 1, 4), - new ItemStack(TBItems.tobacco, 1, 0), - new AspectList().add(Aspect.MIND, 4).add(Aspect.AIR, 4)); + "TB.Tobacco.Wisdom", + new ItemStack(TBItems.tobacco, 1, 4), + new ItemStack(TBItems.tobacco, 1, 0), + new AspectList().add(Aspect.MIND, 4) + .add(Aspect.AIR, 4)); CrucibleRecipe taintTobaccoRec = new CrucibleRecipe( - "TB.Tobacco.Tainted", - new ItemStack(TBItems.tobacco, 1, 7), - new ItemStack(TBItems.tobacco, 1, 0), - new AspectList().add(Aspect.TAINT, 4).add(Aspect.MIND, 4)); + "TB.Tobacco.Tainted", + new ItemStack(TBItems.tobacco, 1, 7), + new ItemStack(TBItems.tobacco, 1, 0), + new AspectList().add(Aspect.TAINT, 4) + .add(Aspect.MIND, 4)); ShapelessArcaneRecipe sanityTobaccoRec = new ShapelessArcaneRecipe( - "TB.Tobacco.Sanity", - new ItemStack(TBItems.tobacco, 1, 6), - new AspectList().add(Aspect.ORDER, 10).add(Aspect.AIR, 10).add(Aspect.ENTROPY, 10), - new Object[] { new ItemStack(TBItems.tobacco, 1, 0) }); + "TB.Tobacco.Sanity", + new ItemStack(TBItems.tobacco, 1, 6), + new AspectList().add(Aspect.ORDER, 10) + .add(Aspect.AIR, 10) + .add(Aspect.ENTROPY, 10), + new Object[] { new ItemStack(TBItems.tobacco, 1, 0) }); new ResearchItem( - "TB.Tobacco.Eldritch", - catName, - new AspectList().add(Aspect.DEATH, 4).add(Aspect.ELDRITCH, 4), - 14, - -7, - 0, - new ItemStack(TBItems.tobacco, 1, 1)).setParents("TB.Tobacco").setParentsHidden("TB.INFUSION") - .setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.etobacco.page.0"), new ResearchPage(eldritchTobacoRec)) - .registerResearchItem(); + "TB.Tobacco.Eldritch", + catName, + new AspectList().add(Aspect.DEATH, 4) + .add(Aspect.ELDRITCH, 4), + 14, + -7, + 0, + new ItemStack(TBItems.tobacco, 1, 1)).setParents("TB.Tobacco") + .setParentsHidden("TB.INFUSION") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.etobacco.page.0"), new ResearchPage(eldritchTobacoRec)) + .registerResearchItem(); new ResearchItem( - "TB.Tobacco.Wispy", - catName, - new AspectList().add(Aspect.AURA, 4).add(Aspect.MAGIC, 4), - 15, - -9, - 0, - new ItemStack(TBItems.tobacco, 1, 8)).setParents("TB.Tobacco").setParentsHidden("TB.INFUSION") - .setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.wtobacco.page.0"), new ResearchPage(wispyTobaccoRec)) - .registerResearchItem(); + "TB.Tobacco.Wispy", + catName, + new AspectList().add(Aspect.AURA, 4) + .add(Aspect.MAGIC, 4), + 15, + -9, + 0, + new ItemStack(TBItems.tobacco, 1, 8)).setParents("TB.Tobacco") + .setParentsHidden("TB.INFUSION") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.wtobacco.page.0"), new ResearchPage(wispyTobaccoRec)) + .registerResearchItem(); new ResearchItem( - "TB.Tobacco.Angry", - catName, - new AspectList().add(Aspect.WEAPON, 4).add(Aspect.HUNGER, 4), - 11, - -9, - 0, - new ItemStack(TBItems.tobacco, 1, 2)).setParents("TB.Tobacco").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.atobacco.page.0"), new ResearchPage(angryTobaccoRec)) - .registerResearchItem(); + "TB.Tobacco.Angry", + catName, + new AspectList().add(Aspect.WEAPON, 4) + .add(Aspect.HUNGER, 4), + 11, + -9, + 0, + new ItemStack(TBItems.tobacco, 1, 2)).setParents("TB.Tobacco") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.atobacco.page.0"), new ResearchPage(angryTobaccoRec)) + .registerResearchItem(); new ResearchItem( - "TB.Tobacco.Mining", - catName, - new AspectList().add(Aspect.MINE, 4).add(Aspect.MOTION, 4), - 8, - -7, - 0, - new ItemStack(TBItems.tobacco, 1, 5)).setParents("TB.Tobacco").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.mtobacco.page.0"), new ResearchPage(miningTobaccoRec)) - .registerResearchItem(); + "TB.Tobacco.Mining", + catName, + new AspectList().add(Aspect.MINE, 4) + .add(Aspect.MOTION, 4), + 8, + -7, + 0, + new ItemStack(TBItems.tobacco, 1, 5)).setParents("TB.Tobacco") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.mtobacco.page.0"), new ResearchPage(miningTobaccoRec)) + .registerResearchItem(); new ResearchItem( - "TB.Tobacco.Wisdom", - catName, - new AspectList().add(Aspect.MIND, 4).add(Aspect.AIR, 4), - 13, - -6, - 0, - new ItemStack(TBItems.tobacco, 1, 4)).setParents("TB.Tobacco").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.witobacco.page.0"), new ResearchPage(wisdomTobaccoRec)) - .registerResearchItem(); + "TB.Tobacco.Wisdom", + catName, + new AspectList().add(Aspect.MIND, 4) + .add(Aspect.AIR, 4), + 13, + -6, + 0, + new ItemStack(TBItems.tobacco, 1, 4)).setParents("TB.Tobacco") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.witobacco.page.0"), new ResearchPage(wisdomTobaccoRec)) + .registerResearchItem(); new ResearchItem( - "TB.Tobacco.Tainted", - catName, - new AspectList().add(Aspect.MIND, 4).add(Aspect.TAINT, 4), - 15, - -8, - 0, - new ItemStack(TBItems.tobacco, 1, 7)).setParents("TB.Tobacco").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.ttobacco.page.0"), new ResearchPage(taintTobaccoRec)) - .registerResearchItem(); + "TB.Tobacco.Tainted", + catName, + new AspectList().add(Aspect.MIND, 4) + .add(Aspect.TAINT, 4), + 15, + -8, + 0, + new ItemStack(TBItems.tobacco, 1, 7)).setParents("TB.Tobacco") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.ttobacco.page.0"), new ResearchPage(taintTobaccoRec)) + .registerResearchItem(); new ResearchItem( - "TB.Tobacco.Saturating", - catName, - new AspectList().add(Aspect.FLESH, 4).add(Aspect.HUNGER, 4), - 10, - -9, - 0, - new ItemStack(TBItems.tobacco, 1, 3)) - .setParents("TB.Tobacco").setConcealed().setSecondary() - .setPages( - new ResearchPage("tb.rec.stobacco.page.0"), - new ResearchPage( - new ShapelessArcaneRecipe[] { saturatingTobaccoRec, - saturatingTobaccoRecM })) - .registerResearchItem(); - - new ResearchItem( - "TB.Tobacco.Sanity", - catName, - new AspectList().add(Aspect.ORDER, 4).add(Aspect.MIND, 4), - 9, - -8, - 0, - new ItemStack(TBItems.tobacco, 1, 6)).setParents("TB.Tobacco").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.satobacco.page.0"), new ResearchPage(sanityTobaccoRec)) - .registerResearchItem(); - - ThaumcraftApi.getCraftingRecipes().add(tobaccoSeedRec); - ThaumcraftApi.getCraftingRecipes().add(pestleRecipe); - ThaumcraftApi.getCraftingRecipes().add(pipeRecipe); - ThaumcraftApi.getCraftingRecipes().add(genTobaccoRec); - ThaumcraftApi.getCraftingRecipes().add(eldritchTobacoRec); - ThaumcraftApi.getCraftingRecipes().add(wispyTobaccoRec); - ThaumcraftApi.getCraftingRecipes().add(angryTobaccoRec); - ThaumcraftApi.getCraftingRecipes().add(miningTobaccoRec); - ThaumcraftApi.getCraftingRecipes().add(wisdomTobaccoRec); - ThaumcraftApi.getCraftingRecipes().add(taintTobaccoRec); - ThaumcraftApi.getCraftingRecipes().add(saturatingTobaccoRec); - ThaumcraftApi.getCraftingRecipes().add(saturatingTobaccoRecM); - ThaumcraftApi.getCraftingRecipes().add(sanityTobaccoRec); - ThaumcraftApi.getCraftingRecipes().add(silverwoodPipeRec); + "TB.Tobacco.Saturating", + catName, + new AspectList().add(Aspect.FLESH, 4) + .add(Aspect.HUNGER, 4), + 10, + -9, + 0, + new ItemStack(TBItems.tobacco, 1, 3)).setParents("TB.Tobacco") + .setConcealed() + .setSecondary() + .setPages( + new ResearchPage("tb.rec.stobacco.page.0"), + new ResearchPage(new ShapelessArcaneRecipe[] { saturatingTobaccoRec, saturatingTobaccoRecM })) + .registerResearchItem(); + + new ResearchItem( + "TB.Tobacco.Sanity", + catName, + new AspectList().add(Aspect.ORDER, 4) + .add(Aspect.MIND, 4), + 9, + -8, + 0, + new ItemStack(TBItems.tobacco, 1, 6)).setParents("TB.Tobacco") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.satobacco.page.0"), new ResearchPage(sanityTobaccoRec)) + .registerResearchItem(); + + ThaumcraftApi.getCraftingRecipes() + .add(tobaccoSeedRec); + ThaumcraftApi.getCraftingRecipes() + .add(pestleRecipe); + ThaumcraftApi.getCraftingRecipes() + .add(pipeRecipe); + ThaumcraftApi.getCraftingRecipes() + .add(genTobaccoRec); + ThaumcraftApi.getCraftingRecipes() + .add(eldritchTobacoRec); + ThaumcraftApi.getCraftingRecipes() + .add(wispyTobaccoRec); + ThaumcraftApi.getCraftingRecipes() + .add(angryTobaccoRec); + ThaumcraftApi.getCraftingRecipes() + .add(miningTobaccoRec); + ThaumcraftApi.getCraftingRecipes() + .add(wisdomTobaccoRec); + ThaumcraftApi.getCraftingRecipes() + .add(taintTobaccoRec); + ThaumcraftApi.getCraftingRecipes() + .add(saturatingTobaccoRec); + ThaumcraftApi.getCraftingRecipes() + .add(saturatingTobaccoRecM); + ThaumcraftApi.getCraftingRecipes() + .add(sanityTobaccoRec); + ThaumcraftApi.getCraftingRecipes() + .add(silverwoodPipeRec); } // TODO BloodyMess @@ -1536,125 +1825,140 @@ public static void setup() { // copy(ResearchCategories.getResearchList("ARTIFICE").research.get("ENCHFABRIC"),"TB.ENCHFABRIC",catName,8,-3).setConcealed().setHidden().registerResearchItem(); new FakeResearchItem( - "TB.ENCHFABRIC", - "THAUMICBASES", - "ENCHFABRIC", - "ARTIFICE", - 8, - -3, - ResearchCategories.getResearch("ENCHFABRIC").icon_item).registerResearchItem(); + "TB.ENCHFABRIC", + "THAUMICBASES", + "ENCHFABRIC", + "ARTIFICE", + 8, + -3, + ResearchCategories.getResearch("ENCHFABRIC").icon_item).registerResearchItem(); ThaumcraftApi.addWarpToResearch("TB.BloodyRobes", 2); ShapedArcaneRecipe bloodyChestRec = new ShapedArcaneRecipe( - "TB.BloodyRobes", - new ItemStack(TBItems.bloodyChest, 1, 0), - new AspectList().add(Aspect.AIR, 5), - new Object[] { "# #", "###", "###", '#', new ItemStack(TBItems.resource, 1, 8) }); + "TB.BloodyRobes", + new ItemStack(TBItems.bloodyChest, 1, 0), + new AspectList().add(Aspect.AIR, 5), + new Object[] { "# #", "###", "###", '#', new ItemStack(TBItems.resource, 1, 8) }); ShapedArcaneRecipe bloodyLegsRec = new ShapedArcaneRecipe( - "TB.BloodyRobes", - new ItemStack(TBItems.bloodyLeggings, 1, 0), - new AspectList().add(Aspect.WATER, 5), - new Object[] { "###", "# #", "# #", '#', new ItemStack(TBItems.resource, 1, 8) }); + "TB.BloodyRobes", + new ItemStack(TBItems.bloodyLeggings, 1, 0), + new AspectList().add(Aspect.WATER, 5), + new Object[] { "###", "# #", "# #", '#', new ItemStack(TBItems.resource, 1, 8) }); ShapedArcaneRecipe bloodyBootsRec = new ShapedArcaneRecipe( - "TB.BloodyRobes", - new ItemStack(TBItems.bloodyBoots, 1, 0), - new AspectList().add(Aspect.EARTH, 3), - new Object[] { "# #", "# #", '#', new ItemStack(TBItems.resource, 1, 8) }); + "TB.BloodyRobes", + new ItemStack(TBItems.bloodyBoots, 1, 0), + new AspectList().add(Aspect.EARTH, 3), + new Object[] { "# #", "# #", '#', new ItemStack(TBItems.resource, 1, 8) }); ShapedArcaneRecipe ironSpikeRec = new ShapedArcaneRecipe( - "TB.Spike.Iron", - new ItemStack(TBBlocks.spike, 1, 0), - new AspectList().add(Aspect.FIRE, 1).add(Aspect.ENTROPY, 1), - new Object[] { " * ", "*#*", "#_#", '*', "nuggetIron", '#', "ingotIron", '_', - new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 0) }); + "TB.Spike.Iron", + new ItemStack(TBBlocks.spike, 1, 0), + new AspectList().add(Aspect.FIRE, 1) + .add(Aspect.ENTROPY, 1), + new Object[] { " * ", "*#*", "#_#", '*', "nuggetIron", '#', "ingotIron", '_', + new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 0) }); ShapedArcaneRecipe thaumiumSpikeRec = new ShapedArcaneRecipe( - "TB.Spike.Thaumic", - new ItemStack(TBBlocks.spike, 1, 2), - primals(4), - new Object[] { " * ", "*#*", "#_#", '*', "nuggetThaumium", '#', "ingotThaumium", '_', - new ItemStack(TBBlocks.spike, 1, 0) }); + "TB.Spike.Thaumic", + new ItemStack(TBBlocks.spike, 1, 2), + primals(4), + new Object[] { " * ", "*#*", "#_#", '*', "nuggetThaumium", '#', "ingotThaumium", '_', + new ItemStack(TBBlocks.spike, 1, 0) }); ShapedArcaneRecipe voidSpikeRec = new ShapedArcaneRecipe( - "TB.Spike.Void", - new ItemStack(TBBlocks.spike, 1, 4), - primals(4), - new Object[] { " * ", "*#*", "#_#", '*', "nuggetVoid", '#', "ingotVoid", '_', - new ItemStack(TBBlocks.spike, 1, 2) }); + "TB.Spike.Void", + new ItemStack(TBBlocks.spike, 1, 4), + primals(4), + new Object[] { " * ", "*#*", "#_#", '*', "nuggetVoid", '#', "ingotVoid", '_', + new ItemStack(TBBlocks.spike, 1, 2) }); CrucibleRecipe cleanEFabricRec = new CrucibleRecipe( - "TB.Spike.Iron", - new ItemStack(ConfigItems.itemResource, 1, 7), - new ItemStack(TBItems.resource, 1, 8), - new AspectList().add(Aspect.ORDER, 1)); - - new ResearchItem( - "TB.Spike.Iron", - catName, - new AspectList().add(Aspect.WEAPON, 6).add(Aspect.HUNGER, 6).add(Aspect.METAL, 6), - 10, - -3, - 1, - new ItemStack(TBBlocks.spike, 1, 0)) - .setParents("TB.ENCHFABRIC") - .setPages( - new ResearchPage("tb.rec.spikeIron.page.0"), - new ResearchPage(ironSpikeRec), - new ResearchPage(cleanEFabricRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Spike.Thaumic", - catName, - new AspectList().add(Aspect.WEAPON, 6).add(Aspect.MAGIC, 6).add(Aspect.MECHANISM, 6), - 13, - -3, - 1, - new ItemStack(TBBlocks.spike, 1, 2)).setConcealed().setParents("TB.Spike.Iron") - .setParentsHidden("TB.THAUMIUM") - .setPages( - new ResearchPage("tb.rec.spikeThaumic.page.0"), - new ResearchPage(thaumiumSpikeRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.BloodyRobes", - catName, - new AspectList().add(Aspect.HUNGER, 6).add(Aspect.FLESH, 6).add(Aspect.ARMOR, 6), - 12, - -4, - 1, - new ItemStack(TBItems.bloodyChest, 1, 0)) - .setConcealed().setParents("TB.Spike.Iron") - .setPages( - new ResearchPage("tb.rec.bloodyRobes.page.0"), - new ResearchPage(bloodyChestRec), - new ResearchPage(bloodyLegsRec), - new ResearchPage(bloodyBootsRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Spike.Void", - catName, - new AspectList().add(Aspect.WEAPON, 6).add(Aspect.ELDRITCH, 6).add(Aspect.ARMOR, 6), - 15, - -2, - 2, - new ItemStack(TBBlocks.spike, 1, 4)).setConcealed().setParents("TB.Spike.Thaumic") - .setParentsHidden("TB.VOIDMETAL") - .setPages(new ResearchPage("tb.rec.spikeVoid.page.0"), new ResearchPage(voidSpikeRec)) - .registerResearchItem(); - - ThaumcraftApi.getCraftingRecipes().add(ironSpikeRec); - ThaumcraftApi.getCraftingRecipes().add(thaumiumSpikeRec); - ThaumcraftApi.getCraftingRecipes().add(voidSpikeRec); - ThaumcraftApi.getCraftingRecipes().add(cleanEFabricRec); - ThaumcraftApi.getCraftingRecipes().add(bloodyChestRec); - ThaumcraftApi.getCraftingRecipes().add(bloodyLegsRec); - ThaumcraftApi.getCraftingRecipes().add(bloodyBootsRec); + "TB.Spike.Iron", + new ItemStack(ConfigItems.itemResource, 1, 7), + new ItemStack(TBItems.resource, 1, 8), + new AspectList().add(Aspect.ORDER, 1)); + + new ResearchItem( + "TB.Spike.Iron", + catName, + new AspectList().add(Aspect.WEAPON, 6) + .add(Aspect.HUNGER, 6) + .add(Aspect.METAL, 6), + 10, + -3, + 1, + new ItemStack(TBBlocks.spike, 1, 0)).setParents("TB.ENCHFABRIC") + .setPages( + new ResearchPage("tb.rec.spikeIron.page.0"), + new ResearchPage(ironSpikeRec), + new ResearchPage(cleanEFabricRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Spike.Thaumic", + catName, + new AspectList().add(Aspect.WEAPON, 6) + .add(Aspect.MAGIC, 6) + .add(Aspect.MECHANISM, 6), + 13, + -3, + 1, + new ItemStack(TBBlocks.spike, 1, 2)).setConcealed() + .setParents("TB.Spike.Iron") + .setParentsHidden("TB.THAUMIUM") + .setPages(new ResearchPage("tb.rec.spikeThaumic.page.0"), new ResearchPage(thaumiumSpikeRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.BloodyRobes", + catName, + new AspectList().add(Aspect.HUNGER, 6) + .add(Aspect.FLESH, 6) + .add(Aspect.ARMOR, 6), + 12, + -4, + 1, + new ItemStack(TBItems.bloodyChest, 1, 0)).setConcealed() + .setParents("TB.Spike.Iron") + .setPages( + new ResearchPage("tb.rec.bloodyRobes.page.0"), + new ResearchPage(bloodyChestRec), + new ResearchPage(bloodyLegsRec), + new ResearchPage(bloodyBootsRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Spike.Void", + catName, + new AspectList().add(Aspect.WEAPON, 6) + .add(Aspect.ELDRITCH, 6) + .add(Aspect.ARMOR, 6), + 15, + -2, + 2, + new ItemStack(TBBlocks.spike, 1, 4)).setConcealed() + .setParents("TB.Spike.Thaumic") + .setParentsHidden("TB.VOIDMETAL") + .setPages(new ResearchPage("tb.rec.spikeVoid.page.0"), new ResearchPage(voidSpikeRec)) + .registerResearchItem(); + + ThaumcraftApi.getCraftingRecipes() + .add(ironSpikeRec); + ThaumcraftApi.getCraftingRecipes() + .add(thaumiumSpikeRec); + ThaumcraftApi.getCraftingRecipes() + .add(voidSpikeRec); + ThaumcraftApi.getCraftingRecipes() + .add(cleanEFabricRec); + ThaumcraftApi.getCraftingRecipes() + .add(bloodyChestRec); + ThaumcraftApi.getCraftingRecipes() + .add(bloodyLegsRec); + ThaumcraftApi.getCraftingRecipes() + .add(bloodyBootsRec); } // TODO Bracelets @@ -1674,87 +1978,87 @@ public static void setup() { // copy(ResearchCategories.getResearchList("ELDRITCH").research.get("ROD_primal_staff"),"TB.ROD_primal_staff",catName,-19,8).setConcealed().setHidden().registerResearchItem(); new FakeResearchItem( - "TB.CAP_gold", - "THAUMICBASES", - "CAP_gold", - "THAUMATURGY", - -8, - 10, - ResearchCategories.getResearch("CAP_gold").icon_item).registerResearchItem(); + "TB.CAP_gold", + "THAUMICBASES", + "CAP_gold", + "THAUMATURGY", + -8, + 10, + ResearchCategories.getResearch("CAP_gold").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.ROD_greatwood", - "THAUMICBASES", - "ROD_greatwood", - "THAUMATURGY", - -10, - 6, - ResearchCategories.getResearch("ROD_greatwood").icon_item).registerResearchItem(); + "TB.ROD_greatwood", + "THAUMICBASES", + "ROD_greatwood", + "THAUMATURGY", + -10, + 6, + ResearchCategories.getResearch("ROD_greatwood").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.ROD_silverwood", - "THAUMICBASES", - "ROD_silverwood", - "THAUMATURGY", - -12, - 6, - ResearchCategories.getResearch("ROD_silverwood").icon_item).registerResearchItem(); + "TB.ROD_silverwood", + "THAUMICBASES", + "ROD_silverwood", + "THAUMATURGY", + -12, + 6, + ResearchCategories.getResearch("ROD_silverwood").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.ROD_reed", - "THAUMICBASES", - "ROD_reed", - "THAUMATURGY", - -19, - 5, - ResearchCategories.getResearch("ROD_reed").icon_item).registerResearchItem(); + "TB.ROD_reed", + "THAUMICBASES", + "ROD_reed", + "THAUMATURGY", + -19, + 5, + ResearchCategories.getResearch("ROD_reed").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.ROD_blaze", - "THAUMICBASES", - "ROD_blaze", - "THAUMATURGY", - -15, - 5, - ResearchCategories.getResearch("ROD_blaze").icon_item).registerResearchItem(); + "TB.ROD_blaze", + "THAUMICBASES", + "ROD_blaze", + "THAUMATURGY", + -15, + 5, + ResearchCategories.getResearch("ROD_blaze").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.ROD_obsidian", - "THAUMICBASES", - "ROD_obsidian", - "THAUMATURGY", - -19, - 11, - ResearchCategories.getResearch("ROD_obsidian").icon_item).registerResearchItem(); + "TB.ROD_obsidian", + "THAUMICBASES", + "ROD_obsidian", + "THAUMATURGY", + -19, + 11, + ResearchCategories.getResearch("ROD_obsidian").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.ROD_ice", - "THAUMICBASES", - "ROD_ice", - "THAUMATURGY", - -17, - 5, - ResearchCategories.getResearch("ROD_ice").icon_item).registerResearchItem(); + "TB.ROD_ice", + "THAUMICBASES", + "ROD_ice", + "THAUMATURGY", + -17, + 5, + ResearchCategories.getResearch("ROD_ice").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.ROD_quartz", - "THAUMICBASES", - "ROD_quartz", - "THAUMATURGY", - -17, - 11, - ResearchCategories.getResearch("ROD_quartz").icon_item).registerResearchItem(); + "TB.ROD_quartz", + "THAUMICBASES", + "ROD_quartz", + "THAUMATURGY", + -17, + 11, + ResearchCategories.getResearch("ROD_quartz").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.ROD_bone", - "THAUMICBASES", - "ROD_bone", - "THAUMATURGY", - -15, - 11, - ResearchCategories.getResearch("ROD_bone").icon_item).registerResearchItem(); + "TB.ROD_bone", + "THAUMICBASES", + "ROD_bone", + "THAUMATURGY", + -15, + 11, + ResearchCategories.getResearch("ROD_bone").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.ROD_primal_staff", - "THAUMICBASES", - "ROD_primal_staff", - "THAUMATURGY", - -19, - 8, - ResearchCategories.getResearch("ROD_primal_staff").icon_item).registerResearchItem(); + "TB.ROD_primal_staff", + "THAUMICBASES", + "ROD_primal_staff", + "THAUMATURGY", + -19, + 8, + ResearchCategories.getResearch("ROD_primal_staff").icon_item).registerResearchItem(); ThaumcraftApi.addWarpToResearch("TB.Bracelet.Void", 2); ThaumcraftApi.addWarpToResearch("TB.Bracelet.Bone", 1); @@ -1763,346 +2067,395 @@ public static void setup() { ThaumcraftApi.addWarpToItem(new ItemStack(TBItems.castingBracelet, 1, 12), 3); ShapedArcaneRecipe ironBraceletRec = new ShapedArcaneRecipe( - "TB.Bracelet.Iron", - new ItemStack(TBItems.castingBracelet, 1, 0), - primals(1), - new Object[] { "CIC", "N N", 'C', new ItemStack(ConfigItems.itemWandCap, 1, 0), 'I', "ingotIron", - 'N', "nuggetIron" }); + "TB.Bracelet.Iron", + new ItemStack(TBItems.castingBracelet, 1, 0), + primals(1), + new Object[] { "CIC", "N N", 'C', new ItemStack(ConfigItems.itemWandCap, 1, 0), 'I', "ingotIron", 'N', + "nuggetIron" }); ShapedArcaneRecipe goldBraceletRec = new ShapedArcaneRecipe( - "TB.Bracelet.Gold", - new ItemStack(TBItems.castingBracelet, 1, 1), - primals(5), - new Object[] { "CIC", "N N", 'C', new ItemStack(ConfigItems.itemWandCap, 1, 1), 'I', "ingotGold", - 'N', "nuggetGold" }); + "TB.Bracelet.Gold", + new ItemStack(TBItems.castingBracelet, 1, 1), + primals(5), + new Object[] { "CIC", "N N", 'C', new ItemStack(ConfigItems.itemWandCap, 1, 1), 'I', "ingotGold", 'N', + "nuggetGold" }); ShapedArcaneRecipe greatwoodBraceletRec = new ShapedArcaneRecipe( - "TB.Bracelet.Greatwood", - new ItemStack(TBItems.castingBracelet, 1, 2), - primals(25), - new Object[] { "CIC", "I I", 'C', new ItemStack(ConfigItems.itemWandCap, 1, 1), 'I', - new ItemStack(ConfigBlocks.blockMagicalLog, 1, 0) }); + "TB.Bracelet.Greatwood", + new ItemStack(TBItems.castingBracelet, 1, 2), + primals(25), + new Object[] { "CIC", "I I", 'C', new ItemStack(ConfigItems.itemWandCap, 1, 1), 'I', + new ItemStack(ConfigBlocks.blockMagicalLog, 1, 0) }); ShapedArcaneRecipe thaumiumBraceletRec = new ShapedArcaneRecipe( - "TB.Bracelet.Thaumium", - new ItemStack(TBItems.castingBracelet, 1, 3), - primals(25), - new Object[] { "CIC", "INI", "N N", 'C', new ItemStack(TBItems.resource, 1, 2), 'I', - new ItemStack(ConfigItems.itemResource, 1, 2), 'N', - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "TB.Bracelet.Thaumium", + new ItemStack(TBItems.castingBracelet, 1, 3), + primals(25), + new Object[] { "CIC", "INI", "N N", 'C', new ItemStack(TBItems.resource, 1, 2), 'I', + new ItemStack(ConfigItems.itemResource, 1, 2), 'N', + new ItemStack(ConfigItems.itemResource, 1, 14) }); InfusionRecipe silverwoodBraceletRec = new InfusionRecipe( - "TB.Bracelet.Silverwood", - new ItemStack(TBItems.castingBracelet, 1, 4), - 5, - primals(17).add(Aspect.MAGIC, 17), - new ItemStack(ConfigItems.itemWandRod, 1, 2), - new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 6), - new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), - new ItemStack(ConfigBlocks.blockCrystal, 1, 6), - new ItemStack(ConfigItems.itemWandCap, 1, 2), new ItemStack(ConfigItems.itemShard, 1, 6), - new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), - new ItemStack(ConfigBlocks.blockCrystal, 1, 6) }); + "TB.Bracelet.Silverwood", + new ItemStack(TBItems.castingBracelet, 1, 4), + 5, + primals(17).add(Aspect.MAGIC, 17), + new ItemStack(ConfigItems.itemWandRod, 1, 2), + new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), + new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), + new ItemStack(ConfigBlocks.blockCrystal, 1, 6) }); InfusionRecipe voidBraceletRec = new InfusionRecipe( - "TB.Bracelet.Void", - new ItemStack(TBItems.castingBracelet, 1, 11), - 8, - new AspectList().add(Aspect.ELDRITCH, 64).add(Aspect.VOID, 64).add(Aspect.MAGIC, 64) - .add(Aspect.AURA, 24).add(Aspect.ENERGY, 24), - new ItemStack(TBItems.resource, 1, 4), - new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(TBBlocks.dustBlock, 1, 0), new ItemStack(ConfigItems.itemResource, 1, 16), - new ItemStack(TBBlocks.crystalBlock, 1, 6), new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(TBBlocks.dustBlock, 1, 0), new ItemStack(ConfigItems.itemResource, 1, 16), - new ItemStack(TBBlocks.crystalBlock, 1, 6) }); + "TB.Bracelet.Void", + new ItemStack(TBItems.castingBracelet, 1, 11), + 8, + new AspectList().add(Aspect.ELDRITCH, 64) + .add(Aspect.VOID, 64) + .add(Aspect.MAGIC, 64) + .add(Aspect.AURA, 24) + .add(Aspect.ENERGY, 24), + new ItemStack(TBItems.resource, 1, 4), + new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(TBBlocks.crystalBlock, 1, 6), + new ItemStack(ConfigItems.itemWandCap, 1, 2), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(TBBlocks.crystalBlock, 1, 6) }); InfusionRecipe reedBraceletRec = new InfusionRecipe( - "TB.Bracelet.Reed", - new ItemStack(TBItems.castingBracelet, 1, 5), - 2, - new AspectList().add(Aspect.AIR, 24).add(Aspect.MOTION, 12).add(Aspect.MAGIC, 8), - new ItemStack(ConfigItems.itemWandRod, 1, 5), - new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 0) }); + "TB.Bracelet.Reed", + new ItemStack(TBItems.castingBracelet, 1, 5), + 2, + new AspectList().add(Aspect.AIR, 24) + .add(Aspect.MOTION, 12) + .add(Aspect.MAGIC, 8), + new ItemStack(ConfigItems.itemWandRod, 1, 5), + new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 0) }); InfusionRecipe boneBraceletRec = new InfusionRecipe( - "TB.Bracelet.Bone", - new ItemStack(TBItems.castingBracelet, 1, 6), - 2, - new AspectList().add(Aspect.ENTROPY, 24).add(Aspect.UNDEAD, 12).add(Aspect.MAGIC, 8), - new ItemStack(ConfigItems.itemWandRod, 1, 7), - new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 5) }); + "TB.Bracelet.Bone", + new ItemStack(TBItems.castingBracelet, 1, 6), + 2, + new AspectList().add(Aspect.ENTROPY, 24) + .add(Aspect.UNDEAD, 12) + .add(Aspect.MAGIC, 8), + new ItemStack(ConfigItems.itemWandRod, 1, 7), + new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 5) }); InfusionRecipe obsidianBraceletRec = new InfusionRecipe( - "TB.Bracelet.Obsidian", - new ItemStack(TBItems.castingBracelet, 1, 7), - 2, - new AspectList().add(Aspect.EARTH, 24).add(Aspect.DARKNESS, 12).add(Aspect.MAGIC, 8), - new ItemStack(ConfigItems.itemWandRod, 1, 1), - new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 3), new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 3) }); + "TB.Bracelet.Obsidian", + new ItemStack(TBItems.castingBracelet, 1, 7), + 2, + new AspectList().add(Aspect.EARTH, 24) + .add(Aspect.DARKNESS, 12) + .add(Aspect.MAGIC, 8), + new ItemStack(ConfigItems.itemWandRod, 1, 1), + new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 3), new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 3) }); InfusionRecipe blazeBraceletRec = new InfusionRecipe( - "TB.Bracelet.Blaze", - new ItemStack(TBItems.castingBracelet, 1, 8), - 2, - new AspectList().add(Aspect.FIRE, 24).add(Aspect.BEAST, 12).add(Aspect.MAGIC, 8), - new ItemStack(ConfigItems.itemWandRod, 1, 6), - new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 1) }); + "TB.Bracelet.Blaze", + new ItemStack(TBItems.castingBracelet, 1, 8), + 2, + new AspectList().add(Aspect.FIRE, 24) + .add(Aspect.BEAST, 12) + .add(Aspect.MAGIC, 8), + new ItemStack(ConfigItems.itemWandRod, 1, 6), + new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 1) }); InfusionRecipe iceBraceletRec = new InfusionRecipe( - "TB.Bracelet.Ice", - new ItemStack(TBItems.castingBracelet, 1, 9), - 2, - new AspectList().add(Aspect.WATER, 24).add(Aspect.COLD, 12).add(Aspect.MAGIC, 8), - new ItemStack(ConfigItems.itemWandRod, 1, 3), - new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 2), new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 2) }); + "TB.Bracelet.Ice", + new ItemStack(TBItems.castingBracelet, 1, 9), + 2, + new AspectList().add(Aspect.WATER, 24) + .add(Aspect.COLD, 12) + .add(Aspect.MAGIC, 8), + new ItemStack(ConfigItems.itemWandRod, 1, 3), + new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 2), new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 2) }); InfusionRecipe quartzBraceletRec = new InfusionRecipe( - "TB.Bracelet.Quartz", - new ItemStack(TBItems.castingBracelet, 1, 10), - 2, - new AspectList().add(Aspect.ORDER, 24).add(Aspect.ENERGY, 12).add(Aspect.MAGIC, 8), - new ItemStack(ConfigItems.itemWandRod, 1, 4), - new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 4), new ItemStack(ConfigItems.itemWandCap, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 4) }); + "TB.Bracelet.Quartz", + new ItemStack(TBItems.castingBracelet, 1, 10), + 2, + new AspectList().add(Aspect.ORDER, 24) + .add(Aspect.ENERGY, 12) + .add(Aspect.MAGIC, 8), + new ItemStack(ConfigItems.itemWandRod, 1, 4), + new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 4), new ItemStack(ConfigItems.itemWandCap, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 4) }); InfusionRecipe primalBraceletRec = new InfusionRecipe( - "TB.Bracelet.Primal", - new ItemStack(TBItems.castingBracelet, 1, 12), - 7, - primals(48).add(Aspect.MAGIC, 96), - new ItemStack(ConfigItems.itemResource, 1, 15), - new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 7), - new ItemStack(TBItems.castingBracelet, 1, 5), new ItemStack(TBItems.castingBracelet, 1, 6), - new ItemStack(TBItems.castingBracelet, 1, 7), new ItemStack(ConfigItems.itemWandCap, 1, 7), - new ItemStack(TBItems.castingBracelet, 1, 8), new ItemStack(TBItems.castingBracelet, 1, 9), - new ItemStack(TBItems.castingBracelet, 1, 10) }); - - new ResearchItem( - "TB.Bracelet.Iron", - catName, - new AspectList().add(Aspect.METAL, 3).add(Aspect.MAGIC, 3), - -6, - 7, - 0, - new ItemStack(TBItems.castingBracelet, 1, 0)) - .setRound() - .setPages( - new ResearchPage("tb.rec.bracelet.iron.page.0"), - new ResearchPage("tb.rec.bracelet.iron.page.1"), - new ResearchPage("tb.rec.bracelet.iron.page.2"), - new ResearchPage(ironBraceletRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Bracelet.Gold", - catName, - new AspectList().add(Aspect.METAL, 3).add(Aspect.MAGIC, 3).add(Aspect.GREED, 3), - -8, - 8, - 0, - new ItemStack(TBItems.castingBracelet, 1, 1)) - .setParents("TB.Bracelet.Iron", "TB.CAP_gold") - .setPages( - new ResearchPage("tb.rec.bracelet.gold.page.0"), - new ResearchPage(goldBraceletRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Bracelet.Greatwood", - catName, - new AspectList().add(Aspect.TREE, 3).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 3), - -10, - 8, - 0, - new ItemStack(TBItems.castingBracelet, 1, 2)).setConcealed() - .setParents("TB.Bracelet.Gold", "TB.ROD_greatwood") - .setPages( - new ResearchPage("tb.rec.bracelet.greatwood.page.0"), - new ResearchPage(greatwoodBraceletRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Bracelet.Thaumium", - catName, - new AspectList().add(Aspect.METAL, 3).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 3) - .add(Aspect.AURA, 3), - -10, - 11, - 0, - new ItemStack(TBItems.castingBracelet, 1, 3)).setConcealed().setParents("TB.Bracelet.Greatwood") - .setParentsHidden("TB.THAUMIUM", "CAP_thauminite") - .setPages( - new ResearchPage("tb.rec.bracelet.thaumium.page.0"), - new ResearchPage(thaumiumBraceletRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Bracelet.Silverwood", - catName, - new AspectList().add(Aspect.ORDER, 3).add(Aspect.MAGIC, 3).add(Aspect.TREE, 3).add(Aspect.AURA, 3) - .add(Aspect.EXCHANGE, 3), - -12, - 8, - 1, - new ItemStack(TBItems.castingBracelet, 1, 4)).setConcealed() - .setParents("TB.Bracelet.Greatwood", "TB.ROD_silverwood") - .setPages( - new ResearchPage("tb.rec.bracelet.silverwood.page.0"), - new ResearchPage(silverwoodBraceletRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Bracelet.Void", - catName, - new AspectList().add(Aspect.VOID, 3).add(Aspect.MAGIC, 3).add(Aspect.ELDRITCH, 3) - .add(Aspect.AURA, 3).add(Aspect.EXCHANGE, 3), - -12, - 11, - 3, - new ItemStack(TBItems.castingBracelet, 1, 11)).setConcealed().setParents("TB.Bracelet.Silverwood") - .setParentsHidden("TB.VOIDMETAL") - .setPages( - new ResearchPage("tb.rec.bracelet.void.page.0"), - new ResearchPage(voidBraceletRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Bracelet.Reed", - catName, - new AspectList().add(Aspect.AIR, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3).add(Aspect.AURA, 3) - .add(Aspect.EXCHANGE, 3), - -19, - 6, - 2, - new ItemStack(TBItems.castingBracelet, 1, 5)).setConcealed().setParents("TB.ROD_reed") - .setParentsHidden("TB.Bracelet.Greatwood") - .setPages( - new ResearchPage("tb.rec.bracelet.reed.page.0"), - new ResearchPage(reedBraceletRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Bracelet.Blaze", - catName, - new AspectList().add(Aspect.FIRE, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3).add(Aspect.AURA, 3) - .add(Aspect.EXCHANGE, 3), - -15, - 6, - 2, - new ItemStack(TBItems.castingBracelet, 1, 8)).setConcealed().setParents("TB.ROD_blaze") - .setParentsHidden("TB.Bracelet.Greatwood") - .setPages( - new ResearchPage("tb.rec.bracelet.blaze.page.0"), - new ResearchPage(blazeBraceletRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Bracelet.Obsidian", - catName, - new AspectList().add(Aspect.EARTH, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3).add(Aspect.AURA, 3) - .add(Aspect.EXCHANGE, 3), - -19, - 10, - 2, - new ItemStack(TBItems.castingBracelet, 1, 7)).setConcealed().setParents("TB.ROD_obsidian") - .setParentsHidden("TB.Bracelet.Greatwood") - .setPages( - new ResearchPage("tb.rec.bracelet.obsidian.page.0"), - new ResearchPage(obsidianBraceletRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Bracelet.Ice", - catName, - new AspectList().add(Aspect.WATER, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3).add(Aspect.AURA, 3) - .add(Aspect.EXCHANGE, 3), - -17, - 6, - 2, - new ItemStack(TBItems.castingBracelet, 1, 9)).setConcealed().setParents("TB.ROD_ice") - .setParentsHidden("TB.Bracelet.Greatwood") - .setPages(new ResearchPage("tb.rec.bracelet.ice.page.0"), new ResearchPage(iceBraceletRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Bracelet.Quartz", - catName, - new AspectList().add(Aspect.ORDER, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3).add(Aspect.AURA, 3) - .add(Aspect.EXCHANGE, 3), - -17, - 10, - 2, - new ItemStack(TBItems.castingBracelet, 1, 10)).setConcealed().setParents("TB.ROD_quartz") - .setParentsHidden("TB.Bracelet.Greatwood") - .setPages( - new ResearchPage("tb.rec.bracelet.quartz.page.0"), - new ResearchPage(quartzBraceletRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Bracelet.Bone", - catName, - new AspectList().add(Aspect.ENTROPY, 3).add(Aspect.MAGIC, 3).add(Aspect.CRAFT, 3) - .add(Aspect.AURA, 3).add(Aspect.EXCHANGE, 3), - -15, - 10, - 2, - new ItemStack(TBItems.castingBracelet, 1, 6)).setConcealed().setParents("TB.ROD_bone") - .setParentsHidden("TB.Bracelet.Greatwood") - .setPages( - new ResearchPage("tb.rec.bracelet.bone.page.0"), - new ResearchPage(boneBraceletRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Bracelet.Primal", - catName, - primals(6).add(Aspect.MAGIC, 12).add(Aspect.ELDRITCH, 12), - -17, - 8, - 4, - new ItemStack(TBItems.castingBracelet, 1, 12)) - .setConcealed().setSpecial() - .setParents( - "TB.ROD_primal_staff", - "TB.Bracelet.Bone", - "TB.Bracelet.Quartz", - "TB.Bracelet.Ice", - "TB.Bracelet.Obsidian", - "TB.Bracelet.Blaze", - "TB.Bracelet.Reed", - "TB.Bracelet.Silverwood") - .setPages( - new ResearchPage("tb.rec.bracelet.primal.page.0"), - new ResearchPage(primalBraceletRec)) - .registerResearchItem(); - - ThaumcraftApi.getCraftingRecipes().add(ironBraceletRec); - ThaumcraftApi.getCraftingRecipes().add(goldBraceletRec); - ThaumcraftApi.getCraftingRecipes().add(greatwoodBraceletRec); - ThaumcraftApi.getCraftingRecipes().add(thaumiumBraceletRec); - ThaumcraftApi.getCraftingRecipes().add(silverwoodBraceletRec); - ThaumcraftApi.getCraftingRecipes().add(voidBraceletRec); - ThaumcraftApi.getCraftingRecipes().add(reedBraceletRec); - ThaumcraftApi.getCraftingRecipes().add(boneBraceletRec); - ThaumcraftApi.getCraftingRecipes().add(obsidianBraceletRec); - ThaumcraftApi.getCraftingRecipes().add(blazeBraceletRec); - ThaumcraftApi.getCraftingRecipes().add(iceBraceletRec); - ThaumcraftApi.getCraftingRecipes().add(quartzBraceletRec); - ThaumcraftApi.getCraftingRecipes().add(primalBraceletRec); + "TB.Bracelet.Primal", + new ItemStack(TBItems.castingBracelet, 1, 12), + 7, + primals(48).add(Aspect.MAGIC, 96), + new ItemStack(ConfigItems.itemResource, 1, 15), + new ItemStack[] { new ItemStack(ConfigItems.itemWandCap, 1, 7), + new ItemStack(TBItems.castingBracelet, 1, 5), new ItemStack(TBItems.castingBracelet, 1, 6), + new ItemStack(TBItems.castingBracelet, 1, 7), new ItemStack(ConfigItems.itemWandCap, 1, 7), + new ItemStack(TBItems.castingBracelet, 1, 8), new ItemStack(TBItems.castingBracelet, 1, 9), + new ItemStack(TBItems.castingBracelet, 1, 10) }); + + new ResearchItem( + "TB.Bracelet.Iron", + catName, + new AspectList().add(Aspect.METAL, 3) + .add(Aspect.MAGIC, 3), + -6, + 7, + 0, + new ItemStack(TBItems.castingBracelet, 1, 0)).setRound() + .setPages( + new ResearchPage("tb.rec.bracelet.iron.page.0"), + new ResearchPage("tb.rec.bracelet.iron.page.1"), + new ResearchPage("tb.rec.bracelet.iron.page.2"), + new ResearchPage(ironBraceletRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Bracelet.Gold", + catName, + new AspectList().add(Aspect.METAL, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.GREED, 3), + -8, + 8, + 0, + new ItemStack(TBItems.castingBracelet, 1, 1)).setParents("TB.Bracelet.Iron", "TB.CAP_gold") + .setPages(new ResearchPage("tb.rec.bracelet.gold.page.0"), new ResearchPage(goldBraceletRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Bracelet.Greatwood", + catName, + new AspectList().add(Aspect.TREE, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.ENERGY, 3), + -10, + 8, + 0, + new ItemStack(TBItems.castingBracelet, 1, 2)).setConcealed() + .setParents("TB.Bracelet.Gold", "TB.ROD_greatwood") + .setPages( + new ResearchPage("tb.rec.bracelet.greatwood.page.0"), + new ResearchPage(greatwoodBraceletRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Bracelet.Thaumium", + catName, + new AspectList().add(Aspect.METAL, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.ENERGY, 3) + .add(Aspect.AURA, 3), + -10, + 11, + 0, + new ItemStack(TBItems.castingBracelet, 1, 3)).setConcealed() + .setParents("TB.Bracelet.Greatwood") + .setParentsHidden("TB.THAUMIUM", "CAP_thauminite") + .setPages( + new ResearchPage("tb.rec.bracelet.thaumium.page.0"), + new ResearchPage(thaumiumBraceletRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Bracelet.Silverwood", + catName, + new AspectList().add(Aspect.ORDER, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.TREE, 3) + .add(Aspect.AURA, 3) + .add(Aspect.EXCHANGE, 3), + -12, + 8, + 1, + new ItemStack(TBItems.castingBracelet, 1, 4)).setConcealed() + .setParents("TB.Bracelet.Greatwood", "TB.ROD_silverwood") + .setPages( + new ResearchPage("tb.rec.bracelet.silverwood.page.0"), + new ResearchPage(silverwoodBraceletRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Bracelet.Void", + catName, + new AspectList().add(Aspect.VOID, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.ELDRITCH, 3) + .add(Aspect.AURA, 3) + .add(Aspect.EXCHANGE, 3), + -12, + 11, + 3, + new ItemStack(TBItems.castingBracelet, 1, 11)).setConcealed() + .setParents("TB.Bracelet.Silverwood") + .setParentsHidden("TB.VOIDMETAL") + .setPages(new ResearchPage("tb.rec.bracelet.void.page.0"), new ResearchPage(voidBraceletRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Bracelet.Reed", + catName, + new AspectList().add(Aspect.AIR, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.CRAFT, 3) + .add(Aspect.AURA, 3) + .add(Aspect.EXCHANGE, 3), + -19, + 6, + 2, + new ItemStack(TBItems.castingBracelet, 1, 5)).setConcealed() + .setParents("TB.ROD_reed") + .setParentsHidden("TB.Bracelet.Greatwood") + .setPages(new ResearchPage("tb.rec.bracelet.reed.page.0"), new ResearchPage(reedBraceletRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Bracelet.Blaze", + catName, + new AspectList().add(Aspect.FIRE, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.CRAFT, 3) + .add(Aspect.AURA, 3) + .add(Aspect.EXCHANGE, 3), + -15, + 6, + 2, + new ItemStack(TBItems.castingBracelet, 1, 8)).setConcealed() + .setParents("TB.ROD_blaze") + .setParentsHidden("TB.Bracelet.Greatwood") + .setPages(new ResearchPage("tb.rec.bracelet.blaze.page.0"), new ResearchPage(blazeBraceletRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Bracelet.Obsidian", + catName, + new AspectList().add(Aspect.EARTH, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.CRAFT, 3) + .add(Aspect.AURA, 3) + .add(Aspect.EXCHANGE, 3), + -19, + 10, + 2, + new ItemStack(TBItems.castingBracelet, 1, 7)).setConcealed() + .setParents("TB.ROD_obsidian") + .setParentsHidden("TB.Bracelet.Greatwood") + .setPages( + new ResearchPage("tb.rec.bracelet.obsidian.page.0"), + new ResearchPage(obsidianBraceletRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Bracelet.Ice", + catName, + new AspectList().add(Aspect.WATER, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.CRAFT, 3) + .add(Aspect.AURA, 3) + .add(Aspect.EXCHANGE, 3), + -17, + 6, + 2, + new ItemStack(TBItems.castingBracelet, 1, 9)).setConcealed() + .setParents("TB.ROD_ice") + .setParentsHidden("TB.Bracelet.Greatwood") + .setPages(new ResearchPage("tb.rec.bracelet.ice.page.0"), new ResearchPage(iceBraceletRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Bracelet.Quartz", + catName, + new AspectList().add(Aspect.ORDER, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.CRAFT, 3) + .add(Aspect.AURA, 3) + .add(Aspect.EXCHANGE, 3), + -17, + 10, + 2, + new ItemStack(TBItems.castingBracelet, 1, 10)).setConcealed() + .setParents("TB.ROD_quartz") + .setParentsHidden("TB.Bracelet.Greatwood") + .setPages(new ResearchPage("tb.rec.bracelet.quartz.page.0"), new ResearchPage(quartzBraceletRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Bracelet.Bone", + catName, + new AspectList().add(Aspect.ENTROPY, 3) + .add(Aspect.MAGIC, 3) + .add(Aspect.CRAFT, 3) + .add(Aspect.AURA, 3) + .add(Aspect.EXCHANGE, 3), + -15, + 10, + 2, + new ItemStack(TBItems.castingBracelet, 1, 6)).setConcealed() + .setParents("TB.ROD_bone") + .setParentsHidden("TB.Bracelet.Greatwood") + .setPages(new ResearchPage("tb.rec.bracelet.bone.page.0"), new ResearchPage(boneBraceletRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Bracelet.Primal", + catName, + primals(6).add(Aspect.MAGIC, 12) + .add(Aspect.ELDRITCH, 12), + -17, + 8, + 4, + new ItemStack(TBItems.castingBracelet, 1, 12)).setConcealed() + .setSpecial() + .setParents( + "TB.ROD_primal_staff", + "TB.Bracelet.Bone", + "TB.Bracelet.Quartz", + "TB.Bracelet.Ice", + "TB.Bracelet.Obsidian", + "TB.Bracelet.Blaze", + "TB.Bracelet.Reed", + "TB.Bracelet.Silverwood") + .setPages(new ResearchPage("tb.rec.bracelet.primal.page.0"), new ResearchPage(primalBraceletRec)) + .registerResearchItem(); + + ThaumcraftApi.getCraftingRecipes() + .add(ironBraceletRec); + ThaumcraftApi.getCraftingRecipes() + .add(goldBraceletRec); + ThaumcraftApi.getCraftingRecipes() + .add(greatwoodBraceletRec); + ThaumcraftApi.getCraftingRecipes() + .add(thaumiumBraceletRec); + ThaumcraftApi.getCraftingRecipes() + .add(silverwoodBraceletRec); + ThaumcraftApi.getCraftingRecipes() + .add(voidBraceletRec); + ThaumcraftApi.getCraftingRecipes() + .add(reedBraceletRec); + ThaumcraftApi.getCraftingRecipes() + .add(boneBraceletRec); + ThaumcraftApi.getCraftingRecipes() + .add(obsidianBraceletRec); + ThaumcraftApi.getCraftingRecipes() + .add(blazeBraceletRec); + ThaumcraftApi.getCraftingRecipes() + .add(iceBraceletRec); + ThaumcraftApi.getCraftingRecipes() + .add(quartzBraceletRec); + ThaumcraftApi.getCraftingRecipes() + .add(primalBraceletRec); } // TODO Flora @@ -2113,399 +2466,494 @@ public static void setup() { ThaumcraftApi.addWarpToResearch("TB.Lucrite", 1); CrucibleRecipe plaxRec = new CrucibleRecipe( - "TB.Plax", - new ItemStack(TBItems.plaxSeed, 1, 0), - new ItemStack(Items.wheat_seeds), - new AspectList().add(Aspect.CLOTH, 4)); + "TB.Plax", + new ItemStack(TBItems.plaxSeed, 1, 0), + new ItemStack(Items.wheat_seeds), + new AspectList().add(Aspect.CLOTH, 4)); CrucibleRecipe metalleatRec = new CrucibleRecipe( - "TB.Metalleat", - new ItemStack(TBItems.metalleatSeeds, 1, 0), - new ItemStack(Items.wheat_seeds), - new AspectList().add(Aspect.ORDER, 4).add(Aspect.METAL, 12).add(Aspect.LIFE, 4)); + "TB.Metalleat", + new ItemStack(TBItems.metalleatSeeds, 1, 0), + new ItemStack(Items.wheat_seeds), + new AspectList().add(Aspect.ORDER, 4) + .add(Aspect.METAL, 12) + .add(Aspect.LIFE, 4)); CrucibleRecipe lucriteRec = new CrucibleRecipe( - "TB.Lucrite", - new ItemStack(TBItems.lucriteSeeds, 1, 0), - new ItemStack(Items.golden_carrot), - new AspectList().add(Aspect.HUNGER, 4).add(Aspect.GREED, 12).add(Aspect.LIFE, 4)); + "TB.Lucrite", + new ItemStack(TBItems.lucriteSeeds, 1, 0), + new ItemStack(Items.golden_carrot), + new AspectList().add(Aspect.HUNGER, 4) + .add(Aspect.GREED, 12) + .add(Aspect.LIFE, 4)); CrucibleRecipe aureliaRec = new CrucibleRecipe( - "TB.Aurelia", - new ItemStack(TBBlocks.aurelia), - new ItemStack(Blocks.red_flower, 1, 7), - new AspectList().add(Aspect.PLANT, 8).add(Aspect.ELDRITCH, 2).add(Aspect.AURA, 2)); + "TB.Aurelia", + new ItemStack(TBBlocks.aurelia), + new ItemStack(Blocks.red_flower, 1, 7), + new AspectList().add(Aspect.PLANT, 8) + .add(Aspect.ELDRITCH, 2) + .add(Aspect.AURA, 2)); CrucibleRecipe knoseRec = new CrucibleRecipe( - "TB.Knose", - new ItemStack(TBItems.knoseSeed), - new ItemStack(Blocks.double_plant, 1, 4), - new AspectList().add(Aspect.MIND, 16).add(Aspect.LIFE, 8).add(Aspect.ENERGY, 2)); + "TB.Knose", + new ItemStack(TBItems.knoseSeed), + new ItemStack(Blocks.double_plant, 1, 4), + new AspectList().add(Aspect.MIND, 16) + .add(Aspect.LIFE, 8) + .add(Aspect.ENERGY, 2)); CrucibleRecipe knowledgeFragmentRec = new CrucibleRecipe( - "TB.Knose", - new ItemStack(ConfigItems.itemResource, 1, 9), - new ItemStack(TBItems.knoseFragment, 1, OreDictionary.WILDCARD_VALUE), - new AspectList().add(Aspect.ORDER, 1).add(Aspect.EXCHANGE, 1)); + "TB.Knose", + new ItemStack(ConfigItems.itemResource, 1, 9), + new ItemStack(TBItems.knoseFragment, 1, OreDictionary.WILDCARD_VALUE), + new AspectList().add(Aspect.ORDER, 1) + .add(Aspect.EXCHANGE, 1)); CrucibleRecipe sweedRec = new CrucibleRecipe( - "TB.BasicPlants", - new ItemStack(TBItems.sweedSeeds), - new ItemStack(Blocks.tallgrass, 1, OreDictionary.WILDCARD_VALUE), - new AspectList().add(Aspect.MOTION, 2).add(Aspect.LIFE, 1)); + "TB.BasicPlants", + new ItemStack(TBItems.sweedSeeds), + new ItemStack(Blocks.tallgrass, 1, OreDictionary.WILDCARD_VALUE), + new AspectList().add(Aspect.MOTION, 2) + .add(Aspect.LIFE, 1)); CrucibleRecipe lazulliaRec = new CrucibleRecipe( - "TB.Lazullia", - new ItemStack(TBItems.lazulliaSeeds), - new ItemStack(Items.wheat_seeds), - new AspectList().add(Aspect.SENSES, 12).add(Aspect.GREED, 3)); + "TB.Lazullia", + new ItemStack(TBItems.lazulliaSeeds), + new ItemStack(Items.wheat_seeds), + new AspectList().add(Aspect.SENSES, 12) + .add(Aspect.GREED, 3)); CrucibleRecipe rainbowCactiRec = new CrucibleRecipe( - "TB.RainbowCacti", - new ItemStack(TBBlocks.rainbowCactus), - new ItemStack(Blocks.cactus), - new AspectList().add(Aspect.EXCHANGE, 24).add(Aspect.SENSES, 6)); + "TB.RainbowCacti", + new ItemStack(TBBlocks.rainbowCactus), + new ItemStack(Blocks.cactus), + new AspectList().add(Aspect.EXCHANGE, 24) + .add(Aspect.SENSES, 6)); CrucibleRecipe redlonRec = new CrucibleRecipe( - "TB.Redlon", - new ItemStack(TBItems.redlonSeeds), - new ItemStack(Items.melon_seeds), - new AspectList().add(Aspect.MECHANISM, 16).add(Aspect.ENERGY, 16)); + "TB.Redlon", + new ItemStack(TBItems.redlonSeeds), + new ItemStack(Items.melon_seeds), + new AspectList().add(Aspect.MECHANISM, 16) + .add(Aspect.ENERGY, 16)); CrucibleRecipe aspectShroomRec = new CrucibleRecipe( - "TB.Ashroom", - new ItemStack(TBBlocks.ashroom, 1, 0), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 5), - new AspectList().add(Aspect.ENTROPY, 4).add(Aspect.CROP, 2)); + "TB.Ashroom", + new ItemStack(TBBlocks.ashroom, 1, 0), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 5), + new AspectList().add(Aspect.ENTROPY, 4) + .add(Aspect.CROP, 2)); CrucibleRecipe flaxiumRec = new CrucibleRecipe( - "TB.Flaxium", - new ItemStack(TBBlocks.flaxium, 1, 0), - new ItemStack(Blocks.red_flower, 1, 2), - new AspectList().add(Aspect.ENTROPY, 1).add(Aspect.MAGIC, 2)); + "TB.Flaxium", + new ItemStack(TBBlocks.flaxium, 1, 0), + new ItemStack(Blocks.red_flower, 1, 2), + new AspectList().add(Aspect.ENTROPY, 1) + .add(Aspect.MAGIC, 2)); CrucibleRecipe glieoniaRec = new CrucibleRecipe( - "TB.Glieonia", - new ItemStack(TBItems.glieoniaSeed, 1, 0), - new ItemStack(Blocks.red_flower, 1, 3), - new AspectList().add(Aspect.LIGHT, 8).add(Aspect.MAGIC, 6).add(Aspect.LIFE, 4)); + "TB.Glieonia", + new ItemStack(TBItems.glieoniaSeed, 1, 0), + new ItemStack(Blocks.red_flower, 1, 3), + new AspectList().add(Aspect.LIGHT, 8) + .add(Aspect.MAGIC, 6) + .add(Aspect.LIFE, 4)); CrucibleRecipe briarRec = new CrucibleRecipe( - "TB.Briar", - new ItemStack(TBBlocks.briar, 1, 0), - new ItemStack(Blocks.double_plant, 1, 4), - new AspectList().add(Aspect.HEAL, 4).add(Aspect.LIFE, 4).add(Aspect.PLANT, 4)); + "TB.Briar", + new ItemStack(TBBlocks.briar, 1, 0), + new ItemStack(Blocks.double_plant, 1, 4), + new AspectList().add(Aspect.HEAL, 4) + .add(Aspect.LIFE, 4) + .add(Aspect.PLANT, 4)); ShapelessArcaneRecipe rosehipRec = new ShapelessArcaneRecipe( - "TB.Briar", - TBItems.rosehipSyrup, - new AspectList().add(Aspect.FIRE, 3).add(Aspect.WATER, 5), - new Object[] { new ItemStack(ConfigItems.itemEssence, 1, 0), new ItemStack(TBItems.resource, 1, 6), - new ItemStack(Items.sugar, 1, 0) }); + "TB.Briar", + TBItems.rosehipSyrup, + new AspectList().add(Aspect.FIRE, 3) + .add(Aspect.WATER, 5), + new Object[] { new ItemStack(ConfigItems.itemEssence, 1, 0), new ItemStack(TBItems.resource, 1, 6), + new ItemStack(Items.sugar, 1, 0) }); InfusionRecipe voidSeedRec = new InfusionRecipe( - "TB.VoidSeed", - new ItemStack(TBItems.voidSeed, 1, 0), - 3, - new AspectList().add(Aspect.ELDRITCH, 16).add(Aspect.DARKNESS, 16).add(Aspect.CROP, 16), - new ItemStack(ConfigItems.itemResource, 1, 17), - new ItemStack[] { new ItemStack(Items.wheat_seeds, 1, 0), new ItemStack(Items.pumpkin_seeds, 1, 0), - new ItemStack(Items.melon_seeds, 1, 0), new ItemStack(Items.poisonous_potato, 1, 0), - new ItemStack(Items.carrot, 1, 0), new ItemStack(Items.nether_wart, 1, 0), }); + "TB.VoidSeed", + new ItemStack(TBItems.voidSeed, 1, 0), + 3, + new AspectList().add(Aspect.ELDRITCH, 16) + .add(Aspect.DARKNESS, 16) + .add(Aspect.CROP, 16), + new ItemStack(ConfigItems.itemResource, 1, 17), + new ItemStack[] { new ItemStack(Items.wheat_seeds, 1, 0), new ItemStack(Items.pumpkin_seeds, 1, 0), + new ItemStack(Items.melon_seeds, 1, 0), new ItemStack(Items.poisonous_potato, 1, 0), + new ItemStack(Items.carrot, 1, 0), new ItemStack(Items.nether_wart, 1, 0), }); InfusionRecipe goldenOakRec = new InfusionRecipe( - "TB.GoldenOak", - new ItemStack(TBBlocks.sapling), - 2, - new AspectList().add(Aspect.PLANT, 16).add(Aspect.GREED, 64), - new ItemStack(Blocks.sapling, 1, 0), - new ItemStack[] { new ItemStack(Items.apple), new ItemStack(Items.apple), - new ItemStack(Items.golden_apple), new ItemStack(Items.golden_apple) }); + "TB.GoldenOak", + new ItemStack(TBBlocks.sapling), + 2, + new AspectList().add(Aspect.PLANT, 16) + .add(Aspect.GREED, 64), + new ItemStack(Blocks.sapling, 1, 0), + new ItemStack[] { new ItemStack(Items.apple), new ItemStack(Items.apple), + new ItemStack(Items.golden_apple), new ItemStack(Items.golden_apple) }); InfusionRecipe peacefulSaplingRec = new InfusionRecipe( - "TB.PeacefulSapling", - new ItemStack(TBBlocks.sapling, 1, 1), - 2, - new AspectList().add(Aspect.TREE, 16).add(Aspect.LIFE, 12).add(Aspect.HEAL, 6), - new ItemStack(Blocks.sapling, 1, 2), - new ItemStack[] { new ItemStack(Items.slime_ball), new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(Items.slime_ball), new ItemStack(ConfigBlocks.blockCustomPlant, 1, 2), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigBlocks.blockMetalDevice, 1, 13), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 2) }); + "TB.PeacefulSapling", + new ItemStack(TBBlocks.sapling, 1, 1), + 2, + new AspectList().add(Aspect.TREE, 16) + .add(Aspect.LIFE, 12) + .add(Aspect.HEAL, 6), + new ItemStack(Blocks.sapling, 1, 2), + new ItemStack[] { new ItemStack(Items.slime_ball), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(Items.slime_ball), new ItemStack(ConfigBlocks.blockCustomPlant, 1, 2), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 13), + new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 2) }); InfusionRecipe netherSaplingRec = new InfusionRecipe( - "TB.NetherSapling", - new ItemStack(TBBlocks.sapling, 1, 2), - 5, - new AspectList().add(Aspect.TREE, 32).add(nether, 32).add(Aspect.HUNGER, 16), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 0), - new ItemStack[] { new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), - new ItemStack(ConfigItems.itemShard, 1, 1), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 4), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), - new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(Items.lava_bucket, 1, 0), - new ItemStack(ConfigItems.itemShard, 1, 1), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 4) }); + "TB.NetherSapling", + new ItemStack(TBBlocks.sapling, 1, 2), + 5, + new AspectList().add(Aspect.TREE, 32) + .add(nether, 32) + .add(Aspect.HUNGER, 16), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 0), + new ItemStack[] { new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), + new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 4), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), new ItemStack(ConfigItems.itemShard, 1, 1), + new ItemStack(Items.lava_bucket, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 1), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 4) }); InfusionRecipe enderSaplingRec = new InfusionRecipe( - "TB.EnderSapling", - new ItemStack(TBBlocks.sapling, 1, 3), - 7, - new AspectList().add(Aspect.TREE, 64).add(Aspect.ELDRITCH, 24).add(Aspect.VOID, 16) - .add(Aspect.DARKNESS, 8), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 1), - new ItemStack[] { new ItemStack(ConfigItems.itemShard, 1, 6), - new ItemStack(Items.ender_pearl, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 6), - new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(Items.ender_pearl, 1, 0), - new ItemStack(Items.ender_pearl, 1, 0), new ItemStack(ConfigBlocks.blockCustomPlant, 1, 4), - new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(Items.ender_pearl, 1, 0), - new ItemStack(ConfigItems.itemShard, 1, 6), - new ItemStack(ConfigItems.itemResource, 1, 1) }); - - new ResearchItem( - "TB.BasicPlants", - catName, - new AspectList().add(Aspect.CROP, 2).add(Aspect.PLANT, 2), - -8, - -2, - 1, - new ItemStack(Items.wheat_seeds, 1, 0)).setParentsHidden("TB.CRUCIBLE").setRound() - .setPages(new ResearchPage("tb.rec.basicPlants.page.0"), new ResearchPage(sweedRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Plax", - catName, - new AspectList().add(Aspect.CROP, 1).add(Aspect.CLOTH, 1), - -11, - -2, - 1, - new ItemStack(TBItems.plaxSeed, 1, 0)).setParents("TB.BasicPlants") - .setPages(new ResearchPage("tb.rec.plax.page.0"), new ResearchPage(plaxRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Briar", - catName, - new AspectList().add(Aspect.CROP, 4).add(Aspect.PLANT, 4).add(Aspect.HEAL, 4), - -13, - -3, - 1, - new ItemStack(TBItems.resource, 1, 6)) - .setParents("TB.Plax").setConcealed() - .setPages( - new ResearchPage("tb.rec.briar.page.0"), - new ResearchPage(briarRec), - new ResearchPage(rosehipRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Aurelia", - catName, - new AspectList().add(Aspect.LIFE, 6).add(Aspect.MAGIC, 6).add(Aspect.AURA, 6), - -10, - 0, - 0, - new ItemStack(TBBlocks.aurelia, 1, 0)) - .setParents("TB.BasicPlants") - .setPages( - new ResearchPage("tb.rec.aurelia.page.0"), - new ResearchPage("tb.rec.aurelia.page.1"), - new ResearchPage(aureliaRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Knose", - catName, - new AspectList().add(Aspect.LIFE, 6).add(Aspect.MIND, 6).add(Aspect.EARTH, 6), - -10, - 2, - 0, - new ItemStack(TBItems.knoseFragment, 1, OreDictionary.WILDCARD_VALUE)).setParents("TB.Aurelia") - .setParentsHidden("TB.CrystalBlocks").setConcealed() - .setPages( - new ResearchPage("tb.rec.knose.page.0"), - new ResearchPage("tb.rec.knose.page.1"), - new ResearchPage(knoseRec), - new ResearchPage(knowledgeFragmentRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Ashroom", - catName, - new AspectList().add(Aspect.LIFE, 6).add(Aspect.ENTROPY, 6).add(Aspect.AURA, 6).add(Aspect.AIR, 6) - .add(Aspect.CROP, 4), - -9, - 2, - 2, - new ItemStack(TBBlocks.ashroom)).setParents("TB.Aurelia").setConcealed() - .setPages(new ResearchPage("tb.rec.ashroom.page.0"), new ResearchPage(aspectShroomRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Glieonia", - catName, - new AspectList().add(Aspect.LIFE, 6).add(Aspect.LIGHT, 6).add(Aspect.SENSES, 6).add(Aspect.FIRE, 6) - .add(Aspect.PLANT, 4), - -12, - 1, - 2, - new ItemStack(TBItems.glieoniaSeed)).setParents("TB.Aurelia").setConcealed() - .setPages(new ResearchPage("tb.rec.glieonia.page.0"), new ResearchPage(glieoniaRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Flaxium", - catName, - new AspectList().add(Aspect.LIFE, 6).add(Aspect.ENTROPY, 6).add(Aspect.AURA, 6) - .add(Aspect.MAGIC, 6), - -11, - 2, - 2, - new ItemStack(TBBlocks.flaxium)).setParents("TB.Aurelia").setConcealed() - .setPages(new ResearchPage("tb.rec.flaxium.page.0"), new ResearchPage(flaxiumRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Metalleat", - catName, - new AspectList().add(Aspect.LIFE, 6).add(Aspect.MAGIC, 6).add(Aspect.METAL, 6) - .add(Aspect.EXCHANGE, 6), - -10, - -4, - 0, - new ItemStack(TBItems.metalleatSeeds, 1, 0)).setParents("TB.BasicPlants") - .setPages(new ResearchPage("tb.rec.metalleat.page.0"), new ResearchPage(metalleatRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Lazullia", - catName, - new AspectList().add(Aspect.LIFE, 6).add(Aspect.MAGIC, 6).add(Aspect.GREED, 6) - .add(Aspect.CRYSTAL, 6).add(Aspect.PLANT, 6).add(Aspect.SENSES, 8), - -8, - -5, - 2, - new ItemStack(TBItems.lazulliaSeeds, 1, 0)) - .setParents("TB.Metalleat").setConcealed() - .setPages( - new ResearchPage( - "tb.rec.lazullia.page.0" - + (Loader.isModLoaded("essentialcraft") ? "_ec3" : "")), - new ResearchPage(lazulliaRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.RainbowCacti", - catName, - new AspectList().add(Aspect.LIFE, 6).add(Aspect.MAGIC, 6).add(Aspect.EXCHANGE, 6) - .add(Aspect.CROP, 6).add(Aspect.ENTROPY, 6).add(Aspect.SENSES, 8), - -11, - -6, - 2, - new ItemStack(TBBlocks.rainbowCactus, 1, 0)).setParents("TB.Metalleat").setConcealed() - .setPages(new ResearchPage("tb.rec.rainCacti.page.0"), new ResearchPage(rainbowCactiRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Lucrite", - catName, - new AspectList().add(Aspect.GREED, 6).add(Aspect.MAGIC, 6).add(Aspect.PLANT, 6) - .add(Aspect.HUNGER, 6), - -9, - -6, - 0, - new ItemStack(TBItems.lucriteSeeds, 1, 0)).setParents("TB.Metalleat").setParentsHidden("TB.SMB") - .setConcealed() - .setPages(new ResearchPage("tb.rec.lucrite.page.0"), new ResearchPage(lucriteRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Redlon", - catName, - new AspectList().add(Aspect.LIFE, 6).add(Aspect.MECHANISM, 6).add(Aspect.ENERGY, 6) - .add(Aspect.CROP, 6).add(Aspect.ORDER, 6).add(Aspect.GREED, 8), - -10, - -6, - 3, - new ItemStack(TBItems.redlonSeeds, 1, 0)).setParents("TB.Metalleat").setConcealed() - .setPages(new ResearchPage("tb.rec.redlon.page.0"), new ResearchPage(redlonRec)) - .registerResearchItem(); + "TB.EnderSapling", + new ItemStack(TBBlocks.sapling, 1, 3), + 7, + new AspectList().add(Aspect.TREE, 64) + .add(Aspect.ELDRITCH, 24) + .add(Aspect.VOID, 16) + .add(Aspect.DARKNESS, 8), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 1), + new ItemStack[] { new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(Items.ender_pearl, 1, 0), + new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 1), + new ItemStack(Items.ender_pearl, 1, 0), new ItemStack(Items.ender_pearl, 1, 0), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 4), new ItemStack(ConfigItems.itemShard, 1, 6), + new ItemStack(Items.ender_pearl, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 6), + new ItemStack(ConfigItems.itemResource, 1, 1) }); + + new ResearchItem( + "TB.BasicPlants", + catName, + new AspectList().add(Aspect.CROP, 2) + .add(Aspect.PLANT, 2), + -8, + -2, + 1, + new ItemStack(Items.wheat_seeds, 1, 0)).setParentsHidden("TB.CRUCIBLE") + .setRound() + .setPages(new ResearchPage("tb.rec.basicPlants.page.0"), new ResearchPage(sweedRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Plax", + catName, + new AspectList().add(Aspect.CROP, 1) + .add(Aspect.CLOTH, 1), + -11, + -2, + 1, + new ItemStack(TBItems.plaxSeed, 1, 0)).setParents("TB.BasicPlants") + .setPages(new ResearchPage("tb.rec.plax.page.0"), new ResearchPage(plaxRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Briar", + catName, + new AspectList().add(Aspect.CROP, 4) + .add(Aspect.PLANT, 4) + .add(Aspect.HEAL, 4), + -13, + -3, + 1, + new ItemStack(TBItems.resource, 1, 6)).setParents("TB.Plax") + .setConcealed() + .setPages( + new ResearchPage("tb.rec.briar.page.0"), + new ResearchPage(briarRec), + new ResearchPage(rosehipRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Aurelia", + catName, + new AspectList().add(Aspect.LIFE, 6) + .add(Aspect.MAGIC, 6) + .add(Aspect.AURA, 6), + -10, + 0, + 0, + new ItemStack(TBBlocks.aurelia, 1, 0)).setParents("TB.BasicPlants") + .setPages( + new ResearchPage("tb.rec.aurelia.page.0"), + new ResearchPage("tb.rec.aurelia.page.1"), + new ResearchPage(aureliaRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Knose", + catName, + new AspectList().add(Aspect.LIFE, 6) + .add(Aspect.MIND, 6) + .add(Aspect.EARTH, 6), + -10, + 2, + 0, + new ItemStack(TBItems.knoseFragment, 1, OreDictionary.WILDCARD_VALUE)).setParents("TB.Aurelia") + .setParentsHidden("TB.CrystalBlocks") + .setConcealed() + .setPages( + new ResearchPage("tb.rec.knose.page.0"), + new ResearchPage("tb.rec.knose.page.1"), + new ResearchPage(knoseRec), + new ResearchPage(knowledgeFragmentRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Ashroom", + catName, + new AspectList().add(Aspect.LIFE, 6) + .add(Aspect.ENTROPY, 6) + .add(Aspect.AURA, 6) + .add(Aspect.AIR, 6) + .add(Aspect.CROP, 4), + -9, + 2, + 2, + new ItemStack(TBBlocks.ashroom)).setParents("TB.Aurelia") + .setConcealed() + .setPages(new ResearchPage("tb.rec.ashroom.page.0"), new ResearchPage(aspectShroomRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Glieonia", + catName, + new AspectList().add(Aspect.LIFE, 6) + .add(Aspect.LIGHT, 6) + .add(Aspect.SENSES, 6) + .add(Aspect.FIRE, 6) + .add(Aspect.PLANT, 4), + -12, + 1, + 2, + new ItemStack(TBItems.glieoniaSeed)).setParents("TB.Aurelia") + .setConcealed() + .setPages(new ResearchPage("tb.rec.glieonia.page.0"), new ResearchPage(glieoniaRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Flaxium", + catName, + new AspectList().add(Aspect.LIFE, 6) + .add(Aspect.ENTROPY, 6) + .add(Aspect.AURA, 6) + .add(Aspect.MAGIC, 6), + -11, + 2, + 2, + new ItemStack(TBBlocks.flaxium)).setParents("TB.Aurelia") + .setConcealed() + .setPages(new ResearchPage("tb.rec.flaxium.page.0"), new ResearchPage(flaxiumRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Metalleat", + catName, + new AspectList().add(Aspect.LIFE, 6) + .add(Aspect.MAGIC, 6) + .add(Aspect.METAL, 6) + .add(Aspect.EXCHANGE, 6), + -10, + -4, + 0, + new ItemStack(TBItems.metalleatSeeds, 1, 0)).setParents("TB.BasicPlants") + .setPages(new ResearchPage("tb.rec.metalleat.page.0"), new ResearchPage(metalleatRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Lazullia", + catName, + new AspectList().add(Aspect.LIFE, 6) + .add(Aspect.MAGIC, 6) + .add(Aspect.GREED, 6) + .add(Aspect.CRYSTAL, 6) + .add(Aspect.PLANT, 6) + .add(Aspect.SENSES, 8), + -8, + -5, + 2, + new ItemStack(TBItems.lazulliaSeeds, 1, 0)).setParents("TB.Metalleat") + .setConcealed() + .setPages( + new ResearchPage( + "tb.rec.lazullia.page.0" + (Loader.isModLoaded("essentialcraft") ? "_ec3" : "")), + new ResearchPage(lazulliaRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.RainbowCacti", + catName, + new AspectList().add(Aspect.LIFE, 6) + .add(Aspect.MAGIC, 6) + .add(Aspect.EXCHANGE, 6) + .add(Aspect.CROP, 6) + .add(Aspect.ENTROPY, 6) + .add(Aspect.SENSES, 8), + -11, + -6, + 2, + new ItemStack(TBBlocks.rainbowCactus, 1, 0)).setParents("TB.Metalleat") + .setConcealed() + .setPages(new ResearchPage("tb.rec.rainCacti.page.0"), new ResearchPage(rainbowCactiRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Lucrite", + catName, + new AspectList().add(Aspect.GREED, 6) + .add(Aspect.MAGIC, 6) + .add(Aspect.PLANT, 6) + .add(Aspect.HUNGER, 6), + -9, + -6, + 0, + new ItemStack(TBItems.lucriteSeeds, 1, 0)).setParents("TB.Metalleat") + .setParentsHidden("TB.SMB") + .setConcealed() + .setPages(new ResearchPage("tb.rec.lucrite.page.0"), new ResearchPage(lucriteRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Redlon", + catName, + new AspectList().add(Aspect.LIFE, 6) + .add(Aspect.MECHANISM, 6) + .add(Aspect.ENERGY, 6) + .add(Aspect.CROP, 6) + .add(Aspect.ORDER, 6) + .add(Aspect.GREED, 8), + -10, + -6, + 3, + new ItemStack(TBItems.redlonSeeds, 1, 0)).setParents("TB.Metalleat") + .setConcealed() + .setPages(new ResearchPage("tb.rec.redlon.page.0"), new ResearchPage(redlonRec)) + .registerResearchItem(); // void seed new ResearchItem( - "TB.VoidSeed", - catName, - new AspectList().add(Aspect.LIFE, 6).add(Aspect.ELDRITCH, 6).add(Aspect.DARKNESS, 6), - 16, - 3, - 1, - new ItemStack(TBItems.voidSeed, 1, 0)).setParents("TB.VOIDMETAL").setConcealed() - .setPages(new ResearchPage("tb.rec.voidSeed.page.0"), new ResearchPage(voidSeedRec)) - .registerResearchItem(); + "TB.VoidSeed", + catName, + new AspectList().add(Aspect.LIFE, 6) + .add(Aspect.ELDRITCH, 6) + .add(Aspect.DARKNESS, 6), + 16, + 3, + 1, + new ItemStack(TBItems.voidSeed, 1, 0)).setParents("TB.VOIDMETAL") + .setConcealed() + .setPages(new ResearchPage("tb.rec.voidSeed.page.0"), new ResearchPage(voidSeedRec)) + .registerResearchItem(); // saplings new ResearchItem( - "TB.GoldenOak", - catName, - new AspectList().add(Aspect.GREED, 8).add(Aspect.HUNGER, 8).add(Aspect.CROP, 8), - -15, - -1, - 0, - new ItemStack(TBBlocks.sapling, 1, 0)).setParents("TB.Briar").setParentsHidden("TB.INFUSION") - .setConcealed() - .setPages(new ResearchPage("tb.rec.goldenOak.page.0"), new ResearchPage(goldenOakRec)) - .registerResearchItem(); + "TB.GoldenOak", + catName, + new AspectList().add(Aspect.GREED, 8) + .add(Aspect.HUNGER, 8) + .add(Aspect.CROP, 8), + -15, + -1, + 0, + new ItemStack(TBBlocks.sapling, 1, 0)).setParents("TB.Briar") + .setParentsHidden("TB.INFUSION") + .setConcealed() + .setPages(new ResearchPage("tb.rec.goldenOak.page.0"), new ResearchPage(goldenOakRec)) + .registerResearchItem(); new ResearchItem( - "TB.PeacefulSapling", - catName, - new AspectList().add(Aspect.LIFE, 8).add(Aspect.HEAL, 8).add(Aspect.TREE, 8), - -18, - -1, - 0, - new ItemStack(TBBlocks.sapling, 1, 1)) - .setParents("TB.GoldenOak").setConcealed() - .setPages( - new ResearchPage("tb.rec.peacefulTree.page.0"), - new ResearchPage(peacefulSaplingRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.NetherSapling", - catName, - new AspectList().add(Aspect.TREE, 8).add(Aspect.FIRE, 8).add(nether, 8), - -17, - 0, - 0, - new ItemStack(TBBlocks.sapling, 1, 2)).setParents("TB.GoldenOak").setConcealed() - .setPages(new ResearchPage("tb.rec.netherTree.page.0"), new ResearchPage(netherSaplingRec)) - .registerResearchItem(); + "TB.PeacefulSapling", + catName, + new AspectList().add(Aspect.LIFE, 8) + .add(Aspect.HEAL, 8) + .add(Aspect.TREE, 8), + -18, + -1, + 0, + new ItemStack(TBBlocks.sapling, 1, 1)).setParents("TB.GoldenOak") + .setConcealed() + .setPages(new ResearchPage("tb.rec.peacefulTree.page.0"), new ResearchPage(peacefulSaplingRec)) + .registerResearchItem(); new ResearchItem( - "TB.EnderSapling", - catName, - new AspectList().add(Aspect.TREE, 8).add(Aspect.ELDRITCH, 8).add(Aspect.VOID, 8), - -17, - -2, - 0, - new ItemStack(TBBlocks.sapling, 1, 3)).setParents("TB.GoldenOak").setConcealed() - .setPages(new ResearchPage("tb.rec.enderTree.page.0"), new ResearchPage(enderSaplingRec)) - .registerResearchItem(); - - ThaumcraftApi.getCraftingRecipes().add(plaxRec); - ThaumcraftApi.getCraftingRecipes().add(metalleatRec); - ThaumcraftApi.getCraftingRecipes().add(lucriteRec); - ThaumcraftApi.getCraftingRecipes().add(knoseRec); - ThaumcraftApi.getCraftingRecipes().add(knowledgeFragmentRec); - ThaumcraftApi.getCraftingRecipes().add(sweedRec); - ThaumcraftApi.getCraftingRecipes().add(lazulliaRec); - ThaumcraftApi.getCraftingRecipes().add(rainbowCactiRec); - ThaumcraftApi.getCraftingRecipes().add(redlonRec); - ThaumcraftApi.getCraftingRecipes().add(aspectShroomRec); - ThaumcraftApi.getCraftingRecipes().add(flaxiumRec); - ThaumcraftApi.getCraftingRecipes().add(glieoniaRec); - ThaumcraftApi.getCraftingRecipes().add(briarRec); - ThaumcraftApi.getCraftingRecipes().add(rosehipRec); - ThaumcraftApi.getCraftingRecipes().add(aureliaRec); - ThaumcraftApi.getCraftingRecipes().add(voidSeedRec); - - ThaumcraftApi.getCraftingRecipes().add(peacefulSaplingRec); - ThaumcraftApi.getCraftingRecipes().add(netherSaplingRec); - ThaumcraftApi.getCraftingRecipes().add(enderSaplingRec); - ThaumcraftApi.getCraftingRecipes().add(goldenOakRec); + "TB.NetherSapling", + catName, + new AspectList().add(Aspect.TREE, 8) + .add(Aspect.FIRE, 8) + .add(nether, 8), + -17, + 0, + 0, + new ItemStack(TBBlocks.sapling, 1, 2)).setParents("TB.GoldenOak") + .setConcealed() + .setPages(new ResearchPage("tb.rec.netherTree.page.0"), new ResearchPage(netherSaplingRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.EnderSapling", + catName, + new AspectList().add(Aspect.TREE, 8) + .add(Aspect.ELDRITCH, 8) + .add(Aspect.VOID, 8), + -17, + -2, + 0, + new ItemStack(TBBlocks.sapling, 1, 3)).setParents("TB.GoldenOak") + .setConcealed() + .setPages(new ResearchPage("tb.rec.enderTree.page.0"), new ResearchPage(enderSaplingRec)) + .registerResearchItem(); + + ThaumcraftApi.getCraftingRecipes() + .add(plaxRec); + ThaumcraftApi.getCraftingRecipes() + .add(metalleatRec); + ThaumcraftApi.getCraftingRecipes() + .add(lucriteRec); + ThaumcraftApi.getCraftingRecipes() + .add(knoseRec); + ThaumcraftApi.getCraftingRecipes() + .add(knowledgeFragmentRec); + ThaumcraftApi.getCraftingRecipes() + .add(sweedRec); + ThaumcraftApi.getCraftingRecipes() + .add(lazulliaRec); + ThaumcraftApi.getCraftingRecipes() + .add(rainbowCactiRec); + ThaumcraftApi.getCraftingRecipes() + .add(redlonRec); + ThaumcraftApi.getCraftingRecipes() + .add(aspectShroomRec); + ThaumcraftApi.getCraftingRecipes() + .add(flaxiumRec); + ThaumcraftApi.getCraftingRecipes() + .add(glieoniaRec); + ThaumcraftApi.getCraftingRecipes() + .add(briarRec); + ThaumcraftApi.getCraftingRecipes() + .add(rosehipRec); + ThaumcraftApi.getCraftingRecipes() + .add(aureliaRec); + ThaumcraftApi.getCraftingRecipes() + .add(voidSeedRec); + + ThaumcraftApi.getCraftingRecipes() + .add(peacefulSaplingRec); + ThaumcraftApi.getCraftingRecipes() + .add(netherSaplingRec); + ThaumcraftApi.getCraftingRecipes() + .add(enderSaplingRec); + ThaumcraftApi.getCraftingRecipes() + .add(goldenOakRec); } // TODO nodes @@ -2515,21 +2963,21 @@ public static void setup() { // copy(ResearchCategories.getResearchList("THAUMATURGY").research.get("VISPOWER"),"TB.VISPOWER",catName,2,-7).setConcealed().setHidden().registerResearchItem(); new FakeResearchItem( - "TB.NODESTABILIZERADV", - "THAUMICBASES", - "NODESTABILIZERADV", - "THAUMATURGY", - -2, - -7, - ResearchCategories.getResearch("NODESTABILIZERADV").icon_item).registerResearchItem(); + "TB.NODESTABILIZERADV", + "THAUMICBASES", + "NODESTABILIZERADV", + "THAUMATURGY", + -2, + -7, + ResearchCategories.getResearch("NODESTABILIZERADV").icon_item).registerResearchItem(); new FakeResearchItem( - "TB.VISPOWER", - "THAUMICBASES", - "VISPOWER", - "THAUMATURGY", - 2, - -7, - ResearchCategories.getResearch("VISPOWER").icon_item).registerResearchItem(); + "TB.VISPOWER", + "THAUMICBASES", + "VISPOWER", + "THAUMATURGY", + 2, + -7, + ResearchCategories.getResearch("VISPOWER").icon_item).registerResearchItem(); ThaumcraftApi.addWarpToResearch("TB.NodeMan", 1); ThaumcraftApi.addWarpToResearch("TB.NodeFoci.Destr", 2); @@ -2539,358 +2987,409 @@ public static void setup() { ThaumcraftApi.addWarpToItem(new ItemStack(TBItems.nodeFoci, 1, 9), 2); InfusionRecipe nodeManipulatorRec = new InfusionRecipe( - "TB.NodeMan", - new ItemStack(TBBlocks.nodeManipulator, 1, 0), - 6, - new AspectList().add(Aspect.MECHANISM, 32).add(Aspect.AURA, 32).add(Aspect.MAGIC, 16) - .add(Aspect.ENERGY, 64).add(Aspect.VOID, 16), - new ItemStack(ConfigBlocks.blockStoneDevice, 1, 11), - new ItemStack[] { new ItemStack(ConfigBlocks.blockStoneDevice, 1, 10), - new ItemStack(ConfigBlocks.blockMirror, 1, 0), - new ItemStack(ConfigBlocks.blockMirror, 1, 6), - new ItemStack(ConfigBlocks.blockStoneDevice, 1, 14), - new ItemStack(TBBlocks.dustBlock, 1, 0), - new ItemStack(ConfigBlocks.blockStoneDevice, 1, 10), - new ItemStack(ConfigBlocks.blockMirror, 1, 0), - new ItemStack(ConfigBlocks.blockMirror, 1, 6), - new ItemStack(ConfigBlocks.blockStoneDevice, 1, 14), - new ItemStack(TBBlocks.dustBlock, 1, 0) }); + "TB.NodeMan", + new ItemStack(TBBlocks.nodeManipulator, 1, 0), + 6, + new AspectList().add(Aspect.MECHANISM, 32) + .add(Aspect.AURA, 32) + .add(Aspect.MAGIC, 16) + .add(Aspect.ENERGY, 64) + .add(Aspect.VOID, 16), + new ItemStack(ConfigBlocks.blockStoneDevice, 1, 11), + new ItemStack[] { new ItemStack(ConfigBlocks.blockStoneDevice, 1, 10), + new ItemStack(ConfigBlocks.blockMirror, 1, 0), new ItemStack(ConfigBlocks.blockMirror, 1, 6), + new ItemStack(ConfigBlocks.blockStoneDevice, 1, 14), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(ConfigBlocks.blockStoneDevice, 1, 10), new ItemStack(ConfigBlocks.blockMirror, 1, 0), + new ItemStack(ConfigBlocks.blockMirror, 1, 6), new ItemStack(ConfigBlocks.blockStoneDevice, 1, 14), + new ItemStack(TBBlocks.dustBlock, 1, 0) }); boolean flag = TBConfig.brightFociRequiresPrimordialPearl; InfusionRecipe brightFociRec = new InfusionRecipe( - "TB.NodeFoci.Bright", - new ItemStack(TBItems.nodeFoci, 1, 0), - 3, - new AspectList().add(Aspect.AURA, flag ? 256 : 64).add(Aspect.LIGHT, flag ? 64 : 16) - .add(Aspect.ENERGY, flag ? 256 : 32), - flag ? new ItemStack(ConfigItems.itemEldritchObject, 1, 3) - : new ItemStack(ConfigItems.itemResource, 1, 15), - new ItemStack[] { new ItemStack(ConfigBlocks.blockMetalDevice, 1, 7), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigBlocks.blockMetalDevice, 1, 7), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "TB.NodeFoci.Bright", + new ItemStack(TBItems.nodeFoci, 1, 0), + 3, + new AspectList().add(Aspect.AURA, flag ? 256 : 64) + .add(Aspect.LIGHT, flag ? 64 : 16) + .add(Aspect.ENERGY, flag ? 256 : 32), + flag ? new ItemStack(ConfigItems.itemEldritchObject, 1, 3) + : new ItemStack(ConfigItems.itemResource, 1, 15), + new ItemStack[] { new ItemStack(ConfigBlocks.blockMetalDevice, 1, 7), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 7), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), + new ItemStack(ConfigItems.itemResource, 1, 14) }); InfusionRecipe destructionFociRec = new InfusionRecipe( - "TB.NodeFoci.Destr", - new ItemStack(TBItems.nodeFoci, 1, 1), - 5, - new AspectList().add(Aspect.AURA, 64).add(Aspect.VOID, 16).add(Aspect.DEATH, 32), - new ItemStack(ConfigItems.itemResource, 1, 15), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 6), - new ItemStack(TBBlocks.crystalBlock, 1, 7), new ItemStack(ConfigBlocks.blockTube, 1, 7), - new ItemStack(ConfigItems.itemFocusExcavation, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 6), new ItemStack(TBBlocks.crystalBlock, 1, 7), - new ItemStack(ConfigBlocks.blockTube, 1, 7), - new ItemStack(ConfigItems.itemFocusExcavation, 1, 0) }); + "TB.NodeFoci.Destr", + new ItemStack(TBItems.nodeFoci, 1, 1), + 5, + new AspectList().add(Aspect.AURA, 64) + .add(Aspect.VOID, 16) + .add(Aspect.DEATH, 32), + new ItemStack(ConfigItems.itemResource, 1, 15), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 6), + new ItemStack(TBBlocks.crystalBlock, 1, 7), new ItemStack(ConfigBlocks.blockTube, 1, 7), + new ItemStack(ConfigItems.itemFocusExcavation, 1, 0), new ItemStack(ConfigItems.itemResource, 1, 6), + new ItemStack(TBBlocks.crystalBlock, 1, 7), new ItemStack(ConfigBlocks.blockTube, 1, 7), + new ItemStack(ConfigItems.itemFocusExcavation, 1, 0) }); InfusionRecipe efficiencyFociRec = new InfusionRecipe( - "TB.NodeFoci.Efficiency", - new ItemStack(TBItems.nodeFoci, 1, 2), - 1, - new AspectList().add(Aspect.AURA, 64).add(Aspect.VOID, 16).add(Aspect.DEATH, 32), - new ItemStack(ConfigItems.itemResource, 1, 15), - new ItemStack[] { new ItemStack(ConfigItems.itemShard, 1, 6), - new ItemStack(TBBlocks.dustBlock, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 6), - new ItemStack(TBBlocks.dustBlock, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 6), - new ItemStack(TBBlocks.dustBlock, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 6), - new ItemStack(TBBlocks.dustBlock, 1, 0) }); + "TB.NodeFoci.Efficiency", + new ItemStack(TBItems.nodeFoci, 1, 2), + 1, + new AspectList().add(Aspect.AURA, 64) + .add(Aspect.VOID, 16) + .add(Aspect.DEATH, 32), + new ItemStack(ConfigItems.itemResource, 1, 15), + new ItemStack[] { new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(TBBlocks.dustBlock, 1, 0) }); InfusionRecipe hungerFociRec = new InfusionRecipe( - "TB.NodeFoci.Hunger", - new ItemStack(TBItems.nodeFoci, 1, 3), - 7, - new AspectList().add(Aspect.AURA, 64).add(Aspect.VOID, 64).add(Aspect.HUNGER, 256) - .add(Aspect.GREED, 64).add(Aspect.ENERGY, 128), - new ItemStack(ConfigItems.itemResource, 1, 15), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemThaumometer, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigBlocks.blockStoneDevice, 1, 11), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemThaumometer, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigBlocks.blockStoneDevice, 1, 11) }); + "TB.NodeFoci.Hunger", + new ItemStack(TBItems.nodeFoci, 1, 3), + 7, + new AspectList().add(Aspect.AURA, 64) + .add(Aspect.VOID, 64) + .add(Aspect.HUNGER, 256) + .add(Aspect.GREED, 64) + .add(Aspect.ENERGY, 128), + new ItemStack(ConfigItems.itemResource, 1, 15), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigItems.itemThaumometer, 1, 0), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigBlocks.blockStoneDevice, 1, 11), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigItems.itemThaumometer, 1, 0), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigBlocks.blockStoneDevice, 1, 11) }); InfusionRecipe unstableFociRec = new InfusionRecipe( - "TB.NodeFoci.Unstable", - new ItemStack(TBItems.nodeFoci, 1, 4), - 3, - new AspectList().add(Aspect.AURA, 64).add(Aspect.DEATH, 32).add(Aspect.ENTROPY, 64), - new ItemStack(ConfigItems.itemResource, 1, 15), - new ItemStack[] { new ItemStack(Items.ender_pearl), new ItemStack(TBBlocks.crystalBlock, 1, 5), - new ItemStack(Items.ender_pearl), new ItemStack(TBBlocks.crystalBlock, 1, 5), - new ItemStack(Items.ender_pearl), new ItemStack(TBBlocks.crystalBlock, 1, 5), - new ItemStack(Items.ender_pearl), new ItemStack(TBBlocks.crystalBlock, 1, 5) }); + "TB.NodeFoci.Unstable", + new ItemStack(TBItems.nodeFoci, 1, 4), + 3, + new AspectList().add(Aspect.AURA, 64) + .add(Aspect.DEATH, 32) + .add(Aspect.ENTROPY, 64), + new ItemStack(ConfigItems.itemResource, 1, 15), + new ItemStack[] { new ItemStack(Items.ender_pearl), new ItemStack(TBBlocks.crystalBlock, 1, 5), + new ItemStack(Items.ender_pearl), new ItemStack(TBBlocks.crystalBlock, 1, 5), + new ItemStack(Items.ender_pearl), new ItemStack(TBBlocks.crystalBlock, 1, 5), + new ItemStack(Items.ender_pearl), new ItemStack(TBBlocks.crystalBlock, 1, 5) }); InfusionRecipe pureFociRec = new InfusionRecipe( - "TB.NodeFoci.Purity", - new ItemStack(TBItems.nodeFoci, 1, 5), - 0, - new AspectList().add(Aspect.AURA, 64).add(Aspect.LIFE, 64).add(Aspect.ORDER, 64), - new ItemStack(ConfigItems.itemResource, 1, 15), - new ItemStack[] { new ItemStack(ConfigBlocks.blockCustomPlant, 1, 1), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 4), - new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 2), - new ItemStack(ConfigBlocks.blockMagicalLeaves, 1, 1), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 4), - new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), - new ItemStack(ConfigBlocks.blockCustomPlant, 1, 2) }); + "TB.NodeFoci.Purity", + new ItemStack(TBItems.nodeFoci, 1, 5), + 0, + new AspectList().add(Aspect.AURA, 64) + .add(Aspect.LIFE, 64) + .add(Aspect.ORDER, 64), + new ItemStack(ConfigItems.itemResource, 1, 15), + new ItemStack[] { new ItemStack(ConfigBlocks.blockCustomPlant, 1, 1), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 4), + new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 2), + new ItemStack(ConfigBlocks.blockMagicalLeaves, 1, 1), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 4), + new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), + new ItemStack(ConfigBlocks.blockCustomPlant, 1, 2) }); InfusionRecipe sinisterFociRec = new InfusionRecipe( - "TB.NodeFoci.Sinister", - new ItemStack(TBItems.nodeFoci, 1, 6), - 4, - new AspectList().add(Aspect.AURA, 64).add(Aspect.DARKNESS, 32).add(Aspect.UNDEAD, 64), - new ItemStack(ConfigItems.itemResource, 1, 15), - new ItemStack[] { new ItemStack(ConfigItems.itemWispEssence, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(TBBlocks.crystalBlock, 1, 7), new ItemStack(ConfigItems.itemFocusPech, 1, 0), - new ItemStack(TBBlocks.crystalBlock, 1, 6), - new ItemStack(ConfigItems.itemWispEssence, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(TBBlocks.crystalBlock, 1, 7), new ItemStack(ConfigItems.itemFocusPech, 1, 0), - new ItemStack(TBBlocks.crystalBlock, 1, 6) }); + "TB.NodeFoci.Sinister", + new ItemStack(TBItems.nodeFoci, 1, 6), + 4, + new AspectList().add(Aspect.AURA, 64) + .add(Aspect.DARKNESS, 32) + .add(Aspect.UNDEAD, 64), + new ItemStack(ConfigItems.itemResource, 1, 15), + new ItemStack[] { new ItemStack(ConfigItems.itemWispEssence, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(TBBlocks.crystalBlock, 1, 7), new ItemStack(ConfigItems.itemFocusPech, 1, 0), + new ItemStack(TBBlocks.crystalBlock, 1, 6), + new ItemStack(ConfigItems.itemWispEssence, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(TBBlocks.crystalBlock, 1, 7), new ItemStack(ConfigItems.itemFocusPech, 1, 0), + new ItemStack(TBBlocks.crystalBlock, 1, 6) }); InfusionRecipe speedFociRec = new InfusionRecipe( - "TB.NodeFoci.Speed", - new ItemStack(TBItems.nodeFoci, 1, 7), - 1, - new AspectList().add(Aspect.AURA, 64).add(Aspect.MOTION, 32).add(Aspect.MAGIC, 16), - new ItemStack(ConfigItems.itemResource, 1, 15), - new ItemStack[] { new ItemStack(TBBlocks.crystalBlock, 1, 6), - new ItemStack(TBBlocks.dustBlock, 1, 0), new ItemStack(TBBlocks.crystalBlock, 1, 6), - new ItemStack(TBBlocks.dustBlock, 1, 0), new ItemStack(TBBlocks.crystalBlock, 1, 6), - new ItemStack(TBBlocks.dustBlock, 1, 0), new ItemStack(TBBlocks.crystalBlock, 1, 6), - new ItemStack(TBBlocks.dustBlock, 1, 0) }); + "TB.NodeFoci.Speed", + new ItemStack(TBItems.nodeFoci, 1, 7), + 1, + new AspectList().add(Aspect.AURA, 64) + .add(Aspect.MOTION, 32) + .add(Aspect.MAGIC, 16), + new ItemStack(ConfigItems.itemResource, 1, 15), + new ItemStack[] { new ItemStack(TBBlocks.crystalBlock, 1, 6), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(TBBlocks.crystalBlock, 1, 6), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(TBBlocks.crystalBlock, 1, 6), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(TBBlocks.crystalBlock, 1, 6), new ItemStack(TBBlocks.dustBlock, 1, 0) }); InfusionRecipe stabilityFociRec = new InfusionRecipe( - "TB.NodeFoci.Stability", - new ItemStack(TBItems.nodeFoci, 1, 8), - 1, - new AspectList().add(Aspect.AURA, 64).add(Aspect.ORDER, 32).add(Aspect.EXCHANGE, 16), - new ItemStack(ConfigItems.itemResource, 1, 15), - new ItemStack[] { new ItemStack(TBBlocks.dustBlock, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 10), new ItemStack(TBBlocks.dustBlock, 1, 0), - new ItemStack(TBBlocks.crystalBlock, 1, 6), new ItemStack(TBBlocks.dustBlock, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 10), new ItemStack(TBBlocks.dustBlock, 1, 0), - new ItemStack(TBBlocks.crystalBlock, 1, 6) }); + "TB.NodeFoci.Stability", + new ItemStack(TBItems.nodeFoci, 1, 8), + 1, + new AspectList().add(Aspect.AURA, 64) + .add(Aspect.ORDER, 32) + .add(Aspect.EXCHANGE, 16), + new ItemStack(ConfigItems.itemResource, 1, 15), + new ItemStack[] { new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(ConfigItems.itemResource, 1, 10), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(TBBlocks.crystalBlock, 1, 6), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(ConfigItems.itemResource, 1, 10), new ItemStack(TBBlocks.dustBlock, 1, 0), + new ItemStack(TBBlocks.crystalBlock, 1, 6) }); InfusionRecipe taintFociRec = new InfusionRecipe( - "TB.NodeFoci.Taint", - new ItemStack(TBItems.nodeFoci, 1, 9), - 5, - new AspectList().add(Aspect.AURA, 64).add(Aspect.TAINT, 64).add(Aspect.ENTROPY, 16), - new ItemStack(ConfigItems.itemResource, 1, 15), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 11), - new ItemStack(TBBlocks.crystalBlock, 1, 7), new ItemStack(ConfigItems.itemResource, 1, 12), - new ItemStack(TBItems.knoseFragment, 1, 7), new ItemStack(ConfigItems.itemResource, 1, 11), - new ItemStack(TBBlocks.crystalBlock, 1, 7), new ItemStack(ConfigItems.itemResource, 1, 12), - new ItemStack(TBItems.knoseFragment, 1, 7), }); + "TB.NodeFoci.Taint", + new ItemStack(TBItems.nodeFoci, 1, 9), + 5, + new AspectList().add(Aspect.AURA, 64) + .add(Aspect.TAINT, 64) + .add(Aspect.ENTROPY, 16), + new ItemStack(ConfigItems.itemResource, 1, 15), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 11), + new ItemStack(TBBlocks.crystalBlock, 1, 7), new ItemStack(ConfigItems.itemResource, 1, 12), + new ItemStack(TBItems.knoseFragment, 1, 7), new ItemStack(ConfigItems.itemResource, 1, 11), + new ItemStack(TBBlocks.crystalBlock, 1, 7), new ItemStack(ConfigItems.itemResource, 1, 12), + new ItemStack(TBItems.knoseFragment, 1, 7), }); ShapedArcaneRecipe nodeLinkRec = new ShapedArcaneRecipe( - "TB.NodeLinker", - new ItemStack(TBBlocks.nodeLinker, 1, 0), - primals(5), - new Object[] { "TPT", "ANA", "BOB", 'T', new ItemStack(ConfigBlocks.blockMetalDevice, 1, 14), 'P', - new ItemStack(ConfigItems.itemResource, 1, 15), 'A', - new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), 'B', - new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), 'O', Blocks.obsidian, 'N', - new ItemStack(ConfigItems.itemResource, 1, 0) }); - - new ResearchItem( - "TB.NodeMan", - catName, - new AspectList().add(Aspect.MECHANISM, 8).add(Aspect.AURA, 8).add(Aspect.ENERGY, 16) - .add(Aspect.MAGIC, 8), - 0, - -8, - 3, - new ItemStack(TBBlocks.nodeManipulator)) - .setParents("TB.INFUSION", "TB.NODESTABILIZERADV", "TB.VISPOWER").setConcealed() - .setPages( - new ResearchPage("tb.rec.nodeMan.page.0"), - new ResearchPage("tb.rec.nodeMan.page.1"), - new ResearchPage("tb.rec.nodeMan.page.2"), - new ResearchPage("tb.rec.nodeMan.page.3"), - new ResearchPage(nodeManipulatorRec)) - .registerResearchItem(); + "TB.NodeLinker", + new ItemStack(TBBlocks.nodeLinker, 1, 0), + primals(5), + new Object[] { "TPT", "ANA", "BOB", 'T', new ItemStack(ConfigBlocks.blockMetalDevice, 1, 14), 'P', + new ItemStack(ConfigItems.itemResource, 1, 15), 'A', + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), 'B', + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), 'O', Blocks.obsidian, 'N', + new ItemStack(ConfigItems.itemResource, 1, 0) }); + + new ResearchItem( + "TB.NodeMan", + catName, + new AspectList().add(Aspect.MECHANISM, 8) + .add(Aspect.AURA, 8) + .add(Aspect.ENERGY, 16) + .add(Aspect.MAGIC, 8), + 0, + -8, + 3, + new ItemStack(TBBlocks.nodeManipulator)) + .setParents("TB.INFUSION", "TB.NODESTABILIZERADV", "TB.VISPOWER") + .setConcealed() + .setPages( + new ResearchPage("tb.rec.nodeMan.page.0"), + new ResearchPage("tb.rec.nodeMan.page.1"), + new ResearchPage("tb.rec.nodeMan.page.2"), + new ResearchPage("tb.rec.nodeMan.page.3"), + new ResearchPage(nodeManipulatorRec)) + .registerResearchItem(); if (flag) { // copy(ResearchCategories.getResearchList("ELDRITCH").research.get("PRIMPEARL"),"TB.PRIMPEARL",catName,0,-13).setConcealed().setHidden().registerResearchItem(); new FakeResearchItem( - "TB.PRIMPEARL", - "THAUMICBASES", - "PRIMPEARL", - "ELDRITCH", - 0, - -13, - ResearchCategories.getResearch("PRIMPEARL").icon_item).registerResearchItem(); + "TB.PRIMPEARL", + "THAUMICBASES", + "PRIMPEARL", + "ELDRITCH", + 0, + -13, + ResearchCategories.getResearch("PRIMPEARL").icon_item).registerResearchItem(); } String[] bParents = flag ? new String[] { "TB.NodeMan", "TB.PRIMPEARL" } : new String[] { "TB.NodeMan" }; new ResearchItem( - "TB.NodeFoci.Bright", - catName, - new AspectList().add(Aspect.AURA, 8).add(Aspect.LIGHT, 8), - 0, - -11, - 0, - new ItemStack(TBItems.nodeFoci, 1, 0)).setParents(bParents).setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.foci.bright.page.0"), new ResearchPage(brightFociRec)) - .registerResearchItem(); + "TB.NodeFoci.Bright", + catName, + new AspectList().add(Aspect.AURA, 8) + .add(Aspect.LIGHT, 8), + 0, + -11, + 0, + new ItemStack(TBItems.nodeFoci, 1, 0)).setParents(bParents) + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.foci.bright.page.0"), new ResearchPage(brightFociRec)) + .registerResearchItem(); new ResearchItem( - "TB.NodeFoci.Destr", - catName, - new AspectList().add(Aspect.AURA, 8).add(Aspect.DEATH, 8).add(Aspect.VOID, 8), - 2, - -10, - 0, - new ItemStack(TBItems.nodeFoci, 1, 1)) - .setParents("TB.NodeMan").setConcealed().setSecondary() - .setPages( - new ResearchPage("tb.rec.foci.destr.page.0"), - new ResearchPage(destructionFociRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.NodeFoci.Efficiency", - catName, - new AspectList().add(Aspect.AURA, 8).add(Aspect.MAGIC, 8).add(Aspect.ENERGY, 8), - -4, - -8, - 0, - new ItemStack(TBItems.nodeFoci, 1, 2)) - .setParents("TB.NodeMan").setConcealed().setSecondary() - .setPages( - new ResearchPage("tb.rec.foci.efficiency.page.0"), - new ResearchPage(efficiencyFociRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.NodeFoci.Hunger", - catName, - new AspectList().add(Aspect.AURA, 8).add(Aspect.HUNGER, 16).add(Aspect.ENERGY, 16), - 4, - -9, - 0, - new ItemStack(TBItems.nodeFoci, 1, 3)).setParents("TB.NodeMan").setConcealed().setSecondary() - .setSpecial() - .setPages(new ResearchPage("tb.rec.foci.hunger.page.0"), new ResearchPage(hungerFociRec)) - .registerResearchItem(); + "TB.NodeFoci.Destr", + catName, + new AspectList().add(Aspect.AURA, 8) + .add(Aspect.DEATH, 8) + .add(Aspect.VOID, 8), + 2, + -10, + 0, + new ItemStack(TBItems.nodeFoci, 1, 1)).setParents("TB.NodeMan") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.foci.destr.page.0"), new ResearchPage(destructionFociRec)) + .registerResearchItem(); new ResearchItem( - "TB.NodeFoci.Unstable", - catName, - new AspectList().add(Aspect.AURA, 8).add(Aspect.ENTROPY, 8).add(Aspect.VOID, 8), - -2, - -10, - 0, - new ItemStack(TBItems.nodeFoci, 1, 4)) - .setParents("TB.NodeMan").setConcealed().setSecondary() - .setPages( - new ResearchPage("tb.rec.foci.unstable.page.0"), - new ResearchPage(unstableFociRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.NodeFoci.Purity", - catName, - new AspectList().add(Aspect.AURA, 8).add(Aspect.LIFE, 8).add(Aspect.ORDER, 8), - -1, - -11, - 0, - new ItemStack(TBItems.nodeFoci, 1, 5)).setParents("TB.NodeMan").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.foci.pure.page.0"), new ResearchPage(pureFociRec)) - .registerResearchItem(); + "TB.NodeFoci.Efficiency", + catName, + new AspectList().add(Aspect.AURA, 8) + .add(Aspect.MAGIC, 8) + .add(Aspect.ENERGY, 8), + -4, + -8, + 0, + new ItemStack(TBItems.nodeFoci, 1, 2)).setParents("TB.NodeMan") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.foci.efficiency.page.0"), new ResearchPage(efficiencyFociRec)) + .registerResearchItem(); new ResearchItem( - "TB.NodeFoci.Sinister", - catName, - new AspectList().add(Aspect.AURA, 8).add(Aspect.UNDEAD, 8).add(Aspect.ENTROPY, 8), - -3, - -10, - 0, - new ItemStack(TBItems.nodeFoci, 1, 6)) - .setParents("TB.NodeMan").setConcealed().setSecondary() - .setPages( - new ResearchPage("tb.rec.foci.sinister.page.0"), - new ResearchPage(sinisterFociRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.NodeFoci.Speed", - catName, - new AspectList().add(Aspect.AURA, 8).add(Aspect.MOTION, 8).add(Aspect.ENERGY, 8), - -4, - -9, - 0, - new ItemStack(TBItems.nodeFoci, 1, 7)).setParents("TB.NodeMan").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.foci.speed.page.0"), new ResearchPage(speedFociRec)) - .registerResearchItem(); + "TB.NodeFoci.Hunger", + catName, + new AspectList().add(Aspect.AURA, 8) + .add(Aspect.HUNGER, 16) + .add(Aspect.ENERGY, 16), + 4, + -9, + 0, + new ItemStack(TBItems.nodeFoci, 1, 3)).setParents("TB.NodeMan") + .setConcealed() + .setSecondary() + .setSpecial() + .setPages(new ResearchPage("tb.rec.foci.hunger.page.0"), new ResearchPage(hungerFociRec)) + .registerResearchItem(); new ResearchItem( - "TB.NodeFoci.Stability", - catName, - new AspectList().add(Aspect.AURA, 8).add(Aspect.ORDER, 8).add(Aspect.EXCHANGE, 8), - 1, - -11, - 0, - new ItemStack(TBItems.nodeFoci, 1, 8)) - .setParents("TB.NodeMan").setConcealed().setSecondary() - .setPages( - new ResearchPage("tb.rec.foci.stability.page.0"), - new ResearchPage(stabilityFociRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.NodeFoci.Taint", - catName, - new AspectList().add(Aspect.AURA, 8).add(Aspect.TAINT, 16).add(Aspect.ENERGY, 8), - 3, - -10, - 0, - new ItemStack(TBItems.nodeFoci, 1, 9)).setParents("TB.NodeMan").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.foci.taint.page.0"), new ResearchPage(taintFociRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.NodeLinker", - catName, - new AspectList().add(Aspect.MECHANISM, 8).add(Aspect.AURA, 8).add(Aspect.TRAVEL, 16) - .add(Aspect.MAGIC, 8), - 5, - -6, - 3, - new ItemStack(TBBlocks.nodeLinker)) - .setParents("TB.VISPOWER").setConcealed() - .setPages( - new ResearchPage("tb.rec.nodeLink.page.0"), - new ResearchPage("tb.rec.nodeLink.page.1"), - new ResearchPage("tb.rec.nodeLink.page.2"), - new ResearchPage(nodeLinkRec)) - .registerResearchItem(); - - ThaumcraftApi.getCraftingRecipes().add(nodeManipulatorRec); - - ThaumcraftApi.getCraftingRecipes().add(brightFociRec); - ThaumcraftApi.getCraftingRecipes().add(destructionFociRec); - ThaumcraftApi.getCraftingRecipes().add(efficiencyFociRec); - ThaumcraftApi.getCraftingRecipes().add(hungerFociRec); - ThaumcraftApi.getCraftingRecipes().add(unstableFociRec); - ThaumcraftApi.getCraftingRecipes().add(pureFociRec); - ThaumcraftApi.getCraftingRecipes().add(sinisterFociRec); - ThaumcraftApi.getCraftingRecipes().add(speedFociRec); - ThaumcraftApi.getCraftingRecipes().add(stabilityFociRec); - ThaumcraftApi.getCraftingRecipes().add(taintFociRec); - - ThaumcraftApi.getCraftingRecipes().add(nodeLinkRec); + "TB.NodeFoci.Unstable", + catName, + new AspectList().add(Aspect.AURA, 8) + .add(Aspect.ENTROPY, 8) + .add(Aspect.VOID, 8), + -2, + -10, + 0, + new ItemStack(TBItems.nodeFoci, 1, 4)).setParents("TB.NodeMan") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.foci.unstable.page.0"), new ResearchPage(unstableFociRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.NodeFoci.Purity", + catName, + new AspectList().add(Aspect.AURA, 8) + .add(Aspect.LIFE, 8) + .add(Aspect.ORDER, 8), + -1, + -11, + 0, + new ItemStack(TBItems.nodeFoci, 1, 5)).setParents("TB.NodeMan") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.foci.pure.page.0"), new ResearchPage(pureFociRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.NodeFoci.Sinister", + catName, + new AspectList().add(Aspect.AURA, 8) + .add(Aspect.UNDEAD, 8) + .add(Aspect.ENTROPY, 8), + -3, + -10, + 0, + new ItemStack(TBItems.nodeFoci, 1, 6)).setParents("TB.NodeMan") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.foci.sinister.page.0"), new ResearchPage(sinisterFociRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.NodeFoci.Speed", + catName, + new AspectList().add(Aspect.AURA, 8) + .add(Aspect.MOTION, 8) + .add(Aspect.ENERGY, 8), + -4, + -9, + 0, + new ItemStack(TBItems.nodeFoci, 1, 7)).setParents("TB.NodeMan") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.foci.speed.page.0"), new ResearchPage(speedFociRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.NodeFoci.Stability", + catName, + new AspectList().add(Aspect.AURA, 8) + .add(Aspect.ORDER, 8) + .add(Aspect.EXCHANGE, 8), + 1, + -11, + 0, + new ItemStack(TBItems.nodeFoci, 1, 8)).setParents("TB.NodeMan") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.foci.stability.page.0"), new ResearchPage(stabilityFociRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.NodeFoci.Taint", + catName, + new AspectList().add(Aspect.AURA, 8) + .add(Aspect.TAINT, 16) + .add(Aspect.ENERGY, 8), + 3, + -10, + 0, + new ItemStack(TBItems.nodeFoci, 1, 9)).setParents("TB.NodeMan") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.foci.taint.page.0"), new ResearchPage(taintFociRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.NodeLinker", + catName, + new AspectList().add(Aspect.MECHANISM, 8) + .add(Aspect.AURA, 8) + .add(Aspect.TRAVEL, 16) + .add(Aspect.MAGIC, 8), + 5, + -6, + 3, + new ItemStack(TBBlocks.nodeLinker)).setParents("TB.VISPOWER") + .setConcealed() + .setPages( + new ResearchPage("tb.rec.nodeLink.page.0"), + new ResearchPage("tb.rec.nodeLink.page.1"), + new ResearchPage("tb.rec.nodeLink.page.2"), + new ResearchPage(nodeLinkRec)) + .registerResearchItem(); + + ThaumcraftApi.getCraftingRecipes() + .add(nodeManipulatorRec); + + ThaumcraftApi.getCraftingRecipes() + .add(brightFociRec); + ThaumcraftApi.getCraftingRecipes() + .add(destructionFociRec); + ThaumcraftApi.getCraftingRecipes() + .add(efficiencyFociRec); + ThaumcraftApi.getCraftingRecipes() + .add(hungerFociRec); + ThaumcraftApi.getCraftingRecipes() + .add(unstableFociRec); + ThaumcraftApi.getCraftingRecipes() + .add(pureFociRec); + ThaumcraftApi.getCraftingRecipes() + .add(sinisterFociRec); + ThaumcraftApi.getCraftingRecipes() + .add(speedFociRec); + ThaumcraftApi.getCraftingRecipes() + .add(stabilityFociRec); + ThaumcraftApi.getCraftingRecipes() + .add(taintFociRec); + + ThaumcraftApi.getCraftingRecipes() + .add(nodeLinkRec); } // TODO revolver @@ -2902,398 +3401,481 @@ public static void setup() { ThaumcraftApi.addWarpToResearch("TB.Revolver.Void", 2); InfusionRecipe revolverRec = new InfusionRecipe( - "TB.Revolver", - new ItemStack(TBItems.revolver, 1, 0), - 5, - new AspectList().add(Aspect.WEAPON, 256).add(Aspect.METAL, 32).add(Aspect.TREE, 16) - .add(Aspect.TOOL, 12).add(Aspect.ENERGY, 32).add(Aspect.MECHANISM, 12).add(Aspect.VOID, 16) - .add(Aspect.FIRE, 32), - new ItemStack(Blocks.iron_block), - new ItemStack[] { new ItemStack(Items.fire_charge, 1, 0), new ItemStack(Items.gunpowder, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 15), - new ItemStack(ConfigBlocks.blockMagicalLog, 1, 0), new ItemStack(Items.gunpowder, 1, 0), - new ItemStack(ConfigItems.itemFocusFire, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(Items.fire_charge, 1, 0), new ItemStack(Items.gunpowder, 1, 0), - new ItemStack(ConfigItems.itemBowBone, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(ConfigBlocks.blockMagicalLog, 1, 0), new ItemStack(Items.gunpowder, 1, 0), - new ItemStack(Blocks.redstone_torch, 1, 0) }); + "TB.Revolver", + new ItemStack(TBItems.revolver, 1, 0), + 5, + new AspectList().add(Aspect.WEAPON, 256) + .add(Aspect.METAL, 32) + .add(Aspect.TREE, 16) + .add(Aspect.TOOL, 12) + .add(Aspect.ENERGY, 32) + .add(Aspect.MECHANISM, 12) + .add(Aspect.VOID, 16) + .add(Aspect.FIRE, 32), + new ItemStack(Blocks.iron_block), + new ItemStack[] { new ItemStack(Items.fire_charge, 1, 0), new ItemStack(Items.gunpowder, 1, 0), + new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockMagicalLog, 1, 0), + new ItemStack(Items.gunpowder, 1, 0), + new ItemStack(ConfigItems.itemFocusFire, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(Items.fire_charge, 1, 0), new ItemStack(Items.gunpowder, 1, 0), + new ItemStack(ConfigItems.itemBowBone, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(ConfigBlocks.blockMagicalLog, 1, 0), new ItemStack(Items.gunpowder, 1, 0), + new ItemStack(Blocks.redstone_torch, 1, 0) }); RevolverInfusionRecipe accuracyRec = new RevolverInfusionRecipe( - "TB.Revolver.Accuracy", - RevolverUpgrade.accuracy, - 1, - new AspectList().add(Aspect.ORDER, 8).add(Aspect.SENSES, 8), - new ItemStack[] { new ItemStack(Blocks.glass_pane, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(Items.carrot, 1, 0), - new ItemStack(Blocks.glass_pane, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(Blocks.glass_pane, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(Blocks.glass_pane, 1, OreDictionary.WILDCARD_VALUE) }); + "TB.Revolver.Accuracy", + RevolverUpgrade.accuracy, + 1, + new AspectList().add(Aspect.ORDER, 8) + .add(Aspect.SENSES, 8), + new ItemStack[] { new ItemStack(Blocks.glass_pane, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(Items.carrot, 1, 0), + new ItemStack(Blocks.glass_pane, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(Blocks.glass_pane, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(Blocks.glass_pane, 1, OreDictionary.WILDCARD_VALUE) }); RevolverInfusionRecipe atropodsRec = new RevolverInfusionRecipe( - "TB.Revolver.Atropods", - RevolverUpgrade.atropodsBane, - 1, - new AspectList().add(Aspect.DEATH, 8).add(Aspect.BEAST, 8).add(Aspect.CLOTH, 8), - new ItemStack[] { new ItemStack(Items.spider_eye, 1, 0), - new ItemStack(Items.fermented_spider_eye, 1, 0), new ItemStack(Items.spider_eye, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "TB.Revolver.Atropods", + RevolverUpgrade.atropodsBane, + 1, + new AspectList().add(Aspect.DEATH, 8) + .add(Aspect.BEAST, 8) + .add(Aspect.CLOTH, 8), + new ItemStack[] { new ItemStack(Items.spider_eye, 1, 0), + new ItemStack(Items.fermented_spider_eye, 1, 0), new ItemStack(Items.spider_eye, 1, 0), + new ItemStack(ConfigItems.itemResource, 1, 14) }); RevolverInfusionRecipe eldritchBRec = new RevolverInfusionRecipe( - "TB.Revolver.EldritchBane", - RevolverUpgrade.eldritchBane, - 2, - new AspectList().add(Aspect.DEATH, 8).add(Aspect.ELDRITCH, 8), - new ItemStack[] { new ItemStack(Items.ender_eye, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.ender_pearl, 1, 0) }); + "TB.Revolver.EldritchBane", + RevolverUpgrade.eldritchBane, + 2, + new AspectList().add(Aspect.DEATH, 8) + .add(Aspect.ELDRITCH, 8), + new ItemStack[] { new ItemStack(Items.ender_eye, 1, 0), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(Items.ender_pearl, 1, 0) }); RevolverInfusionRecipe duelingRec = new RevolverInfusionRecipe( - "TB.Revolver.Dueling", - RevolverUpgrade.dueling, - 2, - new AspectList().add(Aspect.DEATH, 8).add(Aspect.MAN, 8), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.bed, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.ghast_tear, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "TB.Revolver.Dueling", + RevolverUpgrade.dueling, + 2, + new AspectList().add(Aspect.DEATH, 8) + .add(Aspect.MAN, 8), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.bed, 1, 0), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.ghast_tear, 1, 0), + new ItemStack(ConfigItems.itemResource, 1, 14) }); RevolverInfusionRecipe efficiencyRec = new RevolverInfusionRecipe( - "TB.Revolver.Efficiency", - RevolverUpgrade.efficiency, - 0, - new AspectList().add(Aspect.ORDER, 8).add(Aspect.EXCHANGE, 8), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(Items.blaze_powder, 1, 0), new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(Items.enchanted_book, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "TB.Revolver.Efficiency", + RevolverUpgrade.efficiency, + 0, + new AspectList().add(Aspect.ORDER, 8) + .add(Aspect.EXCHANGE, 8), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(Items.blaze_powder, 1, 0), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(Items.enchanted_book, 1, 0), new ItemStack(ConfigItems.itemResource, 1, 14) }); RevolverInfusionRecipe eldritchRec = new RevolverInfusionRecipe( - "TB.Revolver.Eldritch", - RevolverUpgrade.eldritch, - 5, - new AspectList().add(Aspect.ELDRITCH, 8).add(Aspect.VOID, 8), - new ItemStack[] { new ItemStack(ConfigItems.itemEldritchObject, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemEldritchObject, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "TB.Revolver.Eldritch", + RevolverUpgrade.eldritch, + 5, + new AspectList().add(Aspect.ELDRITCH, 8) + .add(Aspect.VOID, 8), + new ItemStack[] { new ItemStack(ConfigItems.itemEldritchObject, 1, 0), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemEldritchObject, 1, 0), + new ItemStack(ConfigItems.itemResource, 1, 14) }); RevolverInfusionRecipe heavyRec = new RevolverInfusionRecipe( - "TB.Revolver.Heavy", - RevolverUpgrade.heavy, - 0, - new AspectList().add(Aspect.WEAPON, 8).add(Aspect.METAL, 8), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(Items.iron_sword, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "TB.Revolver.Heavy", + RevolverUpgrade.heavy, + 0, + new AspectList().add(Aspect.WEAPON, 8) + .add(Aspect.METAL, 8), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(Items.iron_sword, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(ConfigItems.itemResource, 1, 14) }); RevolverInfusionRecipe knowledgeRec = new RevolverInfusionRecipe( - "TB.Revolver.Knowledge", - RevolverUpgrade.knowledge, - 0, - new AspectList().add(Aspect.MIND, 8).add(Aspect.AURA, 8), - new ItemStack[] { new ItemStack(ConfigItems.itemInkwell, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.book, 1, 0), - new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.paper, 1, 0) }); + "TB.Revolver.Knowledge", + RevolverUpgrade.knowledge, + 0, + new AspectList().add(Aspect.MIND, 8) + .add(Aspect.AURA, 8), + new ItemStack[] { new ItemStack(ConfigItems.itemInkwell, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.book, 1, 0), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.paper, 1, 0) }); RevolverInfusionRecipe piercingRec = new RevolverInfusionRecipe( - "TB.Revolver.Piercing", - RevolverUpgrade.piercig, - 12, - new AspectList().add(Aspect.WEAPON, 32).add(Aspect.AIR, 64), - new ItemStack[] { new ItemStack(ConfigItems.itemPrimalArrow, 1, 0), - new ItemStack(ConfigItems.itemPrimalArrow, 1, 1), - new ItemStack(ConfigItems.itemPrimalArrow, 1, 2), - new ItemStack(Items.diamond_sword, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(ConfigItems.itemPrimalArrow, 1, 3), - new ItemStack(ConfigItems.itemPrimalArrow, 1, 4), - new ItemStack(ConfigItems.itemPrimalArrow, 1, 5) }); + "TB.Revolver.Piercing", + RevolverUpgrade.piercig, + 12, + new AspectList().add(Aspect.WEAPON, 32) + .add(Aspect.AIR, 64), + new ItemStack[] { new ItemStack(ConfigItems.itemPrimalArrow, 1, 0), + new ItemStack(ConfigItems.itemPrimalArrow, 1, 1), new ItemStack(ConfigItems.itemPrimalArrow, 1, 2), + new ItemStack(Items.diamond_sword, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack(ConfigItems.itemPrimalArrow, 1, 3), new ItemStack(ConfigItems.itemPrimalArrow, 1, 4), + new ItemStack(ConfigItems.itemPrimalArrow, 1, 5) }); RevolverInfusionRecipe powerRec = new RevolverInfusionRecipe( - "TB.Revolver.Power", - RevolverUpgrade.power, - 2, - new AspectList().add(Aspect.WEAPON, 16), - new ItemStack[] { new ItemStack(Items.gunpowder), new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(Items.fire_charge), new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(Items.fireworks, 1, OreDictionary.WILDCARD_VALUE) }); + "TB.Revolver.Power", + RevolverUpgrade.power, + 2, + new AspectList().add(Aspect.WEAPON, 16), + new ItemStack[] { new ItemStack(Items.gunpowder), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(Items.fire_charge), new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(Items.fireworks, 1, OreDictionary.WILDCARD_VALUE) }); RevolverInfusionRecipe primalRec = new RevolverInfusionRecipe( - "TB.Revolver.Primal", - RevolverUpgrade.primal, - 12, - new AspectList().add(Aspect.WEAPON, 64).add(primals(64)).add(Aspect.MAGIC, 64), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemEldritchObject, 1, 3), new ItemStack(Items.diamond), - new ItemStack(ConfigItems.itemEldritchObject, 1, 3), - new ItemStack(ConfigItems.itemResource, 1, 14), }); + "TB.Revolver.Primal", + RevolverUpgrade.primal, + 12, + new AspectList().add(Aspect.WEAPON, 64) + .add(primals(64)) + .add(Aspect.MAGIC, 64), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigItems.itemEldritchObject, 1, 3), new ItemStack(Items.diamond), + new ItemStack(ConfigItems.itemEldritchObject, 1, 3), + new ItemStack(ConfigItems.itemResource, 1, 14), }); ItemStack silver = OreDictionary.doesOreNameExist("ingotSilver") - && OreDictionary.getOres("ingotSilver") != null - && OreDictionary.getOres("ingotSilver").size() > 0 ? OreDictionary.getOres("ingotSilver").get(0) - : new ItemStack(ConfigItems.itemResource, 1, 15); + && OreDictionary.getOres("ingotSilver") != null + && OreDictionary.getOres("ingotSilver") + .size() > 0 ? OreDictionary.getOres("ingotSilver") + .get(0) : new ItemStack(ConfigItems.itemResource, 1, 15); RevolverInfusionRecipe silverRec = new RevolverInfusionRecipe( - "TB.Revolver.Silver", - RevolverUpgrade.silver, - 0, - new AspectList().add(Aspect.DEATH, 8).add(Aspect.BEAST, 8).add(Aspect.UNDEAD, 8), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemResource, 1, 3), silver, - new ItemStack(ConfigItems.itemResource, 1, 3), - new ItemStack(ConfigItems.itemResource, 1, 14), }); + "TB.Revolver.Silver", + RevolverUpgrade.silver, + 0, + new AspectList().add(Aspect.DEATH, 8) + .add(Aspect.BEAST, 8) + .add(Aspect.UNDEAD, 8), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), + new ItemStack(ConfigItems.itemResource, 1, 3), silver, + new ItemStack(ConfigItems.itemResource, 1, 3), new ItemStack(ConfigItems.itemResource, 1, 14), }); RevolverInfusionRecipe speedRec = new RevolverInfusionRecipe( - "TB.Revolver.Speed", - RevolverUpgrade.speed, - 2, - new AspectList().add(Aspect.MOTION, 8).add(Aspect.AIR, 8), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.feather), - new ItemStack(ConfigItems.itemResource, 1, 14), }); + "TB.Revolver.Speed", + RevolverUpgrade.speed, + 2, + new AspectList().add(Aspect.MOTION, 8) + .add(Aspect.AIR, 8), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(Items.feather), + new ItemStack(ConfigItems.itemResource, 1, 14), }); RevolverInfusionRecipe taintedRec = new RevolverInfusionRecipe( - "TB.Revolver.Tainted", - RevolverUpgrade.tainted, - 4, - new AspectList().add(Aspect.TAINT, 8).add(Aspect.WEAPON, 8), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 11), - new ItemStack(ConfigItems.itemResource, 1, 14), - new ItemStack(ConfigItems.itemResource, 1, 12), - new ItemStack(ConfigItems.itemResource, 1, 14) }); + "TB.Revolver.Tainted", + RevolverUpgrade.tainted, + 4, + new AspectList().add(Aspect.TAINT, 8) + .add(Aspect.WEAPON, 8), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 11), + new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 12), + new ItemStack(ConfigItems.itemResource, 1, 14) }); RevolverInfusionRecipe voidRec = new RevolverInfusionRecipe( - "TB.Revolver.Void", - RevolverUpgrade.uvoid, - 4, - new AspectList().add(Aspect.VOID, 8).add(Aspect.TOOL, 8), - new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 16), - new ItemStack(ConfigItems.itemResource, 1, 16), - new ItemStack(ConfigItems.itemResource, 1, 16), - new ItemStack(ConfigItems.itemResource, 1, 16), - new ItemStack(ConfigItems.itemResource, 1, 16) }); - - new ResearchItem( - "TB.Revolver", - catName, - new AspectList().add(Aspect.WEAPON, 5).add(Aspect.FIRE, 5).add(Aspect.VOID, 4).add(Aspect.TOOL, 2) - .add(Aspect.ENERGY, 2), - -16, - -7, - 4, - new ItemStack(TBItems.revolver, 1, 0)) - .setParentsHidden("TB.INFUSION").setConcealed() - .setPages( - new ResearchPage("tb.rec.revolver.page.0"), - new ResearchPage("tb.rec.revolver.page.1"), - new ResearchPage("tb.rec.revolver.page.2"), - new ResearchPage(revolverRec)) - .registerResearchItem(); - - new ResearchItem( - "TB.Revolver.Accuracy", - catName, - new AspectList().add(Aspect.ORDER, 8).add(Aspect.MECHANISM, 8).add(Aspect.SENSES, 4), - -19, - -7, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/ACCURACY.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.acc.page.0"), new ResearchPage(accuracyRec)) - .registerResearchItem(); + "TB.Revolver.Void", + RevolverUpgrade.uvoid, + 4, + new AspectList().add(Aspect.VOID, 8) + .add(Aspect.TOOL, 8), + new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 16), + new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 16), + new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 16) }); new ResearchItem( - "TB.Revolver.Atropods", - catName, - new AspectList().add(Aspect.DEATH, 8).add(Aspect.BEAST, 8).add(Aspect.CLOTH, 4), - -14, - -10, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/BANE_OF_ATROPODS.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.atr.page.0"), new ResearchPage(atropodsRec)) - .registerResearchItem(); + "TB.Revolver", + catName, + new AspectList().add(Aspect.WEAPON, 5) + .add(Aspect.FIRE, 5) + .add(Aspect.VOID, 4) + .add(Aspect.TOOL, 2) + .add(Aspect.ENERGY, 2), + -16, + -7, + 4, + new ItemStack(TBItems.revolver, 1, 0)).setParentsHidden("TB.INFUSION") + .setConcealed() + .setPages( + new ResearchPage("tb.rec.revolver.page.0"), + new ResearchPage("tb.rec.revolver.page.1"), + new ResearchPage("tb.rec.revolver.page.2"), + new ResearchPage(revolverRec)) + .registerResearchItem(); new ResearchItem( - "TB.Revolver.EldritchBane", - catName, - new AspectList().add(Aspect.DEATH, 8).add(Aspect.ELDRITCH, 4), - -13, - -8, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/BANE_OF_ELDRITCH.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.elb.page.0"), new ResearchPage(eldritchBRec)) - .registerResearchItem(); + "TB.Revolver.Accuracy", + catName, + new AspectList().add(Aspect.ORDER, 8) + .add(Aspect.MECHANISM, 8) + .add(Aspect.SENSES, 4), + -19, + -7, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/ACCURACY.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.acc.page.0"), new ResearchPage(accuracyRec)) + .registerResearchItem(); new ResearchItem( - "TB.Revolver.Dueling", - catName, - new AspectList().add(Aspect.DEATH, 8).add(Aspect.MAN, 8), - -15, - -10, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/DUELING.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.duel.page.0"), new ResearchPage(duelingRec)) - .registerResearchItem(); + "TB.Revolver.Atropods", + catName, + new AspectList().add(Aspect.DEATH, 8) + .add(Aspect.BEAST, 8) + .add(Aspect.CLOTH, 4), + -14, + -10, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/BANE_OF_ATROPODS.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.atr.page.0"), new ResearchPage(atropodsRec)) + .registerResearchItem(); new ResearchItem( - "TB.Revolver.Efficiency", - catName, - new AspectList().add(Aspect.ORDER, 8).add(Aspect.EXCHANGE, 8), - -19, - -8, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/EFFICIENCY.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.eff.page.0"), new ResearchPage(efficiencyRec)) - .registerResearchItem(); + "TB.Revolver.EldritchBane", + catName, + new AspectList().add(Aspect.DEATH, 8) + .add(Aspect.ELDRITCH, 4), + -13, + -8, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/BANE_OF_ELDRITCH.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.elb.page.0"), new ResearchPage(eldritchBRec)) + .registerResearchItem(); new ResearchItem( - "TB.Revolver.Eldritch", - catName, - new AspectList().add(Aspect.ELDRITCH, 8).add(Aspect.VOID, 8), - -13, - -7, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/ELDRITCH.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.eld.page.0"), new ResearchPage(eldritchRec)) - .registerResearchItem(); + "TB.Revolver.Dueling", + catName, + new AspectList().add(Aspect.DEATH, 8) + .add(Aspect.MAN, 8), + -15, + -10, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/DUELING.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.duel.page.0"), new ResearchPage(duelingRec)) + .registerResearchItem(); new ResearchItem( - "TB.Revolver.Heavy", - catName, - new AspectList().add(Aspect.WEAPON, 8).add(Aspect.METAL, 8), - -19, - -6, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/HEAVY.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.hev.page.0"), new ResearchPage(heavyRec)) - .registerResearchItem(); + "TB.Revolver.Efficiency", + catName, + new AspectList().add(Aspect.ORDER, 8) + .add(Aspect.EXCHANGE, 8), + -19, + -8, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/EFFICIENCY.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.eff.page.0"), new ResearchPage(efficiencyRec)) + .registerResearchItem(); new ResearchItem( - "TB.Revolver.Knowledge", - catName, - new AspectList().add(Aspect.MIND, 8).add(Aspect.MAGIC, 8), - -18, - -10, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/KNOWLEGDE.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.kno.page.0"), new ResearchPage(knowledgeRec)) - .registerResearchItem(); + "TB.Revolver.Eldritch", + catName, + new AspectList().add(Aspect.ELDRITCH, 8) + .add(Aspect.VOID, 8), + -13, + -7, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/ELDRITCH.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.eld.page.0"), new ResearchPage(eldritchRec)) + .registerResearchItem(); new ResearchItem( - "TB.Revolver.Piercing", - catName, - new AspectList().add(Aspect.WEAPON, 8).add(Aspect.AIR, 8), - -17, - -10, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/PIERCING.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.pir.page.0"), new ResearchPage(piercingRec)) - .registerResearchItem(); + "TB.Revolver.Heavy", + catName, + new AspectList().add(Aspect.WEAPON, 8) + .add(Aspect.METAL, 8), + -19, + -6, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/HEAVY.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.hev.page.0"), new ResearchPage(heavyRec)) + .registerResearchItem(); new ResearchItem( - "TB.Revolver.Power", - catName, - new AspectList().add(Aspect.WEAPON, 8).add(Aspect.MECHANISM, 8), - -16, - -10, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/POWER.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.pow.page.0"), new ResearchPage(powerRec)) - .registerResearchItem(); + "TB.Revolver.Knowledge", + catName, + new AspectList().add(Aspect.MIND, 8) + .add(Aspect.MAGIC, 8), + -18, + -10, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/KNOWLEGDE.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.kno.page.0"), new ResearchPage(knowledgeRec)) + .registerResearchItem(); new ResearchItem( - "TB.Revolver.Primal", - catName, - new AspectList().add(Aspect.WEAPON, 8).add(Aspect.AURA, 8).add(primals(16)), - -15, - -5, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/PRIMAL.png")) - .setParents("TB.Revolver").setConcealed().setSecondary().setSpecial() - .setPages(new ResearchPage("tb.rec.revolver.primal.page.0"), new ResearchPage(primalRec)) - .registerResearchItem(); + "TB.Revolver.Piercing", + catName, + new AspectList().add(Aspect.WEAPON, 8) + .add(Aspect.AIR, 8), + -17, + -10, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/PIERCING.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.pir.page.0"), new ResearchPage(piercingRec)) + .registerResearchItem(); new ResearchItem( - "TB.Revolver.Silver", - catName, - new AspectList().add(Aspect.DEATH, 8).add(Aspect.UNDEAD, 8), - -13, - -9, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/SILVER.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.sil.page.0"), new ResearchPage(silverRec)) - .registerResearchItem(); + "TB.Revolver.Power", + catName, + new AspectList().add(Aspect.WEAPON, 8) + .add(Aspect.MECHANISM, 8), + -16, + -10, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/POWER.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.pow.page.0"), new ResearchPage(powerRec)) + .registerResearchItem(); new ResearchItem( - "TB.Revolver.Speed", - catName, - new AspectList().add(Aspect.MOTION, 8).add(Aspect.AIR, 8), - -19, - -9, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/SPEED.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.spe.page.0"), new ResearchPage(speedRec)) - .registerResearchItem(); + "TB.Revolver.Primal", + catName, + new AspectList().add(Aspect.WEAPON, 8) + .add(Aspect.AURA, 8) + .add(primals(16)), + -15, + -5, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/PRIMAL.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setSpecial() + .setPages(new ResearchPage("tb.rec.revolver.primal.page.0"), new ResearchPage(primalRec)) + .registerResearchItem(); new ResearchItem( - "TB.Revolver.Tainted", - catName, - new AspectList().add(Aspect.TAINT, 8).add(Aspect.MAGIC, 8), - -18, - -4, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/TAINTED.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.tai.page.0"), new ResearchPage(taintedRec)) - .registerResearchItem(); + "TB.Revolver.Silver", + catName, + new AspectList().add(Aspect.DEATH, 8) + .add(Aspect.UNDEAD, 8), + -13, + -9, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/SILVER.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.sil.page.0"), new ResearchPage(silverRec)) + .registerResearchItem(); new ResearchItem( - "TB.Revolver.Void", - catName, - new AspectList().add(Aspect.VOID, 8).add(Aspect.METAL, 8), - -19, - -5, - 0, - new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/VOID.png")) - .setParents("TB.Revolver").setConcealed().setSecondary() - .setPages(new ResearchPage("tb.rec.revolver.void.page.0"), new ResearchPage(voidRec)) - .registerResearchItem(); - - ThaumcraftApi.getCraftingRecipes().add(revolverRec); - ThaumcraftApi.getCraftingRecipes().add(accuracyRec); - ThaumcraftApi.getCraftingRecipes().add(atropodsRec); - ThaumcraftApi.getCraftingRecipes().add(eldritchBRec); - ThaumcraftApi.getCraftingRecipes().add(duelingRec); - ThaumcraftApi.getCraftingRecipes().add(efficiencyRec); - ThaumcraftApi.getCraftingRecipes().add(eldritchRec); - ThaumcraftApi.getCraftingRecipes().add(heavyRec); - ThaumcraftApi.getCraftingRecipes().add(knowledgeRec); - ThaumcraftApi.getCraftingRecipes().add(piercingRec); - ThaumcraftApi.getCraftingRecipes().add(powerRec); - ThaumcraftApi.getCraftingRecipes().add(primalRec); - ThaumcraftApi.getCraftingRecipes().add(silverRec); - ThaumcraftApi.getCraftingRecipes().add(speedRec); - ThaumcraftApi.getCraftingRecipes().add(taintedRec); - ThaumcraftApi.getCraftingRecipes().add(voidRec); + "TB.Revolver.Speed", + catName, + new AspectList().add(Aspect.MOTION, 8) + .add(Aspect.AIR, 8), + -19, + -9, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/SPEED.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.spe.page.0"), new ResearchPage(speedRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Revolver.Tainted", + catName, + new AspectList().add(Aspect.TAINT, 8) + .add(Aspect.MAGIC, 8), + -18, + -4, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/TAINTED.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.tai.page.0"), new ResearchPage(taintedRec)) + .registerResearchItem(); + + new ResearchItem( + "TB.Revolver.Void", + catName, + new AspectList().add(Aspect.VOID, 8) + .add(Aspect.METAL, 8), + -19, + -5, + 0, + new ResourceLocation("thaumicbases", "textures/thaumonomicon/revolver/VOID.png")) + .setParents("TB.Revolver") + .setConcealed() + .setSecondary() + .setPages(new ResearchPage("tb.rec.revolver.void.page.0"), new ResearchPage(voidRec)) + .registerResearchItem(); + + ThaumcraftApi.getCraftingRecipes() + .add(revolverRec); + ThaumcraftApi.getCraftingRecipes() + .add(accuracyRec); + ThaumcraftApi.getCraftingRecipes() + .add(atropodsRec); + ThaumcraftApi.getCraftingRecipes() + .add(eldritchBRec); + ThaumcraftApi.getCraftingRecipes() + .add(duelingRec); + ThaumcraftApi.getCraftingRecipes() + .add(efficiencyRec); + ThaumcraftApi.getCraftingRecipes() + .add(eldritchRec); + ThaumcraftApi.getCraftingRecipes() + .add(heavyRec); + ThaumcraftApi.getCraftingRecipes() + .add(knowledgeRec); + ThaumcraftApi.getCraftingRecipes() + .add(piercingRec); + ThaumcraftApi.getCraftingRecipes() + .add(powerRec); + ThaumcraftApi.getCraftingRecipes() + .add(primalRec); + ThaumcraftApi.getCraftingRecipes() + .add(silverRec); + ThaumcraftApi.getCraftingRecipes() + .add(speedRec); + ThaumcraftApi.getCraftingRecipes() + .add(taintedRec); + ThaumcraftApi.getCraftingRecipes() + .add(voidRec); } // TODO void metal stuff ShapedOreRecipe voidShearsRec = new ShapedOreRecipe( - new ItemStack(TBItems.voidShears), - new Object[] { " #", "# ", '#', new ItemStack(ConfigItems.itemResource, 1, 16) }); + new ItemStack(TBItems.voidShears), + new Object[] { " #", "# ", '#', new ItemStack(ConfigItems.itemResource, 1, 16) }); ShapedOreRecipe voidFlint = new ShapedOreRecipe( - new ItemStack(TBItems.voidFAS), - new Object[] { "# ", " C", '#', new ItemStack(ConfigItems.itemResource, 1, 16), 'C', - new ItemStack(Items.flint) }); + new ItemStack(TBItems.voidFAS), + new Object[] { "# ", " C", '#', new ItemStack(ConfigItems.itemResource, 1, 16), 'C', + new ItemStack(Items.flint) }); ResearchItem voidIngot = ResearchCategories.getResearchList("ELDRITCH").research.get("VOIDMETAL"); @@ -3306,82 +3888,115 @@ public static void setup() { newPages[newPages.length - 1] = new ResearchPage(voidIngotRec); voidIngot.setPages(newPages); - CraftingManager.getInstance().getRecipeList().add(voidShearsRec); - CraftingManager.getInstance().getRecipeList().add(voidFlint); + CraftingManager.getInstance() + .getRecipeList() + .add(voidShearsRec); + CraftingManager.getInstance() + .getRecipeList() + .add(voidFlint); - CraftingManager.getInstance().getRecipeList().add(voidBlockRec); - CraftingManager.getInstance().getRecipeList().add(voidIngotRec); + CraftingManager.getInstance() + .getRecipeList() + .add(voidBlockRec); + CraftingManager.getInstance() + .getRecipeList() + .add(voidIngotRec); // TODO entity decon InfusionRecipe entityDeconstructorRec = new InfusionRecipe( - "TB.EntityDec", - new ItemStack(TBBlocks.entityDeconstructor, 1, 0), - 4, - new AspectList().add(Aspect.DEATH, 16).add(Aspect.SOUL, 4).add(Aspect.MIND, 16), - new ItemStack(ConfigItems.itemThaumometer), - new ItemStack[] { new ItemStack(Blocks.light_weighted_pressure_plate), - new ItemStack(Blocks.light_weighted_pressure_plate), - new ItemStack(Blocks.heavy_weighted_pressure_plate), - new ItemStack(Blocks.heavy_weighted_pressure_plate), - new ItemStack(ConfigItems.itemResource, 1, 9), new ItemStack(ConfigItems.itemResource, 1, 9), - new ItemStack(ConfigItems.itemResource, 1, 15), - new ItemStack(ConfigItems.itemResource, 1, 15) }); + "TB.EntityDec", + new ItemStack(TBBlocks.entityDeconstructor, 1, 0), + 4, + new AspectList().add(Aspect.DEATH, 16) + .add(Aspect.SOUL, 4) + .add(Aspect.MIND, 16), + new ItemStack(ConfigItems.itemThaumometer), + new ItemStack[] { new ItemStack(Blocks.light_weighted_pressure_plate), + new ItemStack(Blocks.light_weighted_pressure_plate), + new ItemStack(Blocks.heavy_weighted_pressure_plate), + new ItemStack(Blocks.heavy_weighted_pressure_plate), new ItemStack(ConfigItems.itemResource, 1, 9), + new ItemStack(ConfigItems.itemResource, 1, 9), new ItemStack(ConfigItems.itemResource, 1, 15), + new ItemStack(ConfigItems.itemResource, 1, 15) }); new ResearchItem( - "TB.EntityDec", - catName, - new AspectList().add(Aspect.MIND, 8).add(Aspect.DEATH, 8).add(Aspect.SOUL, 8), - 3, - -2, - 1, - new ItemStack(TBBlocks.entityDeconstructor, 1, 0)).setParents("TB.INFUSION").setSecondary() - .setConcealed() - .setPages(new ResearchPage("tb.rec.eDec.page.0"), new ResearchPage(entityDeconstructorRec)) - .registerResearchItem(); + "TB.EntityDec", + catName, + new AspectList().add(Aspect.MIND, 8) + .add(Aspect.DEATH, 8) + .add(Aspect.SOUL, 8), + 3, + -2, + 1, + new ItemStack(TBBlocks.entityDeconstructor, 1, 0)).setParents("TB.INFUSION") + .setSecondary() + .setConcealed() + .setPages(new ResearchPage("tb.rec.eDec.page.0"), new ResearchPage(entityDeconstructorRec)) + .registerResearchItem(); new ResearchItem( - "TB.EntityDecAdv", - catName, - new AspectList().add(Aspect.MIND, 8).add(Aspect.DEATH, 8), - 5, - -3, - 1, - new ItemStack(ConfigBlocks.blockCrystal, 1, OreDictionary.WILDCARD_VALUE)).setParents("TB.EntityDec") - .setSecondary().setConcealed() - .setPages(new ResearchPage("tb.rec.eDeca.page.0"), new ResearchPage("tb.rec.eDeca.page.1")) - .registerResearchItem(); - - ThaumcraftApi.getCraftingRecipes().add(entityDeconstructorRec); - - ThaumcraftApi.getCraftingRecipes().add(drainFociRec); - ThaumcraftApi.getCraftingRecipes().add(expFociRec); - ThaumcraftApi.getCraftingRecipes().add(fluxFociRec); - ThaumcraftApi.getCraftingRecipes().add(activationFociRec); - - ThaumcraftApi.getCraftingRecipes().add(advFurnaceRecipe); - ThaumcraftApi.getCraftingRecipes().add(cryingObsidianRec); - ThaumcraftApi.getCraftingRecipes().add(overchanterRec); - - ThaumcraftApi.getCraftingRecipes().add(relocatorRec); - ThaumcraftApi.getCraftingRecipes().add(irelocatorRec); - ThaumcraftApi.getCraftingRecipes().add(thaumicAnvilRec); - ThaumcraftApi.getCraftingRecipes().add(voidAnvilRec); - - ThaumcraftApi.getCraftingRecipes().add(campfireRec); - ThaumcraftApi.getCraftingRecipes().add(brazierRec); + "TB.EntityDecAdv", + catName, + new AspectList().add(Aspect.MIND, 8) + .add(Aspect.DEATH, 8), + 5, + -3, + 1, + new ItemStack(ConfigBlocks.blockCrystal, 1, OreDictionary.WILDCARD_VALUE)).setParents("TB.EntityDec") + .setSecondary() + .setConcealed() + .setPages(new ResearchPage("tb.rec.eDeca.page.0"), new ResearchPage("tb.rec.eDeca.page.1")) + .registerResearchItem(); + + ThaumcraftApi.getCraftingRecipes() + .add(entityDeconstructorRec); + + ThaumcraftApi.getCraftingRecipes() + .add(drainFociRec); + ThaumcraftApi.getCraftingRecipes() + .add(expFociRec); + ThaumcraftApi.getCraftingRecipes() + .add(fluxFociRec); + ThaumcraftApi.getCraftingRecipes() + .add(activationFociRec); + + ThaumcraftApi.getCraftingRecipes() + .add(advFurnaceRecipe); + ThaumcraftApi.getCraftingRecipes() + .add(cryingObsidianRec); + ThaumcraftApi.getCraftingRecipes() + .add(overchanterRec); + + ThaumcraftApi.getCraftingRecipes() + .add(relocatorRec); + ThaumcraftApi.getCraftingRecipes() + .add(irelocatorRec); + ThaumcraftApi.getCraftingRecipes() + .add(thaumicAnvilRec); + ThaumcraftApi.getCraftingRecipes() + .add(voidAnvilRec); + + ThaumcraftApi.getCraftingRecipes() + .add(campfireRec); + ThaumcraftApi.getCraftingRecipes() + .add(brazierRec); // TODO actual recipes - for (int i = 0; i < 6; ++i) ThaumcraftApi.getCraftingRecipes().add(shards[i]); + for (int i = 0; i < 6; ++i) ThaumcraftApi.getCraftingRecipes() + .add(shards[i]); - for (int i = 0; i < oldRec.length; ++i) ThaumcraftApi.getCraftingRecipes().add(oldRec[i]); + for (int i = 0; i < oldRec.length; ++i) ThaumcraftApi.getCraftingRecipes() + .add(oldRec[i]); - for (int i = 0; i < 10; ++i) ThaumcraftApi.getCraftingRecipes().add(toolsRec[i]); + for (int i = 0; i < 10; ++i) ThaumcraftApi.getCraftingRecipes() + .add(toolsRec[i]); for (int i = 0; i < 7; ++i) { - ThaumcraftApi.getCraftingRecipes().add(cBlocks[i]); - ThaumcraftApi.getCraftingRecipes().add(cTaintedBlocks[i]); + ThaumcraftApi.getCraftingRecipes() + .add(cBlocks[i]); + ThaumcraftApi.getCraftingRecipes() + .add(cTaintedBlocks[i]); } } @@ -3405,8 +4020,12 @@ public static Aspect getPrimalForLoop(int loopInt) { } public static AspectList primals(int amount) { - return new AspectList().add(Aspect.AIR, amount).add(Aspect.WATER, amount).add(Aspect.EARTH, amount) - .add(Aspect.FIRE, amount).add(Aspect.ORDER, amount).add(Aspect.ENTROPY, amount); + return new AspectList().add(Aspect.AIR, amount) + .add(Aspect.WATER, amount) + .add(Aspect.EARTH, amount) + .add(Aspect.FIRE, amount) + .add(Aspect.ORDER, amount) + .add(Aspect.ENTROPY, amount); } /* diff --git a/src/main/java/tb/network/proxy/TBClient.java b/src/main/java/tb/network/proxy/TBClient.java index 7d46d78..0baa5da 100644 --- a/src/main/java/tb/network/proxy/TBClient.java +++ b/src/main/java/tb/network/proxy/TBClient.java @@ -72,12 +72,11 @@ public void registerRenderInformation() { ClientRegistry.bindTileEntitySpecialRenderer(TileNodeLinker.class, new RenderNodeLinker()); MinecraftForgeClient.registerItemRenderer(TBItems.nodeFoci, new NodeFociRenderer()); - MinecraftForgeClient.registerItemRenderer( - Item.getItemFromBlock(TBBlocks.nodeManipulator), - new NodeManipulatorItemRenderer()); + MinecraftForgeClient + .registerItemRenderer(Item.getItemFromBlock(TBBlocks.nodeManipulator), new NodeManipulatorItemRenderer()); MinecraftForgeClient.registerItemRenderer(TBItems.revolver, new RenderRevolver()); MinecraftForgeClient - .registerItemRenderer(Item.getItemFromBlock(TBBlocks.nodeLinker), new NodeLinkerItemRenderer()); + .registerItemRenderer(Item.getItemFromBlock(TBBlocks.nodeLinker), new NodeLinkerItemRenderer()); MinecraftForgeClient.registerItemRenderer(TBItems.castingBracelet, new CastingBraceletRenderer()); RenderingRegistry.registerBlockHandler(new ThaumicRelocatorRenderer()); @@ -90,19 +89,19 @@ public void registerRenderInformation() { @Override public void lightning(World world, double sx, double sy, double sz, double ex, double ey, double ez, int dur, - float curve, int speed, int type) { + float curve, int speed, int type) { FXLightningBolt bolt = new FXLightningBolt( - world, - sx, - sy, - sz, - ex, - ey, - ez, - world.rand.nextLong(), - dur, - curve, - speed); + world, + sx, + sy, + sz, + ex, + ey, + ez, + world.rand.nextLong(), + dur, + curve, + speed); bolt.defaultFractal(); bolt.setType(type); @@ -111,7 +110,7 @@ public void lightning(World world, double sx, double sy, double sz, double ex, d } public void sparkle(World w, double x, double y, double z, double dx, double dy, double dz, int color, - float scale) { + float scale) { FXSparkle fx = new FXSparkle(w, x, y, z, dx, dy, dz, scale, color, 1); fx.noClip = true; ParticleEngine.instance.addEffect(w, fx); diff --git a/src/main/java/tb/network/proxy/TBNetworkManager.java b/src/main/java/tb/network/proxy/TBNetworkManager.java index 5fcd8ab..8c3cee1 100644 --- a/src/main/java/tb/network/proxy/TBNetworkManager.java +++ b/src/main/java/tb/network/proxy/TBNetworkManager.java @@ -19,19 +19,19 @@ public IMessage onMessage(PacketTB message, MessageContext ctx) { NBTTagCompound tag = message.sent; World w = TBCore.proxy.clientWorld(); w.playSound( - tag.getDouble("x"), - tag.getDouble("y"), - tag.getDouble("z"), - tag.getString("snd"), - tag.getFloat("v"), - tag.getFloat("p"), - false); + tag.getDouble("x"), + tag.getDouble("y"), + tag.getDouble("z"), + tag.getString("snd"), + tag.getFloat("v"), + tag.getFloat("p"), + false); } return null; } public static void playSoundOnServer(World w, String sound, double x, double y, double z, float volume, - float pitch) { + float pitch) { NBTTagCompound tg = new NBTTagCompound(); tg.setString("snd", sound); tg.setDouble("x", x); diff --git a/src/main/java/tb/network/proxy/TBServer.java b/src/main/java/tb/network/proxy/TBServer.java index 9194492..f420450 100644 --- a/src/main/java/tb/network/proxy/TBServer.java +++ b/src/main/java/tb/network/proxy/TBServer.java @@ -45,10 +45,10 @@ public Object getClientGuiElement(int ID, EntityPlayer player, World world, int public void registerRenderInformation() {} public void lightning(World world, double sx, double sy, double sz, double ex, double ey, double ez, int dur, - float curve, int speed, int type) {} + float curve, int speed, int type) {} public void sparkle(World w, double x, double y, double z, double dx, double dy, double dz, int color, - float scale) {} + float scale) {} public World clientWorld() { return null; diff --git a/src/main/java/tb/utils/RevolverInfusionRecipe.java b/src/main/java/tb/utils/RevolverInfusionRecipe.java index 8e1a902..e578640 100644 --- a/src/main/java/tb/utils/RevolverInfusionRecipe.java +++ b/src/main/java/tb/utils/RevolverInfusionRecipe.java @@ -20,14 +20,14 @@ public class RevolverInfusionRecipe extends InfusionRecipe { RevolverUpgrade upgrade; public RevolverInfusionRecipe(String research, RevolverUpgrade output, int inst, AspectList aspects2, - ItemStack[] recipe) { + ItemStack[] recipe) { super( - research, - new ItemStack(TBItems.revolver, 1, OreDictionary.WILDCARD_VALUE), - inst, - aspects2, - new ItemStack(TBItems.revolver, 1, OreDictionary.WILDCARD_VALUE), - recipe); + research, + new ItemStack(TBItems.revolver, 1, OreDictionary.WILDCARD_VALUE), + inst, + aspects2, + new ItemStack(TBItems.revolver, 1, OreDictionary.WILDCARD_VALUE), + recipe); upgrade = output; } @@ -46,8 +46,7 @@ public boolean matches(ArrayList input, ItemStack central, World worl if (this.research.length() <= 0) return false; if (this.research.length() > 0 - && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), this.research)) - return false; + && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), this.research)) return false; ItemStack i2 = central.copy(); if (getRecipeInput().getItemDamage() == OreDictionary.WILDCARD_VALUE) @@ -95,6 +94,6 @@ public AspectList getAspects(ItemStack input) { @Override public int getInstability(ItemStack input) { return super.getInstability(input) - + upgrade.getInstabilityForLevel(ItemRevolver.getUpgradeLevel(input, upgrade)); + + upgrade.getInstabilityForLevel(ItemRevolver.getUpgradeLevel(input, upgrade)); } } diff --git a/src/main/java/tb/utils/TBConfig.java b/src/main/java/tb/utils/TBConfig.java index 2b1db77..5ba5d93 100644 --- a/src/main/java/tb/utils/TBConfig.java +++ b/src/main/java/tb/utils/TBConfig.java @@ -46,29 +46,29 @@ public void load(Configuration config) { // Adv. alchemy furnace speedMultiplierForFurnace = cfg.getInt( - "speedMultiplierForFurnace", - "Advanced Alchemy Furnace", - 2, - 0, - Integer.MAX_VALUE, - "This is the speed of the Advanced Alchamical Furnace. TC's basic has 1."); + "speedMultiplierForFurnace", + "Advanced Alchemy Furnace", + 2, + 0, + Integer.MAX_VALUE, + "This is the speed of the Advanced Alchamical Furnace. TC's basic has 1."); makeRequireAlumentum = cfg.getBoolean( - "makeRequireAlumentium", - "Advanced Alchemy Furnace", - true, - "Does the Advanced Alchemical Furnace requires Alumentum to work faster"); + "makeRequireAlumentium", + "Advanced Alchemy Furnace", + true, + "Does the Advanced Alchemical Furnace requires Alumentum to work faster"); // enchants elderKnowledgeID = cfg - .getInt("elderKnowledgeEnchantmentID", "Enchantments", 98, 0, Enchantment.enchantmentsList.length, ""); + .getInt("elderKnowledgeEnchantmentID", "Enchantments", 98, 0, Enchantment.enchantmentsList.length, ""); eldritchBaneID = cfg - .getInt("eldritchBaneEnchantmentID", "Enchantments", 99, 0, Enchantment.enchantmentsList.length, ""); + .getInt("eldritchBaneEnchantmentID", "Enchantments", 99, 0, Enchantment.enchantmentsList.length, ""); magicTouchID = cfg - .getInt("magicTouchEnchantmentID", "Enchantments", 100, 0, Enchantment.enchantmentsList.length, ""); + .getInt("magicTouchEnchantmentID", "Enchantments", 100, 0, Enchantment.enchantmentsList.length, ""); taintedID = cfg.getInt("taintedEnchantmentID", "Enchantments", 101, 0, Enchantment.enchantmentsList.length, ""); vaporisingID = cfg - .getInt("vaporisingEnchantmentID", "Enchantments", 102, 0, Enchantment.enchantmentsList.length, ""); + .getInt("vaporisingEnchantmentID", "Enchantments", 102, 0, Enchantment.enchantmentsList.length, ""); // focus upgrades aquaticFociUID = cfg.getInt("aquaticFociUID", "Foci", 42, 0, Integer.MAX_VALUE, ""); @@ -81,55 +81,55 @@ public void load(Configuration config) { // general + module disable allowTobacco = cfg.getBoolean( - "allowTobacco", - "General", - true, - "If set to false the tobacco will be disabled - there will be no recipes/no entries in Thaumonomicon"); + "allowTobacco", + "General", + true, + "If set to false the tobacco will be disabled - there will be no recipes/no entries in Thaumonomicon"); enableTTCompathability = cfg.getBoolean( - "enableTTCompathability", - "General", - true, - "Allow the mod to register it's enchantments in the Thaumic Tinkerer's enchanter? Set to false if Thaumic Tinkerer is crashing you."); + "enableTTCompathability", + "General", + true, + "Allow the mod to register it's enchantments in the Thaumic Tinkerer's enchanter? Set to false if Thaumic Tinkerer is crashing you."); shardsFromOre = cfg - .getInt("shardsFromOre", "General", 8, 1, 64, "Amount of shards recieved from crucible ore processing"); + .getInt("shardsFromOre", "General", 8, 1, 64, "Amount of shards recieved from crucible ore processing"); brightFociRequiresPrimordialPearl = cfg.getBoolean( - "brightFociRequiresPrimordialPearl", - "General", - true, - "Does the Brightness Foci for the Node Manipulator requires a Primordial Pearl"); + "brightFociRequiresPrimordialPearl", + "General", + true, + "Does the Brightness Foci for the Node Manipulator requires a Primordial Pearl"); enableRevolver = cfg.getBoolean( - "enableRevolver", - "General", - true, - "If set to false the revolver and upgrades will be disabled - there will be no recipes/no entries in Thaumonomicon"); + "enableRevolver", + "General", + true, + "If set to false the revolver and upgrades will be disabled - there will be no recipes/no entries in Thaumonomicon"); enableNodeTools = cfg.getBoolean( - "enableNodeTools", - "General", - true, - "If set to false, will disable the Node Modifer, focuses, and the Node Linker's entries and recipes"); + "enableNodeTools", + "General", + true, + "If set to false, will disable the Node Modifer, focuses, and the Node Linker's entries and recipes"); enableBracelets = cfg.getBoolean( - "enableBracelets", - "General", - true, - "If set to false the various bracelets will be disabled - there will be no recipes/no entries in Thaumonomicon"); + "enableBracelets", + "General", + true, + "If set to false the various bracelets will be disabled - there will be no recipes/no entries in Thaumonomicon"); enableFlora = cfg.getBoolean( - "enableFlora", - "General", - true, - "If set to false the various plant items will be disabled - there will be no recipes/no entries in Thaumonomicon"); + "enableFlora", + "General", + true, + "If set to false the various plant items will be disabled - there will be no recipes/no entries in Thaumonomicon"); enableBloodyMess = cfg.getBoolean( - "enableBloodyMess", - "General", - true, - "If set to false the spikes and bloody robes will be disabled - there will be no recipes/no entries in Thaumonomicon"); + "enableBloodyMess", + "General", + true, + "If set to false the spikes and bloody robes will be disabled - there will be no recipes/no entries in Thaumonomicon"); /* * enableVoidTools = cfg.getBoolean("enableVoidTools", "General", true, @@ -139,8 +139,8 @@ public void load(Configuration config) { // pyrofluid minBlazePowderFromPyrofluid = cfg - .getInt("minBlazePowderFromPyrofluid", "Pyrofluid", 5, 0, Integer.MAX_VALUE, ""); + .getInt("minBlazePowderFromPyrofluid", "Pyrofluid", 5, 0, Integer.MAX_VALUE, ""); maxBlazePowderFromPyrofluid = cfg - .getInt("maxBlazePowderFromPyrofluid", "Pyrofluid", 5 + 32, 0, Integer.MAX_VALUE, ""); + .getInt("maxBlazePowderFromPyrofluid", "Pyrofluid", 5 + 32, 0, Integer.MAX_VALUE, ""); } } diff --git a/src/main/java/tb/utils/TBUtils.java b/src/main/java/tb/utils/TBUtils.java index d467603..868c2ae 100644 --- a/src/main/java/tb/utils/TBUtils.java +++ b/src/main/java/tb/utils/TBUtils.java @@ -17,13 +17,12 @@ public static void addAspectToKnowledgePool(EntityPlayer player, Aspect aspect, ResearchManager.scheduleSave(player); if (player instanceof EntityPlayerMP) if (!(player instanceof FakePlayer)) { PacketHandler.INSTANCE.sendTo( - new PacketAspectPool( - aspect.getTag(), - Short.valueOf(amount), - Short.valueOf( - Thaumcraft.proxy.playerKnowledge - .getAspectPoolFor(player.getCommandSenderName(), aspect))), - (EntityPlayerMP) player); + new PacketAspectPool( + aspect.getTag(), + Short.valueOf(amount), + Short.valueOf( + Thaumcraft.proxy.playerKnowledge.getAspectPoolFor(player.getCommandSenderName(), aspect))), + (EntityPlayerMP) player); } } diff --git a/src/main/resources/assets/thaumicbases/lang/en_US.lang b/src/main/resources/assets/thaumicbases/lang/en_US.lang index 4424b45..c4e0914 100644 --- a/src/main/resources/assets/thaumicbases/lang/en_US.lang +++ b/src/main/resources/assets/thaumicbases/lang/en_US.lang @@ -51,7 +51,7 @@ tile.overchanter.name=Overchanting Table tile.TBoldCobblestone.name=Ancient Cobblestone tile.TBoldGravel.name=Ancient Gravel tile.TBoldCobblestoneMossy.name=Ancient Mossy Cobblestone -tile.advAlchFurnace.name=Advanced Alchemical Furnace +tile.advAlchFurnace.name=Thaumium Alchemical Furnace tile.entityDeconstructor.name=Entity Deconstructor tile.TBoldIron.name=Ancient Iron Block tile.TBoldDiamond.name=Ancient Diamond Block @@ -402,7 +402,7 @@ tc.research_text.TB.Foci.Activation=Remote access tb.rec.actFoci.page.0=Well, after your research on the ability of mirrors of transporting items it would be logical to continue onwards - what if mirrors could transport simple force and image? Well, it is not that simple, so you had to make a wand foci out of all that mess you were getting yourself into. This wand foci works really simple - once equipped on the wand a thaumaturge must shift-click on the desired block's location, which will store it to the wand. After that a simple click will act like a right click on the stored location. However, the range is limited to 32 blocks. Some mundane inventories are also too heavy for the transmitted force to interact with, should they bee far from a thaumaturge. tb.rec.actFoci.page.1=§l Potency Upgrade §rAvailable at all levels, this upgrade will increase the range of interaction up by 10 blocks. Will not work in unloaded chunks! -tc.research_name.TB.AdvAlc=Advanced Alchemical Furnace +tc.research_name.TB.AdvAlc=Thaumium Alchemical Furnace tc.research_text.TB.AdvAlc=Let the flame burn brighter tb.rec.advAlc.page.0=You are extremely annoyed about the speed of your Alchemical Furnace. There must be a way to speed that damn thing up! Sure, attaching more bellows helps... A tiny bit. However, what if you could use the Aer to use those bellows right next to the furnace's flame? Well, the furnace burns too hot and quickly becomes a pile of useless smelted construction. However, you have managed to use Thaumium to make the furnace more heat resistant! The result is a furnace, functioning just as a regular Alchemical Furnace, but 2 times faster! However, it is only achievable if the furnace runs on the Alumentum. Bellows can also be attached to achieve even more speed.