EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-23 21:56:47 +01:00
Code Issues Projects Releases Wiki Activity
5,926 Commits 48 Branches 45 Tags 34 MiB
16d7b51497
Commit Graph

1513 Commits

Author SHA1 Message Date
nossr50
b68feb6992 rogue import spotted 2019-04-02 23:07:52 -07:00
nossr50
f3837265db 2.1.33 2019-04-02 23:03:48 -07:00
nossr50
53534e0f1d Fixing Mining Double Drops (update configs) 2019-03-29 17:44:54 -07:00
nossr50
74908cdcf5 2.1.29 - Double Drop Fix 2019-03-29 11:27:49 -07:00
nossr50
c4a383c4fb Removed PVP requirement on Stab, added info about Stab to /swords 2019-03-27 12:33:04 -07:00
nossr50
e0341f7ae7 Added new subskill to Swords, Stab 2019-03-27 12:11:11 -07:00
nossr50
d324aa9589 Rescale Iron Arm Damage 2019-03-27 11:27:05 -07:00
nossr50
719283177e Shake has an upper limit of 10 damage (will be configurable in the near future), alchemy ranks adjusted 2019-03-26 08:22:39 -07:00
nossr50
aa25ba6338 Fixed DoubleDrops for Mining, MANY nerfs to Rupture (PVP balance tweaks coming soon) 2019-03-23 22:57:44 -07:00
nossr50
faab64864a Fixing Double Drops for Mining -- READ THE FULL COMMIT MSG 
This fix is very similar to what was deployed for Herbalism in 2.1.22

NOTE: Here's what your Double_Drop entries in Config.yml for Mining should look like

https://paste.gg/p/anonymous/dcd06f1215844311b4f2225f200090d1

IMPORTANT: Version 2.1.22 which came before this had a similar fix for Herbalism, instructions on how to fix your Herbalism Double Drops can be found here
        https://www.spigotmc.org/resources/official-mcmmo.64348/update?update=269868
 2019-03-23 18:07:23 -07:00
nossr50
df6315dd62 Fixed Repair Mastery using incorrect numbers during calculations 2019-03-23 16:23:38 -07:00
nossr50
255f7bf335 Fixes #3832 - Resolved issue with double drops & herbalism, similar fixes coming to woodcutting/mining soon. Reminder to update config.yml, read changelog for instructions. 
If you harvest crops with a Hoe it does not require seeds to replant on successful Green Thumb
 2019-03-23 16:21:25 -07:00
nossr50
ce6553d857 Fixing Double Drops for Herbalism (Update your configs) see changelog for instructions 2019-03-23 13:34:14 -07:00
nossr50
e40a7bb4e1 XP Gain from Roll has a CD now (60 seconds) 2019-03-21 14:32:01 -07:00
nossr50
dece43429d Added an option to turn off fishing exploit detection as a band-aid fix until the config update is done 2019-03-20 07:04:05 -07:00
nossr50
c8d95dc711 2.1.19 2019-03-18 03:12:00 -07:00
nossr50
bb118607ce Less aggressive detection 2019-03-18 02:40:19 -07:00
nossr50
2d849f55e5 Smaller bounds on fishing scarcity 2019-03-18 00:43:14 -07:00
nossr50
fef9058e16 Fishing is now more aggressive about over casting, added messages about fishing, removed vanilla rewards for exploiters 2019-03-18 00:26:49 -07:00
nossr50
e3d2526939 Improve Fishing AFK detection 2019-03-18 00:11:27 -07:00
nossr50
2f0a58b968 2.1.18 - It turns out Kelp is actually made up of 2 blocks mixed together 2019-03-16 20:26:26 -07:00
nossr50
bb46b2a6ac Drowned Transformation will no longer enabled XP on mob spawners, Kelp will now count the whole block for XP 2019-03-13 13:27:16 -07:00
nossr50
f9f6d1550e Silk Touch toggle in advanced.yml for double drops 2019-03-09 17:31:45 -08:00
nossr50
af9b631ee2 kill flux mining 2019-03-09 16:44:55 -08:00
nossr50
7703cafa34 fixing compile error 2019-03-09 16:25:51 -08:00
nossr50
437fe29112 Fuel Efficiency now uses a rank system, also fixed some bugs with it 2019-03-09 16:22:20 -08:00
nossr50
28b71804a2 Fixed display bug w/ Fish Diet, added Tropical, Raw Cod/Salmon to eligible foods 2019-03-09 15:48:29 -08:00
nossr50
e389c4b8f1 WG API shouldn't be used unless WG is on version 7 2019-02-05 10:49:40 -08:00
nossr50
4ea5432561 Abilities no longer activate if you don't have permission 2019-02-04 22:04:50 -08:00
nossr50
371a3ceec7 Unarmed now has some spam detection 
Fixed an error in the skillranks.yml file as well
 2019-02-03 13:17:42 -08:00
