Browse Source

change: Project-wide reformat/cleanup.

merge-requests/38/head
Brandon Pearce 1 year ago
parent
commit
44f174a751
100 changed files with 701 additions and 640 deletions
  1. 1
    1
      OrbisAPI
  2. 52
    52
      build.gradle
  3. 0
    1
      build.properties
  4. 54
    54
      idea/code_style.xml
  5. 29
    29
      idea/inspections.xml
  6. 13
    13
      src/api/java/com/gildedgames/aether/api/dialog/IDialogSlide.java
  7. 7
    6
      src/api/java/com/gildedgames/aether/api/dialog/IDialogSlideRenderer.java
  8. 10
    10
      src/api/java/com/gildedgames/aether/api/dialog/IDialogSpeaker.java
  9. 1
    2
      src/api/java/com/gildedgames/aether/api/items/ItemPropertiesBuilder.java
  10. 9
    3
      src/api/java/com/gildedgames/aether/api/items/equipment/effects/EffectInstance.java
  11. 0
    1
      src/api/java/com/gildedgames/aether/api/player/IPlayerAether.java
  12. 1
    1
      src/api/java/com/gildedgames/aether/api/registry/IItemPropertiesRegistry.java
  13. 1
    0
      src/api/java/com/gildedgames/aether/api/registry/tab/ITabClient.java
  14. 1
    4
      src/api/java/com/gildedgames/aether/api/util/ItemMetaPair.java
  15. 1
    1
      src/api/java/com/gildedgames/aether/api/util/OpenSimplexNoise.java
  16. 1
    0
      src/api/java/com/gildedgames/aether/api/util/TemplateUtil.java
  17. 1
    1
      src/api/java/com/gildedgames/aether/api/world/islands/IIslandData.java
  18. 3
    3
      src/main/java/com/gildedgames/aether/client/ClientProxy.java
  19. 0
    1
      src/main/java/com/gildedgames/aether/client/SessionEventHandler.java
  20. 2
    7
      src/main/java/com/gildedgames/aether/client/SpecialMovesEventsClient.java
  21. 2
    2
      src/main/java/com/gildedgames/aether/client/gui/PerformanceIngame.java
  22. 2
    11
      src/main/java/com/gildedgames/aether/client/gui/container/simple_crafting/GuiMasonryBench.java
  23. 0
    1
      src/main/java/com/gildedgames/aether/client/gui/dialog/GuiDialogViewer.java
  24. 1
    1
      src/main/java/com/gildedgames/aether/client/gui/misc/CustomLoadingRenderer.java
  25. 0
    1
      src/main/java/com/gildedgames/aether/client/gui/misc/GuiAetherLoading.java
  26. 2
    2
      src/main/java/com/gildedgames/aether/client/models/entities/living/ModelAechorPlant.java
  27. 126
    64
      src/main/java/com/gildedgames/aether/client/models/entities/living/ModelBurrukai.java
  28. 6
    6
      src/main/java/com/gildedgames/aether/client/models/entities/living/ModelCarrionSprout.java
  29. 9
    5
      src/main/java/com/gildedgames/aether/client/models/entities/living/ModelKirrid.java
  30. 7
    7
      src/main/java/com/gildedgames/aether/client/models/entities/living/ModelSwetHead.java
  31. 6
    6
      src/main/java/com/gildedgames/aether/client/models/entities/living/ModelSwetJelly.java
  32. 19
    11
      src/main/java/com/gildedgames/aether/client/models/entities/player/LayerAetherPatronArmor.java
  33. 2
    3
      src/main/java/com/gildedgames/aether/client/models/entities/player/LayerAetherPlayerGloves.java
  34. 2
    2
      src/main/java/com/gildedgames/aether/client/models/entities/player/LayerArmorProxy.java
  35. 2
    2
      src/main/java/com/gildedgames/aether/client/models/entities/player/LayerHeadShadow.java
  36. 2
    6
      src/main/java/com/gildedgames/aether/client/renderer/ClientRenderHandler.java
  37. 2
    3
      src/main/java/com/gildedgames/aether/client/renderer/PatronRewardArmorRenderer.java
  38. 0
    1
      src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderAechorPlant.java
  39. 0
    2
      src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderMoa.java
  40. 2
    1
      src/main/java/com/gildedgames/aether/client/renderer/entities/living/layers/LayerGlowing.java
  41. 1
    1
      src/main/java/com/gildedgames/aether/client/renderer/entities/projectiles/RenderBolt.java
  42. 3
    3
      src/main/java/com/gildedgames/aether/client/renderer/entities/projectiles/RenderDart.java
  43. 33
    25
      src/main/java/com/gildedgames/aether/client/renderer/particles/ParticleLeaf.java
  44. 1
    4
      src/main/java/com/gildedgames/aether/common/CommonEvents.java
  45. 1
    0
      src/main/java/com/gildedgames/aether/common/CommonProxy.java
  46. 2
    2
      src/main/java/com/gildedgames/aether/common/analytics/GAUser.java
  47. 8
    9
      src/main/java/com/gildedgames/aether/common/blocks/BlocksAether.java
  48. 0
    1
      src/main/java/com/gildedgames/aether/common/blocks/IBlockSnowy.java
  49. 26
    25
      src/main/java/com/gildedgames/aether/common/blocks/construction/BlockAetherPortal.java
  50. 1
    0
      src/main/java/com/gildedgames/aether/common/blocks/construction/BlockRockGlassTranslucent.java
  51. 1
    5
      src/main/java/com/gildedgames/aether/common/blocks/construction/BlockScatterglassSlab.java
  52. 9
    9
      src/main/java/com/gildedgames/aether/common/blocks/construction/signs/BlockWallSkyrootSign.java
  53. 2
    1
      src/main/java/com/gildedgames/aether/common/blocks/construction/walls/BlockSkyrootWall.java
  54. 2
    1
      src/main/java/com/gildedgames/aether/common/blocks/containers/BlockHolystoneFurnace.java
  55. 2
    1
      src/main/java/com/gildedgames/aether/common/blocks/decorative/BlockAgiositeDecorative.java
  56. 0
    1
      src/main/java/com/gildedgames/aether/common/blocks/decorative/BlockDecorative.java
  57. 2
    1
      src/main/java/com/gildedgames/aether/common/blocks/decorative/BlockFadedHolystoneDecorative.java
  58. 9
    8
      src/main/java/com/gildedgames/aether/common/blocks/decorative/BlockHolystoneDecorative.java
  59. 8
    7
      src/main/java/com/gildedgames/aether/common/blocks/decorative/BlockIcestoneBricksDecorative.java
  60. 2
    1
      src/main/java/com/gildedgames/aether/common/blocks/decorative/BlockLightSkyrootDecorative.java
  61. 0
    1
      src/main/java/com/gildedgames/aether/common/blocks/decorative/BlockRockGlassPaneDecorative.java
  62. 2
    1
      src/main/java/com/gildedgames/aether/common/blocks/decorative/BlockSkyrootDecorative.java
  63. 9
    8
      src/main/java/com/gildedgames/aether/common/blocks/decorative/BlockTherastoneDecorative.java
  64. 2
    1
      src/main/java/com/gildedgames/aether/common/blocks/decorative/BlockTherawoodDecorative.java
  65. 2
    2
      src/main/java/com/gildedgames/aether/common/blocks/natural/BlockAetherGrass.java
  66. 30
    30
      src/main/java/com/gildedgames/aether/common/blocks/natural/BlockAetherLog.java
  67. 1
    4
      src/main/java/com/gildedgames/aether/common/blocks/natural/BlockHolystone.java
  68. 2
    1
      src/main/java/com/gildedgames/aether/common/blocks/natural/BlockMoaEgg.java
  69. 1
    2
      src/main/java/com/gildedgames/aether/common/blocks/natural/plants/BlockAetherFlower.java
  70. 58
    46
      src/main/java/com/gildedgames/aether/common/blocks/natural/plants/BlockBrettlPlant.java
  71. 2
    2
      src/main/java/com/gildedgames/aether/common/blocks/natural/plants/BlockOrangeTree.java
  72. 3
    7
      src/main/java/com/gildedgames/aether/common/blocks/util/BlockCustomSnow.java
  73. 0
    1
      src/main/java/com/gildedgames/aether/common/blocks/util/BlockCustomSnowBlock.java
  74. 14
    14
      src/main/java/com/gildedgames/aether/common/blocks/util/BlockFloating.java
  75. 2
    1
      src/main/java/com/gildedgames/aether/common/blocks/util/BlockRotatable.java
  76. 1
    1
      src/main/java/com/gildedgames/aether/common/capabilities/CapabilityManagerAether.java
  77. 1
    1
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/PlayerAether.java
  78. 3
    3
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/PlayerAetherHooks.java
  79. 0
    1
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/PlayerAetherModule.java
  80. 0
    4
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerConfigModule.java
  81. 1
    1
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerDialogModule.java
  82. 1
    1
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerHungerDisableModule.java
  83. 2
    1
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerPreventDropsModule.java
  84. 12
    10
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerRollMovementModule.java
  85. 0
    1
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerSeparateInventoryModule.java
  86. 2
    5
      src/main/java/com/gildedgames/aether/common/capabilities/entity/player/modules/PlayerSwetTracker.java
  87. 2
    1
      src/main/java/com/gildedgames/aether/common/capabilities/item/effects/InvisiblityEffectFactory.java
  88. 5
    5
      src/main/java/com/gildedgames/aether/common/capabilities/world/chunk/PlacementFlagCapability.java
  89. 6
    6
      src/main/java/com/gildedgames/aether/common/containers/slots/SlotAmbrosium.java
  90. 6
    6
      src/main/java/com/gildedgames/aether/common/containers/slots/SlotAmbrosiumChunk.java
  91. 6
    6
      src/main/java/com/gildedgames/aether/common/containers/slots/SlotFlintAndSteel.java
  92. 6
    6
      src/main/java/com/gildedgames/aether/common/containers/slots/SlotMoaEgg.java
  93. 2
    4
      src/main/java/com/gildedgames/aether/common/containers/tiles/ContainerIcestoneCooler.java
  94. 2
    3
      src/main/java/com/gildedgames/aether/common/containers/tiles/ContainerIncubator.java
  95. 15
    15
      src/main/java/com/gildedgames/aether/common/dialog/data/DialogSpeaker.java
  96. 3
    1
      src/main/java/com/gildedgames/aether/common/dialog/data/actions/DialogActionExit.java
  97. 0
    1
      src/main/java/com/gildedgames/aether/common/dialog/data/actions/DialogActionNavigateBack.java
  98. 2
    1
      src/main/java/com/gildedgames/aether/common/dialog/data/actions/DialogActionNavigateScene.java
  99. 3
    3
      src/main/java/com/gildedgames/aether/common/dialog/data/slide_renderers/DialogSlideRendererStatic.java
  100. 0
    0
      src/main/java/com/gildedgames/aether/common/entities/ai/cockatrice/EntityAICockatriceSneakAttack.java

+ 1
- 1
OrbisAPI

@@ -1 +1 @@
Subproject commit b71dbe5d192f07200c4c8802e5bf36868db2b841
Subproject commit 8b93ad6770da57cd6289d53c65fcafba677dbb08

+ 52
- 52
build.gradle View File

@@ -1,15 +1,15 @@
buildscript {
repositories {
jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath 'org.ajoberstar:grgit:2.2.0'
}
repositories {
jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath 'org.ajoberstar:grgit:2.2.0'
}
}

import org.ajoberstar.grgit.Grgit
@@ -18,15 +18,15 @@ apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'maven-publish'

dependencies {
compile project(":OrbisAPI")
compile project(":OrbisAPI")
}

ext.config = loadConfig(file('build.properties'))
ext.repo = Grgit.open()

allprojects {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 1.8
targetCompatibility = 1.8
}

version = "${config.mod_version}"
@@ -34,76 +34,76 @@ group = "com.gildedgames"
archivesBaseName = "aether_ii"

sourceSets {
api {
java { srcDir "src/api/java" }
}
api {
java { srcDir "src/api/java" }
}
}

jar {
from sourceSets.api.output
from sourceSets.main.output
from sourceSets.api.output
from sourceSets.main.output
}

minecraft {
version = config.forge_version
mappings = config.forge_mappings
version = config.forge_version
mappings = config.forge_mappings

runDir = "run"
runDir = "run"
}

processResources {
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version

from (sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'

expand 'version': project.version, 'mcversion': project.minecraft.version
}
expand 'version': project.version, 'mcversion': project.minecraft.version
}

from (sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}

idea {
module {
inheritOutputDirs = true
}
module {
inheritOutputDirs = true
}
}

// We disable this because Gradle will fail to build otherwise for some reason.
// See https://github.com/MinecraftForge/Srg2Source/issues/10
minecraft {
makeObfSourceJar = false
makeObfSourceJar = false
}

static def loadConfig(File config) {
def props = new Properties()
config.withInputStream {
stream -> props.load(stream)
}
return new ConfigSlurper().parse(props)
def props = new Properties()
config.withInputStream {
stream -> props.load(stream)
}
return new ConfigSlurper().parse(props)
}

