diff --git a/build.gradle b/build.gradle index 7353f493..e361698f 100644 --- a/build.gradle +++ b/build.gradle @@ -63,10 +63,6 @@ repositories { name = "private" url = "https://jitpack.io" } - maven { - name = "ic2" - url = "http://maven.ic2.player.to" - } maven { // location of the maven that hosts JEI files name = "Progwml6 maven" @@ -77,6 +73,7 @@ repositories { name = "jared" url = "http://maven.blamejared.com" } + maven { url 'https://maven.mohistmc.com/' } } configurations { diff --git a/gradle.properties b/gradle.properties index e9406b4a..66411a5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ mod_name=AcademyCraft -mod_ver=1.1.4 +mod_ver=1.1.5 mod_group=cn.academy mc_ver=1.12.2 forge_ver=14.23.5.2846-1.12.2 diff --git a/src/main/java/cn/academy/entity/EntityArc.java b/src/main/java/cn/academy/entity/EntityArc.java index c6ad219e..034b408c 100644 --- a/src/main/java/cn/academy/entity/EntityArc.java +++ b/src/main/java/cn/academy/entity/EntityArc.java @@ -71,11 +71,6 @@ public EntityArc(EntityPlayer _player) { this(_player, defaultPatterns); } - @Override - protected void entityInit() { - - } - @Override public void onUpdate() { super.onUpdate(); diff --git a/src/main/java/cn/academy/entity/EntityBlock.java b/src/main/java/cn/academy/entity/EntityBlock.java index 3e4a9eb5..917ceade 100644 --- a/src/main/java/cn/academy/entity/EntityBlock.java +++ b/src/main/java/cn/academy/entity/EntityBlock.java @@ -98,6 +98,7 @@ private void hSpfs(boolean value) { @Override public void entityInit() { + super.entityInit(); dataManager.register(BLOCKID, 0); dataManager.register(META, 0); diff --git a/src/main/java/cn/academy/entity/EntityBloodSplash.java b/src/main/java/cn/academy/entity/EntityBloodSplash.java index 31c0b381..84226634 100644 --- a/src/main/java/cn/academy/entity/EntityBloodSplash.java +++ b/src/main/java/cn/academy/entity/EntityBloodSplash.java @@ -32,11 +32,6 @@ public EntityBloodSplash(World world) { setSize(RandUtils.rangef(0.8f, 1.3f)); } - @Override - protected void entityInit() { - - } - public void setSize(float size) { this.width = this.height = size; } diff --git a/src/main/java/cn/academy/entity/EntityDiamondShield.java b/src/main/java/cn/academy/entity/EntityDiamondShield.java index 3c2bbbdd..f9029bb7 100644 --- a/src/main/java/cn/academy/entity/EntityDiamondShield.java +++ b/src/main/java/cn/academy/entity/EntityDiamondShield.java @@ -29,11 +29,6 @@ public EntityDiamondShield(EntityPlayer _player) { updatePos(); } - @Override - protected void entityInit() { - - } - @Override public void onUpdate() { super.onUpdate(); diff --git a/src/main/java/cn/academy/entity/EntityMagHook.java b/src/main/java/cn/academy/entity/EntityMagHook.java index ac3c1408..8ba22aa9 100644 --- a/src/main/java/cn/academy/entity/EntityMagHook.java +++ b/src/main/java/cn/academy/entity/EntityMagHook.java @@ -96,6 +96,7 @@ public EntityMagHook(World world) { @Override public void entityInit() { + super.entityInit(); dataManager.register(HIT_SIDE, EnumFacing.DOWN); dataManager.register(IS_HIT, false); dataManager.register(HOOK_X, 0); diff --git a/src/main/java/cn/academy/entity/EntityMarker.java b/src/main/java/cn/academy/entity/EntityMarker.java index d84526de..430c44d1 100644 --- a/src/main/java/cn/academy/entity/EntityMarker.java +++ b/src/main/java/cn/academy/entity/EntityMarker.java @@ -31,11 +31,6 @@ public EntityMarker(World world) { super(world); } - @Override - protected void entityInit() { - - } - @Override public void onUpdate() { super.onUpdate(); diff --git a/src/main/java/cn/academy/entity/EntityMdBall.java b/src/main/java/cn/academy/entity/EntityMdBall.java index ae3c467f..1da9fb58 100644 --- a/src/main/java/cn/academy/entity/EntityMdBall.java +++ b/src/main/java/cn/academy/entity/EntityMdBall.java @@ -102,6 +102,7 @@ public EntityMdBall(World world) { @Override public void entityInit() { + super.entityInit(); this.dataManager.register(SPAWNER_ID,0); this.dataManager.register(SUB_X,0F); this.dataManager.register(SUB_Y,0F); diff --git a/src/main/java/cn/academy/entity/EntityMdShield.java b/src/main/java/cn/academy/entity/EntityMdShield.java index a836d5b6..5c1898b9 100644 --- a/src/main/java/cn/academy/entity/EntityMdShield.java +++ b/src/main/java/cn/academy/entity/EntityMdShield.java @@ -31,11 +31,6 @@ public EntityMdShield(EntityPlayer _player) { updatePos(); } - @Override - protected void entityInit() { - - } - @Override public void onUpdate() { super.onUpdate(); diff --git a/src/main/java/cn/academy/entity/EntityRayBase.java b/src/main/java/cn/academy/entity/EntityRayBase.java index aaad891e..181b85ad 100644 --- a/src/main/java/cn/academy/entity/EntityRayBase.java +++ b/src/main/java/cn/academy/entity/EntityRayBase.java @@ -54,11 +54,6 @@ public EntityRayBase(World world) { ignoreFrustumCheck = true; } - @Override - protected void entityInit() { - - } - public void setFromTo(Vec3d from, Vec3d to) { setFromTo(from.x, from.y, from.z, to.x, to.y, to.z); } diff --git a/src/main/java/cn/academy/entity/EntityRippleMark.java b/src/main/java/cn/academy/entity/EntityRippleMark.java index 6aa39540..48cdf0fa 100644 --- a/src/main/java/cn/academy/entity/EntityRippleMark.java +++ b/src/main/java/cn/academy/entity/EntityRippleMark.java @@ -24,11 +24,6 @@ public EntityRippleMark(World world) { setSize(2, 2); } - @Override - protected void entityInit() { - - } - @Override public boolean shouldRenderInPass(int pass) { return pass == 1; diff --git a/src/main/java/cn/academy/entity/EntityTPMarking.java b/src/main/java/cn/academy/entity/EntityTPMarking.java index 441e8e0b..f6261071 100644 --- a/src/main/java/cn/academy/entity/EntityTPMarking.java +++ b/src/main/java/cn/academy/entity/EntityTPMarking.java @@ -32,11 +32,6 @@ public EntityTPMarking(EntityPlayer player) { setPosition(player.posX, player.posY, player.posZ); } - @Override - protected void entityInit() { - - } - @Override public void onUpdate() { super.onUpdate(); diff --git a/src/main/scala/cn/academy/ability/vanilla/electromaster/skill/MineDetect.scala b/src/main/scala/cn/academy/ability/vanilla/electromaster/skill/MineDetect.scala index 2682b381..8e3f127d 100644 --- a/src/main/scala/cn/academy/ability/vanilla/electromaster/skill/MineDetect.scala +++ b/src/main/scala/cn/academy/ability/vanilla/electromaster/skill/MineDetect.scala @@ -162,7 +162,6 @@ class HandlerEntity(_target: EntityPlayer, _time: Int, _range: Double, _advanced override def writeEntityToNBT(p_70014_1_ : NBTTagCompound) = {} override def readEntityFromNBT(p_70037_1_ : NBTTagCompound) = {} - override def entityInit(): Unit = {} } @RegEntityRender(classOf[HandlerEntity])