Permalink
Browse files

Refactored to reflect the changes made to MDX with models.

  • Loading branch information...
Ri5ux committed Jan 12, 2018
1 parent 040ac2f commit 1cdc90034055fcfcbe03098ae67913ca18ef5dc8
Showing with 1,365 additions and 834 deletions.
  1. +3 −1 src/main/java/org/avp/EntityHandler.java
  2. +3 −0 src/main/java/org/avp/ItemHandler.java
  3. +3 −3 src/main/java/org/avp/PlayerModeHandler.java
  4. +2 −2 src/main/java/org/avp/block/skulls/BlockSkullEngineer.java
  5. +2 −2 src/main/java/org/avp/block/skulls/BlockSkullSpaceJockey.java
  6. +2 −2 src/main/java/org/avp/block/skulls/BlockSkullXenomorph.java
  7. +2 −2 src/main/java/org/avp/block/skulls/BlockSkullXenomorphWarrior.java
  8. +2 −2 src/main/java/org/avp/block/skulls/BlockSkullYautja.java
  9. +12 −8 src/main/java/org/avp/client/Renders.java
  10. +146 −144 src/main/java/org/avp/client/Resources.java
  11. +1 −1 src/main/java/org/avp/client/model/entities/ModelBullet.java
  12. +1 −1 src/main/java/org/avp/client/model/entities/ModelLaserMine.java
  13. +1 −1 src/main/java/org/avp/client/model/entities/ModelPlasma.java
  14. +1 −1 src/main/java/org/avp/client/model/entities/ModelSpear.java
  15. +1 −1 src/main/java/org/avp/client/model/entities/ModelSupplyChute.java
  16. +3 −3 src/main/java/org/avp/client/model/entities/living/ModelAethon.java
  17. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelAqua.java
  18. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelBabyhead.java
  19. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelBatXenomorph.java
  20. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelBelugaburster.java
  21. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelBelugamorph.java
  22. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelBoiler.java
  23. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelChestburster.java
  24. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelChestbursterPredalien.java
  25. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelChestbursterQueen.java
  26. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelChestbursterRunner.java
  27. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelCrusher.java
  28. +297 −329 src/main/java/org/avp/client/model/entities/living/ModelDeacon.java
  29. +458 −0 src/main/java/org/avp/client/model/entities/living/ModelDeaconAdult.java
  30. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelDeaconShark.java
  31. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelDracoOvamorph.java
  32. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelDracoburster.java
  33. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelDracomorph.java
  34. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelDrone.java
  35. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelEngineer.java
  36. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelFacehugger.java
  37. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelGooMutant.java
  38. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelHammerpede.java
  39. +46 −46 src/main/java/org/avp/client/model/entities/living/ModelMarine.java
  40. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelMatriarch.java
  41. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelMutantYautja.java
  42. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelMyceliomorph.java
  43. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelOctohugger.java
  44. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelOvamorph.java
  45. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelPantheramorph.java
  46. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelPraetorian.java
  47. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelPredalien.java
  48. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelPredatorHound.java
  49. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelRunnerDrone.java
  50. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelRunnerWarrior.java
  51. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelSpitter.java
  52. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelTrilobite.java
  53. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelUltramorph.java
  54. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelUrsuidae.java
  55. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelVardaMonkey.java
  56. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelWarrior.java
  57. +1 −1 src/main/java/org/avp/client/model/entities/living/ModelYautja.java
  58. +1 −1 src/main/java/org/avp/client/model/items/Model88MOD4.java
  59. +1 −1 src/main/java/org/avp/client/model/items/ModelAK47.java
  60. +1 −1 src/main/java/org/avp/client/model/items/ModelM240ICU.java
  61. +1 −1 src/main/java/org/avp/client/model/items/ModelM4.java
  62. +1 −1 src/main/java/org/avp/client/model/items/ModelM40.java
  63. +1 −1 src/main/java/org/avp/client/model/items/ModelM41A.java
  64. +1 −1 src/main/java/org/avp/client/model/items/ModelM56SG.java
  65. +1 −1 src/main/java/org/avp/client/model/items/ModelMotionTracker.java
  66. +1 −1 src/main/java/org/avp/client/model/items/ModelPlasmaCannon.java
  67. +1 −1 src/main/java/org/avp/client/model/items/ModelSevastopolFlamethrower.java
  68. +1 −1 src/main/java/org/avp/client/model/items/ModelSniper.java
  69. +1 −1 src/main/java/org/avp/client/model/items/ModelStunBaton.java
  70. +1 −1 src/main/java/org/avp/client/model/items/ModelWristBlade.java
  71. +1 −1 src/main/java/org/avp/client/model/tile/ModelAmpule.java
  72. +1 −1 src/main/java/org/avp/client/model/tile/ModelBlastdoor.java
  73. +1 −1 src/main/java/org/avp/client/model/tile/ModelCCFL.java
  74. +1 −1 src/main/java/org/avp/client/model/tile/ModelCable.java
  75. +1 −1 src/main/java/org/avp/client/model/tile/ModelCryostasisTube.java
  76. +1 −1 src/main/java/org/avp/client/model/tile/ModelDNASynthesizer.java
  77. +1 −1 src/main/java/org/avp/client/model/tile/ModelHiveResin.java
  78. +1 −1 src/main/java/org/avp/client/model/tile/ModelLightPanel.java
  79. +1 −1 src/main/java/org/avp/client/model/tile/ModelLocker.java
  80. +1 −1 src/main/java/org/avp/client/model/tile/ModelMedpod.java
  81. +1 −1 src/main/java/org/avp/client/model/tile/ModelPowercell.java
  82. +1 −1 src/main/java/org/avp/client/model/tile/ModelRedstoneFluxGenerator.java
  83. +1 −1 src/main/java/org/avp/client/model/tile/ModelRepulsionGenerator.java
  84. +1 −1 src/main/java/org/avp/client/model/tile/ModelSatelliteDish.java
  85. +1 −1 src/main/java/org/avp/client/model/tile/ModelSevastopolBlastdoor.java
  86. +1 −1 src/main/java/org/avp/client/model/tile/ModelSolarPanel.java
  87. +1 −1 src/main/java/org/avp/client/model/tile/ModelStasisMechanism.java
  88. +1 −1 src/main/java/org/avp/client/model/tile/ModelTransformer.java
  89. +1 −1 src/main/java/org/avp/client/model/tile/ModelTurret.java
  90. +1 −1 src/main/java/org/avp/client/model/tile/ModelWorkstation.java
  91. +1 −1 src/main/java/org/avp/client/model/tile/rackmodules/ModelNetworkModuleRack.java
  92. +1 −1 src/main/java/org/avp/client/model/tile/rackmodules/ModelRackModule1.java
  93. +1 −1 src/main/java/org/avp/client/model/tile/rackmodules/ModelRackModule2.java
  94. +1 −1 src/main/java/org/avp/client/model/tile/rackmodules/ModelRackModule3.java
  95. +1 −1 src/main/java/org/avp/client/model/tile/rackmodules/ModelRackModule4.java
  96. +1 −1 src/main/java/org/avp/client/model/tile/rackmodules/ModelRackModule5.java
  97. +1 −1 src/main/java/org/avp/client/model/tile/rackmodules/ModelRackModule6.java
  98. +1 −1 src/main/java/org/avp/client/model/tile/rackmodules/ModelRackModule7.java
  99. +1 −1 src/main/java/org/avp/client/model/tile/rackmodules/ModelRackModule8.java
  100. +1 −1 src/main/java/org/avp/client/render/RenderLivingHook.java
  101. +3 −3 src/main/java/org/avp/client/render/RenderPlayerPlasmaCannon.java
  102. +1 −1 src/main/java/org/avp/client/render/block/model/cached/CachedModelReflectiveShape.java
  103. +2 −2 src/main/java/org/avp/client/render/entities/RenderWristbracer.java
  104. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderAethon.java
  105. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderAqua.java
  106. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderBabyhead.java
  107. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderBelugaburster.java
  108. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderBoiler.java
  109. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderChestburster.java
  110. +3 −3 src/main/java/org/avp/client/render/entities/living/RenderCombatSynthetic.java
  111. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderDeacon.java
  112. +15 −0 src/main/java/org/avp/client/render/entities/living/RenderDeaconAdult.java
  113. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderDeaconShark.java
  114. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderDracoEgg.java
  115. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderDracoburster.java
  116. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderDracomorph.java
  117. +3 −3 src/main/java/org/avp/client/render/entities/living/RenderEngineer.java
  118. +3 −3 src/main/java/org/avp/client/render/entities/living/RenderFacehuggers.java
  119. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderGooMutant.java
  120. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderHammerpede.java
  121. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderMarine.java
  122. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderMatriarch.java
  123. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderMyceliomorph.java
  124. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderOctohugger.java
  125. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderOvamorph.java
  126. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderPredalien.java
  127. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderPredalienChestburster.java
  128. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderPredatorHound.java
  129. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderQueenChestburster.java
  130. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderRunnerChestburster.java
  131. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderScelemur.java
  132. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderSpitter.java
  133. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderTrilobite.java
  134. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderUrsuidae.java
  135. +5 −5 src/main/java/org/avp/client/render/entities/living/RenderXenomorph.java
  136. +4 −4 src/main/java/org/avp/client/render/entities/living/RenderYautja.java
  137. +1 −1 src/main/java/org/avp/client/render/entities/living/RenderYautjaMutant.java
  138. +4 −4 src/main/java/org/avp/client/render/items/ItemRendererGroup.java
  139. +1 −1 src/main/java/org/avp/client/render/items/RenderItemAPC.java
  140. +2 −2 src/main/java/org/avp/client/render/items/RenderItemM40.java
  141. +1 −1 src/main/java/org/avp/client/render/items/RenderItemNetworkRackModule.java
  142. +1 −1 src/main/java/org/avp/client/render/items/RenderItemSkull.java
  143. +4 −4 src/main/java/org/avp/client/render/items/RenderItemSummoner.java
  144. +5 −5 src/main/java/org/avp/client/render/items/RenderItemSupplyCrate.java
  145. +1 −1 src/main/java/org/avp/client/render/items/RenderItemWristbracer.java
  146. +1 −1 src/main/java/org/avp/client/render/items/RenderItemWristbracerBlades.java
  147. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItem88Mod4Action.java
  148. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItem88Mod4Barrel.java
  149. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItem88Mod4Stock.java
  150. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemAK47Action.java
  151. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemAK47Barrel.java
  152. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemAK47Stock.java
  153. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemM41AAction.java
  154. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemM41ABarrel.java
  155. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemM41APeripherals.java
  156. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemM41AStock.java
  157. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemM4Action.java
  158. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemM4Barrel.java
  159. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemM4Stock.java
  160. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemM56SGAction.java
  161. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemM56SGAimingModule.java
  162. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemM56SGBarrel.java
  163. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemM56SGStock.java
  164. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemM56SGSupportFrame.java
  165. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemSniperAction.java
  166. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemSniperBarrel.java
  167. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemSniperPeripherals.java
  168. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemSniperScope.java
  169. +3 −3 src/main/java/org/avp/client/render/items/firearms/parts/RenderItemSniperStock.java
  170. +2 −2 src/main/java/org/avp/client/render/tile/RenderCryostasisTube.java
  171. +1 −1 src/main/java/org/avp/client/render/tile/RenderHiveResin.java
  172. +1 −1 src/main/java/org/avp/client/render/tile/RenderSkull.java
  173. +2 −2 src/main/java/org/avp/client/render/transforms/CryostasisTubeRenderers.java
  174. +1 −1 src/main/java/org/avp/entities/living/EntityDeacon.java
  175. +79 −0 src/main/java/org/avp/entities/living/EntityDeaconAdult.java
  176. +5 −5 src/main/java/org/avp/item/ItemNetworkRackModule.java
  177. +3 −3 src/main/java/org/avp/item/ItemSupplyChute.java
  178. +5 −5 src/main/java/org/avp/item/rackmodules/ItemNetworkRackModule1.java
  179. +5 −5 src/main/java/org/avp/item/rackmodules/ItemNetworkRackModule2.java
  180. +5 −5 src/main/java/org/avp/item/rackmodules/ItemNetworkRackModule3.java
  181. +5 −5 src/main/java/org/avp/item/rackmodules/ItemNetworkRackModule4.java
  182. +5 −5 src/main/java/org/avp/item/rackmodules/ItemNetworkRackModule5.java
  183. +5 −5 src/main/java/org/avp/item/rackmodules/ItemNetworkRackModule6.java
  184. +5 −5 src/main/java/org/avp/item/rackmodules/ItemNetworkRackModule7.java
  185. +5 −5 src/main/java/org/avp/item/rackmodules/ItemNetworkRackModule8.java
  186. +3 −3 src/main/java/org/avp/world/MarineTypes.java
  187. +5 −5 src/main/java/org/avp/world/playermode/LevelData.java
  188. BIN src/main/resources/assets/avp/textures/mob/deacon.png
  189. BIN src/main/resources/assets/avp/textures/mob/deacon_adult.png
