diff --git a/libs/gregtech-5.09.32.09-dev.jar b/libs/gregtech-5.09.32.09-dev.jar deleted file mode 100644 index ebbf0611..00000000 Binary files a/libs/gregtech-5.09.32.09-dev.jar and /dev/null differ diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDissEnchanter.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDissEnchanter.java index ab1009bd..f374597a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDissEnchanter.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDissEnchanter.java @@ -52,7 +52,6 @@ public class GUIDissEnchanter extends GuiContainer { fontRendererObj.drawString("Damage: " + (40 - tile.bookPower) + "%", 5, 49, 0x0000ff); } - @SuppressWarnings("unchecked") @Override public void initGui() { super.initGui(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDraconiumChest.java index 3e22f8db..11fd70ce 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDraconiumChest.java @@ -117,7 +117,6 @@ public class GUIDraconiumChest extends GuiContainer implements INEIGuiHandler { RenderHelper.enableGUIStandardItemLighting(); } - @SuppressWarnings("unchecked") @Override public void initGui() { super.initGui(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIParticleGenerator.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIParticleGenerator.java index 2489b105..32b7c2bf 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIParticleGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIParticleGenerator.java @@ -116,7 +116,6 @@ public class GUIParticleGenerator extends GuiScreen { super.mouseClicked(x, y, button); } - @SuppressWarnings("unchecked") @Override public void initGui() { int posX = (this.width - xSize) / 2; @@ -524,7 +523,6 @@ public class GUIParticleGenerator extends GuiScreen { fontRendererObj.drawString("> " + random_scale1, col2, posY + ln2 + 7 * 22, 0x000000, false); } - @SuppressWarnings("unchecked") private void page1Buttons() { int posX = (this.width - xSize) / 2; int posY = (this.height - ySize) / 2; @@ -616,7 +614,6 @@ public class GUIParticleGenerator extends GuiScreen { } - @SuppressWarnings("unchecked") private void page2Buttons() { int posX = (this.width - xSize) / 2; int posY = (this.height - ySize) / 2; @@ -689,7 +686,6 @@ public class GUIParticleGenerator extends GuiScreen { } - @SuppressWarnings("unchecked") private void page3Buttons() { int posX = (this.width - xSize) / 2; int posY = (this.height - ySize) / 2; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIPlayerDetector.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIPlayerDetector.java index e2c5cc95..6b857db0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIPlayerDetector.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIPlayerDetector.java @@ -84,7 +84,6 @@ public class GUIPlayerDetector extends GuiContainer { drawHoveringText(lines, x, y, fontRendererObj); } - @SuppressWarnings("unchecked") @Override public void initGui() { super.initGui(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUISunDial.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUISunDial.java index ef4c1a2f..b692466c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUISunDial.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUISunDial.java @@ -48,7 +48,6 @@ public class GUISunDial extends GuiContainer { } - @SuppressWarnings("unchecked") @Override public void initGui() { super.initGui(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUITeleporter.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUITeleporter.java index 0b57f295..098c833b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUITeleporter.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUITeleporter.java @@ -302,7 +302,6 @@ public class GUITeleporter extends GuiScreen { else if (!editingNew) ((GuiButton) buttonList.get(4)).enabled = true; } - @SuppressWarnings("unchecked") @Override public void initGui() { buttonList.clear(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIUpgradeModifier.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIUpgradeModifier.java index 54bf6c84..210be50a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIUpgradeModifier.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIUpgradeModifier.java @@ -231,7 +231,6 @@ public class GUIUpgradeModifier extends GuiContainer { fontRendererObj.drawString(">" + (coreSlots - usedSlots), guiLeft + 4, guiTop + 67, 0x000000); } - @SuppressWarnings("unchecked") @Override public void drawScreen(int x, int y, float f) { super.drawScreen(x, y, f); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIWeatherController.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIWeatherController.java index c367acec..7bddd4e1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIWeatherController.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIWeatherController.java @@ -61,7 +61,6 @@ public class GUIWeatherController extends GuiContainer { public static final String STORM_TEXT = "Thunder Storm"; public static String text; - @SuppressWarnings("unchecked") @Override public void initGui() { super.initGui(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHudConfig.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHudConfig.java index 0a25a680..cd15b7e4 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHudConfig.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHudConfig.java @@ -30,7 +30,6 @@ public class GuiHudConfig extends GuiScreen { this.parent = parent; } - @SuppressWarnings("unchecked") @Override public void initGui() { super.initGui(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java index d79c8a33..c97cc4dc 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java @@ -325,7 +325,7 @@ public class GUIManual extends GUIScrollingBase implements GuiYesNoCallback { List content; reader.beginArray(); - + //Read next page while (reader.hasNext()) { String name; @@ -335,13 +335,16 @@ public class GUIManual extends GUIScrollingBase implements GuiYesNoCallback { content = new ArrayList(); reader.beginObject(); - + //Read page name String s = reader.nextName(); if (s.equals("name")) { name = reader.nextString(); - } else - throw new IOException("Error reading manual.json (invalid name in place of \"name\" [Found:\"" + s + "\"])"); + } else { + reader.close(); + throw new IOException("Error reading manual.json (invalid name in place of \"name\" [Found:\"" + s + "\"])"); + } + //Read page images s = reader.nextName(); @@ -362,9 +365,10 @@ public class GUIManual extends GUIScrollingBase implements GuiYesNoCallback { if (!imageURLs.contains(url)) imageURLs.add(url); } reader.endArray(); - } else - throw new IOException("Error reading manual.json (invalid name in place of \"images\" [Found:\"" + s + "\"])"); - + } else{ + reader.close(); + throw new IOException("Error reading manual.json (invalid name in place of \"name\" [Found:\"" + s + "\"])"); + } //Read page content s = reader.nextName(); if (s.equals("content")) { @@ -373,17 +377,17 @@ public class GUIManual extends GUIScrollingBase implements GuiYesNoCallback { content.add(reader.nextString()); } reader.endArray(); - } else - throw new IOException("Error reading manual.json (invalid name in place of \"content\" [Found:\"" + s + "\"])"); - + } else{ + reader.close(); + throw new IOException("Error reading manual.json (invalid name in place of \"name\" [Found:\"" + s + "\"])"); + } reader.endObject(); if (isValidPage(name)) pageList.add(new ManualPage(name, images.toArray(new String[images.size()]), content.toArray(new String[content.size()]), nameL, meta)); } - reader.endArray(); - + reader.close(); } catch (FileNotFoundException e) { e.printStackTrace(); @@ -391,6 +395,7 @@ public class GUIManual extends GUIScrollingBase implements GuiYesNoCallback { catch (IOException e) { e.printStackTrace(); } + } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java index 6123af23..79d8eef3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java @@ -48,7 +48,6 @@ public class GUIToolConfig extends GUIBase { addDependentComponents(); } - @SuppressWarnings("unchecked") @Override public void initGui() { super.initGui(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentFieldButton.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentFieldButton.java index 3fd2486e..ea34f873 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentFieldButton.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentFieldButton.java @@ -71,7 +71,6 @@ public class ComponentFieldButton extends ComponentBase { drawString(fontRendererObj, field.getLocalizedName(), x + offsetX + 2, y + offsetY + (getHeight() / 2) - (fontRendererObj.FONT_HEIGHT / 2), 0xffffff); } - @SuppressWarnings("unchecked") @Override public void renderFinal(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { if (isMouseOver(mouseX, mouseY)) { diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java index 7bc0d5d6..665d31f4 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java @@ -380,7 +380,6 @@ public class ComponentManualPage extends ComponentScrollingBase { } } - @SuppressWarnings("unchecked") private Object[] getRecipeInput(IRecipe recipe) { if (recipe instanceof ShapelessOreRecipe) return ((ShapelessOreRecipe) recipe).getInput().toArray(); else if (recipe instanceof ShapedOreRecipe) return getShapedOreRecipe((ShapedOreRecipe) recipe); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumBlock.java index 10de320b..0c93ceea 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumBlock.java @@ -69,7 +69,6 @@ public class DraconiumBlock extends BlockDE { return icons[meta]; } - @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) @Override public void getSubBlocks(Item item, CreativeTabs p_149666_2_, List list) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/InfusedObsidian.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/InfusedObsidian.java index 8e768765..42e34191 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/InfusedObsidian.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/InfusedObsidian.java @@ -68,7 +68,6 @@ public class InfusedObsidian extends BlockDE { } @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("info.infusedObsidian.txt")); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/CKeyStoneItemBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/CKeyStoneItemBlock.java index b94dcd84..4e1644d8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/CKeyStoneItemBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/CKeyStoneItemBlock.java @@ -19,7 +19,6 @@ public class CKeyStoneItemBlock extends ItemBlock { setHasSubtypes(true); } - @SuppressWarnings("unchecked") @Override public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { list.add(new ItemStack(item, 1, 0)); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumChestItemBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumChestItemBlock.java index 3e5e276c..b6bb80c9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumChestItemBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumChestItemBlock.java @@ -18,7 +18,6 @@ public class DraconiumChestItemBlock extends ItemBlockCustomData { super(block); } - @SuppressWarnings("unchecked") @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { list.add(StatCollector.translateToLocal("info.draconiumChestInfo1.txt")); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumItemBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumItemBlock.java index 9be3fe14..e6088360 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumItemBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumItemBlock.java @@ -29,7 +29,6 @@ public class DraconiumItemBlock extends ItemBlock implements IEnergyContainerIte protected int maxReceive = BalanceConfigHandler.draconiumBlockChargingSpeed; protected int maxExtract = BalanceConfigHandler.draconiumBlockChargingSpeed; - @SuppressWarnings("unchecked") @Override public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { list.add(new ItemStack(item, 1, 0)); @@ -94,7 +93,6 @@ public class DraconiumItemBlock extends ItemBlock implements IEnergyContainerIte } @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") @Override public void addInformation(ItemStack stack, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { if (stack.hasTagCompound()) list.add(getEnergyStored(stack) + " / " + getMaxEnergyStored(stack) + "RF"); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java index 5e2eaa10..e39f2315 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java @@ -47,7 +47,6 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock { ModBlocks.register(this, EnergyCrystalItemBlock.class); } - @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) @Override public void getSubBlocks(Item item, CreativeTabs p_149666_2_, List list) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Generator.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Generator.java index 4d533f13..b5b67823 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Generator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Generator.java @@ -65,7 +65,6 @@ public class Generator extends BlockCustomDrop { } - @SuppressWarnings({"rawtypes", "unchecked"}) @SideOnly(Side.CLIENT) @Override public void getSubBlocks(final Item item, final CreativeTabs tab, final List par3list) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Grinder.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Grinder.java index 2957934f..3cb24fc4 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Grinder.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Grinder.java @@ -63,7 +63,6 @@ public class Grinder extends BlockCustomDrop { public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) { } - @SuppressWarnings({"rawtypes", "unchecked"}) @SideOnly(Side.CLIENT) @Override public void getSubBlocks(final Item item, final CreativeTabs tab, final List par3list) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/WeatherController.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/WeatherController.java index 6854b0b3..c36a5cb7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/WeatherController.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/WeatherController.java @@ -95,7 +95,6 @@ public class WeatherController extends BlockCustomDrop { else return icon_top; } - @SuppressWarnings({"rawtypes", "unchecked"}) @SideOnly(Side.CLIENT) @Override public void getSubBlocks(final Item item, final CreativeTabs tab, final List par3list) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerPlayerDetector.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerPlayerDetector.java index 08ddfa45..9c939530 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerPlayerDetector.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerPlayerDetector.java @@ -51,7 +51,6 @@ public class ContainerPlayerDetector extends Container { addSlotToContainer(new SlotOpaqueBlock(tileDetector, 0, 145, 15)); } - @SuppressWarnings("unchecked") public void updateContainerSlots() { if (gui == null) { return; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosCrystal.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosCrystal.java index 01097107..202dea26 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosCrystal.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosCrystal.java @@ -171,7 +171,7 @@ public class EntityChaosCrystal extends EntityLivingBase { private EntityChaosGuardian getGuardian() { if (guardian == null) { - @SuppressWarnings("unchecked") List list = worldObj.getEntitiesWithinAABB(EntityChaosGuardian.class, AxisAlignedBB.getBoundingBox(posX, posY, posZ, posX, posY, posZ).expand(512, 512, 512)); + List list = worldObj.getEntitiesWithinAABB(EntityChaosGuardian.class, AxisAlignedBB.getBoundingBox(posX, posY, posZ, posX, posY, posZ).expand(512, 512, 512)); if (list.size() > 0) guardian = list.get(0); if (guardian != null && guardian.crystals != null && !guardian.crystals.contains(this)) { guardian.crystals.add(this); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosGuardian.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosGuardian.java index f2a9df2a..67e356b2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosGuardian.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosGuardian.java @@ -443,6 +443,9 @@ public class EntityChaosGuardian extends EntityDragon {//summon DraconicEvolutio case GUARDING: break; + case FIREBOMB: + break; + case CHARGING: if (Utills.getDistanceAtoB(posX, posZ, homeX, homeZ) > 300) behaviour = EnumBehaviour.GO_HOME; break; @@ -530,7 +533,7 @@ public class EntityChaosGuardian extends EntityDragon {//summon DraconicEvolutio else if (nextAttackTimer == 0) { Entity attackTarget = target; - @SuppressWarnings("unchecked") List targets = attackTarget == null ? worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(homeX, homeY, homeZ, homeX, homeY, homeZ).expand(100, 100, 100)) : null; + List targets = attackTarget == null ? worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(homeX, homeY, homeZ, homeX, homeY, homeZ).expand(100, 100, 100)) : null; if (targets != null && targets.size() > 0) { Iterator i = targets.iterator(); @@ -748,7 +751,7 @@ public class EntityChaosGuardian extends EntityDragon {//summon DraconicEvolutio break; case FIREBOMB: - @SuppressWarnings("unchecked") List targets = worldObj.getEntitiesWithinAABB(EntityPlayer.class, boundingBox.expand(150, 150, 150)); + List targets = worldObj.getEntitiesWithinAABB(EntityPlayer.class, boundingBox.expand(150, 150, 150)); target = null; while (targets.size() > 0 && target == null) { EntityPlayer potentialTarget = targets.get(rand.nextInt(targets.size())); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosVortex.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosVortex.java index a6affac9..1802b631 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosVortex.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosVortex.java @@ -66,7 +66,7 @@ public class EntityChaosVortex extends Entity { double intensity = (ticksExisted - 130) / 100D; if (intensity > 1D) intensity = 1D; - @SuppressWarnings("unchecked") List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, boundingBox.expand(200, 200, 200)); + List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, boundingBox.expand(200, 200, 200)); for (EntityPlayer player : players) { double x = (rand.nextDouble() - 0.5) * 2 * intensity; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java index f080ee8f..9022cd76 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java @@ -94,7 +94,6 @@ public class EntityCustomArrow extends EntityArrow { this.ticksInGround = 0; } - @SuppressWarnings("rawtypes") @Override public void onUpdate() { //region Entity Update And motion diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java index 3bff0ad0..17a70a81 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java @@ -108,7 +108,6 @@ public class EntityDraconicArrow extends EntityArrow { } } - @SuppressWarnings("rawtypes") @Override public void onUpdate() { //super.onUpdate(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonHeart.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonHeart.java index c9cb65a8..a4b02c38 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonHeart.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonHeart.java @@ -114,7 +114,7 @@ public class EntityDragonHeart extends Entity { } break; } - @SuppressWarnings("unchecked") List items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(posX - 5, posY - 5, posZ - 5, posX + 5, posY + 5, posZ + 5)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(posX - 5, posY - 5, posZ - 5, posX + 5, posY + 5, posZ + 5)); for (EntityItem item : items) { ItemStack stack = item.getEntityItem(); if (Utills.getDistanceAtoB(posX, posY + 0.5, posZ, item.posX, item.posY, item.posZ) < 1) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonProjectile.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonProjectile.java index ad9d64a0..bba41c12 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonProjectile.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonProjectile.java @@ -216,8 +216,8 @@ public class EntityDragonProjectile extends Entity { worldObj.playSoundEffect(posX, posY, posZ, "random.explode", 4.0F, (1.0F + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2F) * 0.7F); int i = 3 + rand.nextInt(3); EntityDragonProjectile newProjectile; - @SuppressWarnings("unchecked") List list = worldObj.getEntitiesWithinAABBExcludingEntity(shooter, boundingBox.expand(60, 60, 60), Utills.selectPlayer); - for (i = i; i > 0; i--) { + List list = worldObj.getEntitiesWithinAABBExcludingEntity(shooter, boundingBox.expand(60, 60, 60), Utills.selectPlayer); + for (i =+ 0; i > 0; i--) { newProjectile = new EntityDragonProjectile(worldObj, MINI_CHAOS_CHASER, list.size() > 0 ? list.get(rand.nextInt(list.size())) : null, power / 2F, shooter); newProjectile.motionY = 0; int randDir = rand.nextInt(); @@ -285,7 +285,7 @@ public class EntityDragonProjectile extends Entity { private void damageEntitiesInRadius(DamageSource source, double radius, float damage) { if (worldObj.isRemote) return; - @SuppressWarnings("unchecked") List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(posX, posY, posZ, posX, posY, posZ).expand(radius, radius, radius)); + List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(posX, posY, posZ, posX, posY, posZ).expand(radius, radius, radius)); for (EntityLivingBase entityLivingBase : entities) { if (entityLivingBase == shooter) continue; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityEnderArrow.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityEnderArrow.java index ebb2b0f0..1dd43f2f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityEnderArrow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityEnderArrow.java @@ -102,7 +102,6 @@ public class EntityEnderArrow extends EntityDraconicArrow { } } - @SuppressWarnings("rawtypes") @Override public void onUpdate() { for (int i = 0; i < 10; i++) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java index 7f57c2de..b06242f0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java @@ -64,7 +64,6 @@ import java.lang.reflect.Method; import java.util.List; import java.util.Random; -@SuppressWarnings("unused") public class MinecraftForgeEventHandler { Random random = new Random(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCore.java b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCore.java index baea4f9b..4c159a4b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCore.java @@ -25,7 +25,6 @@ public class DraconicCore extends ItemDE { ModItems.register(this); } - @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumEnergyCore.java b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumEnergyCore.java index c42e4a6f..09f73bcd 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumEnergyCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumEnergyCore.java @@ -40,7 +40,6 @@ public class DraconiumEnergyCore extends ItemDE { } @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") @Override public void getSubItems(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item, 1, 0)); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java b/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java index a41d2a7a..091b7f8a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java @@ -479,7 +479,6 @@ public class Tclogo extends ItemDE { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked", "rawtypes"}) public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) { list.add(EnumChatFormatting.RED + "Warning! this is an item used to test random bits of code. You should not play with it"); list.add(EnumChatFormatting.RED + "because depending on what i used it for last it could do anything."); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java index 50de155e..b69732b8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java @@ -92,7 +92,6 @@ public class DraconicArmor return true; } - @SuppressWarnings("unchecked") @Override public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { list.add(ItemNBTHelper.setInteger(new ItemStack(item), "Energy", 0)); @@ -213,7 +212,6 @@ public class DraconicArmor } } - @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { @@ -221,7 +219,6 @@ public class DraconicArmor ToolBase.holdCTRLForUpgrades(list, stack); } - @SuppressWarnings("unchecked") public boolean clearNegativeEffects(Entity par3Entity) { boolean flag = false; if (par3Entity.ticksExisted % 20 == 0) { @@ -240,7 +237,7 @@ public class DraconicArmor } for (PotionEffect potion : potions) { int id = potion.getPotionID(); - if (ReflectionHelper.getPrivateValue(Potion.class, Potion.potionTypes[id], new String[]{"isBadEffect", "field_76418_K", "J"})) { + if ((Boolean) ReflectionHelper.getPrivateValue(Potion.class, Potion.potionTypes[id], new String[]{"isBadEffect", "field_76418_K", "J"})) { if (potion.getPotionID() == Potion.digSlowdown.id && ModHelper.isHoldingCleaver(player)) break; if ((player.getHeldItem() == null || (player.getHeldItem().getItem() != ModItems.wyvernBow && player.getHeldItem().getItem() != ModItems.draconicBow)) || id != 2) { player.removePotionEffect(id); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java index b6c0aebf..31be3a45 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java @@ -66,7 +66,6 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IConfigurab return true; } - @SuppressWarnings("unchecked") @Override public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { list.add(ItemNBTHelper.setInteger(new ItemStack(item), "Energy", 0)); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/AdminSpawnEgg.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/AdminSpawnEgg.java index 9d5284cd..99355b19 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/AdminSpawnEgg.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/AdminSpawnEgg.java @@ -101,7 +101,6 @@ public class AdminSpawnEgg extends ItemDE { return true; } - @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean p_77624_4_) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/CreativeStructureSpawner.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/CreativeStructureSpawner.java index b2e98ab0..2a8c27d0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/CreativeStructureSpawner.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/CreativeStructureSpawner.java @@ -28,7 +28,6 @@ public class CreativeStructureSpawner extends ItemDE { } @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") @Override public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { list.add(new ItemStack(item, 1, 0)); @@ -107,7 +106,6 @@ public class CreativeStructureSpawner extends ItemDE { } @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") @Override public void addInformation(ItemStack stack, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { if (stack.getItemDamage() == 1) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java index b1089927..b3471620 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java @@ -88,7 +88,6 @@ public class DraconicDistructionStaff extends MiningTool implements IInventoryTo return super.onItemRightClick(stack, world, player); } - @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean extended) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java index d97ceb75..6aacef77 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java @@ -179,7 +179,6 @@ public class DraconicHoe extends ItemHoe implements IEnergyContainerItem, IRende } } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) { InfoHelper.addEnergyInfo(stack, list); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java index b5a3b783..a4d69baa 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java @@ -55,7 +55,6 @@ public class DraconiumFluxCapacitor extends RFItemBase implements IUpgradableIte } @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") @Override public void getSubItems(Item item, CreativeTabs tab, List list) { list.add(ItemNBTHelper.setInteger(new ItemStack(item, 1, 0), "Energy", 0)); @@ -136,7 +135,6 @@ public class DraconiumFluxCapacitor extends RFItemBase implements IUpgradableIte @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"rawtypes", "unchecked"}) public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) { if (InfoHelper.holdShiftForDetails(list)) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/EnderArrow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/EnderArrow.java index 94d50bf7..cdcf4711 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/EnderArrow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/EnderArrow.java @@ -28,7 +28,6 @@ public class EnderArrow extends ItemDE { itemIcon = iconRegister.registerIcon(References.RESOURCESPREFIX + "ender_arrow"); } - @SuppressWarnings("unchecked") @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { list.add(EnumChatFormatting.DARK_PURPLE + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("info.arrowInfo.txt")); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java index a422f308..565c2ac3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java @@ -57,7 +57,6 @@ public class Magnet extends ItemDE { } @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") @Override public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { list.add(new ItemStack(item, 1, 0)); @@ -75,7 +74,6 @@ public class Magnet extends ItemDE { return ItemNBTHelper.getBoolean(stack, "MagnetEnabled", false); } - @SuppressWarnings("unchecked") @Override public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean hotbar) { if (!entity.isSneaking() && entity.ticksExisted % 5 == 0 && ItemNBTHelper.getBoolean(stack, "MagnetEnabled", false) && entity instanceof EntityPlayer) { @@ -128,7 +126,6 @@ public class Magnet extends ItemDE { return stack; } - @SuppressWarnings("unchecked") @Override public void addInformation(ItemStack stack, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { list.add(StatCollector.translateToLocal("info.de.shiftRightClickToActivate.txt")); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/SafetyMatch.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/SafetyMatch.java index eaaccf70..fd8140c8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/SafetyMatch.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/SafetyMatch.java @@ -40,7 +40,6 @@ public class SafetyMatch extends ItemDE { else return super.getUnlocalizedName(itemStack) + "Box"; } - @SuppressWarnings("ALL") @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { @@ -116,7 +115,6 @@ public class SafetyMatch extends ItemDE { } } - @SuppressWarnings("ALL") @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java index b2c1a03d..68eeb183 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java @@ -111,7 +111,6 @@ public class TeleporterMKI extends ItemDE { } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) { if (!ItemNBTHelper.getBoolean(stack, "IsSet", false)) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKII.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKII.java index 6a6b21e4..cd7fdc80 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKII.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKII.java @@ -108,7 +108,6 @@ public class TeleporterMKII extends TeleporterMKI implements IHudDisplayItem { } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override public void addInformation(final ItemStack teleporter, final EntityPlayer player, final List list2, final boolean extraInformation) { short selected = ItemNBTHelper.getShort(teleporter, "Selection", (short) 0); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Wrench.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Wrench.java index c95cb31c..a4b7e761 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Wrench.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Wrench.java @@ -72,7 +72,6 @@ public class Wrench extends ItemDE implements IHudDisplayItem { player.addChatComponentMessage(new ChatComponentTranslation("msg.de.wrenchMode." + currentMode + ".txt")); } - @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer p_77624_2_, List list, boolean bool) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java index 45beb71e..7438a4ae 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java @@ -15,14 +15,17 @@ import com.brandon3055.draconicevolution.common.utills.IUpgradableItem; import com.brandon3055.draconicevolution.common.utills.ItemConfigField; import com.brandon3055.draconicevolution.integration.ModHelper; +import cpw.mods.fml.common.Loader; import net.minecraft.block.Block; import net.minecraft.block.material.MaterialLiquid; import net.minecraft.client.Minecraft; +import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -40,6 +43,7 @@ import net.minecraftforge.event.world.BlockEvent; /** * Created by Brandon on 2/01/2015. + * Modified by bartimaeusnek on 23/05/2018 */ public abstract class MiningTool extends ToolBase implements IUpgradableItem { @@ -176,15 +180,26 @@ public abstract class MiningTool extends ToolBase implements IUpgradableItem { } } + + for (int xPos = x - xMin; xPos <= x + xMax; xPos++) { for (int yPos = y + yOffset - yMin; yPos <= y + yOffset + yMax; yPos++) { for (int zPos = z - zMin; zPos <= z + zMax; zPos++) { + player.worldObj.getChunkFromBlockCoords(xPos, zPos).sendUpdates=false; breakExtraBlock(stack, player.worldObj, xPos, yPos, zPos, breakRadius * ((breakDepth / 2) + 1), player, refStrength, Math.abs(x - xPos) <= 1 && Math.abs(y - yPos) <= 1 && Math.abs(z - zPos) <= 1, blockMap); } } } - - @SuppressWarnings("unchecked") List items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - xMin, y + yOffset - yMin, z - zMin, x + xMax + 1, y + yOffset + yMax + 1, z + zMax + 1)); + for (int xPos = x - xMin; xPos <= x + xMax; xPos++) { + for (int yPos = y + yOffset - yMin; yPos <= y + yOffset + yMax; yPos++) { + for (int zPos = z - zMin; zPos <= z + zMax; zPos++) { + player.worldObj.getChunkFromBlockCoords(x, z).sendUpdates=true; + player.worldObj.getChunkFromBlockCoords(x, z).isModified=true; + } + } + } + + List items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - xMin, y + yOffset - yMin, z - zMin, x + xMax + 1, y + yOffset + yMax + 1, z + zMax + 1)); for (EntityItem item : items) { if (!player.worldObj.isRemote) { item.setLocationAndAngles(player.posX, player.posY, player.posZ, 0, 0); @@ -196,7 +211,7 @@ public abstract class MiningTool extends ToolBase implements IUpgradableItem { return true; } - + protected void breakExtraBlock(ItemStack stack, World world, int x, int y, int z, int totalSize, EntityPlayer player, float refStrength, boolean breakSound, Map blockMap) { if (world.isAirBlock(x, y, z)) return; @@ -247,23 +262,35 @@ public abstract class MiningTool extends ToolBase implements IUpgradableItem { extractEnergy(stack, scaledPower, false); if (!world.isRemote) { - + block.onBlockHarvested(world, x, y, z, meta, player); - - if (block.removedByPlayer(world, player, x, y, z, true)) { - block.onBlockDestroyedByPlayer(world, x, y, z, meta); - block.harvestBlock(world, player, x, y, z, meta); - player.addExhaustion(-0.025F); - if (block.getExpDrop(world, meta, EnchantmentHelper.getFortuneModifier(player)) > 0) - player.addExperience(block.getExpDrop(world, meta, EnchantmentHelper.getFortuneModifier(player))); - } - + + ArrayList drops = block.getDrops(world, x, y, z, meta, EnchantmentHelper.getFortuneModifier(player)); + for (ItemStack is : drops) { + if (!player.inventory.addItemStackToInventory(is)) { + if (world.getGameRules().getGameRuleBooleanValue("doTileDrops") && !world.restoringBlockSnapshots){ + float f = 0.7F; + double d0 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; + double d1 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; + double d2 = (double)(world.rand.nextFloat() * f) + (double)(1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, (double)x + d0, (double)y + d1, (double)z + d2, is); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + } + } + } + block.onBlockDestroyedByPlayer(world, x, y, z, meta); + world.setBlock(x, y, z, Blocks.air, 0, 2); + player.addExhaustion(-0.025F); + if (block.getExpDrop(world, meta, EnchantmentHelper.getFortuneModifier(player)) > 0) + player.addExperience(block.getExpDrop(world, meta, EnchantmentHelper.getFortuneModifier(player))); EntityPlayerMP mpPlayer = (EntityPlayerMP) player; mpPlayer.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world)); + } else { if (breakSound) world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); - if (block.removedByPlayer(world, player, x, y, z, true)) { - block.onBlockDestroyedByPlayer(world, x, y, z, meta); + if (block.removedByPlayer(world, player, x, y, z, false)) { + block.onBlockDestroyedByPlayer(world, x, y, z, meta); } Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C07PacketPlayerDigging(2, x, y, z, Minecraft.getMinecraft().objectMouseOver.sideHit)); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/RFItemBase.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/RFItemBase.java index 5fcea053..e09cbbc8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/RFItemBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/RFItemBase.java @@ -125,7 +125,6 @@ public class RFItemBase extends ItemDE implements IEnergyContainerItem, IConfigu } @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") @Override public void getSubItems(Item item, CreativeTabs tab, List list) { list.add(ItemNBTHelper.setInteger(new ItemStack(item, 1, 0), "Energy", 0)); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolBase.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolBase.java index 6d05b5f8..7add93e2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolBase.java @@ -75,7 +75,6 @@ public class ToolBase extends RFItemBase { return efficiencyOnProperMaterial; } - @SuppressWarnings("unchecked") @Override public void setHarvestLevel(String toolClass, int level) { if (toolClass.equals("pickaxe")) blockOverrides.addAll(PICKAXE_OVERRIDES); @@ -234,7 +233,6 @@ public class ToolBase extends RFItemBase { return toolMaterial; } - @SuppressWarnings("unchecked") public static void holdCTRLForUpgrades(List list, ItemStack stack) { if (stack == null || !(stack.getItem() instanceof IUpgradableItem)) return; if (!InfoHelper.isCtrlKeyDown()) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolHandler.java index cec0c2af..9b6467ab 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolHandler.java @@ -201,7 +201,6 @@ public class ToolHandler { } } - @SuppressWarnings({"rawtypes", "unused"}) public static void AOEAttack(EntityPlayer player, Entity entity, ItemStack stack, int range) { World world = player.worldObj; AxisAlignedBB box = AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range).expand(1.0D, 1.0D, 1.0D); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java index 2e7b67ca..175d5f87 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java @@ -111,7 +111,6 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked", "rawtypes"}) public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) { boolean show = InfoHelper.holdShiftForDetails(list); if (show) { @@ -126,7 +125,6 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI } @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") @Override public void getSubItems(Item item, CreativeTabs tab, List list) { list.add(ItemNBTHelper.setInteger(new ItemStack(item, 1, 0), "Energy", 0)); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java index 03c89c9e..aa375d79 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java @@ -87,7 +87,6 @@ public class DraconicSword extends ItemSword implements IEnergyContainerWeaponIt return true; } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) { if (InfoHelper.holdShiftForDetails(list)) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java index 03d2d500..a0744943 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java @@ -122,7 +122,6 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked", "rawtypes"}) public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) { boolean show = InfoHelper.holdShiftForDetails(list); if (show) { @@ -137,7 +136,6 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte } @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") @Override public void getSubItems(Item item, CreativeTabs tab, List list) { list.add(ItemNBTHelper.setInteger(new ItemStack(item, 1, 0), "Energy", 0)); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java index d9c252da..48645506 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java @@ -58,7 +58,6 @@ public class WyvernSword extends ItemSword implements IEnergyContainerWeaponItem } - @SuppressWarnings("unchecked") @Override public void getSubItems(Item item, CreativeTabs tab, List list) { list.add(ItemNBTHelper.setInteger(new ItemStack(item, 1, 0), "Energy", 0)); @@ -90,7 +89,6 @@ public class WyvernSword extends ItemSword implements IEnergyContainerWeaponItem return true; } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) { if (InfoHelper.holdShiftForDetails(list)) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java index fdcc19bc..fd876900 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java @@ -10,6 +10,7 @@ public class VersionHandler { public static final int SNAPSHOT = 0; public static final String MCVERSION = "1.7.10"; + @SuppressWarnings({"unused"}) public static final String FULL_VERSION = VERSION + (SNAPSHOT > 0 ? "-snapshot_" + SNAPSHOT : ""); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDissEnchanter.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDissEnchanter.java index da0f805e..2b45214f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDissEnchanter.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDissEnchanter.java @@ -77,7 +77,6 @@ public class TileDissEnchanter extends TileEntity implements ISidedInventory { worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } - @SuppressWarnings("unchecked") public void buttonClick(EntityPlayer player) { if (!isValidRecipe) return; if (player.experienceLevel < dissenchantCost && !player.capabilities.isCreativeMode) return; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java index d90b5411..3b9b1872 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java @@ -65,7 +65,7 @@ public class TileDraconiumChest extends TileEntity implements ISidedInventory, I if (worldObj != null && !this.worldObj.isRemote && this.numUsingPlayers != 0 && (this.ticksSinceSync + this.xCoord + this.yCoord + this.zCoord) % 200 == 0) { this.numUsingPlayers = 0; float var1 = 5.0F; - @SuppressWarnings("unchecked") List var2 = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox((double) ((float) this.xCoord - var1), (double) ((float) this.yCoord - var1), (double) ((float) this.zCoord - var1), (double) ((float) (this.xCoord + 1) + var1), (double) ((float) (this.yCoord + 1) + var1), (double) ((float) (this.zCoord + 1) + var1))); + List var2 = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox((double) ((float) this.xCoord - var1), (double) ((float) this.yCoord - var1), (double) ((float) this.zCoord - var1), (double) ((float) (this.xCoord + 1) + var1), (double) ((float) (this.yCoord + 1) + var1), (double) ((float) (this.zCoord + 1) + var1))); for (EntityPlayer var4 : var2) { if (var4.openContainer instanceof ContainerDraconiumChest) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java index 5d69a185..7000d486 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java @@ -147,7 +147,6 @@ public class TileGrinder extends TileObjectSync implements ISidedInventory, IEne } } - @SuppressWarnings("unchecked") public boolean killNextEntity() { if (worldObj.isRemote) return false; //fakePlayer = null; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetectorAdvanced.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetectorAdvanced.java index fe753fb1..70b92668 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetectorAdvanced.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetectorAdvanced.java @@ -72,7 +72,6 @@ public class TilePlayerDetectorAdvanced extends TileEntity implements IInventory return b; } - @SuppressWarnings({"unchecked"}) private void findEntitys() { double x1 = xCoord + 0.5 - range; double y1 = yCoord + 0.5 - range; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/utills/UpdateChecker.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/UpdateChecker.java index a9a70969..4369cb80 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/utills/UpdateChecker.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/UpdateChecker.java @@ -25,7 +25,7 @@ public class UpdateChecker { thread.start(); } - + @SuppressWarnings({"unused"}) @SubscribeEvent public void tickStart(TickEvent.PlayerTickEvent event) { if (event.phase != TickEvent.Phase.START) return; diff --git a/src/main/java/com/brandon3055/draconicevolution/integration/nei/CraftingChestOverlayHandler.java b/src/main/java/com/brandon3055/draconicevolution/integration/nei/CraftingChestOverlayHandler.java index 05b93d3a..91209148 100644 --- a/src/main/java/com/brandon3055/draconicevolution/integration/nei/CraftingChestOverlayHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/integration/nei/CraftingChestOverlayHandler.java @@ -61,7 +61,6 @@ public class CraftingChestOverlayHandler implements IOverlayHandler { if (quantity != 0) moveIngredients(gui, assignedIngredients, quantity); } - @SuppressWarnings("unchecked") private boolean clearIngredients(GuiContainer gui, List ingreds) { int offsetx = getOffsetX(gui); int offsety = getOffsetY(gui); @@ -77,7 +76,6 @@ public class CraftingChestOverlayHandler implements IOverlayHandler { return true; } - @SuppressWarnings("unchecked") private void moveIngredients(GuiContainer gui, List assignedIngredients, int quantity) { for (IngredientDistribution distrib : assignedIngredients) { ItemStack pstack = distrib.permutation; @@ -212,7 +210,6 @@ public class CraftingChestOverlayHandler implements IOverlayHandler { return assignedIngredients; } - @SuppressWarnings("unchecked") private void findInventoryQuantities(GuiContainer gui, List ingredStacks) { for (Slot slot : (List) gui.inventorySlots.inventorySlots)//work out how much we have to go round { @@ -241,7 +238,6 @@ public class CraftingChestOverlayHandler implements IOverlayHandler { return slot.inventory instanceof InventoryPlayer || slot.inventory instanceof TileDraconiumChest; } - @SuppressWarnings("unchecked") public Slot[][] mapIngredSlots(GuiContainer gui, List ingredients) { int offsetx = getOffsetX(gui); int offsety = getOffsetY(gui);