task signJar(type: SignJar, dependsOn: reobfJar) {
if (project.hasProperty("aether_keystore")) {
keyStore = project.aether_keystore
alias = project.aether_keystore_alias
storePass = project.aether_keystore_pass
keyPass = project.aether_keystore_pass
inputFile = jar.archivePath
outputFile = jar.archivePath
}
if (project.hasProperty("aether_keystore")) {
keyStore = project.aether_keystore
alias = project.aether_keystore_alias
storePass = project.aether_keystore_pass
keyPass = project.aether_keystore_pass
inputFile = jar.archivePath
outputFile = jar.archivePath
}
}

task apiJar(type: Jar) {
classifier = "api"
classifier = "api"

from sourceSets.api.output
from sourceSets.api.output
}

artifacts {
archives jar
archives apiJar
archives jar
archives apiJar
}

+ 0
- 1
build.properties View File

@@ -1,4 +1,3 @@
mod_version=1.12.2-1.0.3.1

forge_version=1.12.2-14.23.3.2678
forge_mappings=snapshot_20180503

+ 54
- 54
idea/code_style.xml View File

@@ -1,56 +1,56 @@
<code_scheme name="Aether II Formatting Guidelines">
<option name="RIGHT_MARGIN" value="160" />
<option name="ENABLE_JAVADOC_FORMATTING" value="false" />
<JSON>
<option name="OBJECT_WRAPPING" value="5" />
<option name="ARRAY_WRAPPING" value="5" />
</JSON>
<codeStyleSettings language="JAVA">
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
<option name="BLANK_LINES_AROUND_FIELD" value="1" />
<option name="BRACE_STYLE" value="2" />
<option name="CLASS_BRACE_STYLE" value="2" />
<option name="METHOD_BRACE_STYLE" value="2" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="WHILE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<option name="ALIGN_MULTILINE_RESOURCES" value="false" />
<option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="1" />
<option name="RESOURCE_LIST_WRAP" value="5" />
<option name="EXTENDS_LIST_WRAP" value="1" />
<option name="THROWS_LIST_WRAP" value="1" />
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
<option name="THROWS_KEYWORD_WRAP" value="1" />
<option name="METHOD_CALL_CHAIN_WRAP" value="1" />
<option name="BINARY_OPERATION_WRAP" value="1" />
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_WRAP" value="1" />
<option name="IF_BRACE_FORCE" value="3" />
<option name="DOWHILE_BRACE_FORCE" value="3" />
<option name="FOR_BRACE_FORCE" value="3" />
<option name="CLASS_ANNOTATION_WRAP" value="0" />
<option name="FIELD_ANNOTATION_WRAP" value="0" />
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JSON">
<option name="KEEP_BLANK_LINES_IN_CODE" value="2" />
<option name="SPACE_WITHIN_BRACKETS" value="true" />
<option name="SPACE_WITHIN_BRACES" value="true" />
<indentOptions>
<option name="INDENT_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<option name="RIGHT_MARGIN" value="160"/>
<option name="ENABLE_JAVADOC_FORMATTING" value="false"/>
<JSON>
<option name="OBJECT_WRAPPING" value="5"/>
<option name="ARRAY_WRAPPING" value="5"/>
</JSON>
<codeStyleSettings language="JAVA">
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false"/>
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false"/>
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1"/>
<option name="KEEP_BLANK_LINES_IN_CODE" value="1"/>
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1"/>
<option name="BLANK_LINES_AROUND_FIELD" value="1"/>
<option name="BRACE_STYLE" value="2"/>
<option name="CLASS_BRACE_STYLE" value="2"/>
<option name="METHOD_BRACE_STYLE" value="2"/>
<option name="ELSE_ON_NEW_LINE" value="true"/>
<option name="WHILE_ON_NEW_LINE" value="true"/>
<option name="CATCH_ON_NEW_LINE" value="true"/>
<option name="FINALLY_ON_NEW_LINE" value="true"/>
<option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
<option name="ALIGN_MULTILINE_RESOURCES" value="false"/>
<option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true"/>
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true"/>
<option name="CALL_PARAMETERS_WRAP" value="1"/>
<option name="METHOD_PARAMETERS_WRAP" value="1"/>
<option name="RESOURCE_LIST_WRAP" value="5"/>
<option name="EXTENDS_LIST_WRAP" value="1"/>
<option name="THROWS_LIST_WRAP" value="1"/>
<option name="EXTENDS_KEYWORD_WRAP" value="1"/>
<option name="THROWS_KEYWORD_WRAP" value="1"/>
<option name="METHOD_CALL_CHAIN_WRAP" value="1"/>
<option name="BINARY_OPERATION_WRAP" value="1"/>
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true"/>
<option name="TERNARY_OPERATION_WRAP" value="5"/>
<option name="ARRAY_INITIALIZER_WRAP" value="1"/>
<option name="IF_BRACE_FORCE" value="3"/>
<option name="DOWHILE_BRACE_FORCE" value="3"/>
<option name="FOR_BRACE_FORCE" value="3"/>
<option name="CLASS_ANNOTATION_WRAP" value="0"/>
<option name="FIELD_ANNOTATION_WRAP" value="0"/>
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true"/>
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JSON">
<option name="KEEP_BLANK_LINES_IN_CODE" value="2"/>
<option name="SPACE_WITHIN_BRACKETS" value="true"/>
<option name="SPACE_WITHIN_BRACES" value="true"/>
<indentOptions>
<option name="INDENT_SIZE" value="4"/>
<option name="USE_TAB_CHARACTER" value="true"/>
</indentOptions>
</codeStyleSettings>
</code_scheme>

+ 29
- 29
idea/inspections.xml View File

@@ -1,31 +1,31 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Aether II" />
<inspection_tool class="ClassReferencesSubclass" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="InstanceofThis" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MissingOverrideAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
<option name="ignoreObjectMethods" value="true" />
<option name="ignoreAnonymousClassMethods" value="false" />
</inspection_tool>
<inspection_tool class="NullableProblems" enabled="true" level="WARNING" enabled_by_default="true">
<option name="REPORT_NULLABLE_METHOD_OVERRIDES_NOTNULL" value="true" />
<option name="REPORT_NOT_ANNOTATED_METHOD_OVERRIDES_NOTNULL" value="false" />
<option name="REPORT_NOTNULL_PARAMETER_OVERRIDES_NULLABLE" value="false" />
<option name="REPORT_NOT_ANNOTATED_PARAMETER_OVERRIDES_NOTNULL" value="true" />
<option name="REPORT_NOT_ANNOTATED_GETTER" value="false" />
<option name="REPORT_NOT_ANNOTATED_SETTER_PARAMETER" value="true" />
<option name="REPORT_ANNOTATION_NOT_PROPAGATED_TO_OVERRIDERS" value="false" />
<option name="REPORT_NULLS_PASSED_TO_NON_ANNOTATED_METHOD" value="true" />
</inspection_tool>
<inspection_tool class="ObsoleteCollection" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoreRequiredObsoleteCollectionTypes" value="false" />
</inspection_tool>
<inspection_tool class="RedundantSuppression" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="SystemOutErr" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="ThrowablePrintStackTrace" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="UnqualifiedFieldAccess" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="UnqualifiedMethodAccess" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="UnusedImport" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="UseOfObsoleteDateTimeApi" enabled="true" level="WARNING" enabled_by_default="true" />
</profile>
<profile version="1.0">
<option name="myName" value="Aether II"/>
<inspection_tool class="ClassReferencesSubclass" enabled="true" level="WARNING" enabled_by_default="true"/>
<inspection_tool class="InstanceofThis" enabled="true" level="WARNING" enabled_by_default="true"/>
<inspection_tool class="MissingOverrideAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
<option name="ignoreObjectMethods" value="true"/>
<option name="ignoreAnonymousClassMethods" value="false"/>
</inspection_tool>
<inspection_tool class="NullableProblems" enabled="true" level="WARNING" enabled_by_default="true">
<option name="REPORT_NULLABLE_METHOD_OVERRIDES_NOTNULL" value="true"/>
<option name="REPORT_NOT_ANNOTATED_METHOD_OVERRIDES_NOTNULL" value="false"/>
<option name="REPORT_NOTNULL_PARAMETER_OVERRIDES_NULLABLE" value="false"/>
<option name="REPORT_NOT_ANNOTATED_PARAMETER_OVERRIDES_NOTNULL" value="true"/>
<option name="REPORT_NOT_ANNOTATED_GETTER" value="false"/>
<option name="REPORT_NOT_ANNOTATED_SETTER_PARAMETER" value="true"/>
<option name="REPORT_ANNOTATION_NOT_PROPAGATED_TO_OVERRIDERS" value="false"/>
<option name="REPORT_NULLS_PASSED_TO_NON_ANNOTATED_METHOD" value="true"/>
</inspection_tool>
<inspection_tool class="ObsoleteCollection" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoreRequiredObsoleteCollectionTypes" value="false"/>
</inspection_tool>
<inspection_tool class="RedundantSuppression" enabled="true" level="WARNING" enabled_by_default="true"/>
<inspection_tool class="SystemOutErr" enabled="true" level="WARNING" enabled_by_default="true"/>
<inspection_tool class="ThrowablePrintStackTrace" enabled="true" level="WARNING" enabled_by_default="true"/>
<inspection_tool class="UnqualifiedFieldAccess" enabled="true" level="WARNING" enabled_by_default="true"/>
<inspection_tool class="UnqualifiedMethodAccess" enabled="true" level="WARNING" enabled_by_default="true"/>
<inspection_tool class="UnusedImport" enabled="true" level="WARNING" enabled_by_default="true"/>
<inspection_tool class="UseOfObsoleteDateTimeApi" enabled="true" level="WARNING" enabled_by_default="true"/>
</profile>
</component>

+ 13
- 13
src/api/java/com/gildedgames/aether/api/dialog/IDialogSlide.java View File

@@ -10,18 +10,18 @@ import java.util.Optional;
*/
public interface IDialogSlide
{
/**
* The returned String represents an implementation that is used to draw
* the {@link #getSlideData()} defined by this Slide.
* @return An {@link Optional} object containing a String which represents
* a renderer implementation
*/
Optional<String> getRenderer();
/**
* The returned String represents an implementation that is used to draw
* the {@link #getSlideData()} defined by this Slide.
* @return An {@link Optional} object containing a String which represents
* a renderer implementation
*/
Optional<String> getRenderer();

/**
* Slide data that will eventually be interpreted by this Slide's
* Renderer and drawn on screen.
* @return An {@link Optional} object containing a map of String data.
*/
Optional<Map<String, String>> getSlideData();
/**
* Slide data that will eventually be interpreted by this Slide's
* Renderer and drawn on screen.
* @return An {@link Optional} object containing a map of String data.
*/
Optional<Map<String, String>> getSlideData();
}

+ 7
- 6
src/api/java/com/gildedgames/aether/api/dialog/IDialogSlideRenderer.java View File

@@ -11,10 +11,11 @@ public interface IDialogSlideRenderer
* @param slide The slide that will be rendered by this implementation.
*/
void setup(IDialogSlide slide);
/**
* Should interpret the data defined by the provided slide and
* render it based on this implementation's goals.
* @param slide The slide that will be rendered by this implementation.
*/
void draw(IDialogSlide slide, double screenWidth, double screenHeight, int mouseX, int mouseY, float partialTicks);

/**
* Should interpret the data defined by the provided slide and
* render it based on this implementation's goals.
* @param slide The slide that will be rendered by this implementation.
*/
void draw(IDialogSlide slide, double screenWidth, double screenHeight, int mouseX, int mouseY, float partialTicks);
}

+ 10
- 10
src/api/java/com/gildedgames/aether/api/dialog/IDialogSpeaker.java View File

@@ -9,16 +9,16 @@ import java.util.Optional;
*/
public interface IDialogSpeaker
{
/**
* @return The name of the speaker.
*/
@Nonnull
String getUnlocalizedName();
/**
* @return The name of the speaker.
*/
@Nonnull
String getUnlocalizedName();

/**
* Returns the slides for the viewer GUI to use. First one is default, if exists.
* @return An {@link Optional} value containing the {@link IDialogSlide}s, if they exist.
*/
Optional<Map<String, IDialogSlide>> getSlides();
/**
* Returns the slides for the viewer GUI to use. First one is default, if exists.
* @return An {@link Optional} value containing the {@link IDialogSlide}s, if they exist.
*/
Optional<Map<String, IDialogSlide>> getSlides();

}

+ 1
- 2
src/api/java/com/gildedgames/aether/api/items/ItemPropertiesBuilder.java View File

@@ -18,7 +18,7 @@ public class ItemPropertiesBuilder
private ItemEquipmentSlot slot = ItemEquipmentSlot.NONE;

private ItemRarity rarity = ItemRarity.NONE;
/**
* Sets the rarity of this item.
* @param rarity The rarity of this item
@@ -56,7 +56,6 @@ public class ItemPropertiesBuilder
return this;
}


/**
* Adds an {@link IEffectPrecondition} to this item that will determine whether or
* not it can provide effects to an entity.

+ 9
- 3
src/api/java/com/gildedgames/aether/api/items/equipment/effects/EffectInstance.java View File

@@ -19,7 +19,9 @@ public abstract class EffectInstance
*
* @param player The player entity that is updating
*/
public void onEntityUpdate(IPlayerAether player) { }
public void onEntityUpdate(IPlayerAether player)
{
}

