This commit is contained in:
brandon3055 committed 2015-05-14 11:18:55 +10:00
1 parent 16603eae28
commit 96be94c7b4
8 files changed
+61 -50

No files matched your search

+3
View File
@@ -1,3 +1,6 @@
######## 1.0.1-Bugfix-c ########
-fixed crash when arrow from DE bow hits RFTools force field
######## 1.0.1-Bugfix-b ########
-fixed a problem in the config gui that came from a change in bugfix a
+2 -2
View File
@@ -1,3 +1,3 @@
Version:1.0.1b
Version:1.0.1c
Snapshot:0
ReleaseNote:Bug Fix for the last Bug Fix.
ReleaseNote:Fixed crash with RFTools Force Field.
+2 -2
View File
@@ -1,3 +1,3 @@
Version:1.0.1b
Version:1.0.1c
Snapshot:0
ReleaseNote:Bug Fix for the last Bug Fix.
ReleaseNote:Fixed crash with RFTools Force Field.
+18 -21
View File
@@ -26,35 +26,33 @@ repositories {
apply plugin: 'forge'
version = "1.7.10-v1.0.1b" //Version System A.B.CD A=Minecraft version (increments with each new minecraft version) B=Major mod change (Will break saves) C=Release Number (Increments with each public release) D=Bugfix version (a-z)
group = "com.brandon3055.draconicevolution" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
// Define properties file
ext.configFile = file "build.properties"
configFile.withReader {
// Load config. It shall from now be referenced as simply config or project.config
def prop = new Properties()
prop.load(it)
project.ext.config = new ConfigSlurper().parse prop
}
version = "${config.minecraft_version}-${config.mod_version}"
group = "com.brandon3055.draconicevolution"
archivesBaseName = "Draconic-Evolution"
minecraft {
version = "1.7.10-10.13.3.1400-1.7.10"
version = config.minecraft_version + "-" + config.forge_version
runDir = "run"
//assetDir = "run/assets"
}
dependencies {
// you may put jars on which you depend on in ./libs
// or you may define them like so..
//compile "some.group:artifact:version:classifier"
//compile "some.group:artifact:version"
// real examples
//compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
//compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
// for more info...
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html
compile "codechicken:CodeChickenLib:1.7.10-1.1.1.99:dev"
compile "codechicken:CodeChickenCore:1.7.10-1.0.4.29:dev"
compile "codechicken:NotEnoughItems:1.7.10-1.0.3.74:dev"
compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev"
compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.ccc_version}:dev"
compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev"
if (file('../BrandonsLib/').exists()) compile project('../BrandonsLib')
}
processResources
@@ -69,7 +67,6 @@ processResources
// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
}
// copy everything else, thats not the mcmod.info
+9
View File
@@ -0,0 +1,9 @@
minecraft_version=1.7.10
mod_version=1.0.1c
forge_version=10.13.3.1403-1.7.10
CCLIB_version=1.1.1.99
NEI_version=1.0.3.74
ccc_version=1.0.4.29
//Version System A.B.CD A=Minecraft version (increments with each new minecraft version) B=Major mod change (May break saves) C=Release Number (Increments with each public release) D=Bugfix version (a-z)
+1
View File
@@ -0,0 +1 @@
if(file('../BrandonsLib/').exists()) { include '../BrandonsLib' }
@@ -24,10 +24,10 @@ import net.minecraft.world.World;
import java.util.List;
public class EntityDraconicArrow extends EntityArrow {
private int field_145791_d = -1;
private int field_145792_e = -1;
private int field_145789_f = -1;
private Block field_145790_g;
private int blockX = -1;
private int blockY = -1;
private int blockZ = -1;
private Block blockHit;
private int inData;
private boolean inGround;
private int ticksInGround;
@@ -125,7 +125,7 @@ public class EntityDraconicArrow extends EntityArrow {
this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, f) * 180.0D / Math.PI);
}
Block block = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f);
Block block = this.worldObj.getBlock(this.blockX, this.blockY, this.blockZ);
if (block.getMaterial() != Material.air) {
if (explosive) {
@@ -133,8 +133,8 @@ public class EntityDraconicArrow extends EntityArrow {
this.setDead();
return;
}
block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
block.setBlockBoundsBasedOnState(this.worldObj, this.blockX, this.blockY, this.blockZ);
AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.blockX, this.blockY, this.blockZ);
if (axisalignedbb != null && axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) {
this.inGround = true;
@@ -146,9 +146,9 @@ public class EntityDraconicArrow extends EntityArrow {
}
if (this.inGround) {
int j = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f);
int j = this.worldObj.getBlockMetadata(this.blockX, this.blockY, this.blockZ);
if (block == this.field_145790_g && j == this.inData) {
if (block == this.blockHit && j == this.inData) {
++this.ticksInGround;
if (this.ticksInGround == 1200) {
@@ -299,11 +299,12 @@ public class EntityDraconicArrow extends EntityArrow {
this.ticksInAir = 0;
}
} else {
this.field_145791_d = movingobjectposition.blockX;
this.field_145792_e = movingobjectposition.blockY;
this.field_145789_f = movingobjectposition.blockZ;
this.field_145790_g = block;
this.inData = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f);
this.blockX = movingobjectposition.blockX;
this.blockY = movingobjectposition.blockY;
this.blockZ = movingobjectposition.blockZ;
block = this.worldObj.getBlock(this.blockX, this.blockY, this.blockZ);
this.blockHit = block;
this.inData = this.worldObj.getBlockMetadata(this.blockX, this.blockY, this.blockZ);
this.motionX = ((float) (movingobjectposition.hitVec.xCoord - this.posX));
this.motionY = ((float) (movingobjectposition.hitVec.yCoord - this.posY));
this.motionZ = ((float) (movingobjectposition.hitVec.zCoord - this.posZ));
@@ -315,8 +316,8 @@ public class EntityDraconicArrow extends EntityArrow {
this.inGround = true;
this.arrowShake = 7;
if (this.field_145790_g.getMaterial() != Material.air) {
this.field_145790_g.onEntityCollidedWithBlock(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this);
if (this.blockHit.getMaterial() != Material.air) {
this.blockHit.onEntityCollidedWithBlock(this.worldObj, this.blockX, this.blockY, this.blockZ, this);
}
}
}
@@ -379,11 +380,11 @@ public class EntityDraconicArrow extends EntityArrow {
@Override
public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound)
{
par1NBTTagCompound.setShort("xTile", (short) this.field_145791_d);
par1NBTTagCompound.setShort("yTile", (short) this.field_145792_e);
par1NBTTagCompound.setShort("zTile", (short) this.field_145789_f);
par1NBTTagCompound.setShort("xTile", (short) this.blockX);
par1NBTTagCompound.setShort("yTile", (short) this.blockY);
par1NBTTagCompound.setShort("zTile", (short) this.blockZ);
par1NBTTagCompound.setShort("life", (short) this.ticksInGround);
par1NBTTagCompound.setByte("inTile", (byte) Block.getIdFromBlock(this.field_145790_g));
par1NBTTagCompound.setByte("inTile", (byte) Block.getIdFromBlock(this.blockHit));
par1NBTTagCompound.setByte("inData", (byte) this.inData);
par1NBTTagCompound.setByte("shake", (byte) this.arrowShake);
par1NBTTagCompound.setByte("inGround", (byte) (this.inGround ? 1 : 0));
@@ -395,11 +396,11 @@ public class EntityDraconicArrow extends EntityArrow {
@Override
public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound)
{
this.field_145791_d = par1NBTTagCompound.getShort("xTile");
this.field_145792_e = par1NBTTagCompound.getShort("yTile");
this.field_145789_f = par1NBTTagCompound.getShort("zTile");
this.blockX = par1NBTTagCompound.getShort("xTile");
this.blockY = par1NBTTagCompound.getShort("yTile");
this.blockZ = par1NBTTagCompound.getShort("zTile");
this.ticksInGround = par1NBTTagCompound.getShort("life");
this.field_145790_g = Block.getBlockById(par1NBTTagCompound.getByte("inTile") & 255);
this.blockHit = Block.getBlockById(par1NBTTagCompound.getByte("inTile") & 255);
this.inData = par1NBTTagCompound.getByte("inData") & 255;
this.arrowShake = par1NBTTagCompound.getByte("shake") & 255;
this.inGround = par1NBTTagCompound.getByte("inGround") == 1;
@@ -5,7 +5,7 @@ package com.brandon3055.draconicevolution.common.lib;
*/
public class VersionHandler
{
public static final String VERSION = "1.0.1b";
public static final String VERSION = "1.0.1c";
public static final int SNAPSHOT = 0;
public static final String MCVERSION = "1.7.10";