diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
112 files changed, 681 insertions, 936 deletions
diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java index d39c194dfd..7747deb5da 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java @@ -31,7 +31,7 @@ public class BasicBlock extends BlockContainer { this.setStepSound(soundTypeMetal); } - public static enum BlockTypes { + public enum BlockTypes { STANDARD("blockBlock", "pickaxe", soundTypeMetal), FRAME("blockFrameGt", "wrench", soundTypeMetal), diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java index 7e64f19bf3..a85e700db2 100644 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java @@ -7,8 +7,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EnumCreatureType; -import net.minecraft.entity.boss.EntityDragon; -import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -73,8 +71,7 @@ public class BlockWitherProof extends Block { if ((entity == null) || !entity.isEntityAlive()) { return false; } - if ((entity instanceof EntityWither) || (entity instanceof EntityDragon) - || (entity instanceof IBossDisplayData)) { + if (entity instanceof IBossDisplayData) { return false; } else { return super.canEntityDestroy(world, x, y, z, entity); @@ -109,7 +106,7 @@ public class BlockWitherProof extends Block { @Override public float ge |