/**
* Called when this instance is removed from a player. This is only called once per entity
@@ -28,7 +30,9 @@ public abstract class EffectInstance
*
* @param player The player this instance was removed from
*/
public void onInstanceRemoved(IPlayerAether player) { }
public void onInstanceRemoved(IPlayerAether player)
{
}

/**
* Called when this instance is added to a player. This is guaranteed to called exactly once,
@@ -36,7 +40,9 @@ public abstract class EffectInstance
*
* @param player The player this instance was added to
*/
public void onInstanceAdded(IPlayerAether player) { }
public void onInstanceAdded(IPlayerAether player)
{
}

/**
* Adds information about this instance to {@param label}, such as the stats

+ 0
- 1
src/api/java/com/gildedgames/aether/api/player/IPlayerAether.java View File

@@ -1,7 +1,6 @@
package com.gildedgames.aether.api.player;

import com.gildedgames.aether.api.dialog.IDialogController;
import com.gildedgames.aether.api.net.data.UserFeatures;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;


+ 1
- 1
src/api/java/com/gildedgames/aether/api/registry/IItemPropertiesRegistry.java View File

@@ -19,7 +19,7 @@ public interface IItemPropertiesRegistry
/**
* Registers an item with the registry, throwing an {@link IllegalArgumentException} if
* it is already registered.
*
*
* @param item The item to register
* @param def The {@link IItemProperties} to register
*/

+ 1
- 0
src/api/java/com/gildedgames/aether/api/registry/tab/ITabClient.java View File

@@ -16,6 +16,7 @@ public interface ITabClient extends ITab
*/
@SideOnly(Side.CLIENT)
boolean isTabValid(GuiScreen gui);

/**
* Called when the player selects another {@link ITab} within this {@link ITab}'s parent {@link ITabGroupHandler}. This includes
* when the {@link ITabGroupHandler} is closed and this {@link ITab} was open.

+ 1
- 4
src/api/java/com/gildedgames/aether/api/util/ItemMetaPair.java View File

@@ -43,10 +43,7 @@ public class ItemMetaPair
{
ItemMetaPair pair = (ItemMetaPair) obj;

if (pair.item == this.item && pair.meta == this.meta)
{
return true;
}
return pair.item == this.item && pair.meta == this.meta;
}

return false;

+ 1
- 1
src/api/java/com/gildedgames/aether/api/util/OpenSimplexNoise.java View File

@@ -3,7 +3,7 @@ package com.gildedgames.aether.api.util;
/*
* OpenSimplex Noise in Java.
* by Kurt Spencer
*
*
* v1.1 (October 5, 2014)
* - Added 2D and 4D implementations.
* - Proper gradient sets for all dimensions, from a

+ 1
- 0
src/api/java/com/gildedgames/aether/api/util/TemplateUtil.java View File

@@ -122,6 +122,7 @@ public class TemplateUtil
|| TemplateUtil.canGrowInto(state.getBlock());
}

@SafeVarargs
public static <T> T pickRandom(final Random rand, final T... objects)
{
return objects[rand.nextInt(objects.length)];

+ 1
- 1
src/api/java/com/gildedgames/aether/api/world/islands/IIslandData.java View File

@@ -76,7 +76,7 @@ public interface IIslandData extends NBT
*/
long getSeed();

PlacedBlueprint placeBlueprint(BlueprintDefinition def, ICreationData data);
PlacedBlueprint placeBlueprint(BlueprintDefinition def, ICreationData<?> data);

List<PlacedBlueprint> getPlacedBlueprints();


+ 3
- 3
src/main/java/com/gildedgames/aether/client/ClientProxy.java View File

@@ -109,7 +109,7 @@ public class ClientProxy extends CommonProxy
z + (r.nextDouble() * (r.nextBoolean() ? range : -range)),
(r.nextDouble() * (r.nextBoolean() ? range : -range)) * 0.2, 0.075 * r.nextDouble(),
(r.nextDouble() * (r.nextBoolean() ? range : -range)) * 0.2);
}
}

if (r.nextInt(4) == 0)
{
@@ -117,7 +117,7 @@ public class ClientProxy extends CommonProxy
z + (r.nextDouble() * (r.nextBoolean() ? range : -range)),
(r.nextDouble() * (r.nextBoolean() ? range : -range)) * 0.1, 0.1 * r.nextDouble(),
(r.nextDouble() * (r.nextBoolean() ? range : -range)) * 0.1);
}
}

if (r.nextInt(4) == 0)
{
@@ -144,7 +144,7 @@ public class ClientProxy extends CommonProxy
z + (r.nextDouble() * (r.nextBoolean() ? range : -range)),
(r.nextDouble() * (r.nextBoolean() ? range : -range)) * 0.001, 0.075 * r.nextDouble(),
(r.nextDouble() * (r.nextBoolean() ? range : -range)) * 0.001);
}
}

if (r.nextInt(4) == 0)
{

+ 0
- 1
src/main/java/com/gildedgames/aether/client/SessionEventHandler.java View File

@@ -2,7 +2,6 @@ package com.gildedgames.aether.client;

import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.analytics.GAUser;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.network.FMLNetworkEvent;
import net.minecraftforge.fml.relauncher.Side;

+ 2
- 7
src/main/java/com/gildedgames/aether/client/SpecialMovesEventsClient.java View File

@@ -7,11 +7,6 @@ import com.gildedgames.aether.common.network.NetworkingAether;
import com.gildedgames.aether.common.network.packets.PacketSpecialMovement;
import com.gildedgames.aether.common.util.helpers.AetherHelper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.init.Blocks;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.client.event.EntityViewRenderEvent;
import net.minecraftforge.fml.client.FMLClientHandler;
import net.minecraftforge.fml.common.Mod;
@@ -43,7 +38,7 @@ public class SpecialMovesEventsClient
int ticks = module.getTicksRolling();
int ticksRequired = module.getTicksRollingMax();

float rollingPercent = Math.min(1.0F, ((float)ticks + (float)event.getRenderPartialTicks()) / ticksRequired);
float rollingPercent = Math.min(1.0F, ((float) ticks + (float) event.getRenderPartialTicks()) / ticksRequired);

float fovMod = (float) AetherCore.CONFIG.getRollFOV();

@@ -80,7 +75,7 @@ public class SpecialMovesEventsClient
int ticks = module.getTicksRolling();
int ticksRequired = module.getTicksRollingMax();

float rollingPercent = Math.min(1.0F, ((float)ticks + (float)event.getRenderPartialTicks()) / ticksRequired);
float rollingPercent = Math.min(1.0F, ((float) ticks + (float) event.getRenderPartialTicks()) / ticksRequired);

float cameraTilt = (float) AetherCore.CONFIG.getRollCameraTilt();


+ 2
- 2
src/main/java/com/gildedgames/aether/client/gui/PerformanceIngame.java View File

@@ -14,10 +14,10 @@ import java.lang.reflect.Field;

public class PerformanceIngame extends Gui
{
private static ResourceLocation SERVER_STALL_ICON = AetherCore.getResource("textures/gui/overlay/server_stall.png");

private static final Field SERVER_CURRENT_TIME_FIELD = ReflectionAether.getField(MinecraftServer.class, ReflectionAether.SERVER_CURRENT_TIME.getMappings());

private static ResourceLocation SERVER_STALL_ICON = AetherCore.getResource("textures/gui/overlay/server_stall.png");

private static int ANIMATION_FRAMES = 4;

private float iconAlpha = -1.0f;

+ 2
- 11
src/main/java/com/gildedgames/aether/client/gui/container/simple_crafting/GuiMasonryBench.java View File

@@ -121,7 +121,7 @@ public class GuiMasonryBench extends GuiContainer implements IExtendedGui
}

@Override
protected void actionPerformed(GuiButton button) throws IOException
protected void actionPerformed(GuiButton button)
{
if (button.id == 31)
{
@@ -306,17 +306,8 @@ public class GuiMasonryBench extends GuiContainer implements IExtendedGui
return -1;
}

if (id1 > id2)
{
return 1;
}

if (id1 < id2)
{
return -1;
}
return Integer.compare(id1, id2);

return 0;
});

Collections.reverse(this.recipes);

+ 0
- 1
src/main/java/com/gildedgames/aether/client/gui/dialog/GuiDialogViewer.java View File

@@ -180,7 +180,6 @@ public class GuiDialogViewer extends GuiFrame implements IDialogChangeListener
if (this.controller.getCurrentScene() == null)
{
Minecraft.getMinecraft().displayGuiScreen(null);
return;
}
}
}

+ 1
- 1
src/main/java/com/gildedgames/aether/client/gui/misc/CustomLoadingRenderer.java View File

@@ -160,7 +160,7 @@ public class CustomLoadingRenderer extends LoadingScreenRenderer
{
Thread.yield();
}
catch (final Exception var15)
catch (final Exception ignored)
{
}
}

+ 0
- 1
src/main/java/com/gildedgames/aether/client/gui/misc/GuiAetherLoading.java View File

@@ -14,7 +14,6 @@ import com.gildedgames.orbis_api.util.InputHelper;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextComponentTranslation;
import org.lwjgl.opengl.GL11;


+ 2
- 2
src/main/java/com/gildedgames/aether/client/models/entities/living/ModelAechorPlant.java View File

@@ -11,12 +11,12 @@ public class ModelAechorPlant extends ModelBase

public ModelRenderer petal[], leaf[], thorn[], stamen[], stamen2[];

private ModelRenderer stem, head;

public float sinage, sinage2;

public float size;

private ModelRenderer stem, head;