@@ -32,6 +32,7 @@
import org.avp.entities.living.EntityCombatSynthetic;
import org.avp.entities.living.EntityCrusher;
import org.avp.entities.living.EntityDeacon;
import org.avp.entities.living.EntityDeaconAdult;
import org.avp.entities.living.EntityDeaconShark;
import org.avp.entities.living.EntityDracoEgg;
import org.avp.entities.living.EntityDracoburster;
@@ -77,6 +78,7 @@
import org.avp.tile.TileEntityLocker;
import org.avp.tile.TileEntityMedpod;
import org.avp.tile.TileEntityNegativeTransformer;
import org.avp.tile.TileEntityNetworkRack;
import org.avp.tile.TileEntityPowercell;
import org.avp.tile.TileEntityPowerline;
import org.avp.tile.TileEntityRedstoneEmitter;
@@ -85,7 +87,6 @@
import org.avp.tile.TileEntityReflective;
import org.avp.tile.TileEntityRepulsionGenerator;
import org.avp.tile.TileEntitySatelliteDish;
import org.avp.tile.TileEntityNetworkRack;
import org.avp.tile.TileEntitySevastopolBlastDoor;
import org.avp.tile.TileEntitySkull;
import org.avp.tile.TileEntitySolarPanel;
@@ -240,6 +241,7 @@ private void registerLivingEntities()
Game.register(EntityUrsuidae.class, "Ursuidae", entityId++, AliensVsPredator.instance(), 250, 1, true, 0x222222, 0x00AAFF);
Game.register(EntityScelemur.class, "VardaMonkey", entityId++, AliensVsPredator.instance(), 250, 1, true, 0x222222, 0x00AAFF);
Game.register(EntityYautjaMutant.class, "YautjaMutant", entityId++, AliensVsPredator.instance(), 250, 1, true, 0x222222, 0x00AAFF);
Game.register(EntityDeaconAdult.class, "DeaconAdult", entityId++, AliensVsPredator.instance(), 250, 1, true, 0x222222, 0x00AAFF);
}
private static final Class<?>[][] PARAM_TYPES = new Class[][] { { EnumCreatureType.class, Class.class, int.class, Material.class, boolean.class, boolean.class } };
@@ -11,6 +11,7 @@
import org.avp.entities.living.EntityCombatSynthetic;
import org.avp.entities.living.EntityCrusher;
import org.avp.entities.living.EntityDeacon;
import org.avp.entities.living.EntityDeaconAdult;
import org.avp.entities.living.EntityDeaconShark;
import org.avp.entities.living.EntityDracoEgg;
import org.avp.entities.living.EntityDracoburster;
@@ -234,6 +235,7 @@
public Item summonerPredalien = new ItemEntitySummoner(EntityPredalien.class);
public Item summonerCombatSynthetic = new ItemEntitySummoner(EntityCombatSynthetic.class);
public Item summonerDeacon = new ItemEntitySummoner(EntityDeacon.class);
public Item summonerDeaconAdult = new ItemEntitySummoner(EntityDeaconAdult.class);
public Item summonerHammerpede = new ItemEntitySummoner(EntityHammerpede.class);
public Item summonerTrilobite = new ItemEntitySummoner(EntityTrilobite.class);
public Item summonerYautjaBerserker = new ItemEntitySummoner(EntityYautjaBerserker.class);
@@ -285,6 +287,7 @@ public void pre(FMLPreInitializationEvent event)
register("summon.queen", summonerQueen).setCreativeTab(AliensVsPredator.tabEntities());
register("summon.predalien", summonerPredalien).setCreativeTab(AliensVsPredator.tabEntities());
register("summon.deacon", summonerDeacon).setCreativeTab(AliensVsPredator.tabEntities());
register("summon.deacon.adult", summonerDeaconAdult).setCreativeTab(AliensVsPredator.tabEntities());
register("summon.deaconshark", summonerDeaconShark).setCreativeTab(AliensVsPredator.tabEntities());
register("summon.hammerpede", summonerHammerpede).setCreativeTab(AliensVsPredator.tabEntities());
register("summon.trilobite", summonerTrilobite).setCreativeTab(AliensVsPredator.tabEntities());
@@ -5,9 +5,9 @@
import org.avp.world.playermode.LevelData;
import org.avp.world.playermode.PlayerMode;
import com.arisux.mdx.lib.client.Model;
import com.arisux.mdx.lib.client.TexturedModel;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.Model;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.game.IInitEvent;
import com.arisux.mdx.lib.world.entity.player.Players;
@@ -129,7 +129,7 @@ public LevelData getLevelMappingForPlayer(EntityPlayer player)
}
@SideOnly(Side.CLIENT)
public TexturedModel<? extends Model> getModelTexMapForPlayer(EntityPlayer player)
public MapModelTexture<? extends Model> getModelTexMapForPlayer(EntityPlayer player)
{
return getLevelMappingForPlayer(player).getModelTexMap();
}
@@ -4,8 +4,8 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.entities.living.ModelEngineer;
import com.arisux.mdx.lib.client.TexturedModel;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -16,7 +16,7 @@
@SideOnly(Side.CLIENT)
private static class Resources
{
private static final TexturedModel<ModelEngineer> model = AliensVsPredator.resources().models().ENGINEER;
private static final MapModelTexture<ModelEngineer> model = AliensVsPredator.resources().models().ENGINEER;
}
@Override
@@ -4,8 +4,8 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.entities.living.ModelEngineer;
import com.arisux.mdx.lib.client.TexturedModel;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -16,7 +16,7 @@
@SideOnly(Side.CLIENT)
private static class Resources
{
private static final TexturedModel<ModelEngineer> model = AliensVsPredator.resources().models().SPACE_JOCKEY;
private static final MapModelTexture<ModelEngineer> model = AliensVsPredator.resources().models().SPACE_JOCKEY;
}
@Override
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.entities.living.ModelWarrior;
import com.arisux.mdx.lib.client.TexturedModel;
import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -17,7 +17,7 @@
@SideOnly(Side.CLIENT)
private static class Resources
{
private static final TexturedModel<ModelWarrior> model = AliensVsPredator.resources().models().DRONE_SKULL;
private static final MapModelTexture<ModelWarrior> model = AliensVsPredator.resources().models().DRONE_SKULL;
}
@Override
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.entities.living.ModelWarrior;
import com.arisux.mdx.lib.client.TexturedModel;
import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -17,7 +17,7 @@
@SideOnly(Side.CLIENT)
private static class Resources
{
private static final TexturedModel<ModelWarrior> model = AliensVsPredator.resources().models().WARRIOR_SKULL;
private static final MapModelTexture<ModelWarrior> model = AliensVsPredator.resources().models().WARRIOR_SKULL;
}
@Override
@@ -4,9 +4,9 @@
import org.avp.block.BlockSkull;
import org.avp.client.model.entities.living.ModelYautja;
import com.arisux.mdx.lib.client.TexturedModel;
import com.arisux.mdx.lib.client.render.OpenGL;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.fml.relauncher.Side;
@@ -17,7 +17,7 @@
@SideOnly(Side.CLIENT)
private static class Resources
{
private static final TexturedModel<ModelYautja> model = AliensVsPredator.resources().models().YAUTJA_SKULL;
private static final MapModelTexture<ModelYautja> model = AliensVsPredator.resources().models().YAUTJA_SKULL;
}
@Override
@@ -39,6 +39,7 @@
import org.avp.client.render.entities.living.RenderCombatSynthetic;
import org.avp.client.render.entities.living.RenderCrusher;
import org.avp.client.render.entities.living.RenderDeacon;
import org.avp.client.render.entities.living.RenderDeaconAdult;
import org.avp.client.render.entities.living.RenderDeaconShark;
import org.avp.client.render.entities.living.RenderDracoEgg;
import org.avp.client.render.entities.living.RenderDracoburster;
@@ -196,6 +197,7 @@
import org.avp.entities.living.EntityCombatSynthetic;
import org.avp.entities.living.EntityCrusher;
import org.avp.entities.living.EntityDeacon;
import org.avp.entities.living.EntityDeaconAdult;
import org.avp.entities.living.EntityDeaconShark;
import org.avp.entities.living.EntityDracoEgg;
import org.avp.entities.living.EntityDracoburster;
@@ -259,7 +261,7 @@
import org.avp.tile.TileEntityTurret;
import org.avp.tile.TileEntityWorkstation;
import com.arisux.mdx.lib.client.TexturedModel;
import com.arisux.mdx.lib.client.render.model.MapModelTexture;
import com.arisux.mdx.lib.game.IInitEvent;
import com.arisux.mdx.lib.game.IPreInitEvent;
import com.arisux.mdx.lib.game.Renderers;
@@ -358,6 +360,7 @@ private void registerLivingEntityRenderers()
Renderers.registerRenderer(EntityTrilobite.class, RenderTrilobite.class);
Renderers.registerRenderer(EntityHammerpede.class, RenderHammerpede.class);
Renderers.registerRenderer(EntityDeacon.class, RenderDeacon.class);
Renderers.registerRenderer(EntityDeaconAdult.class, RenderDeaconAdult.class);
Renderers.registerRenderer(EntityDrone.class, RenderDrone.class);
Renderers.registerRenderer(EntityWarrior.class, RenderWarrior.class);
Renderers.registerRenderer(EntityPraetorian.class, RenderPraetorian.class);
@@ -484,7 +487,8 @@ private void registerItemRenderers(ItemHandler items)
Renderers.registerItemRenderer(items.rackModule8, new RenderItemNetworkRackModule());
Renderers.registerItemRenderer(items.summonerDrone, (new RenderItemSummoner(AliensVsPredator.resources().models().DRONE_ADVANCED)).setScale(7.5F).setY(6F));
Renderers.registerItemRenderer(items.summonerDeacon, (new RenderItemSummoner(AliensVsPredator.resources().models().DEACON)).setScale(14F).setY(-4F));
Renderers.registerItemRenderer(items.summonerDeacon, (new RenderItemSummoner(AliensVsPredator.resources().models().DEACON)).setScale(7F).setY(4F));
Renderers.registerItemRenderer(items.summonerDeaconAdult, (new RenderItemSummoner(AliensVsPredator.resources().models().DEACON_ADULT)).setScale(7F).setY(4F));
Renderers.registerItemRenderer(items.summonerWarrior, (new RenderItemSummoner(AliensVsPredator.resources().models().WARRIOR)).setScale(7.5F).setY(9F));
Renderers.registerItemRenderer(items.summonerRunnerDrone, (new RenderItemSummoner(AliensVsPredator.resources().models().RUNNER_DRONE)).setScale(7.5F).setY(6F));
Renderers.registerItemRenderer(items.summonerRunnerWarrior, (new RenderItemSummoner(AliensVsPredator.resources().models().RUNNER_WARRIOR)).setScale(7.5F).setY(9F));
@@ -529,35 +533,35 @@ private void registerItemRenderers(ItemHandler items)
Renderers.registerItemRenderer(items.summonerVardaMonkey, (new RenderItemSummoner(AliensVsPredator.resources().models().VARDA_MONKEY)).setScale(16F).setY(-14F));
Renderers.registerItemRenderer(items.summonerYautjaMutant, (new RenderItemSummoner(AliensVsPredator.resources().models().MUTANT_YAUTJA)).setScale(9F).setY(6F));
TexturedModel<Model88MOD4> _88MOD4 = AliensVsPredator.resources().models()._88MOD4;
MapModelTexture<Model88MOD4> _88MOD4 = AliensVsPredator.resources().models()._88MOD4;
Renderers.registerItemRenderer(items.itemPistolBarrel, new RenderItem88Mod4Barrel(_88MOD4, _88MOD4.getModel().getBarrel()));
Renderers.registerItemRenderer(items.itemPistolAction, new RenderItem88Mod4Action(_88MOD4, _88MOD4.getModel().getAction()));
Renderers.registerItemRenderer(items.itemPistolStock, new RenderItem88Mod4Stock(_88MOD4, _88MOD4.getModel().getStock()));
TexturedModel<ModelAK47> AK47 = AliensVsPredator.resources().models().AK47;
MapModelTexture<ModelAK47> AK47 = AliensVsPredator.resources().models().AK47;
Renderers.registerItemRenderer(items.itemAK47Barrel, new RenderItemAK47Barrel(AK47, AK47.getModel().getBarrel()));
Renderers.registerItemRenderer(items.itemAK47Action, new RenderItemAK47Action(AK47, AK47.getModel().getAction()));
Renderers.registerItemRenderer(items.itemAK47Stock, new RenderItemAK47Stock(AK47, AK47.getModel().getStock()));
TexturedModel<ModelM4> M4 = AliensVsPredator.resources().models().M4;
MapModelTexture<ModelM4> M4 = AliensVsPredator.resources().models().M4;
Renderers.registerItemRenderer(items.itemM4Barrel, new RenderItemM4Barrel(M4, M4.getModel().getBarrel()));
Renderers.registerItemRenderer(items.itemM4Action, new RenderItemM4Action(M4, M4.getModel().getAction()));
Renderers.registerItemRenderer(items.itemM4Stock, new RenderItemM4Stock(M4, M4.getModel().getStock()));
TexturedModel<ModelM56SG> M56SG = AliensVsPredator.resources().models().M56SG;
MapModelTexture<ModelM56SG> M56SG = AliensVsPredator.resources().models().M56SG;
Renderers.registerItemRenderer(items.itemM56SGAction, new RenderItemM56SGAction(M56SG, M56SG.getModel().getAction()));
Renderers.registerItemRenderer(items.itemM56SGAimingModule, new RenderItemM56SGAimingModule(M56SG, M56SG.getModel().getAccessories()));
Renderers.registerItemRenderer(items.itemM56SGBarrel, new RenderItemM56SGBarrel(M56SG, M56SG.getModel().getBarrel()));
Renderers.registerItemRenderer(items.itemM56SGStock, new RenderItemM56SGStock(M56SG, M56SG.getModel().getStock()));
Renderers.registerItemRenderer(items.itemM56SGSupportFrame, new RenderItemM56SGSupportFrame(M56SG, M56SG.getModel().getPeripherals()));
TexturedModel<ModelM41A> M41A = AliensVsPredator.resources().models().M41A;
MapModelTexture<ModelM41A> M41A = AliensVsPredator.resources().models().M41A;
Renderers.registerItemRenderer(items.itemM41AAction, new RenderItemM41AAction(M41A, M41A.getModel().getAction()));
Renderers.registerItemRenderer(items.itemM41ABarrel, new RenderItemM41ABarrel(M41A, M41A.getModel().getBarrel()));
Renderers.registerItemRenderer(items.itemM41AStock, new RenderItemM41AStock(M41A, M41A.getModel().getStock()));
Renderers.registerItemRenderer(items.itemM41APeripherals, new RenderItemM41APeripherals(M41A, M41A.getModel().getPeripherals()));
TexturedModel<ModelSniper> SNIPER = AliensVsPredator.resources().models().SNIPER;
MapModelTexture<ModelSniper> SNIPER = AliensVsPredator.resources().models().SNIPER;
Renderers.registerItemRenderer(items.itemSniperBarrel, new RenderItemSniperBarrel(SNIPER, SNIPER.getModel().getBarrel()));
Renderers.registerItemRenderer(items.itemSniperAction, new RenderItemSniperAction(SNIPER, SNIPER.getModel().getAction()));
Renderers.registerItemRenderer(items.itemSniperScope, new RenderItemSniperScope(SNIPER, SNIPER.getModel().getScope()));
Oops, something went wrong.

0 comments on commit 1cdc900

Please sign in to comment.