diff --git a/build.gradle b/build.gradle index 1a561c020..c307243fb 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ minecraft { version = "${config.mc_version}-${config.forge_version}" runDir = "eclipse/assets" - mappings = "snapshot_20151128" + mappings = "snapshot_20151229" //This, does the token replacement. //Though, I reccomend this to be replaced with a token such as @VERSION@ replace 'GRADLE:BUILD', config.build_number diff --git a/build.properties b/build.properties index 6d5815543..ff6f0b60c 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ -forge_version=11.15.0.1649-1.8.8 -mc_version=1.8.8 +forge_version=11.15.0.1656 +mc_version=1.8.9 build_number=248 mod_name=Botania diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 03a0a085c..f85f8b54d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -125,7 +125,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { ItemStack stack = altar.getStackInSlot(i); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index aef5461f7..863814a29 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -66,7 +66,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { float s = 0.6F; GlStateManager.scale(s, s, s); GlStateManager.translate(-0.5F, 2.125F, 0F); // todo 1.8 tweak held item render - Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.THIRD_PERSON); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON); GlStateManager.popMatrix(); IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index ec02bd362..af9f704b8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -71,7 +71,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { float s = 0.25F; GlStateManager.scale(s, s, s); - mc.getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); + mc.getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.scale(1F / s, 1F / s, 1F / s); GlStateManager.popMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(texture); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 8d0144d25..8fcd3c23d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -68,7 +68,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { GlStateManager.translate(-0.075F, -1.25F, 0F); GlStateManager.scale(s, s, s); //GlStateManager.rotate(180F, 0F, 1F, 0F); - Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.popMatrix(); } GlStateManager.color(1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index 8002c1b0d..6e28b243f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -43,7 +43,7 @@ public class RenderTilePrism extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.translate(0.5F, 0.5F, pos); - Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.NONE); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index fb6a8289f..57544353c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -72,7 +72,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { if(stack != null) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - mc.getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); + mc.getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); } GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 13211e78f..e22408ae5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -91,7 +91,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.translate(-0.0F, -1F, -0.4375F); GlStateManager.scale(0.8F, 0.8F, 0.8F); - Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.FIXED); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.FIXED); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index ad7e1415d..20b51467d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -84,10 +84,10 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { GlStateManager.texGen(GlStateManager.TexGen.T, 9217); GlStateManager.texGen(GlStateManager.TexGen.R, 9217); GlStateManager.texGen(GlStateManager.TexGen.Q, 9216); - GlStateManager.func_179105_a(GlStateManager.TexGen.S, 9473, this.func_147525_a(1.0F, 0.0F, 0.0F, 0.0F)); - GlStateManager.func_179105_a(GlStateManager.TexGen.T, 9473, this.func_147525_a(0.0F, 0.0F, 1.0F, 0.0F)); - GlStateManager.func_179105_a(GlStateManager.TexGen.R, 9473, this.func_147525_a(0.0F, 0.0F, 0.0F, 1.0F)); - GlStateManager.func_179105_a(GlStateManager.TexGen.Q, 9474, this.func_147525_a(0.0F, 1.0F, 0.0F, 0.0F)); + GlStateManager.texGen(GlStateManager.TexGen.S, 9473, this.func_147525_a(1.0F, 0.0F, 0.0F, 0.0F)); + GlStateManager.texGen(GlStateManager.TexGen.T, 9473, this.func_147525_a(0.0F, 0.0F, 1.0F, 0.0F)); + GlStateManager.texGen(GlStateManager.TexGen.R, 9473, this.func_147525_a(0.0F, 0.0F, 0.0F, 1.0F)); + GlStateManager.texGen(GlStateManager.TexGen.Q, 9474, this.func_147525_a(0.0F, 1.0F, 0.0F, 0.0F)); GlStateManager.enableTexGenCoord(GlStateManager.TexGen.S); GlStateManager.enableTexGenCoord(GlStateManager.TexGen.T); GlStateManager.enableTexGenCoord(GlStateManager.TexGen.R); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 7575d9e59..f5f341b18 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -26,6 +26,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; @@ -72,6 +73,21 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { ); } + @Override + public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity) { + if (collidingEntity instanceof EntityItem) { + float f = 1F / 16F * 2F; + + // Todo 1.8 temporary hack to let items collide from the top. Figure out what changed to break this. + setBlockBounds(f, f, f, 1F - f, 0.65F, 1F -f); + super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity); + setBlockBounds(f, f, f, 1F - f, 1F / 16F * 20F, 1F - f); + return; + } else { + super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity); + } + } + @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.ALTAR_VARIANT); @@ -87,7 +103,6 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { if (meta < 0 || meta >= AltarVariant.values().length ) { meta = 0; } - System.out.println(AltarVariant.values()[meta]); return getDefaultState().withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.values()[meta]); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 48d66f31d..b5597e2dd 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -125,8 +125,8 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile this.motionY = y; this.motionZ = z; float f1 = MathHelper.sqrt_double(x * x + z * z); - this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.func_181159_b(x, z) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.func_181159_b(y, (double)f1) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.atan2(x, z) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.atan2(y, (double)f1) * 180.0D / Math.PI); this.ticksInGround = 0; } @@ -143,8 +143,8 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(x * x + z * z); - this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.func_181159_b(x, z) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.func_181159_b(y, (double)f) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.atan2(x, z) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.atan2(y, (double)f) * 180.0D / Math.PI); } } @@ -240,7 +240,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile { if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && this.worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.portal) { - this.func_181015_d(movingobjectposition.getBlockPos()); + this.setPortal(movingobjectposition.getBlockPos()); } else { @@ -252,9 +252,9 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile this.posY += this.motionY; this.posZ += this.motionZ; float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float)(MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.rotationYaw = (float)(MathHelper.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - for (this.rotationPitch = (float)(MathHelper.func_181159_b(this.motionY, (double)f1) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (this.rotationPitch = (float)(MathHelper.atan2(this.motionY, (double)f1) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 05597c07a..c6fcf392b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -99,7 +99,7 @@ public class EntityThrownItem extends EntityItem { { if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.portal) { - func_181015_d(movingobjectposition.getBlockPos()); + setPortal(movingobjectposition.getBlockPos()); } else {