public ModelAechorPlant()
{
this.size = 1.0F;

+ 126
- 64
src/main/java/com/gildedgames/aether/client/models/entities/living/ModelBurrukai.java View File

@@ -12,67 +12,129 @@ import net.minecraft.util.math.MathHelper;
public class ModelBurrukai extends ModelBase
{
public ModelRenderer Tail;

public ModelRenderer HeadMain;

public ModelRenderer HeadAntlerTopLeft1;

public ModelRenderer HeadAntlerTopLeft2;

public ModelRenderer HeadAntlerBottomLeft1;

public ModelRenderer HeadAntlerBottomRight1;

public ModelRenderer HeadAntlerTopRight2;

public ModelRenderer HeadAntlerBottomLeft2;

public ModelRenderer HeadAntlerBottomRight2;

public ModelRenderer HeadPlateTop;

public ModelRenderer HeadPlateLow;

public ModelRenderer HeadAntlersMiddle;

public ModelRenderer HeadBrowLeft;

public ModelRenderer HeadBrowRight;

public ModelRenderer HeadEyeLeft;

public ModelRenderer HeadEyeRight;

public ModelRenderer HeadEarLeft;

public ModelRenderer HeadEarRight;

public ModelRenderer HeadRidge;

public ModelRenderer HeadBase;

public ModelRenderer HeadCheekRight;

public ModelRenderer HeadCheekLeft;

public ModelRenderer HeadChin;

public ModelRenderer HeadAntlerTopRight1;

public ModelRenderer HeadSnout;

public ModelRenderer TorsoNeckJoint;

public ModelRenderer TorsoFrontFurLeft;

public ModelRenderer TorsoFrontFurRight;

public ModelRenderer TorsoShoulderLeft;

public ModelRenderer TorsoShoulderRight;

public ModelRenderer TorsoChest;

public ModelRenderer TorsoPlate1;

public ModelRenderer TorsoPlate2;

public ModelRenderer TorsoPlate3;

public ModelRenderer TorsoShoulderPlateLeftMid;

public ModelRenderer TorsoShoulderPlateLeftFront;

public ModelRenderer TorsoShoulderPlateLeftBack;

public ModelRenderer TorsoShoulderPlateRightMid;

public ModelRenderer TorsoShoulderPlateRightFront;

public ModelRenderer TorsoShoulderPlateRightBack;

public ModelRenderer TorsoBackFur;

public ModelRenderer TorsoRear;

public ModelRenderer TorsoCrotch;

public ModelRenderer FrontLegLeftTop;

public ModelRenderer FrontLegLeftBottom;

public ModelRenderer FrontLegLeftHoofIn;

public ModelRenderer FrontLegLeftHoofOut;

public ModelRenderer HindLegRightCalfMiddle;

public ModelRenderer HindLegRightKnee;

public ModelRenderer HindLegRightShin;

public ModelRenderer HindLegRightHoofIn;

public ModelRenderer HindLegRightHoofOut;

public ModelRenderer HindLegRightHoofMiddle;

public ModelRenderer HindLegLeftCalfMiddle;

public ModelRenderer HindLegLeftKnee;

public ModelRenderer HindLegLeftShin;

public ModelRenderer HindLegLeftHoofIn;

public ModelRenderer HindLegLeftHoofOut;

public ModelRenderer HindLegLeftHoofMiddle;

public ModelRenderer FrontLegRightTop;

public ModelRenderer FrontLegRightBottom;

public ModelRenderer FrontLegRightHoofIn;

public ModelRenderer FrontLegRightHoofOut;

public ModelBurrukai()
@@ -82,251 +144,251 @@ public class ModelBurrukai extends ModelBase
this.HeadEyeLeft = new ModelRenderer(this, 80, 42);
this.HeadEyeLeft.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadEyeLeft.addBox(4.5F, -3.0F, -5.0F, 1, 5, 4, 0.0F);
this.setRotateAngle(HeadEyeLeft, 0.0F, 0.6108652381980153F, 0.0F);
this.setRotateAngle(this.HeadEyeLeft, 0.0F, 0.6108652381980153F, 0.0F);
this.TorsoPlate2 = new ModelRenderer(this, 40, 151);
this.TorsoPlate2.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoPlate2.addBox(-5.0F, -2.0F, 1.0F, 10, 4, 12, 0.0F);
this.setRotateAngle(TorsoPlate2, 0.5235987901687622F, -0.0F, 0.0F);
this.setRotateAngle(this.TorsoPlate2, 0.5235987901687622F, -0.0F, 0.0F);
this.HeadMain = new ModelRenderer(this, 48, 27);
this.HeadMain.setRotationPoint(0.0F, 3.0F, -5.0F);
this.HeadMain.addBox(-4.0F, -2.0F, -4.0F, 8, 3, 6, 0.0F);
this.FrontLegRightBottom = new ModelRenderer(this, 96, 286);
this.FrontLegRightBottom.setRotationPoint(2.5F, 9.8F, -0.0F);
this.FrontLegRightBottom.addBox(-2.0F, 0.0F, -1.2F, 4, 12, 4, 0.0F);
this.setRotateAngle(FrontLegRightBottom, -0.5009094953223726F, 0.0F, 0.0F);
this.setRotateAngle(this.FrontLegRightBottom, -0.5009094953223726F, 0.0F, 0.0F);
this.FrontLegLeftTop = new ModelRenderer(this, 92, 265);
this.FrontLegLeftTop.setRotationPoint(4.0F, 1.0F, 4.5F);
this.FrontLegLeftTop.addBox(0.0F, -2.0F, -3.0F, 5, 14, 7, 0.0F);
this.setRotateAngle(FrontLegLeftTop, 0.0F, -0.03490658476948738F, 0.0F);
this.setRotateAngle(this.FrontLegLeftTop, 0.0F, -0.03490658476948738F, 0.0F);
this.HeadAntlerTopLeft1 = new ModelRenderer(this, 101, 16);
this.HeadAntlerTopLeft1.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadAntlerTopLeft1.addBox(5.0F, 12.0F, -1.0F, 9, 2, 2, 0.0F);
this.setRotateAngle(HeadAntlerTopLeft1, 0.0F, -0.0F, -1.7453292519943295F);
this.setRotateAngle(this.HeadAntlerTopLeft1, 0.0F, -0.0F, -1.7453292519943295F);
this.HeadEarRight = new ModelRenderer(this, 26, 43);
this.HeadEarRight.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadEarRight.addBox(-5.0F, 0.0F, -2.0F, 1, 5, 3, 0.0F);
this.setRotateAngle(HeadEarRight, 0.0F, -0.0F, 0.5235987755982988F);
this.setRotateAngle(this.HeadEarRight, 0.0F, -0.0F, 0.5235987755982988F);
this.HindLegLeftHoofOut = new ModelRenderer(this, 107, 368);
this.HindLegLeftHoofOut.setRotationPoint(-0.3F, 9.7F, -1.7F);
this.HindLegLeftHoofOut.addBox(1.0F, 0.0F, 0.0F, 1, 2, 4, 0.0F);
this.setRotateAngle(HindLegLeftHoofOut, 0.17453292519943295F, -0.17453292519943295F, 0.0F);
this.setRotateAngle(this.HindLegLeftHoofOut, 0.17453292519943295F, -0.17453292519943295F, 0.0F);
this.HindLegRightHoofMiddle = new ModelRenderer(this, 101, 371);
this.HindLegRightHoofMiddle.setRotationPoint(0.0F, 9.5F, 0.0F);
this.HindLegRightHoofMiddle.addBox(-1.1F, 0.0F, 0.0F, 2, 2, 1, 0.0F);
this.setRotateAngle(HindLegRightHoofMiddle, 0.2617993877991494F, -0.0F, 0.0F);
this.setRotateAngle(this.HindLegRightHoofMiddle, 0.2617993877991494F, -0.0F, 0.0F);
this.HindLegLeftKnee = new ModelRenderer(this, 91, 340);
this.HindLegLeftKnee.setRotationPoint(-0.4F, 11.0F, -0.9F);
this.HindLegLeftKnee.addBox(-2.0F, -5.0F, 0.0F, 4, 5, 9, 0.0F);
this.setRotateAngle(HindLegLeftKnee, -0.17453292519943295F, -0.0F, 0.0F);
this.setRotateAngle(this.HindLegLeftKnee, -0.17453292519943295F, -0.0F, 0.0F);
this.HeadPlateLow = new ModelRenderer(this, 52, 10);
this.HeadPlateLow.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadPlateLow.addBox(-0.5F, -8.5F, -4.3F, 5, 2, 5, 0.0F);
this.setRotateAngle(HeadPlateLow, 0.9431759277777356F, 0.5654866776461628F, 0.6227334771115768F);
this.setRotateAngle(this.HeadPlateLow, 0.9431759277777356F, 0.5654866776461628F, 0.6227334771115768F);
this.HindLegRightHoofIn = new ModelRenderer(this, 11, 369);
this.HindLegRightHoofIn.setRotationPoint(-1.7F, 9.7F, -1.3F);
this.HindLegRightHoofIn.addBox(0.0F, 0.0F, -0.0F, 1, 2, 4, 0.0F);
this.setRotateAngle(HindLegRightHoofIn, 0.17453292519943295F, 0.17453292519943295F, 0.0F);
this.setRotateAngle(this.HindLegRightHoofIn, 0.17453292519943295F, 0.17453292519943295F, 0.0F);
this.HeadEyeRight = new ModelRenderer(this, 34, 42);
this.HeadEyeRight.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadEyeRight.addBox(-5.5F, -3.0F, -5.0F, 1, 5, 4, 0.0F);
this.setRotateAngle(HeadEyeRight, 0.0F, -0.6108652381980153F, 0.0F);
this.setRotateAngle(this.HeadEyeRight, 0.0F, -0.6108652381980153F, 0.0F);
this.HeadSnout = new ModelRenderer(this, 46, 73);
this.HeadSnout.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadSnout.addBox(-2.0F, -2.5F, -11.5F, 4, 3, 2, 0.0F);
this.setRotateAngle(HeadSnout, 0.3490658503988659F, -0.0F, 0.0F);
this.setRotateAngle(this.HeadSnout, 0.3490658503988659F, -0.0F, 0.0F);
this.TorsoFrontFurRight = new ModelRenderer(this, 0, 91);
this.TorsoFrontFurRight.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoFrontFurRight.addBox(-9.0F, -3.0F, -0.5F, 9, 9, 13, 0.0F);
this.setRotateAngle(TorsoFrontFurRight, 0.0F, -0.0F, -0.2617993877991494F);
this.setRotateAngle(this.TorsoFrontFurRight, 0.0F, -0.0F, -0.2617993877991494F);
this.HeadBase = new ModelRenderer(this, 43, 53);
this.HeadBase.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadBase.addBox(-2.5F, 0.7F, -10.6F, 5, 7, 13, 0.0F);
this.TorsoShoulderPlateRightMid = new ModelRenderer(this, 15, 150);
this.TorsoShoulderPlateRightMid.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoShoulderPlateRightMid.addBox(-13.0F, -8.0F, 3.0F, 5, 18, 4, 0.0F);
this.setRotateAngle(TorsoShoulderPlateRightMid, 0.0F, -0.0F, -0.17453292012214658F);
this.setRotateAngle(this.TorsoShoulderPlateRightMid, 0.0F, -0.0F, -0.17453292012214658F);
this.HindLegLeftHoofIn = new ModelRenderer(this, 91, 368);
this.HindLegLeftHoofIn.setRotationPoint(-1.7F, 9.7F, -1.3F);
this.HindLegLeftHoofIn.addBox(0.0F, 0.0F, -0.0F, 1, 2, 4, 0.0F);
this.setRotateAngle(HindLegLeftHoofIn, 0.17453292519943295F, 0.17453292519943295F, 0.0F);
this.setRotateAngle(this.HindLegLeftHoofIn, 0.17453292519943295F, 0.17453292519943295F, 0.0F);
this.HeadEarLeft = new ModelRenderer(this, 90, 43);
this.HeadEarLeft.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadEarLeft.addBox(4.0F, 0.0F, -2.0F, 1, 5, 3, 0.0F);
this.setRotateAngle(HeadEarLeft, 0.0F, -0.0F, -0.5235987755982988F);
this.setRotateAngle(this.HeadEarLeft, 0.0F, -0.0F, -0.5235987755982988F);
this.TorsoShoulderPlateRightBack = new ModelRenderer(this, 17, 134);
this.TorsoShoulderPlateRightBack.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoShoulderPlateRightBack.addBox(-13.5F, -9.0F, 3.5F, 4, 12, 4, 0.0F);
this.setRotateAngle(TorsoShoulderPlateRightBack, -0.30740453246205135F, 0.16852786693084162F, -0.2656520475633568F);
this.setRotateAngle(this.TorsoShoulderPlateRightBack, -0.30740453246205135F, 0.16852786693084162F, -0.2656520475633568F);
this.FrontLegLeftBottom = new ModelRenderer(this, 96, 286);
this.FrontLegLeftBottom.setRotationPoint(2.5F, 9.8F, -0.0F);
this.FrontLegLeftBottom.addBox(-2.0F, 0.0F, -1.2F, 4, 12, 4, 0.0F);
this.setRotateAngle(FrontLegLeftBottom, -0.5009094953223726F, 0.0F, 0.0F);
this.setRotateAngle(this.FrontLegLeftBottom, -0.5009094953223726F, 0.0F, 0.0F);
this.HeadAntlerTopRight2 = new ModelRenderer(this, 23, 14);
this.HeadAntlerTopRight2.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadAntlerTopRight2.addBox(-14.0F, -3.0F, -1.5F, 9, 3, 3, 0.0F);
this.setRotateAngle(HeadAntlerTopRight2, 0.0F, -0.0F, 0.5235987755982988F);
this.setRotateAngle(this.HeadAntlerTopRight2, 0.0F, -0.0F, 0.5235987755982988F);
this.HeadChin = new ModelRenderer(this, 50, 73);
this.HeadChin.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadChin.addBox(-2.0F, -2.0F, -13.0F, 4, 7, 8, 0.0F);
this.setRotateAngle(HeadChin, 0.7853981633974483F, -0.0F, 0.0F);
this.setRotateAngle(this.HeadChin, 0.7853981633974483F, -0.0F, 0.0F);
this.TorsoShoulderPlateLeftBack = new ModelRenderer(this, 91, 134);
this.TorsoShoulderPlateLeftBack.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoShoulderPlateLeftBack.addBox(9.5F, -9.0F, 3.5F, 4, 12, 4, 0.0F);
this.setRotateAngle(TorsoShoulderPlateLeftBack, -0.30740453246205135F, -0.16852786693084162F, 0.2656520475633568F);
this.setRotateAngle(this.TorsoShoulderPlateLeftBack, -0.30740453246205135F, -0.16852786693084162F, 0.2656520475633568F);
this.HeadAntlerBottomLeft2 = new ModelRenderer(this, 77, 20);
this.HeadAntlerBottomLeft2.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadAntlerBottomLeft2.addBox(5.0F, -1.5F, -2.5F, 7, 3, 3, 0.0F);
this.setRotateAngle(HeadAntlerBottomLeft2, 0.0F, -0.0F, -0.7853981633974483F);
this.setRotateAngle(this.HeadAntlerBottomLeft2, 0.0F, -0.0F, -0.7853981633974483F);
this.TorsoPlate3 = new ModelRenderer(this, 44, 167);
this.TorsoPlate3.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoPlate3.addBox(-4.0F, -1.5F, 9.0F, 8, 3, 10, 0.0F);
this.setRotateAngle(TorsoPlate3, 0.17453292519943295F, -0.0F, 0.0F);
this.setRotateAngle(this.TorsoPlate3, 0.17453292519943295F, -0.0F, 0.0F);
this.TorsoShoulderLeft = new ModelRenderer(this, 91, 113);
this.TorsoShoulderLeft.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoShoulderLeft.addBox(8.0F, -4.0F, 0.5F, 3, 12, 9, 0.0F);
this.setRotateAngle(TorsoShoulderLeft, 0.0F, -0.0F, 0.5235987901687622F);
this.setRotateAngle(this.TorsoShoulderLeft, 0.0F, -0.0F, 0.5235987901687622F);
this.TorsoShoulderPlateLeftFront = new ModelRenderer(this, 91, 172);
this.TorsoShoulderPlateLeftFront.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoShoulderPlateLeftFront.addBox(7.5F, -6.0F, 2.0F, 4, 12, 4, 0.0F);
this.setRotateAngle(TorsoShoulderPlateLeftFront, 0.3073524812762014F, 0.16859880574265224F, 0.26563911215353697F);
this.setRotateAngle(this.TorsoShoulderPlateLeftFront, 0.3073524812762014F, 0.16859880574265224F, 0.26563911215353697F);
this.HindLegRightShin = new ModelRenderer(this, 18, 355);
this.HindLegRightShin.setRotationPoint(0.0F, -2.5F, 6.1F);
this.HindLegRightShin.addBox(-1.5F, 0.0F, -1.3F, 3, 10, 4, 0.0F);
this.setRotateAngle(HindLegRightShin, 0.2617993877991494F, -0.0F, 0.0F);
this.setRotateAngle(this.HindLegRightShin, 0.2617993877991494F, -0.0F, 0.0F);
this.HindLegRightHoofOut = new ModelRenderer(this, 29, 369);
this.HindLegRightHoofOut.setRotationPoint(-0.3F, 9.7F, -1.7F);
this.HindLegRightHoofOut.addBox(1.0F, 0.0F, 0.0F, 1, 2, 4, 0.0F);
this.setRotateAngle(HindLegRightHoofOut, 0.17453292519943295F, -0.17453292519943295F, 0.0F);
this.setRotateAngle(this.HindLegRightHoofOut, 0.17453292519943295F, -0.17453292519943295F, 0.0F);
this.FrontLegRightTop = new ModelRenderer(this, 92, 265);
this.FrontLegRightTop.setRotationPoint(-9.2F, 1.0F, 4.5F);
this.FrontLegRightTop.addBox(0.0F, -2.0F, -3.0F, 5, 14, 7, 0.0F);
this.setRotateAngle(FrontLegRightTop, 0.0F, -0.03490658503988659F, 0.0F);
this.setRotateAngle(this.FrontLegRightTop, 0.0F, -0.03490658503988659F, 0.0F);
this.FrontLegRightHoofOut = new ModelRenderer(this, 104, 302);
this.FrontLegRightHoofOut.setRotationPoint(0.0F, 0.0F, 0.0F);
this.FrontLegRightHoofOut.addBox(-1.1F, 10.1F, -7.1F, 2, 3, 4, 0.0F);
this.setRotateAngle(FrontLegRightHoofOut, 0.5235987755982988F, -0.17453292519943295F, -0.0916297857297023F);
this.setRotateAngle(this.FrontLegRightHoofOut, 0.5235987755982988F, -0.17453292519943295F, -0.0916297857297023F);
this.TorsoChest = new ModelRenderer(this, 38, 115);
this.TorsoChest.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoChest.addBox(-6.0F, 7.0F, -1.0F, 12, 12, 12, 0.0F);
this.setRotateAngle(TorsoChest, 0.11153583228588103F, -0.0F, 0.0F);
this.setRotateAngle(this.TorsoChest, 0.11153583228588103F, -0.0F, 0.0F);
this.HindLegRightKnee = new ModelRenderer(this, 12, 341);
this.HindLegRightKnee.setRotationPoint(-0.4F, 11.0F, -0.9F);
this.HindLegRightKnee.addBox(-2.0F, -5.0F, 0.0F, 4, 5, 9, 0.0F);
this.setRotateAngle(HindLegRightKnee, -0.17453292519943295F, -0.0F, 0.0F);
this.setRotateAngle(this.HindLegRightKnee, -0.17453292519943295F, -0.0F, 0.0F);
this.HindLegRightCalfMiddle = new ModelRenderer(this, 13, 321);
this.HindLegRightCalfMiddle.setRotationPoint(-4.1F, 2.0F, 23.0F);
this.HindLegRightCalfMiddle.addBox(-3.0F, -2.0F, -1.5F, 5, 13, 7, 0.0F);
this.setRotateAngle(HindLegRightCalfMiddle, -0.2617993877991494F, 0.0F, 0.0F);
this.setRotateAngle(this.HindLegRightCalfMiddle, -0.2617993877991494F, 0.0F, 0.0F);
this.HeadAntlerBottomLeft1 = new ModelRenderer(this, 97, 22);
this.HeadAntlerBottomLeft1.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadAntlerBottomLeft1.addBox(2.5F, 10.0F, -2.0F, 6, 2, 2, 0.0F);
this.setRotateAngle(HeadAntlerBottomLeft1, 0.0F, -0.0F, -2.0943951023931953F);
this.setRotateAngle(this.HeadAntlerBottomLeft1, 0.0F, -0.0F, -2.0943951023931953F);
this.FrontLegLeftHoofOut = new ModelRenderer(this, 104, 302);
this.FrontLegLeftHoofOut.setRotationPoint(0.0F, 0.0F, 0.0F);
this.FrontLegLeftHoofOut.addBox(-1.1F, 10.1F, -7.1F, 2, 3, 4, 0.0F);
this.setRotateAngle(FrontLegLeftHoofOut, 0.5235987755982988F, -0.17453292519943295F, -0.0916297857297023F);
this.setRotateAngle(this.FrontLegLeftHoofOut, 0.5235987755982988F, -0.17453292519943295F, -0.0916297857297023F);
this.HindLegLeftCalfMiddle = new ModelRenderer(this, 92, 320);
this.HindLegLeftCalfMiddle.setRotationPoint(5.0F, 2.0F, 23.0F);
this.HindLegLeftCalfMiddle.addBox(-3.0F, -2.0F, -1.5F, 5, 13, 7, 0.0F);
this.setRotateAngle(HindLegLeftCalfMiddle, -0.2617993877991494F, 0.0F, 0.0F);
this.setRotateAngle(this.HindLegLeftCalfMiddle, -0.2617993877991494F, 0.0F, 0.0F);
this.TorsoCrotch = new ModelRenderer(this, 54, 232);
this.TorsoCrotch.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoCrotch.addBox(-2.0F, 1.0F, 25.0F, 4, 10, 4, 0.0F);
this.setRotateAngle(TorsoCrotch, -0.17453292012214658F, -0.0F, 0.0F);
this.setRotateAngle(this.TorsoCrotch, -0.17453292012214658F, -0.0F, 0.0F);
this.HeadAntlerBottomRight2 = new ModelRenderer(this, 27, 20);
this.HeadAntlerBottomRight2.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadAntlerBottomRight2.addBox(-12.0F, -1.5F, -2.5F, 7, 3, 3, 0.0F);
this.setRotateAngle(HeadAntlerBottomRight2, 0.0F, -0.0F, 0.7853981633974483F);
this.setRotateAngle(this.HeadAntlerBottomRight2, 0.0F, -0.0F, 0.7853981633974483F);
this.HeadBrowLeft = new ModelRenderer(this, 77, 33);
this.HeadBrowLeft.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadBrowLeft.addBox(2.0F, -5.5F, -3.6F, 4, 3, 6, 0.0F);
this.setRotateAngle(HeadBrowLeft, 0.3490658503988659F, 0.6981317007977318F, 0.17453292519943295F);
this.setRotateAngle(this.HeadBrowLeft, 0.3490658503988659F, 0.6981317007977318F, 0.17453292519943295F);
this.HeadAntlerBottomRight1 = new ModelRenderer(this, 11, 22);
this.HeadAntlerBottomRight1.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadAntlerBottomRight1.addBox(-8.5F, 10.0F, -2.0F, 6, 2, 2, 0.0F);
this.setRotateAngle(HeadAntlerBottomRight1, 0.0F, -0.0F, 2.0943951023931953F);
this.setRotateAngle(this.HeadAntlerBottomRight1, 0.0F, -0.0F, 2.0943951023931953F);
this.HeadPlateTop = new ModelRenderer(this, 46, 0);
this.HeadPlateTop.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadPlateTop.addBox(-4.0F, -8.8F, -1.5F, 8, 2, 8, 0.0F);
this.setRotateAngle(HeadPlateTop, 0.8726646259971648F, -0.0F, 0.0F);
this.setRotateAngle(this.HeadPlateTop, 0.8726646259971648F, -0.0F, 0.0F);
this.HeadCheekRight = new ModelRenderer(this, 11, 51);
this.HeadCheekRight.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadCheekRight.addBox(-5.0F, 0.8F, -9.0F, 4, 7, 12, 0.0F);
this.setRotateAngle(HeadCheekRight, 0.0F, -0.2617993877991494F, 0.0F);
this.setRotateAngle(this.HeadCheekRight, 0.0F, -0.2617993877991494F, 0.0F);
this.HeadBrowRight = new ModelRenderer(this, 27, 33);
this.HeadBrowRight.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadBrowRight.addBox(-6.0F, -5.5F, -3.6F, 4, 3, 6, 0.0F);
this.setRotateAngle(HeadBrowRight, 0.3490658503988659F, -0.6981317007977318F, -0.17453292519943295F);
this.setRotateAngle(this.HeadBrowRight, 0.3490658503988659F, -0.6981317007977318F, -0.17453292519943295F);
this.TorsoFrontFurLeft = new ModelRenderer(this, 78, 91);
this.TorsoFrontFurLeft.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoFrontFurLeft.addBox(0.0F, -3.0F, -0.5F, 9, 9, 13, 0.0F);
this.setRotateAngle(TorsoFrontFurLeft, 0.0F, -0.0F, 0.2617993877991494F);
this.setRotateAngle(this.TorsoFrontFurLeft, 0.0F, -0.0F, 0.2617993877991494F);
this.HeadRidge = new ModelRenderer(this, 47, 36);
this.HeadRidge.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadRidge.addBox(-2.0F, -7.0F, -8.0F, 4, 6, 11, 0.0F);
this.setRotateAngle(HeadRidge, 0.7853981633974483F, -0.0F, 0.0F);
this.setRotateAngle(this.HeadRidge, 0.7853981633974483F, -0.0F, 0.0F);
this.HeadAntlersMiddle = new ModelRenderer(this, 47, 17);
this.HeadAntlersMiddle.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadAntlersMiddle.addBox(-5.0F, -7.0F, -3.0F, 10, 5, 5, 0.0F);
this.HeadAntlerTopLeft2 = new ModelRenderer(this, 77, 14);
this.HeadAntlerTopLeft2.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadAntlerTopLeft2.addBox(5.0F, -3.0F, -1.5F, 9, 3, 3, 0.0F);
this.setRotateAngle(HeadAntlerTopLeft2, 0.0F, -0.0F, -0.5235987755982988F);
this.setRotateAngle(this.HeadAntlerTopLeft2, 0.0F, -0.0F, -0.5235987755982988F);
this.HindLegLeftShin = new ModelRenderer(this, 97, 354);
this.HindLegLeftShin.setRotationPoint(0.0F, -2.5F, 6.1F);
this.HindLegLeftShin.addBox(-1.5F, 0.0F, -1.3F, 3, 10, 4, 0.0F);
this.setRotateAngle(HindLegLeftShin, 0.2617993877991494F, -0.0F, 0.0F);
this.setRotateAngle(this.HindLegLeftShin, 0.2617993877991494F, -0.0F, 0.0F);
this.FrontLegRightHoofIn = new ModelRenderer(this, 92, 302);
this.FrontLegRightHoofIn.setRotationPoint(0.0F, 0.0F, 0.0F);
this.FrontLegRightHoofIn.addBox(-0.9F, 10.1F, -7.1F, 2, 3, 4, 0.0F);
this.setRotateAngle(FrontLegRightHoofIn, 0.5235987755982988F, 0.17453292519943295F, 0.0916297857297023F);
this.setRotateAngle(this.FrontLegRightHoofIn, 0.5235987755982988F, 0.17453292519943295F, 0.0916297857297023F);
this.HindLegLeftHoofMiddle = new ModelRenderer(this, 101, 371);
this.HindLegLeftHoofMiddle.setRotationPoint(0.0F, 9.5F, 0.0F);
this.HindLegLeftHoofMiddle.addBox(-1.1F, 0.0F, 0.0F, 2, 2, 1, 0.0F);
this.setRotateAngle(HindLegLeftHoofMiddle, 0.2617993877991494F, -0.0F, 0.0F);
this.setRotateAngle(this.HindLegLeftHoofMiddle, 0.2617993877991494F, -0.0F, 0.0F);
this.FrontLegLeftHoofIn = new ModelRenderer(this, 92, 302);
this.FrontLegLeftHoofIn.setRotationPoint(0.0F, 0.0F, 0.0F);
this.FrontLegLeftHoofIn.addBox(-0.9F, 10.1F, -7.1F, 2, 3, 4, 0.0F);
this.setRotateAngle(FrontLegLeftHoofIn, 0.5235987755982988F, 0.17453292519943295F, 0.0916297857297023F);
this.setRotateAngle(this.FrontLegLeftHoofIn, 0.5235987755982988F, 0.17453292519943295F, 0.0916297857297023F);
this.TorsoShoulderRight = new ModelRenderer(this, 9, 113);
this.TorsoShoulderRight.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoShoulderRight.addBox(-11.0F, -4.0F, 0.5F, 3, 12, 9, 0.0F);
this.setRotateAngle(TorsoShoulderRight, 0.0F, -0.0F, -0.5235987901687622F);
this.setRotateAngle(this.TorsoShoulderRight, 0.0F, -0.0F, -0.5235987901687622F);
this.TorsoBackFur = new ModelRenderer(this, 33, 180);
this.TorsoBackFur.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoBackFur.addBox(-5.0F, -3.0F, 11.0F, 10, 4, 19, 0.0F);
this.setRotateAngle(TorsoBackFur, -0.17453292012214658F, -0.0F, 0.0F);
this.setRotateAngle(this.TorsoBackFur, -0.17453292012214658F, -0.0F, 0.0F);
this.TorsoRear = new ModelRenderer(this, 40, 203);
this.TorsoRear.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoRear.addBox(-3.5F, 3.0F, 11.0F, 7, 14, 15, 0.0F);
this.HeadCheekLeft = new ModelRenderer(this, 79, 51);
this.HeadCheekLeft.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadCheekLeft.addBox(0.9F, 0.8F, -9.0F, 4, 7, 12, 0.0F);
this.setRotateAngle(HeadCheekLeft, 0.0F, 0.2617993877991494F, 0.0F);
this.setRotateAngle(this.HeadCheekLeft, 0.0F, 0.2617993877991494F, 0.0F);
this.Tail = new ModelRenderer(this, 56, 246);
this.Tail.setRotationPoint(0.0F, -3.0F, 29.0F);
this.Tail.addBox(-2.0F, 0.0F, -2.0F, 3, 10, 3, 0.0F);
this.setRotateAngle(Tail, 0.515060975741379F, -0.7518794329071241F, -0.3622181621097308F);
this.setRotateAngle(this.Tail, 0.515060975741379F, -0.7518794329071241F, -0.3622181621097308F);
this.TorsoPlate1 = new ModelRenderer(this, 44, 139);
this.TorsoPlate1.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoPlate1.addBox(-4.5F, -3.0F, -3.0F, 9, 3, 9, 0.0F);
this.setRotateAngle(TorsoPlate1, 1.2217304706573486F, -0.0F, 0.0F);
this.setRotateAngle(this.TorsoPlate1, 1.2217304706573486F, -0.0F, 0.0F);
this.HeadAntlerTopRight1 = new ModelRenderer(this, 1, 16);
this.HeadAntlerTopRight1.setRotationPoint(0.0F, 0.0F, 0.0F);
this.HeadAntlerTopRight1.addBox(-14.0F, 12.0F, -1.0F, 9, 2, 2, 0.0F);
this.setRotateAngle(HeadAntlerTopRight1, 0.0F, -0.0F, 1.7453292519943295F);
this.setRotateAngle(this.HeadAntlerTopRight1, 0.0F, -0.0F, 1.7453292519943295F);
this.TorsoNeckJoint = new ModelRenderer(this, 44, 95);
this.TorsoNeckJoint.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoNeckJoint.addBox(-3.5F, 2.0F, -2.0F, 7, 10, 10, 0.0F);
this.setRotateAngle(TorsoNeckJoint, -0.5235987901687622F, -0.0F, 0.0F);
this.setRotateAngle(this.TorsoNeckJoint, -0.5235987901687622F, -0.0F, 0.0F);
this.TorsoShoulderPlateRightFront = new ModelRenderer(this, 17, 172);
this.TorsoShoulderPlateRightFront.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoShoulderPlateRightFront.addBox(-11.5F, -6.0F, 2.0F, 4, 12, 4, 0.0F);
this.setRotateAngle(TorsoShoulderPlateRightFront, 0.30740453246205135F, -0.16852786693084162F, -0.2656520475633568F);
this.setRotateAngle(this.TorsoShoulderPlateRightFront, 0.30740453246205135F, -0.16852786693084162F, -0.2656520475633568F);
this.TorsoShoulderPlateLeftMid = new ModelRenderer(this, 91, 150);
this.TorsoShoulderPlateLeftMid.setRotationPoint(0.0F, -6.0F, 0.0F);
this.TorsoShoulderPlateLeftMid.addBox(8.0F, -8.0F, 3.0F, 5, 18, 4, 0.0F);
this.setRotateAngle(TorsoShoulderPlateLeftMid, 0.0F, -0.0F, 0.17453292012214658F);
this.setRotateAngle(this.TorsoShoulderPlateLeftMid, 0.0F, -0.0F, 0.17453292012214658F);
this.HeadMain.addChild(this.HeadEyeLeft);
this.FrontLegRightTop.addChild(this.FrontLegRightBottom);
this.HeadMain.addChild(this.HeadAntlerTopLeft1);
@@ -369,7 +431,8 @@ public class ModelBurrukai extends ModelBase
}

@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
this.TorsoPlate2.render(f5);
this.HeadMain.render(f5);
this.FrontLegLeftTop.render(f5);
@@ -396,7 +459,6 @@ public class ModelBurrukai extends ModelBase
this.TorsoShoulderPlateLeftMid.render(f5);
}