nossr50
c839837d7a Fixing some coloring issues 2019-02-01 11:00:02 -08:00
nossr50
8228ae248f Fixed a bug where Arcane Salvage could never fail 
SubSkillFailure renamed to SubSkillFailed in config.yml
SubSkillFailed now sends to chat by default and no longer sends to the action bar
 2019-02-01 10:34:13 -08:00
nossr50
c6a4cbd715 Fixed a bug where Salvage was giving back too many materials 2019-02-01 10:22:55 -08:00
nossr50
8262711e7e Prep for release of 2.1.4 
Fixed many display bugs
Added ranks to Super Repair, and Repair Mastery
Fixes #3754, #3746, #3745, #3756
 2019-01-31 20:02:39 -08:00
nossr50
bdfac28b44 Fixed Alchemy XP Gain 2019-01-31 18:44:51 -08:00
t00thpick1
cb89a80fd8 Only have 1 xp gain instance for archery. 2019-01-31 19:55:09 -05:00
nossr50
f2c32f07da Removing leftover debug code 
nossr50 did an oopsie
 2019-01-31 14:14:15 -08:00
nossr50
bff72486d0 Fixed a bug where static chance skills uses incorrect calculations for success 
Cleaned up some leftover code from the old skill unlock system
 2019-01-31 14:07:03 -08:00
nossr50
039542f125 Iron Arm Style no longer checks for Iron Grip levels for its own unlock checks 2019-01-31 11:27:14 -08:00
nossr50
cef9fad49f Fixing unarmed not picking up items properly 2019-01-29 16:13:04 -08:00
nossr50
370af987d6 Fixes #3737 2019-01-28 19:35:54 -08:00
nossr50
a22636b2d9 Flux Mining will now be a passive and not an item 2019-01-28 17:48:26 -08:00
nossr50
399a1529f4 Pummel now calculates correctly 2019-01-28 13:14:15 -08:00
nossr50
3734300e59 Fixing an error with shake and RNG calculations 2019-01-28 04:15:34 -08:00
nossr50
fc7b4a6790 Buffed Iron Arm, adding ranks to Iron Arm, Iron Grip, Arrow Deflect, and Disarm 2019-01-28 03:55:30 -08:00
nossr50
f89b7ccc9f better debug stick 2019-01-27 23:12:04 -08:00
nossr50
4f832edada Fixing the fishing AFK detection 2019-01-27 21:55:00 -08:00
nossr50
85a04c71f4 tweaking anti-afk 2019-01-27 21:13:42 -08:00
nossr50
c7ed3ee2a0 Magic Hunter requires treasure hunter and has ranks now 2019-01-27 20:56:16 -08:00
nossr50
7e34e87bc0 Magic Hunter stats now check for treasure hunter 2019-01-27 20:36:55 -08:00
nossr50
b2b623505d Removing traps from fishing command 2019-01-27 20:27:48 -08:00
nossr50
e969598f58 Fixing a lot of bugs involving calculating the success of skills 2019-01-27 19:36:16 -08:00
nossr50
5f39a7cb80 Fixing a bug where Lucky perk wasn't adding to success 2019-01-27 18:53:10 -08:00
nossr50
d81c3d06c5 XP Gains now report sources, added some config options regarding XP bars 
Fixed some issues with Roll
Fixes https://github.com/mcMMO-Dev/mcMMO/issues/3732
 2019-01-27 18:11:51 -08:00
