Permalink
Browse files

Started update to 1.8.9

  • Loading branch information...
1 parent 39dfb7f commit c04a05c8af428c9932683ced96bb1a7bd311eaf5 @CrazyPants CrazyPants committed Jan 10, 2016
Showing with 363 additions and 416 deletions.
  1. +10 −43 build.gradle
  2. +2 −2 gradle.properties
  3. BIN gradle/wrapper/gradle-wrapper.jar
  4. +2 −2 gradle/wrapper/gradle-wrapper.properties
  5. +5 −5 resources/assets/enderzoo/config/SpawnConfig_Core.xml
  6. +59 −1 src/main/java/crazypants/enderzoo/ClientProxy.java
  7. +2 −5 src/main/java/crazypants/enderzoo/DebugUtil.java
  8. +4 −6 src/main/java/crazypants/enderzoo/EnderZoo.java
  9. +60 −66 src/main/java/crazypants/enderzoo/charge/BlockConfusingCharge.java
  10. +40 −54 src/main/java/crazypants/enderzoo/charge/RenderPrimedCharge.java
  11. +26 −8 src/main/java/crazypants/enderzoo/config/Config.java
  12. +0 −2 src/main/java/crazypants/enderzoo/config/ConfigFactoryEnderZoo.java
  13. +2 −4 src/main/java/crazypants/enderzoo/config/GuiConfigFactoryEnderZoo.java
  14. +4 −7 src/main/java/crazypants/enderzoo/entity/EntityConcussionCreeper.java
  15. +1 −1 src/main/java/crazypants/enderzoo/entity/EntityDireSlime.java
  16. +1 −2 src/main/java/crazypants/enderzoo/entity/EntityDireWolf.java
  17. +4 −6 src/main/java/crazypants/enderzoo/entity/EntityEnderminy.java
  18. +3 −3 src/main/java/crazypants/enderzoo/entity/EntityFallenKnight.java
  19. +3 −3 src/main/java/crazypants/enderzoo/entity/EntityFallenMount.java
  20. +5 −6 src/main/java/crazypants/enderzoo/entity/EntityUtil.java
  21. +10 −10 src/main/java/crazypants/enderzoo/entity/EntityWitherWitch.java
  22. +23 −12 src/main/java/crazypants/enderzoo/entity/MobInfo.java
  23. +0 −1 src/main/java/crazypants/enderzoo/entity/ai/EntityAIAttackOnCollideAggressive.java
  24. +2 −1 src/main/java/crazypants/enderzoo/entity/ai/EntityAIAttackOnCollideOwned.java
  25. +2 −3 src/main/java/crazypants/enderzoo/entity/ai/EntityAIMountedAttackOnCollide.java
  26. +6 −6 src/main/java/crazypants/enderzoo/entity/ai/EntityAINearestAttackableTargetBounded.java
  27. +4 −7 src/main/java/crazypants/enderzoo/entity/render/RenderDireSlime.java
  28. +7 −20 src/main/java/crazypants/enderzoo/entity/render/RenderDirewolf.java
  29. +10 −34 src/main/java/crazypants/enderzoo/entity/render/RenderEnderminy.java
  30. +6 −6 src/main/java/crazypants/enderzoo/entity/render/RenderFallenKnight.java
  31. +1 −1 src/main/java/crazypants/enderzoo/entity/render/RenderFallenMount.java
  32. +16 −14 src/main/java/crazypants/enderzoo/entity/render/RenderUtil.java
  33. +18 −23 src/main/java/crazypants/enderzoo/entity/render/RenderWitherCat.java
  34. +8 −26 src/main/java/crazypants/enderzoo/entity/render/RenderWitherWitch.java
  35. +7 −7 src/main/java/crazypants/enderzoo/item/GuardiansBowModelLoader.java
  36. +7 −14 src/main/java/crazypants/enderzoo/item/ItemSpawnEgg.java
  37. +3 −5 src/main/java/crazypants/enderzoo/spawn/MobSpawnEventHandler.java