/**
* This is a helper function from Tabula to set the rotation of model parts
*/
@@ -432,15 +494,15 @@ public class ModelBurrukai extends ModelBase
this.FrontLegLeftTop.rotateAngleX = rightSwingX * .8f;
this.FrontLegRightTop.rotateAngleX = leftSwingX * .8f;

float leftSwingXLower = (Math.max(-0.5009094953223726F, -rightSwingX * 2f))-0.1009094953223726F;
float rightSwingXLower = (Math.max(-0.5009094953223726F, -leftSwingX * 2f))-0.1009094953223726F;
float leftSwingXLower = (Math.max(-0.5009094953223726F, -rightSwingX * 2f)) - 0.1009094953223726F;
float rightSwingXLower = (Math.max(-0.5009094953223726F, -leftSwingX * 2f)) - 0.1009094953223726F;

this.FrontLegLeftBottom.rotateAngleX = rightSwingXLower;
this.FrontLegRightBottom.rotateAngleX = leftSwingXLower;

float shinMod = 3f;

this.HindLegRightKnee.rotateAngleX = -0.17453292519943295F * 2+ leftSwingX * .75f;
this.HindLegRightKnee.rotateAngleX = -0.17453292519943295F * 2 + leftSwingX * .75f;
this.HindLegRightShin.rotateAngleX = 0.5617993877991494F + rightSwingX * shinMod;