nossr50
6592562c56 Check the target fishing location 2019-01-26 14:41:17 -08:00
nossr50
9aae4825cc Fixing XP gain in fishing 2019-01-26 14:34:28 -08:00
nossr50
22c5280d4e AFK Fishing protection 2019-01-26 14:25:01 -08:00
nossr50
1df4f74f8c Counter Attack now makes use of a rank system 2019-01-26 12:54:38 -08:00
nossr50
d4d5d9bac1 Gore, Pummel, and Call of The Wild now use the rank system 2019-01-26 12:50:35 -08:00
nossr50
baf1796b08 Taming's Beast Lore now uses a rank system 2019-01-26 11:21:42 -08:00
nossr50
105a81aede Axes' Critical Strikes now uses the rank system 2019-01-26 10:55:16 -08:00
nossr50
9ff8692625 Added Dodge, Arrow Retrieval to rank system 2019-01-26 10:52:22 -08:00
nossr50
d84d487435 Debug stick tells you about placestore & treasure data when hitting blocks 2019-01-26 08:14:06 -08:00
nossr50
f1fc095876 Removed the Kraken 2019-01-25 14:00:18 -08:00
nossr50
3a367d71fa Fishing traps are stupid. 2019-01-25 13:46:26 -08:00
nossr50
f4cab35a46 Fix SkillShot display 2019-01-25 12:49:16 -08:00
nossr50
1d6a142b12 Rewrote the RNG system to be more unified 2019-01-24 20:45:26 -08:00
nossr50
4031674626 Send bleed messages to the correct player 2019-01-23 16:18:21 -08:00
nossr50
71a3eb6a93 Fixed a lot of problems with the bleed task code... 2019-01-23 16:01:30 -08:00
nossr50
c51be84b50 Serrated now uses Rupture rank to calculate its bleed effect's properties 
Gore now actually uses Rupture rank 1 in its calculations
 2019-01-23 15:29:31 -08:00
nossr50
3e5c4bc617 Fixing several issues related to Bleed/Rupture 
Rupture now keeps track of who applied the damage and attributes it correctly in events
Rupture's bleed timer task no longer caps at the low value of 10 ticks internally
Ruptures bleed check code has had some minor refactoring
 2019-01-23 15:22:16 -08:00