View
@@ -1,15 +1,19 @@
buildscript {
repositories {
+ jcenter()
mavenCentral()
maven { url = "http://files.minecraftforge.net/maven" }
maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
}
- dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' }
+ dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' }
}
-apply plugin: 'forge'
+plugins {
+ id "com.matthewprenger.cursegradle" version "1.0.5"
+}
+
+apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'maven-publish'
-apply plugin: 'curseforge'
ext.buildnumber = 0
if (System.getenv('BUILD_NUMBER') != null)
@@ -25,10 +29,9 @@ if (project.hasProperty('mod_appendix'))
version += "_${project.mod_appendix}"
minecraft {
- mappings = 'snapshot_20150311'
+ mappings = "snapshot_nodoc_20160104"
version = "${minecraft_version}-${forge_version}"
-
- runDir = 'run'
+ runDir = "run"
replace "@VERSION@", project.version
replaceIn "EnderZoo.java"
@@ -84,7 +87,7 @@ jar {
from { configurations.exportedCompile.collect { it.isDirectory() ? it : zipTree(it) } }
}
-task sourceJar(type: Jar) {
+task sourcesJar(type: Jar) {
from sourceSets.main.allSource
classifier = 'sources'
}
@@ -121,39 +124,3 @@ publishing {
}
}
-String getChangelogText() {
- def changelogFile = new File('ReleaseNotes.txt')
- String str = ''
- String separator = '---'
- int lineCount = 0
- boolean done = false
- changelogFile.eachLine {
- if (done || it == null) {
- return
- }
- if (lineCount < 3) {
- lineCount++
- if (it.startsWith(separator)) {return}
- }
- if (!it.startsWith(separator)) {
- str += "$it" + (lineCount < 3 ? ':\n\n' : '\n')
- return
- }
- done = true // once we go past the first version block, parse no more
- }
- return str
-}
-
-curse {
- dependsOn 'reobf'
-
- onlyIf {
- return project.hasProperty('cp_curseforge_key') && System.getenv("CURSE") != null && System.getenv("CURSE").equalsIgnoreCase("true")
- }
-
- if (project.hasProperty('cp_curseforge_key')) apiKey = project.curseforge_key
- projectId = project.curse_projectId
- changelog = System.getenv("CHANGELOG").equals("none") ? getChangelogText() : System.getenv("CHANGELOG")
- releaseType = project.hasProperty('mod_appendix') ? "${mod_appendix}".toString() : 'release'
- additionalArtifact deobfJar, sourceJar
-}
View
@@ -1,5 +1,5 @@
-minecraft_version=1.8
-forge_version=11.14.1.1341
+minecraft_version=1.8.9
+forge_version=11.15.0.1684
mod_version=1.1
#Comment out this line to get rid of the appendix
Binary file not shown.
@@ -1,6 +1,6 @@
-#Tue Aug 19 17:12:51 CDT 2014
+#Tue Dec 15 20:33:12 AEDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
@@ -84,7 +84,7 @@ dimensionExclude attributes:
-->
<SpawnConfig>
- <entry id="ConcussionCreeper" mobName="enderzoo.ConcussionCreeper" creatureType="MONSTER" rate="40"
+ <entry id="ConcussionCreeper" mobName="EnderZoo.enderzoo.ConcussionCreeper" creatureType="MONSTER" rate="40"
minGroupSize="1" maxGroupSize="3" remove="false">
<biomeFilter type="any">
<biome type="BASE_LAND_TYPES" />
@@ -96,7 +96,7 @@ dimensionExclude attributes:
<dimensionExclude name="Dungeon"/>
</entry>
- <entry id="EnderMiny" mobName="enderzoo.Enderminy" rate="30">
+ <entry id="EnderMiny" mobName="EnderZoo.enderzoo.Enderminy" rate="30">
<biomeFilter type="any">
<biome type="FOREST" />
<biome type="SWAMP" />
@@ -107,7 +107,7 @@ dimensionExclude attributes:
<dimensionExclude name="Twilight Forest"/>
</entry>
- <entry id="FallenKnight" mobName="enderzoo.FallenKnight" rate="30" minGroupSize="1" maxGroupSize="4">
+ <entry id="FallenKnight" mobName="EnderZoo.enderzoo.FallenKnight" rate="30" minGroupSize="1" maxGroupSize="4">
<biomeFilter type="any">
<biome type="PLAINS" />
<biome type="NETHER" exclude="true" />
@@ -116,7 +116,7 @@ dimensionExclude attributes:
<dimensionExclude name="Twilight Forest"/>
</entry>
- <entry id="WitherWitch" mobName="enderzoo.WitherWitch" rate="5" minGroupSize="1" maxGroupSize="1">
+ <entry id="WitherWitch" mobName="EnderZoo.enderzoo.WitherWitch" rate="5" minGroupSize="1" maxGroupSize="1">
<biomeFilter type="any">
<biome type="FOREST" />
<biome type="SWAMP" />
@@ -129,7 +129,7 @@ dimensionExclude attributes:
<dimensionExclude name="Twilight Forest"/>
</entry>
- <entry id="DireWolf" mobName="enderzoo.DireWolf" rate="30" minGroupSize="2" maxGroupSize="6">
+ <entry id="DireWolf" mobName="EnderZoo.enderzoo.DireWolf" rate="30" minGroupSize="2" maxGroupSize="6">
<biomeFilter type="all">
<biome type="SNOWY" />
<biome type="CONIFEROUS" />
@@ -31,6 +31,7 @@
import crazypants.enderzoo.item.ItemSpawnEgg;
import crazypants.enderzoo.item.ItemWitheringDust;
import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.resources.model.ModelResourceLocation;
@@ -40,6 +41,7 @@
import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World;
import net.minecraftforge.fml.client.FMLClientHandler;
+import net.minecraftforge.fml.client.registry.IRenderFactory;
import net.minecraftforge.fml.client.registry.RenderingRegistry;
@@ -58,34 +60,88 @@ public EntityPlayer getClientPlayer() {
@Override
public void load() {
super.load();
-
+
RenderManager rm = Minecraft.getMinecraft().getRenderManager();
if(Config.enderminyEnabled) {
RenderingRegistry.registerEntityRenderingHandler(EntityEnderminy.class, new RenderEnderminy(rm));
+// RenderingRegistry.registerEntityRenderingHandler(EntityEnderminy.class, new IRenderFactory<EntityEnderminy>() {
+// @Override
+// public Render<? super EntityEnderminy> createRenderFor(RenderManager manager) {
+// return new RenderEnderminy(manager);
+// }
+// });
}
if(Config.concussionCreeperEnabled) {
RenderingRegistry.registerEntityRenderingHandler(EntityConcussionCreeper.class, new RenderConcussionCreeper(rm));
+// RenderingRegistry.registerEntityRenderingHandler(EntityConcussionCreeper.class, new IRenderFactory<EntityConcussionCreeper>() {
+// @Override
+// public Render<? super EntityConcussionCreeper> createRenderFor(RenderManager manager) {
+// return new RenderConcussionCreeper(manager);
+// }
+// });
}
if(Config.fallenKnightEnabled) {
RenderingRegistry.registerEntityRenderingHandler(EntityFallenKnight.class, new RenderFallenKnight(rm));
+// RenderingRegistry.registerEntityRenderingHandler(EntityFallenKnight.class, new IRenderFactory<EntityFallenKnight>() {
+// @Override
+// public Render<? super EntityFallenKnight> createRenderFor(RenderManager manager) {
+// return new RenderFallenKnight(manager);
+// }
+// });
}
if(Config.fallenMountEnabled) {
RenderingRegistry.registerEntityRenderingHandler(EntityFallenMount.class, new RenderFallenMount(rm));
+// RenderingRegistry.registerEntityRenderingHandler(EntityFallenMount.class, new IRenderFactory<EntityFallenMount>() {
+// @Override
+// public Render<? super EntityFallenMount> createRenderFor(RenderManager manager) {
+// return new RenderFallenMount(manager);
+// }
+// });
}
if(Config.witherWitchEnabled) {
RenderingRegistry.registerEntityRenderingHandler(EntityWitherWitch.class, new RenderWitherWitch(rm));
+// RenderingRegistry.registerEntityRenderingHandler(EntityWitherWitch.class, new IRenderFactory<EntityWitherWitch>() {
+// @Override
+// public Render<? super EntityWitherWitch> createRenderFor(RenderManager manager) {
+// return new RenderWitherWitch(manager);
+// }
+// });
}
if(Config.witherCatEnabled) {
RenderingRegistry.registerEntityRenderingHandler(EntityWitherCat.class, new RenderWitherCat(rm));
+// RenderingRegistry.registerEntityRenderingHandler(EntityWitherCat.class, new IRenderFactory<EntityWitherCat>() {
+// @Override
+// public Render<? super EntityWitherCat> createRenderFor(RenderManager manager) {
+// return new RenderWitherCat(manager);
+// }
+// });
}
if(Config.direWolfEnabled) {
RenderingRegistry.registerEntityRenderingHandler(EntityDireWolf.class, new RenderDirewolf(rm));
+// RenderingRegistry.registerEntityRenderingHandler(EntityDireWolf.class, new IRenderFactory<EntityDireWolf>() {
+// @Override
+// public Render<? super EntityDireWolf> createRenderFor(RenderManager manager) {
+// return new RenderDirewolf(manager);
+// }
+// });
}
if (Config.direSlimeEnabled) {
RenderingRegistry.registerEntityRenderingHandler(EntityDireSlime.class, new RenderDireSlime(rm));
+// RenderingRegistry.registerEntityRenderingHandler(EntityDireSlime.class, new IRenderFactory<EntityDireSlime>() {
+// @Override
+// public Render<? super EntityDireSlime> createRenderFor(RenderManager manager) {
+// return new RenderDireSlime(manager);
+// }
+// });
}
RenderingRegistry.registerEntityRenderingHandler(EntityPrimedCharge.class, new RenderPrimedCharge(rm));
+// RenderingRegistry.registerEntityRenderingHandler(EntityPrimedCharge.class, new IRenderFactory<EntityPrimedCharge>() {
+// @Override
+// public Render<? super EntityPrimedCharge> createRenderFor(RenderManager manager) {
+// return new RenderPrimedCharge(manager);
+// }
+// });
regRenderer(EnderZoo.itemWitheringDust, ItemWitheringDust.NAME);
regRenderer(EnderZoo.itemConfusingDust, ItemConfusingDust.NAME);
@@ -142,5 +198,7 @@ public void setInstantConfusionOnPlayer(EntityPlayer ent, int duration) {
ent.addPotionEffect(new PotionEffect(Potion.confusion.getId(), duration, 1, false, true));
Minecraft.getMinecraft().thePlayer.timeInPortal = 1;
}
+
+
}
@@ -8,7 +8,6 @@
import net.minecraft.util.MovingObjectPosition;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.LivingSpawnEvent;
-import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent;
@@ -31,11 +30,9 @@ public void setEnabled(boolean enabled) {
if (enabled) {
System.err.println("DebugUtil.setEnabled:!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ");
- MinecraftForge.EVENT_BUS.register(this);
- FMLCommonHandler.instance().bus().register(this);
+ MinecraftForge.EVENT_BUS.register(this);
} else {
- MinecraftForge.EVENT_BUS.unregister(this);
- FMLCommonHandler.instance().bus().unregister(this);
+ MinecraftForge.EVENT_BUS.unregister(this);
}
}
@@ -98,12 +98,10 @@ public void preInit(FMLPreInitializationEvent event) {
}
private void registerEntity(MobInfo mob) {
- if (!mob.isEnabled()) {
- return;
- }
- int entityID = EntityRegistry.findGlobalUniqueEntityId();
- EntityRegistry.registerGlobalEntityID(mob.getClz(), mob.getName(), entityID, mob.getEggBackgroundColor(), mob.getEggForegroundColor());
- EntityRegistry.registerModEntity(mob.getClz(), mob.getName(), entityID, this, 64, 3, true);
+// if (!mob.isEnabled()) {
+// return;
+// }
+ EntityRegistry.registerModEntity(mob.getClz(), mob.getName(), mob.getEntityId(), this, 64, 3, true);
}
@EventHandler
Oops, something went wrong.

0 comments on commit c04a05c

Please sign in to comment.