this.HindLegLeftKnee.rotateAngleX = -0.17453292519943295F * 2 + rightSwingX * .75f;

+ 6
- 6
src/main/java/com/gildedgames/aether/client/models/entities/living/ModelCarrionSprout.java View File

@@ -7,6 +7,12 @@ import org.lwjgl.opengl.GL11;

public class ModelCarrionSprout extends ModelBase
{
private final float pie = 3.141593F * 2F;

public float sinage;

public float sinage2;

private ModelRenderer stem;

private ModelRenderer bud_base;
@@ -65,12 +71,6 @@ public class ModelCarrionSprout extends ModelBase

private ModelRenderer petal_back_right;

public float sinage;

public float sinage2;

private final float pie = 3.141593F * 2F;

public ModelCarrionSprout()
{
this.textureWidth = 64;

+ 9
- 5
src/main/java/com/gildedgames/aether/client/models/entities/living/ModelKirrid.java View File

@@ -10,6 +10,8 @@ import net.minecraft.util.math.MathHelper;

public class ModelKirrid extends ModelBase
{
protected float childYOffset = 8.0F;

//fields
private ModelRenderer BodyMain;

@@ -71,8 +73,6 @@ public class ModelKirrid extends ModelBase

private ModelRenderer HeadEarRight;

protected float childYOffset = 8.0F;

private float childZOffset = 4.0F;

public ModelKirrid()
@@ -416,9 +416,13 @@ public class ModelKirrid extends ModelBase
this.HeadEarLeft.rotationPointY = rotationPointY;
this.HeadEarRight.rotationPointY = rotationPointY;

this.HeadCheekLeft.offsetX = MathHelper.sin(headAng * -0.3662F + (float) Math.PI) * 0.1F * ((EntityKirrid) entitylivingbaseIn).getHeadRotationAngleX(partialTickTime) + .005f;
this.HeadCheekRight.offsetX = MathHelper.sin(headAng * 0.3662F + (float) Math.PI) * 0.1F * ((EntityKirrid) entitylivingbaseIn).getHeadRotationAngleX(partialTickTime) - .001f;
this.HeadJaw.offsetY = MathHelper.sin(headAng * 0.6662F + (float) Math.PI) * 0.2F * ((EntityKirrid) entitylivingbaseIn).getHeadRotationAngleX(partialTickTime);
this.HeadCheekLeft.offsetX =
MathHelper.sin(headAng * -0.3662F + (float) Math.PI) * 0.1F * ((EntityKirrid) entitylivingbaseIn).getHeadRotationAngleX(partialTickTime)
+ .005f;
this.HeadCheekRight.offsetX =
MathHelper.sin(headAng * 0.3662F + (float) Math.PI) * 0.1F * ((EntityKirrid) entitylivingbaseIn).getHeadRotationAngleX(partialTickTime) - .001f;
this.HeadJaw.offsetY =
MathHelper.sin(headAng * 0.6662F + (float) Math.PI) * 0.2F * ((EntityKirrid) entitylivingbaseIn).getHeadRotationAngleX(partialTickTime);

this.setHeadRotations(headAng * 9.0F);
}

+ 7
- 7
src/main/java/com/gildedgames/aether/client/models/entities/living/ModelSwetHead.java View File

@@ -39,32 +39,32 @@ public class ModelSwetHead extends ModelBase
this.TopRightTail.mirror = true;
this.TopRightTail.setRotationPoint(-3.5F, -1.0F, -3.0F);
this.TopRightTail.addBox(-5.0F, 0.0F, 0.0F, 5, 11, 0, 0.0F);
this.setRotateAngle(TopRightTail, 1.3962634015954636F, -0.3490658503988659F, 1.2217304763960306F);
this.setRotateAngle(this.TopRightTail, 1.3962634015954636F, -0.3490658503988659F, 1.2217304763960306F);
this.BottomLeftTail = new ModelRenderer(this, 50, 0);
this.BottomLeftTail.setRotationPoint(3.5F, 1.0F, -3.0F);
this.BottomLeftTail.addBox(0.0F, 0.0F, 0.0F, 5, 11, 0, 0.0F);
this.setRotateAngle(BottomLeftTail, 1.7453292519943295F, 0.3490658503988659F, 1.0471975511965976F);
this.setRotateAngle(this.BottomLeftTail, 1.7453292519943295F, 0.3490658503988659F, 1.0471975511965976F);
this.OuterBody = new ModelRenderer(this, 0, 0);
this.OuterBody.setRotationPoint(0.0F, 0.0F, 0.0F);
this.OuterBody.addBox(-5.0F, -5.0F, -5.0F, 10, 10, 10, 0.0F);
this.TopLeftTail = new ModelRenderer(this, 40, 0);
this.TopLeftTail.setRotationPoint(3.5F, -1.0F, -3.0F);
this.TopLeftTail.addBox(0.0F, 0.0F, 0.0F, 5, 11, 0, 0.0F);
this.setRotateAngle(TopLeftTail, 1.3962634015954636F, 0.3490658503988659F, -1.2217304763960306F);
this.setRotateAngle(this.TopLeftTail, 1.3962634015954636F, 0.3490658503988659F, -1.2217304763960306F);
this.BottomRightTail = new ModelRenderer(this, 50, 0);
this.BottomRightTail.mirror = true;
this.BottomRightTail.setRotationPoint(-3.5F, 1.0F, -3.0F);
this.BottomRightTail.addBox(-5.0F, 0.0F, 0.0F, 5, 11, 0, 0.0F);
this.setRotateAngle(BottomRightTail, 1.7453292519943295F, -0.3490658503988659F, -1.0471975511965976F);
this.setRotateAngle(this.BottomRightTail, 1.7453292519943295F, -0.3490658503988659F, -1.0471975511965976F);
this.BackRightTail = new ModelRenderer(this, 50, 0);
this.BackRightTail.setRotationPoint(-1.5F, 0.0F, 2.0F);
this.BackRightTail.addBox(-5.0F, 0.0F, 0.0F, 5, 11, 0, 0.0F);
this.setRotateAngle(BackRightTail, 1.6580627893946132F, -0.3490658503988659F, -1.3962634015954636F);
this.setRotateAngle(this.BackRightTail, 1.6580627893946132F, -0.3490658503988659F, -1.3962634015954636F);
this.BackLeftTail = new ModelRenderer(this, 50, 0);
this.BackLeftTail.mirror = true;
this.BackLeftTail.setRotationPoint(1.5F, 0.0F, 2.0F);
this.BackLeftTail.addBox(0.0F, 0.0F, 0.0F, 5, 11, 0, 0.0F);
this.setRotateAngle(BackLeftTail, 1.6580627893946132F, 0.3490658503988659F, 1.3962634015954636F);
this.setRotateAngle(this.BackLeftTail, 1.6580627893946132F, 0.3490658503988659F, 1.3962634015954636F);
this.OuterBody.addChild(this.TopRightTail);
this.OuterBody.addChild(this.BottomLeftTail);
this.InnerBody.addChild(this.OuterBody);
@@ -85,7 +85,7 @@ public class ModelSwetHead extends ModelBase
GlStateManager.translate(-this.InnerBody.rotationPointX * f5, -this.InnerBody.rotationPointY * f5, -this.InnerBody.rotationPointZ * f5);
EntitySwet swet = (EntitySwet) entity;
final float sc = ((swet.getFoodSaturation() - 1));
final float s = sc / 1.2F;
final float wiggle = (swet.prevSquishFactor + (swet.squishFactor - swet.prevSquishFactor) * f5) / (f1 * 0.5F + 1.0F);

+ 6
- 6
src/main/java/com/gildedgames/aether/client/models/entities/living/ModelSwetJelly.java View File

@@ -30,7 +30,7 @@ public class ModelSwetJelly extends ModelBase
this.Right = new ModelRenderer(this, 0, 47);
this.Right.setRotationPoint(-10.0F, 0.0F, 0.0F);
this.Right.addBox(-6.5F, -6.5F, 0.0F, 13, 13, 2, 0.0F);
this.setRotateAngle(Right, 0.0F, 1.5707963267948966F, 0.0F);
this.setRotateAngle(this.Right, 0.0F, 1.5707963267948966F, 0.0F);
this.Front = new ModelRenderer(this, 0, 47);
this.Front.setRotationPoint(0.0F, 0.0F, -10.0F);
this.Front.addBox(-6.5F, -6.5F, 0.0F, 13, 13, 2, 0.0F);
@@ -43,17 +43,17 @@ public class ModelSwetJelly extends ModelBase
this.Back = new ModelRenderer(this, 0, 47);
this.Back.setRotationPoint(0.0F, 0.0F, 10.0F);
this.Back.addBox(-6.5F, -6.5F, 0.0F, 13, 13, 2, 0.0F);
this.setRotateAngle(Back, 0.0F, 3.141592653589793F, 0.0F);
this.setRotateAngle(this.Back, 0.0F, 3.141592653589793F, 0.0F);
this.Left = new ModelRenderer(this, 0, 47);
this.Left.mirror = true;
this.Left.setRotationPoint(10.0F, 0.0F, 0.0F);
this.Left.addBox(-6.5F, -6.5F, 0.0F, 13, 13, 2, 0.0F);
this.setRotateAngle(Left, 0.0F, -1.5707963267948966F, 0.0F);
this.setRotateAngle(this.Left, 0.0F, -1.5707963267948966F, 0.0F);
this.Top = new ModelRenderer(this, 0, 47);
this.Top.mirror = true;
this.Top.setRotationPoint(0.0F, -10.0F, 0.0F);
this.Top.addBox(-6.5F, -6.5F, 0.0F, 13, 13, 2, 0.0F);
this.setRotateAngle(Top, -1.5707963267948966F, 0.0F, 0.0F);
this.setRotateAngle(this.Top, -1.5707963267948966F, 0.0F, 0.0F);
this.Base.addChild(this.Right);
this.Base.addChild(this.Front);
this.Base.addChild(this.Back);
@@ -79,7 +79,7 @@ public class ModelSwetJelly extends ModelBase
float width = swet.getSquishPool();
float height = width * 1.14f;
GlStateManager.translate(0, -height / 2 + 1.2f,0);
GlStateManager.translate(0, -height / 2 + 1.2f, 0);
GlStateManager.scale(width, height, width);
this.Bottom.render(f5);
@@ -92,7 +92,7 @@ public class ModelSwetJelly extends ModelBase
public void renderRaw(final Entity entity, final float f, final float f1, final float f2, final float f3, final float f4, final float f5)
{
this.Base.render(f5);
GlStateManager.translate(0,.85f,0);
GlStateManager.translate(0, .85f, 0);
this.Bottom.render(f5);
}

+ 19
- 11
src/main/java/com/gildedgames/aether/client/models/entities/player/LayerAetherPatronArmor.java View File

@@ -16,16 +16,16 @@ import java.util.Map;

public class LayerAetherPatronArmor implements LayerRenderer<EntityLivingBase>
{
private static final Map<String, ResourceLocation> ARMOR_TEXTURE_RES_MAP = Maps.newHashMap();

private final RenderLivingBase<?> renderer;

private PatronRewardArmor previewArmor;

private ModelBiped modelLeggings;

private ModelBiped modelArmor;

private final RenderLivingBase<?> renderer;

private static final Map<String, ResourceLocation> ARMOR_TEXTURE_RES_MAP = Maps.newHashMap();

public LayerAetherPatronArmor(RenderLivingBase<?> rendererIn)
{
this.renderer = rendererIn;
@@ -38,6 +38,7 @@ public class LayerAetherPatronArmor implements LayerRenderer<EntityLivingBase>
this.previewArmor = armor;
}

@Override
public void doRenderLayer(EntityLivingBase entity, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks,
float netHeadYaw, float headPitch, float scale)
{
@@ -49,14 +50,20 @@ public class LayerAetherPatronArmor implements LayerRenderer<EntityLivingBase>
armor = aePlayer.getPatronRewardsModule().getChoices().getArmorChoice();
}

if (armor != null && armor.getArmorTextureName() != null) {
this.renderArmorLayer(entity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale, EntityEquipmentSlot.CHEST, armor.getArmorTextureName());
this.renderArmorLayer(entity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale, EntityEquipmentSlot.LEGS, armor.getArmorTextureName());
this.renderArmorLayer(entity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale, EntityEquipmentSlot.FEET, armor.getArmorTextureName());
this.renderArmorLayer(entity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale, EntityEquipmentSlot.HEAD, armor.getArmorTextureName());
if (armor != null && armor.getArmorTextureName() != null)
{
this.renderArmorLayer(entity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale, EntityEquipmentSlot.CHEST,
armor.getArmorTextureName());
this.renderArmorLayer(entity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale, EntityEquipmentSlot.LEGS,
armor.getArmorTextureName());
this.renderArmorLayer(entity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale, EntityEquipmentSlot.FEET,
armor.getArmorTextureName());
this.renderArmorLayer(entity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale, EntityEquipmentSlot.HEAD,
armor.getArmorTextureName());
}
}

@Override
public boolean shouldCombineTextures()
{
return false;
@@ -65,8 +72,9 @@ public class LayerAetherPatronArmor implements LayerRenderer<EntityLivingBase>
protected void renderArmorLayer(EntityLivingBase entity, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks,
float netHeadYaw, float headPitch, float scale, EntityEquipmentSlot slot, String res)
{
ResourceLocation texture = ARMOR_TEXTURE_RES_MAP.computeIfAbsent(AetherCore.getResourcePath("textures/armor/" + res + "_layer_" + (slot == EntityEquipmentSlot.LEGS ? 2 : 1) + ".png"),
ResourceLocation::new);
ResourceLocation texture = ARMOR_TEXTURE_RES_MAP
.computeIfAbsent(AetherCore.getResourcePath("textures/armor/" + res + "_layer_" + (slot == EntityEquipmentSlot.LEGS ? 2 : 1) + ".png"),
ResourceLocation::new);

ModelBiped model = this.getModelFromSlot(slot);


+ 2
- 3
src/main/java/com/gildedgames/aether/client/models/entities/player/LayerAetherPlayerGloves.java View File

@@ -15,10 +15,10 @@ import net.minecraft.util.ResourceLocation;

public class LayerAetherPlayerGloves extends LayerBipedArmor
{
private PatronRewardArmor previewArmor;

private final RenderLivingBase<?> renderer;

private PatronRewardArmor previewArmor;

private ModelPlayer modelArmorSlim;

public LayerAetherPlayerGloves(RenderLivingBase<?> rendererIn)
@@ -54,7 +54,6 @@ public class LayerAetherPlayerGloves extends LayerBipedArmor
armor = player.getPatronRewardsModule().getChoices().getArmorChoice();
}


ResourceLocation texture = null;

if (armor == null)

+ 2
- 2
src/main/java/com/gildedgames/aether/client/models/entities/player/LayerArmorProxy.java View File

@@ -14,10 +14,10 @@ import net.minecraft.util.ResourceLocation;
// Delegate Hack
public class LayerArmorProxy extends LayerBipedArmor
{
private PatronRewardArmor previewArmor;

private final LayerBipedArmor proxy;

private PatronRewardArmor previewArmor;

public LayerArmorProxy(RenderLivingBase<?> rendererIn, LayerBipedArmor proxy)
{
super(rendererIn);

+ 2
- 2
src/main/java/com/gildedgames/aether/client/models/entities/player/LayerHeadShadow.java View File

@@ -25,10 +25,10 @@ import java.util.UUID;

public class LayerHeadShadow extends LayerBipedArmor
{
private PatronRewardArmor previewArmor;

private final RenderLivingBase<?> renderer;

private PatronRewardArmor previewArmor;

private ModelPlayer modelArmorSlim;

public LayerHeadShadow(RenderLivingBase<?> rendererIn)

+ 2
- 6
src/main/java/com/gildedgames/aether/client/renderer/ClientRenderHandler.java View File

@@ -3,12 +3,8 @@ package com.gildedgames.aether.client.renderer;
import com.gildedgames.aether.client.gui.overlays.IOverlay;
import com.gildedgames.aether.client.gui.overlays.PortalOverlay;
import com.gildedgames.aether.client.gui.overlays.SwetOverlay;
import com.gildedgames.aether.client.models.entities.player.LayerHeadShadow;
import com.gildedgames.aether.client.models.entities.player.LayerAetherPlayerGloves;
import com.gildedgames.aether.client.models.entities.player.LayerSwetLatch;
import com.gildedgames.aether.client.models.entities.player.*;
import com.gildedgames.aether.client.renderer.entities.living.RenderPlayerHelper;
import com.gildedgames.aether.client.models.entities.player.LayerArmorProxy;
import com.gildedgames.aether.client.models.entities.player.LayerAetherPatronArmor;
import com.gildedgames.aether.common.ReflectionAether;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.google.common.collect.Lists;
@@ -35,7 +31,7 @@ public class ClientRenderHandler

public ClientRenderHandler()
{
for (RenderLivingBase<?> playerRender: new HashSet<>(Minecraft.getMinecraft().getRenderManager().getSkinMap().values()))
for (RenderLivingBase<?> playerRender : new HashSet<>(Minecraft.getMinecraft().getRenderManager().getSkinMap().values()))
{
Field field = ReflectionAether.getField(RenderLivingBase.class, ReflectionAether.ENTITY_RENDER_LAYERS.getMappings());


+ 2
- 3
src/main/java/com/gildedgames/aether/client/renderer/PatronRewardArmorRenderer.java View File

@@ -3,10 +3,10 @@ package com.gildedgames.aether.client.renderer;
import com.gildedgames.aether.api.items.equipment.ItemEquipmentSlot;
import com.gildedgames.aether.api.patron.IPatronRewardRenderer;
import com.gildedgames.aether.api.player.inventory.IInventoryEquipment;
import com.gildedgames.aether.client.models.entities.player.LayerAetherPatronArmor;
import com.gildedgames.aether.client.models.entities.player.LayerAetherPlayerGloves;
import com.gildedgames.aether.client.models.entities.player.LayerArmorProxy;
import com.gildedgames.aether.client.models.entities.player.LayerHeadShadow;
import com.gildedgames.aether.client.models.entities.player.LayerAetherPlayerGloves;
import com.gildedgames.aether.client.models.entities.player.LayerAetherPatronArmor;
import com.gildedgames.aether.common.ReflectionAether;
import com.gildedgames.aether.common.capabilities.entity.player.PlayerAether;
import com.gildedgames.aether.common.patron.armor.PatronRewardArmor;
@@ -18,7 +18,6 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.entity.RenderLivingBase;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.client.renderer.entity.layers.LayerBipedArmor;
import net.minecraft.client.renderer.entity.layers.LayerRenderer;

+ 0
- 1
src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderAechorPlant.java View File

@@ -1,7 +1,6 @@
package com.gildedgames.aether.client.renderer.entities.living;

import com.gildedgames.aether.client.models.entities.living.ModelAechorPlant;
import com.gildedgames.aether.client.models.entities.living.ModelCarrionSprout;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.entities.living.mobs.EntityAechorPlant;
import net.minecraft.client.renderer.entity.RenderLiving;

+ 0
- 2
src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderMoa.java View File

@@ -17,7 +17,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper;
import org.lwjgl.opengl.GL11;

import java.awt.*;
@@ -48,7 +47,6 @@ public class RenderMoa extends RenderLiving<EntityMoa>
SPRITE.initSprite(16, 16, 0, 0, false);
}


private void scaleMoa(EntityMoa entityMoa)
{
float moaScale = entityMoa.isChild() ? 0.5f : 0.85f;

+ 2
- 1
src/main/java/com/gildedgames/aether/client/renderer/entities/living/layers/LayerGlowing.java View File

@@ -1,6 +1,5 @@
package com.gildedgames.aether.client.renderer.entities.living.layers;

import com.google.common.base.Supplier;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.entity.RenderLiving;
@@ -10,6 +9,8 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

import java.util.function.Supplier;

@SideOnly(Side.CLIENT)
public class LayerGlowing<T extends EntityLiving> implements LayerRenderer<T>
{

+ 1
- 1
src/main/java/com/gildedgames/aether/client/renderer/entities/projectiles/RenderBolt.java View File

@@ -53,7 +53,7 @@ public class RenderBolt extends Render<EntityBolt>
final float f = 0.0F;
final float f1 = 0.5F;
final float f2 = (float) (i * 10) / 32.0F;
final float f3 = (float) (5 + i * 10) / 32.0F;
final float f3 = (float) (5) / 32.0F;
final float f4 = 0.0F;
final float f5 = 0.15625F;
final float f6 = (float) (5 + i * 10) / 32.0F;

+ 3
- 3
src/main/java/com/gildedgames/aether/client/renderer/entities/projectiles/RenderDart.java View File

@@ -50,11 +50,11 @@ public class RenderDart extends Render<EntityDart>
final float f = 0.0F;
final float f1 = 0.5F;
final float f2 = (float) (i * 10) / 32.0F;
final float f3 = (float) (5 + i * 10) / 32.0F;
final float f3 = (float) (5) / 32.0F;
final float f4 = 0.0F;
final float f5 = 0.15625F;
final float f6 = (float) (5 + i * 10) / 32.0F;
final float f7 = (float) (10 + i * 10) / 32.0F;
final float f6 = (float) (5) / 32.0F;
final float f7 = (float) (10) / 32.0F;
final float f8 = 0.05625F;
final float f9 = (float) dart.arrowShake - partialTicks;


+ 33
- 25
src/main/java/com/gildedgames/aether/client/renderer/particles/ParticleLeaf.java View File

@@ -20,12 +20,15 @@ public class ParticleLeaf extends Particle
private final ResourceLocation sprite = AetherCore.getResource("textures/particles/skyroot_leaf_particle.png");

private float mulRotX;

private float mulRotY;

private float prevRotX;

private float prevRotY;

private float rotX;

private float rotY;

public ParticleLeaf(World worldIn, double posXIn, double posYIn, double posZIn, double motionX, double motionY, double motionZ, Block block)
@@ -99,7 +102,6 @@ public class ParticleLeaf extends Particle
this.particleBlue = 0.301f;
}


this.motionY = motionY;
this.motionX = motionX;
this.motionZ = motionZ;
@@ -124,15 +126,16 @@ public class ParticleLeaf extends Particle
}

@Override
public void renderParticle(BufferBuilder buffer, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ)
public void renderParticle(BufferBuilder buffer, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY,
float rotationXZ)
{
Minecraft.getMinecraft().renderEngine.bindTexture(this.sprite);

GlStateManager.disableLighting();

double x = this.prevPosX + (this.posX - this.prevPosX) * (double)partialTicks - interpPosX;
double y = this.prevPosY + (this.posY - this.prevPosY) * (double)partialTicks - interpPosY;
double z = this.prevPosZ + (this.posZ - this.prevPosZ) * (double)partialTicks - interpPosZ;
double x = this.prevPosX + (this.posX - this.prevPosX) * (double) partialTicks - interpPosX;
double y = this.prevPosY + (this.posY - this.prevPosY) * (double) partialTicks - interpPosY;
double z = this.prevPosZ + (this.posZ - this.prevPosZ) * (double) partialTicks - interpPosZ;

int brightness = this.getBrightnessForRender(partialTicks);

@@ -146,47 +149,52 @@ public class ParticleLeaf extends Particle

int i = 0;

rotationX = MathHelper.cos(f3 * 0.017453292F) * (float)(1 - i * 2);
rotationZ = MathHelper.sin(f3 * 0.017453292F) * (float)(1 - i * 2);
rotationX = MathHelper.cos(f3 * 0.017453292F) * (float) (1 - i * 2);
rotationZ = MathHelper.sin(f3 * 0.017453292F) * (float) (1 - i * 2);

rotationYZ = -rotationZ * MathHelper.sin(f2 * 0.017453292F) * (float)(1 - i * 2);
rotationXY = rotationX * MathHelper.sin(f2 * 0.017453292F) * (float)(1 - i * 2);
rotationYZ = -rotationZ * MathHelper.sin(f2 * 0.017453292F) * (float) (1 - i * 2);
rotationXY = rotationX * MathHelper.sin(f2 * 0.017453292F) * (float) (1 - i * 2);
rotationXZ = MathHelper.cos(f2 * 0.017453292F);

Vec3d[] avec3d = new Vec3d[] {
new Vec3d(
(double)(-rotationX * scale - rotationXY * scale),
(double)(-rotationZ * scale),
(double)(-rotationYZ * scale - rotationXZ * scale)
(double) (-rotationX * scale - rotationXY * scale),
(double) (-rotationZ * scale),
(double) (-rotationYZ * scale - rotationXZ * scale)
),
new Vec3d(
(double)(-rotationX * scale + rotationXY * scale),
(double)(rotationZ * scale),
(double)(-rotationYZ * scale + rotationXZ * scale)
(double) (-rotationX * scale + rotationXY * scale),
(double) (rotationZ * scale),
(double) (-rotationYZ * scale + rotationXZ * scale)
),
new Vec3d(
(double)(rotationX * scale + rotationXY * scale),
(double)(rotationZ * scale),
(double)(rotationYZ * scale + rotationXZ * scale)
(double) (rotationX * scale + rotationXY * scale),
(double) (rotationZ * scale),
(double) (rotationYZ * scale + rotationXZ * scale)
),
new Vec3d(
(double)(rotationX * scale - rotationXY * scale),
(double)(-rotationZ * scale),
(double)(rotationYZ * scale - rotationXZ * scale)
(double) (rotationX * scale - rotationXY * scale),
(double) (-rotationZ * scale),
(double) (rotationYZ * scale - rotationXZ * scale)
)
};

float a = 1.0f - (Math.max(0.0f, this.particleAge - 70.0f) * 0.03f);

buffer.begin(7, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP);
buffer.pos(x + avec3d[0].x, y + avec3d[0].y, z + avec3d[0].z).tex(0.0D, 1.0D).color(this.particleRed, this.particleGreen, this.particleBlue, a).lightmap(j, k).endVertex();
buffer.pos(x + avec3d[1].x, y + avec3d[1].y, z + avec3d[1].z).tex(1.0D, 1.0D).color(this.particleRed, this.particleGreen, this.particleBlue, a).lightmap(j, k).endVertex();
buffer.pos(x + avec3d[2].x, y + avec3d[2].y, z + avec3d[2].z).tex(1.0D, 0.0D).color(this.particleRed, this.particleGreen, this.particleBlue, a).lightmap(j, k).endVertex();
buffer.pos(x + avec3d[3].x, y + avec3d[3].y, z + avec3d[3].z).tex(0.0D, 0.0D).color(this.particleRed, this.particleGreen, this.particleBlue, a).lightmap(j, k).endVertex();
buffer.pos(x + avec3d[0].x, y + avec3d[0].y, z + avec3d[0].z).tex(0.0D, 1.0D).color(this.particleRed, this.particleGreen, this.particleBlue, a)
.lightmap(j, k).endVertex();
buffer.pos(x + avec3d[1].x, y + avec3d[1].y, z + avec3d[1].z).tex(1.0D, 1.0D).color(this.particleRed, this.particleGreen, this.particleBlue, a)
.lightmap(j, k).endVertex();
buffer.pos(x + avec3d[2].x, y + avec3d[2].y, z + avec3d[2].z).tex(1.0D, 0.0D).color(this.particleRed, this.particleGreen, this.particleBlue, a)
.lightmap(j, k).endVertex();
buffer.pos(x + avec3d[3].x, y + avec3d[3].y, z + avec3d[3].z).tex(0.0D, 0.0D).color(this.particleRed, this.particleGreen, this.particleBlue, a)
.lightmap(j, k).endVertex();

Tessellator.getInstance().draw();
}

@Override
public int getFXLayer()
{
return 3;

+ 1
- 4
src/main/java/com/gildedgames/aether/common/CommonEvents.java View File

@@ -357,10 +357,7 @@ public class CommonEvents
{
size = new BlockAetherPortal.Size(world, pos, EnumFacing.Axis.Z);

if (size.isWithinSizeBounds() && size.getPortalBlocks() == 0)
{
return true;
}
return size.isWithinSizeBounds() && size.getPortalBlocks() == 0;
}
}


+ 1
- 0
src/main/java/com/gildedgames/aether/common/CommonProxy.java View File

@@ -36,6 +36,7 @@ import java.util.Random;
public class CommonProxy implements IAetherServices
{
private final ContentRegistry contentRegistry = new ContentRegistry();

private final GildedGamesAccountApiImpl webAPI = new GildedGamesAccountApiImpl();

private File configDir;

+ 2
- 2
src/main/java/com/gildedgames/aether/common/analytics/GAUser.java View File

@@ -13,12 +13,12 @@ public class GAUser
@SerializedName("persistent_id")
private final UUID persistentId;

private final UUID sessionId;

@Expose
@SerializedName("session_count")
private int sessionCount;

private final UUID sessionId;

private long sessionStart;

/**

+ 8
- 9
src/main/java/com/gildedgames/aether/common/blocks/BlocksAether.java View File

@@ -158,14 +158,6 @@ public class BlocksAether

public static final BlockFerrositeSand ferrosite_sand = new BlockFerrositeSand();

public static BlockCustomSnowBlock highlands_snow = new BlockCustomSnowBlock();

public static BlockCustomSnow highlands_snow_layer = new BlockCustomSnow();

public static Block highlands_ice = new BlockIce();

public static Block highlands_packed_ice = new BlockPackedIce();

public static final BlockAetherCraftingTable aether_crafting_table = new BlockAetherCraftingTable();

public static final BlockBlueberryBush blueberry_bush = new BlockBlueberryBush();
@@ -301,6 +293,14 @@ public class BlocksAether

private static final List<Block> registeredBlocks = new ArrayList<>();

public static BlockCustomSnowBlock highlands_snow = new BlockCustomSnowBlock();

public static BlockCustomSnow highlands_snow_layer = new BlockCustomSnow();

public static Block highlands_ice = new BlockIce();

public static Block highlands_packed_ice = new BlockPackedIce();

public static Block therawood_decorative = new BlockTherawoodDecorative();

public static BlockCustomCarpet cloudwool_carpet = new BlockCustomCarpet();
@@ -317,7 +317,6 @@ public class BlocksAether

public static Block aether_teleporter = new BlockAetherTeleporter();


@SubscribeEvent
public static void onRegisterBlocks(final RegistryEvent.Register<Block> event)
{

+ 0
- 1
src/main/java/com/gildedgames/aether/common/blocks/IBlockSnowy.java View File

@@ -1,7 +1,6 @@
package com.gildedgames.aether.common.blocks;
import net.minecraft.block.properties.PropertyBool;
import net.minecraft.block.state.IBlockState;
public interface IBlockSnowy
{

+ 26
- 25
src/main/java/com/gildedgames/aether/common/blocks/construction/BlockAetherPortal.java View File

@@ -52,6 +52,11 @@ public class BlockAetherPortal extends BlockBreakable
this.setDefaultState(this.blockState.getBaseState().withProperty(PROPERTY_AXIS, EnumFacing.Axis.X));
}

public static int getMetaForAxis(EnumFacing.Axis axis)
{
return axis == EnumFacing.Axis.X ? 1 : (axis == EnumFacing.Axis.Z ? 2 : 0);
}

@Override
public boolean isFullCube(IBlockState state)
{
@@ -63,13 +68,13 @@ public class BlockAetherPortal extends BlockBreakable
{
switch (state.getValue(PROPERTY_AXIS))
{
case X:
return X_AABB;
case Y:
default:
return Y_AABB;
case Z:
return Z_AABB;
case X:
return X_AABB;
case Y:
default:
return Y_AABB;
case Z:
return Z_AABB;
}
}

@@ -171,20 +176,20 @@ public class BlockAetherPortal extends BlockBreakable
{
switch (rot)
{
case COUNTERCLOCKWISE_90:
case CLOCKWISE_90:
switch (state.getValue(PROPERTY_AXIS))
{
case X:
return state.withProperty(PROPERTY_AXIS, EnumFacing.Axis.Z);
case Z:
return state.withProperty(PROPERTY_AXIS, EnumFacing.Axis.X);
case COUNTERCLOCKWISE_90:
case CLOCKWISE_90:
switch (state.getValue(PROPERTY_AXIS))
{
case X:
return state.withProperty(PROPERTY_AXIS, EnumFacing.Axis.Z);
case Z:
return state.withProperty(PROPERTY_AXIS, EnumFacing.Axis.X);
default:
return state;
}

default:
return state;
}

default:
return state;
}
}

@@ -194,11 +199,6 @@ public class BlockAetherPortal extends BlockBreakable
return getMetaForAxis(state.getValue(PROPERTY_AXIS));
}

public static int getMetaForAxis(EnumFacing.Axis axis)
{
return axis == EnumFacing.Axis.X ? 1 : (axis == EnumFacing.Axis.Z ? 2 : 0);
}

@Override
public IBlockState getStateFromMeta(int meta)
{
@@ -404,7 +404,8 @@ public class BlockAetherPortal extends BlockBreakable

for (int j = 0; j < this.height; ++j)
{
this.world.setBlockState(blockpos.up(j), BlocksAether.aether_portal.getDefaultState().withProperty(BlockAetherPortal.PROPERTY_AXIS, this.axis), 2);