nossr50
92de75e002 Bleed only tells you that you've started bleeding if you aren't already bleeding. 2019-01-23 12:39:51 -08:00
nossr50
c6e1edee91 Rupture will now check your rank before activating 2019-01-23 12:34:21 -08:00
nossr50
11c8374f6c Bleed doesn't suck anymore. 2019-01-21 15:15:10 -08:00
nossr50
97670f14d1 Treasure Hunter (Exc.) is now Archaelogy, retro mode now scales up treasure drop level requirements by 10, the default file has been edited to reflect this change, I recommend regenerating your treasures.yml by deleting it for now 2019-01-21 04:54:48 -08:00
nossr50
fb8213d87c Swords Counter-Attacks no longer require blocking 2019-01-21 04:39:22 -08:00
nossr50
6ad9c8e664 Readying a Tool now has a sound 2019-01-20 00:46:33 -08:00
nossr50
b8a146f8bd Fixed a sync problem where XP bars were 1-step behind 2019-01-19 20:30:19 -08:00
t00thpick1
eb1f097d18 Fix chorus blocks ignoring blockstore. 2019-01-19 17:02:24 -05:00
nossr50
126e1c5942 All skills should be on the new rank system now 2019-01-17 08:46:10 -08:00
nossr50
a59907fcec Shake sends custom damagecause 2019-01-16 11:07:11 -08:00
nossr50
52355b2757 Fixing error in Farmer's Diet 2019-01-15 05:39:25 -08:00
nossr50
13a3e9a790 Adding ranks to Fisherman/Farmer's Diet and Green Thumb 2019-01-15 05:35:41 -08:00
nossr50
4a30fcc2de 2.1.0 is probably playable now, but not unfinished 2019-01-15 02:43:44 -08:00
nossr50
95d60e646d Diminishing returns now has an optional minimum gains setting 2019-01-14 22:11:58 -08:00
nossr50
ee04bebcd9 All skills now use the ActionBar 2019-01-14 00:56:07 -08:00
nossr50
1769df98dc Archery now uses the ActionBar 2019-01-14 00:54:42 -08:00
nossr50
ca2eebf022 Axes now use the ActionBar 2019-01-14 00:52:25 -08:00
nossr50
4101f16580 Fishing now uses the ActionBar 2019-01-14 00:50:13 -08:00
nossr50
655a31d556 Herbalism now uses the ActionBar 2019-01-13 23:23:48 -08:00
nossr50
e1576e8d1c Repair now used the ActionBar 2019-01-13 23:16:24 -08:00
nossr50
2605235f2a Salvage now uses the ActionBar 2019-01-13 22:56:48 -08:00
nossr50
6bba647250 Woodcutting now uses the ActionBar 2019-01-13 22:47:27 -08:00
nossr50
79ae49a6d1 Unarmed now uses the ActionBar 2019-01-13 22:45:16 -08:00
nossr50
f007114753 Swords now use the ActionBar 2019-01-13 22:42:55 -08:00
nossr50
dad3e76c7c Taming now uses Action Bar 2019-01-13 22:32:35 -08:00
nossr50
6f77bb206d Refactoring + adding a new skillranks config (not functional yet) 2019-01-12 23:54:53 -08:00
nossr50
d3c47935d4 Some refactoring 2019-01-12 19:56:54 -08:00
nossr50
85fd0a79bc Sounds volume and pitch are now configurable in the new sounds.yml file 2019-01-12 19:08:54 -08:00
nossr50
b572c0aea9 Fixing some issues with scoreboards, it's getting late so I'll take a better look at them in the morning. 2019-01-11 10:27:11 -08:00
nossr50
d141a28747 Most things that print to your chat will now print to action bar 2019-01-11 07:11:17 -08:00
nossr50
362d036b16 4 days of work and I'm still not done ;_; 2019-01-08 19:52:52 -08:00
nossr50
01a7aa4d12 Reworked the relationship between SubSkill and Locale keys 2019-01-04 07:58:39 -08:00
nossr50
54cf356b71 converting more SubSkills to be JSON friendly 
AxeMaster & SkillShot
 2019-01-03 04:32:46 -08:00
nossr50
4669e3e54d Starting to convert existing subskills to be JSON friendly 
So far only a few have been converted
 2019-01-03 03:42:11 -08:00
nossr50
bec088c969 Some work on milestones is done 2018-12-31 10:10:00 -08:00
nossr50
0d260a74c9 Refactoring to make my life easier 2018-12-29 05:24:55 -08:00
nossr50
a316bb7bd2 Not much work was done today because of testing & research 
The real work begins soon
 2018-12-28 06:29:08 -08:00
