diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index a99fa1b..ee51d39 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -196,6 +196,9 @@ public class LudicrousEvents { event.newSpeed *= 5; if(!event.entityPlayer.isInsideOfMaterial(Material.water) && !EnchantmentHelper.getAquaAffinityModifier(event.entityPlayer)) event.newSpeed *= 5; + if(held.getTagCompound().getBoolean("hammer")) { + event.newSpeed *= 0.1; + } } } } diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemMatterCluster.java b/src/main/java/fox/spiteful/avaritia/items/ItemMatterCluster.java index 282f12f..4a663a0 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemMatterCluster.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemMatterCluster.java @@ -196,7 +196,6 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem { int donorcount = getClusterSize(donor); int recipientcount = getClusterSize(recipient); - Lumberjack.info("merge 1"); Lumberjack.info(donorcount +", "+ recipientcount); if (donorcount == 0 || donorcount == capacity || recipientcount == capacity) { return; @@ -207,7 +206,6 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem { List> datalist = new ArrayList>(); datalist.addAll(donordata.entrySet()); - Lumberjack.info("merge 2"); while (recipientcount < capacity && donorcount > 0) { Entry e = datalist.get(0); ItemStackWrapper wrap = e.getKey(); @@ -231,8 +229,6 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem { datalist.remove(0); } } - - Lumberjack.info("merge 4"); setClusterData(recipient, recipientdata, recipientcount); if (donorcount > 0) { @@ -246,10 +242,12 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - List drops = ToolHelper.collateMatterClusterContents(ItemMatterCluster.getClusterData(stack)); - - for (ItemStack drop : drops) { - ToolHelper.dropItem(drop, world, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ)); + if(!world.isRemote) { + List drops = ToolHelper.collateMatterClusterContents(ItemMatterCluster.getClusterData(stack)); + + for (ItemStack drop : drops) { + ToolHelper.dropItem(drop, world, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ)); + } } stack.stackSize = 0; @@ -288,4 +286,14 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem { { return this.getIcon(stack, 0); } + + @Override + public String getUnlocalizedName(ItemStack stack) + { + int count = getClusterSize(stack); + if (count == capacity) { + return super.getUnlocalizedName(stack) + ".full"; + } + return super.getUnlocalizedName(stack); + } } diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index d58767c..84271e2 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -33,6 +33,7 @@ item.infinity_armor_3.name=Infinity Boots item.avaritia_fracturedore.name=Unknown Fractured Ore item.avaritia_fracturedore.prefix=Fractured item.avaritia_mattercluster.name=Matter Cluster +item.avaritia_mattercluster.full.name=Critical Matter Cluster # # Blocks tile.compressed_workbench.name=Compressed Crafting Table @@ -56,7 +57,7 @@ tooltip.infinity_ingot.desc=The fury of the universe in the palm of your hand. tooltip.record_fragment.desc=One likes to believe in the freedom of music~ tooltip.skullfire_sword.desc=Beheads skeletons and scorches them black. tooltip.matter_cluster.desc=Use to deconstruct. -tooltip.matter_cluster.desc2=Hold SHIFT for more info. +tooltip.matter_cluster.desc2=Hold SHIFT for contents. tooltip.matter_cluster.counter=items # # Achievements diff --git a/src/main/resources/assets/avaritia/textures/blocks/block_infinity.png b/src/main/resources/assets/avaritia/textures/blocks/block_infinity.png index a8cd097..a63ca5c 100644 Binary files a/src/main/resources/assets/avaritia/textures/blocks/block_infinity.png and b/src/main/resources/assets/avaritia/textures/blocks/block_infinity.png differ diff --git a/src/main/resources/assets/avaritia/textures/blocks/block_infinity.png.mcmeta b/src/main/resources/assets/avaritia/textures/blocks/block_infinity.png.mcmeta index 0645f48..203da75 100644 --- a/src/main/resources/assets/avaritia/textures/blocks/block_infinity.png.mcmeta +++ b/src/main/resources/assets/avaritia/textures/blocks/block_infinity.png.mcmeta @@ -1,5 +1,37 @@ { "animation": { - "frametime": 2 + "frametime": 1, + "frames": [ + 0, + 0, + 0, + 1, + 1, + 1, + 2, + 2, + 2, + 3, + 3, + 4, + 4, + 5, + 6, + 7, + 8, + 7, + 6, + 5, + 4, + 4, + 3, + 3, + 2, + 2, + 2, + 1, + 1, + 1, + ] } } diff --git a/src/main/resources/assets/avaritia/textures/items/mattercluster_full.png b/src/main/resources/assets/avaritia/textures/items/mattercluster_full.png index 057a70e..8ffd635 100644 Binary files a/src/main/resources/assets/avaritia/textures/items/mattercluster_full.png and b/src/main/resources/assets/avaritia/textures/items/mattercluster_full.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/mattercluster_full_mask.png b/src/main/resources/assets/avaritia/textures/items/mattercluster_full_mask.png index c3c3847..3f19f8c 100644 Binary files a/src/main/resources/assets/avaritia/textures/items/mattercluster_full_mask.png and b/src/main/resources/assets/avaritia/textures/items/mattercluster_full_mask.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/mattercluster_full_mask.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/mattercluster_full_mask.png.mcmeta deleted file mode 100644 index caa3c53..0000000 --- a/src/main/resources/assets/avaritia/textures/items/mattercluster_full_mask.png.mcmeta +++ /dev/null @@ -1,22 +0,0 @@ -{ - "animation": { - "frametime": 1, - "frames": [ - 0, - 0, - 0, - 0, - 1, - 1, - 2, - 2, - 3, - 4, - 3, - 2, - 2, - 1, - 1 - ] - } -} diff --git a/src/main/resources/assets/avaritia/textures/items/mattercluster_mask.png b/src/main/resources/assets/avaritia/textures/items/mattercluster_mask.png index e61a357..917f15a 100644 Binary files a/src/main/resources/assets/avaritia/textures/items/mattercluster_mask.png and b/src/main/resources/assets/avaritia/textures/items/mattercluster_mask.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/mattercluster_mask.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/mattercluster_mask.png.mcmeta deleted file mode 100644 index caa3c53..0000000 --- a/src/main/resources/assets/avaritia/textures/items/mattercluster_mask.png.mcmeta +++ /dev/null @@ -1,22 +0,0 @@ -{ - "animation": { - "frametime": 1, - "frames": [ - 0, - 0, - 0, - 0, - 1, - 1, - 2, - 2, - 3, - 4, - 3, - 2, - 2, - 1, - 1 - ] - } -} diff --git a/todo.txt b/todo.txt index 9c91bda..33d1892 100644 --- a/todo.txt +++ b/todo.txt @@ -1,12 +1,10 @@ - Finish the main tools - World Breaker (Infinity Pickaxe) - - Mass destruction EntityItem - Planet Eater (Infinity Shovel) - Destroyer Mode - 17x17x17 AOE, No Drops - Nature's Ruin (Infinity Axe) - Treecapitating? - 17x17 all trees ded on right click -- Make Infinity block not look so derpy - Dire Crafting Table stores inventory - Neutronium Compressor - 100+ ingredients per singularity @@ -15,6 +13,7 @@ - Cross-mod support - Clean up the code - Finish Thaumcraft support + - TiCon Materials - Add configs - Configs for all cross-mod interaction - Config to gut entire mod except for 9x9 crafting, for modpack use