diff --git a/Change Log.txt b/Change Log.txt index 338b6242..25508e6a 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -1,5 +1,7 @@ ######## 1.0.2c ######## -- +-fixed shovels unable to harvest some blocks in AOE mode (Any block that requires a shovel but can not be harvested by hand) +-added config blacklist for the Item Dislocator. +-fixed armor still draining power when another mod cancels a damage event. ######## 1.0.2b ######## -fixed not being able to close the flow gate gui's by pressing the inventory key. @@ -401,12 +403,12 @@ All mobs killed by the mob grinder now drop loot and player only loot. Fixed Armor Crash All tool and armor item entities are now Persistent and can not be killed except if they fall out of the world -All items in the game can be placed in the world using the “Place Item” key (default P) +All items in the game can be placed in the world using the �Place Item� key (default P) Added ender arrow Improved Draconic Helm night vision effect (effect now stops immediately when you enter a lit area) Fixed Mob grinder crash Update Fix is now disabled by default -Fixed Buggy gui’s for grinder and generator +Fixed Buggy gui�s for grinder and generator ######## 0.9.32-beta (Bug Fix) ######## @@ -444,7 +446,7 @@ Fixed Advanced charm of dislocation server crash Draconium ore can no longer be destroyed by the Enderdragon Weapons now work on the Enderdragon Fixed Draconic Hoe use animation -Draconic Hoe now checks “isReplacable” +Draconic Hoe now checks �isReplacable� Reduced the teleport sound effect volume Fixed Mining AOE bugginess Added AOE to the Draconic Axe diff --git a/VERSION.txt b/VERSION.txt index 09ff6108..fe48d50b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,3 @@ -Version:1.0.2b +Version:1.0.2c Snapshot:0 -ReleaseNote:Fixed more bugs... No matter how many i squash more seem to show up. Will they ever stop coming?. +ReleaseNote:Yup you guessed it more bugs... But nothing major. diff --git a/build.gradle b/build.gradle index 69ec93d1..a303ae1e 100644 --- a/build.gradle +++ b/build.gradle @@ -80,4 +80,22 @@ idea { module { inheritOutputDirs = true } +} + +task deobfJar(type: Jar) { // Generate deobfuscated + from sourceSets.main.output + classifier = 'deobf' +} + +task sourceJar(type: Jar) { // Generate sources + from sourceSets.main.allSource + classifier = 'sources' +} + +tasks.build.dependsOn('sourceJar', 'deobfJar') + +artifacts { + archives deobfJar + archives sourceJar + archives jar } \ No newline at end of file diff --git a/build.properties b/build.properties index cd6552c4..8f67a002 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.7.10 -mod_version=1.0.2b +mod_version=1.0.2c forge_version=10.13.4.1614-1.7.10 CCLIB_version=1.1.3.140 NEI_version=1.0.3.74 diff --git a/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java index 0a55e0aa..b8fb63e8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java @@ -59,9 +59,8 @@ public class HudHandler { int y = (int) (((float)ConfigHandler.hudSettings[1] / 1000F) * (float) height); GL11.glPushMatrix(); - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); GuiHelper.drawHoveringText(hudList, x, y, fontRenderer, toolTipFadeOut > 1 ? 1 : toolTipFadeOut, ConfigHandler.hudSettings[4] / 100D, width, height); - GL11.glPopAttrib(); + GL11.glDisable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/handler/ParticleHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/handler/ParticleHandler.java index 3fb89a8a..e34667fc 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/handler/ParticleHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/handler/ParticleHandler.java @@ -79,7 +79,6 @@ public class ParticleHandler { if (mc == null || mc.renderViewEntity == null || mc.effectRenderer == null) return false; - double var15 = mc.renderViewEntity.posX - x; double var17 = mc.renderViewEntity.posY - y; double var19 = mc.renderViewEntity.posZ - z; 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 2c9fff09..aae223e5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java @@ -1,6 +1,5 @@ package com.brandon3055.draconicevolution.common.entity; -import com.brandon3055.brandonscore.common.utills.LogHelper; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.handler.ParticleHandler; import com.brandon3055.draconicevolution.client.render.particle.Particles; @@ -405,9 +404,8 @@ public class EntityCustomArrow extends EntityArrow { @Override public void onCollideWithPlayer(EntityPlayer par1EntityPlayer) { - if (!this.worldObj.isRemote && this.inGround && this.arrowShake <= 0) { - LogHelper.info("collide "+ canBePickedUp); + boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && par1EntityPlayer.capabilities.isCreativeMode; if (this.canBePickedUp == 1 && !par1EntityPlayer.inventory.addItemStackToInventory(new ItemStack(Items.arrow, 1))) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java index 2e9bef2c..f50f2f8c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java @@ -5,7 +5,9 @@ import net.minecraftforge.common.config.Configuration; import java.io.File; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class ConfigHandler { @@ -44,6 +46,8 @@ public class ConfigHandler { public static boolean useOriginal3DArmorModel; public static boolean useOldD2DToolTextures; public static boolean disableGuardianCrystalRespawn; + private static String[] itemDislocatorBlacklist; + public static Map itemDislocatorBlacklistMap = new HashMap(); //spawner public static String[] spawnerList; @@ -115,6 +119,7 @@ public class ConfigHandler { chaosIslandSeparation = config.get(Configuration.CATEGORY_GENERAL, "Chaos Island Separation", 10000, "This sets how far apart the chaos islands will spawn. The islands spawn in a grid pattern.").getInt(10000); useOriginal3DArmorModel = config.get(Configuration.CATEGORY_GENERAL, "Use the original 3D armor models", false, "If true the original 3D armor models created by Skeletonpunk will be used instead of the current ones").getBoolean(false); disableGuardianCrystalRespawn = config.get(Configuration.CATEGORY_GENERAL, "Disable Guardian Crystal Respawn", false, "(Wuss mode) Setting this to true will disable the chaos guardians ability to respawn healing crystals. Under certain circumstances such as on a Spigot server where entity render distance is significantly lower this may be required.").getBoolean(false); + itemDislocatorBlacklist = config.getStringList("Item Dislocator Blacklist", Configuration.CATEGORY_GENERAL, new String[] {"appliedenergistics2:item.ItemCrystalSeed"}, "A list of items of items that should be ignored by the item dislocator. Use the items registry name e.g. minecraft:apple you can also add a meta value like so minecraft:wool|4"); //Spawner @@ -137,8 +142,25 @@ public class ConfigHandler { reactorFuelUsageMultiplier = config.get("Draconic Reactor", "FuelUsageMultiplier", 1, "Use this to adjust how quickly the reactor uses fuel", 0, 1000000).getDouble(1); reactorOutputMultiplier = config.get("Draconic Reactor", "EnergyOutputMultiplier", 1, "Use this to adjust the output of the reactor", 0, 1000000).getDouble(1); - for (String s : disabledBlocksItems) disabledNamesList.add(s); - for (int i : speedDimBlackList) speedLimitDimList.add(i); + disabledNamesList.clear(); + for (String s : disabledBlocksItems) { + disabledNamesList.add(s); + } + + speedLimitDimList.clear(); + for (int i : speedDimBlackList) { + speedLimitDimList.add(i); + } + + itemDislocatorBlacklistMap.clear(); + for (String s : itemDislocatorBlacklist){ + if (s.contains("|")){ + itemDislocatorBlacklistMap.put(s.substring(0, s.indexOf("|")), Integer.parseInt(s.substring(s.indexOf("|")+1))); + } + else{ + itemDislocatorBlacklistMap.put(s, -1); + } + } } catch (Exception e) { LogHelper.error("Unable to load Config"); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java index fb33a806..e7b7be9f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java @@ -75,6 +75,10 @@ public class CustomArmorHandler { } public static void onPlayerAttacked(LivingAttackEvent event){ + if (event.isCanceled()){ + return; + } + EntityPlayer player = (EntityPlayer)event.entityLiving; ArmorSummery summery = new ArmorSummery().getSummery(player); @@ -127,6 +131,10 @@ public class CustomArmorHandler { } public static void onPlayerDeath(LivingDeathEvent event) { + if (event.isCanceled()){ + return; + } + EntityPlayer player = (EntityPlayer)event.entityLiving; ArmorSummery summery = new ArmorSummery().getSummery(player); 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 cad633b4..9249c840 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 @@ -4,6 +4,7 @@ import com.brandon3055.brandonscore.common.utills.InfoHelper; import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import com.brandon3055.draconicevolution.common.items.ItemDE; import com.brandon3055.draconicevolution.common.lib.References; import cpw.mods.fml.relauncher.Side; @@ -85,7 +86,16 @@ public class Magnet extends ItemDE { boolean flag = false; for (EntityItem item : items) { - flag = true; + if (item.getEntityItem() == null) { + continue; + } + + String name = Item.itemRegistry.getNameForObject(item.getEntityItem().getItem()); + if (ConfigHandler.itemDislocatorBlacklistMap.containsKey(name) && (ConfigHandler.itemDislocatorBlacklistMap.get(name) == -1 || ConfigHandler.itemDislocatorBlacklistMap.get(name) == item.getEntityItem().getItemDamage())) { + continue; + } + flag = true; + if (item.delayBeforeCanPickup > 0) item.delayBeforeCanPickup = 0; item.motionX = item.motionY = item.motionZ = 0; item.setPosition(entity.posX-0.2+(world.rand.nextDouble()*0.4), entity.posY-0.6, entity.posZ-0.2+(world.rand.nextDouble()*0.4)); 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 baf1217b..253146ef 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 @@ -31,13 +31,11 @@ public class RFItemBase extends ItemDE implements IEnergyContainerItem, IConfigu /**Max Extract*/ private int maxExtract = 0; - public RFItemBase(){ this.setMaxStackSize(1); this.setCreativeTab(DraconicEvolution.tabToolsWeapons); } - @Override public boolean hasCustomEntity(ItemStack stack) { return true; @@ -56,9 +54,7 @@ public class RFItemBase extends ItemDE implements IEnergyContainerItem, IConfigu public void setMaxExtract(int maxExtract){ this.maxExtract = maxExtract;} - public int getCapacity(ItemStack stack){ - return capacity; - } + public int getCapacity(ItemStack stack){ return capacity; } public int getMaxExtract(ItemStack stack){ return maxExtract; } @@ -66,7 +62,6 @@ public class RFItemBase extends ItemDE implements IEnergyContainerItem, IConfigu @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyReceived = Math.min(getCapacity(container) - energy, Math.min(getMaxReceive(container), maxReceive)); @@ -79,7 +74,6 @@ public class RFItemBase extends ItemDE implements IEnergyContainerItem, IConfigu @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyExtracted = Math.min(energy, Math.min(getMaxExtract(container), maxExtract)); 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 27c06ab8..34f8d380 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 @@ -93,7 +93,7 @@ public class ToolBase extends RFItemBase { public boolean func_150897_b(Block block) { if (getToolClasses(null).contains("pickaxe")) return true; - return blockOverrides.contains(block); + return blockOverrides.contains(block) || blockOverrides.contains(block.getMaterial()); } @SideOnly(Side.CLIENT) 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 f399ac72..6a278c72 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java @@ -5,7 +5,7 @@ package com.brandon3055.draconicevolution.common.lib; */ public class VersionHandler { - public static final String VERSION = "1.0.2b"; + public static final String VERSION = "1.0.2c"; public static final int SNAPSHOT = 0; public static final String MCVERSION = "1.7.10";