nossr50
3831ca6b0f Burn it with fire 2018-12-27 03:04:55 -08:00
nossr50
93d10c0739 Starting work on converting skills to use the new 100-scale system 2018-12-26 23:59:43 -08:00
t00thpick1
203d3749ee Fix herbalism XP again 2018-10-14 21:27:55 -04:00
t00thpick1
1fcecbd3e7 Replant only the fully grown plants. 2018-10-13 17:09:08 -04:00
t00thpick1
5663b71387 Some of these should not have been blockdata, also this should check age of crops. 2018-10-09 21:52:23 -04:00
t00thpick1
e2edbaad34 Update herbalism permissions for new block names. Should fix replanting crops. 2018-09-14 22:44:21 -04:00
t00thpick1
184b98bbdc BREAKING CHANGE - Fix typo in secondary skill enum...... Fixes #2891 2018-09-14 22:36:47 -04:00
t00thpick1
7cc604dbdb Update potions.yml to reflect 1.13 potions and material names. 2018-09-14 20:50:28 -04:00
Devon Palma
2f2a80e1ce Various Fixes (#3537) 
* Updated ItemUtils, added isBlock check to smelt functions

+ added a check in ItemUtils.isSmeltable() and ItemUtils.isSmelted() to make sure the Item type was a block to prevent an error occuring mentioned in https://github.com/mcMMO-Dev/mcMMO/issues/3536

* Fixed Green Thumb replant issue

see https://github.com/mcMMO-Dev/mcMMO/issues/3535

HerbalismManager
= fixed names of netherwart
= fixed handleBlockState, and slightly altered it
StringUtils
= fixed name of netherwart

* Fixes to herbalism skill

Herbalism
= fixed material name for grass in green terra block conversion
= fixed material name for grass in shroom thumb block conversion
EntityListener
= fixed material name for melon in food level change
experience config
= updated name for melon and sugar cane

* Minor Name Updates

experience config
= removed Stone|*
= added Stone, Granite, Adesite, Diorite
MaterialTypes
= updated material reference for wood

* Small fishing change

PlayerListener
= made it so COD, TROPICAL_FISH, and PUFFERFISH are no longer overwritten, so players can now catch these
 2018-08-05 10:15:12 -04:00
R4zorax
a39a77f89e Fix fishing in 1.13 (#3528) 
* Fix fishing to use Material instead of BlockData (that was AIR)
 2018-08-02 20:27:15 -04:00
Shane Robertson
63378ae4c1 Updated herbalism (crop replaced by ageable) (#3523) 
* [WIP] Replacing MaterialData with Blockdata

* Fixed most block based experience gain

* Removed debug prints

* Updated configs

* [WIP] Replacing MaterialData with Blockdata

* Fixed most block based experience gain & updated wooden_tools

* ACTAULLY removed debug prints

* [WIP] Replacing bukkit treespecies 

This feature has been unofficially deprecated, (not yet fixed/marked in bukkit)
Also updated config.yml to match changes

* Updated configs

* [WIP] Replacing MaterialData with Blockdata

* [WIP] Replacing MaterialData with Blockdata

* Fixed most block based experience gain

* Fixed most block based experience gain & updated wooden_tools

* Removed debug prints

* ACTAULLY removed debug prints

* [WIP] Replacing bukkit treespecies 

This feature has been unofficially deprecated, (not yet fixed/marked in bukkit)
Also updated config.yml to match changes

* Fixed greenterra

Replaced deprecated features
 2018-07-31 21:35:45 -04:00
t00thpick1
fecf83c79c Don't break on double drops for woodcutting. 2018-07-30 20:44:10 -04:00
Shane Robertson
4bda175328 Removed misc, print statements (#3508) 
* ACTAULLY removed debug prints
 2018-07-26 20:47:45 -04:00
Shane Robertson
ee324c77a9 Fixed errors with block-based skill experience (#3506) 
* Updated configs

* [WIP] Replacing MaterialData with Blockdata

* Fixed most block based experience gain

* Fixed most block based experience gain & updated wooden_tools

* Removed debug prints
 2018-07-26 19:53:29 -04:00
t00thpick1
b73eced36f Remove sound adapter 2018-07-25 20:29:40 -04:00
t00thpick1
fbe26af2d7 Merge remote-tracking branch 'origin/master' 2018-07-23 22:14:44 -04:00
t00thpick1
0a1559511a Quick and dirty 1.13 update. I.e. it now compiles for 1.13. 2018-07-23 22:13:57 -04:00
t00thpick1
cbff8482ce
Merge pull request #3427 from joblo2213/master 
Add McMMOPlayerSalvageCheckEvent
 2018-06-09 11:50:32 -04:00
joblo.2213
0035762a71
Add McMMOPlayerSalvageCheckEvent 2018-06-09 09:46:06 +02:00
Glitchfinder
c83d011faa Don't convert raw salmon to raw fish when summoning ocelots. 
Fixes #3366
 2018-05-15 19:40:48 -07:00
Glitchfinder
c87b410823 Merge branch 'anvil_unbreakables' of github.com:GiovanH/mcMMO 2018-05-11 10:07:53 -07:00
Glitchfinder
e98d241452 Merge branch 'master' of github.com:ProgrammingAtDawn/mcMMO 2018-05-11 10:04:14 -07:00
GiovanH
421455224f Codebase! 2018-05-10 04:54:35 +01:00
t00thpick1
2b159adefd
Merge pull request #3330 from hoorigan/ench-book-fixes 
Enchanted book fixes
 2018-04-28 20:04:06 -04:00
ezeiger92
feeb17d6f0 Scale fishing drop chance by lure rather than subtracting 1 
Fixes mcMMO-Dev/mcMMO#3383
Added config option for lure enchantment modifier
Fixes lure enchantment having no effect on drops from offhand
 2018-02-15 15:48:21 -08:00
ezeiger92
6d2003d577 Remove offhand fishing rod if not in main hand 
Fixes mcMMO-Dev/mcMMO#3342
Fixed style error in last commit
 2018-02-15 13:59:10 -08:00
ProgrammingAtDawn
d64399df49 Calculate experience gain before processing green thumb. 2018-01-24 20:53:59 +01:00
hoorigan
6d5ab0edda
FishingManager: force enchant on enchanted book 
Added a small conditional to ensure that enchanted books get an enchantment.
 2017-10-31 16:45:08 -04:00
t00thpick1
4c3f3ee4e2 Dont use named seeds in replanting. Fixes #3273 2017-08-31 23:47:28 -04:00
Erik
60aa32d003 Patches! 
* Update bukkit version
* Default vanilla  exp modifier for fishing is now 1
* Fixed beetroot permission for herbalism
 2017-08-15 12:20:09 -07:00
Erik
b5f6b1d97f Fix for 3250 - HashSet<Byte> to HashSet<Material> for getTargetBlock 2017-08-05 11:50:24 -07:00
t00thpick1
f1ac5739e4 [bugfix] Resolve issues with Herbalism exp. 
Due to flaws the previous changes to the configuration system combined with some bad lines in the experience.config that I mistakenly recommended, herbalism was not granting experience in most cases, as it was marking newly planted crops and such as player placed no exp granting blocks, rather than ignoring them as it should.
block types now are evaluated in 3 steps:
1: Explicit Name  i.e. ("Crops|4", "Crops|0"), Which is the material name then data value
2: "friendly name"  i.e. ("Crops_Ripe", "Crops_Ungrown"), Which is a typically data valueless name,  some of which I make up in mcMMO, but most of which are just the Material name
3: Wildcard name  i.e. ("Crops|*") Which is any block with that block value, regardless of data value

In order to be sure herbalism grants exp for you once again, make sure your configuration for herbalism looks similar to this:
https://github.com/mcMMO-Dev/mcMMO/blob/master/src/main/resources/experience.yml#L151

In terms of which blocks are listed there.  Specifically, there should be no blocks marked "ungrown"
 2017-08-01 01:33:02 -04:00
t00thpick1
24f8b2fbd5 More configuration for hylian luck 2017-06-10 14:16:31 -04:00
t00thpick1
ee02a19e9a Add more configuration to shake treasures 2017-06-10 13:59:49 -04:00
t00thpick1
15436b44da Update configurations and skill block checks to be more configurable. 2017-06-10 13:47:20 -04:00
t00thpick1
fda625b235 Merge pull request #3185 from nathanprocks/master 
Add shaking from shulkers
 2017-06-07 21:22:30 -04:00
Nathan Piercy
95167f44f1 Add shaking from shulkers 2017-06-04 16:34:48 +10:00
Luck
789b51fd05
Fix for removed methods in Bukkit 1.12 2017-05-14 16:36:31 +01:00
t00thpick1
a43ae4178a Some cleanups to mob related XP code 2017-04-15 00:04:07 -04:00
kanesada2
2e7f56eeb5 fix shake for WITHER-SKELETON. avoid to use getSkeltonType() 2017-01-13 14:10:55 +09:00
t00thpick1
a2bcce9ab1 I believe this resolves berserk allowing you to take drops into your equipment slots. 2016-12-17 17:32:16 -05:00
Jake Ben-Tovim
5f9f3e8167 Fix 1.11 brewing, remove health bar from armor stands 
This fixes brewing on the newest Spigot API builds. The Alchemy skill was completely broken due to a change in the Spigot BrewEvent constructor, which this fixes via the changes to FakeBrewEvent.java and AlchemyPotionBrewer.java. This also adds a check in EntityListener.java for armor stands, so that health bars aren't displayed for them. The health bars never really displayed properly (armor stand health acts differently from most entities), and it allowed players to punch invisible armor stands server admins may have been intentionally hiding to temporarily reveal them via a health bar, which is an issue.
 2016-11-28 21:28:05 -05:00