Civcraft / MusterCull

A Bukkit plugin and Minecraft mob limiter.
BSD 3-Clause "New" or "Revised" License
2 stars 6 forks source link

MasterMerge #37

Closed idoash4 closed 9 years ago

idoash4 commented 9 years ago

I am aware there are still edge cases that need to be handled(like sheeps and withers) but I already finished most of the basics features and I decided it will be a good idea to let someone review it before keep going. I have tested this version on my local server and merging seems to be working, but it is hard testing MusterCull on a testing server with only 1 player online.

This is an example of how to add an entity to the config:

A creeper will only spawn after 5(spawnDelay) creepers attempted to spawn at the same area( range - 144 blocks). The creeper will have the combined drops of all the other creepers that attempted to spawn * the multiplier(in this case 1 + 4*0.5 = 3). Once there are 3(limit) creepers at the same area all the creepers that attempt to spawn will be merged into the existing creepers.

Its really late for me so I will explain more about the code tomorrow I just wanted to get this pull up in the meantime. (Just to be clear I didn't change the name of the plugin I just thought this is a cool title for the pull)

CivcraftBot commented 9 years ago

Can one of the admins verify this patch? Type 'ok to test' to test.

CivcraftBot commented 9 years ago

Can one of the admins verify this patch? Type 'ok to test' to test.

ttk2 commented 9 years ago

nice, do you want me to make a testing build and put it up?

idoash4 commented 9 years ago

Yes, I will add entities to the config in game.

ttk2 commented 9 years ago

ok to test

ttk2 commented 9 years ago

ok its on Civtest, go for it.

idoash4 commented 9 years ago

Are you getting any stack traces?

ttk2 commented 9 years ago

2015-06-20 10:13:10 [ERROR] Error occurred while enabling MusterCull v1.4.3 (Is it up to date?) java.lang.IllegalArgumentException: No enum constant org.bukkit.entity.EntityType.CAVESPIDER at java.lang.Enum.valueOf(Enum.java:238) ~[?:1.8.0_45-internal] at org.bukkit.entity.EntityType.valueOf(EntityType.java:1) ~[spigot.jar:git-Spigot-1d14d5f-7722428] at com.untamedears.mustercull.Configuration.load(Configuration.java:213) ~[?:?] at com.untamedears.mustercull.MusterCull.onEnable(MusterCull.java:96) ~[?:?] at org.bukkit.plugin.java.JavaPlugin.setEnabled(JavaPlugin.java:321) ~[spigot.jar:git-Spigot-1d14d5f-7722428] at org.bukkit.plugin.java.JavaPluginLoader.enablePlugin(JavaPluginLoader.java:335) [spigot.jar:git-Spigot-1d14d5f-7722428] at org.bukkit.plugin.SimplePluginManager.enablePlugin(SimplePluginManager.java:405) [spigot.jar:git-Spigot-1d14d5f-7722428] at org.bukkit.craftbukkit.v1_8_R2.CraftServer.loadPlugin(CraftServer.java:356) [spigot.jar:git-Spigot-1d14d5f-7722428] at org.bukkit.craftbukkit.v1_8_R2.CraftServer.enablePlugins(CraftServer.java:316) [spigot.jar:git-Spigot-1d14d5f-7722428] at net.minecraft.server.v1_8_R2.MinecraftServer.r(MinecraftServer.java:416) [spigot.jar:git-Spigot-1d14d5f-7722428] at net.minecraft.server.v1_8_R2.MinecraftServer.k(MinecraftServer.java:382) [spigot.jar:git-Spigot-1d14d5f-7722428] at net.minecraft.server.v1_8_R2.MinecraftServer.a(MinecraftServer.java:337) [spigot.jar:git-Spigot-1d14d5f-7722428] at net.minecraft.server.v1_8_R2.DedicatedServer.init(DedicatedServer.java:257) [spigot.jar:git-Spigot-1d14d5f-7722428] at net.minecraft.server.v1_8_R2.MinecraftServer.run(MinecraftServer.java:522) [spigot.jar:git-Spigot-1d14d5f-7722428] at java.lang.Thread.run(Thread.java:745) [?:1.8.0_45-internal]

this is the only one so far

On Sat, Jun 20, 2015 at 9:20 AM BlackXnt notifications@github.com wrote:

Are you getting any stack traces?

— Reply to this email directly or view it on GitHub https://github.com/Civcraft/MusterCull/pull/37#issuecomment-113773597.

idoash4 commented 9 years ago

Did you update the config too?

ttk2 commented 9 years ago

now i did

idoash4 commented 9 years ago

can you update the jar on civtest with this commit?

ttk2 commented 9 years ago

ok to test

ttk2 commented 9 years ago

its up

ttk2 commented 9 years ago

hows this going?

idoash4 commented 9 years ago

Great! I have tested everything I could think of and only found one bug. I will fix it on monday + clean the code a bit and let someone review it. Also can I get the logs of MusterCull from civtest?

ttk2 commented 9 years ago

https://mega.nz/#!N9NjDSbD!yjwELiLs0hCjTGNEJB4rX6J5Qti2Mt8hsD-mF1J6_vs

here are the logs.

ttk2 commented 9 years ago

so whats up with this?

idoash4 commented 9 years ago

I still need to clean the code and add a new config option. I didn't have time to even open Eclipse since saturday. I hope I will finish it today.

ttk2 commented 9 years ago

Sounds great keep me posted.

On Tue, Jun 23, 2015, 4:04 AM BlackXnt notifications@github.com wrote:

I still need to clean the code and add a new config option. I didn't have time to even open Eclipse since saturday. I hope I will finish it today.

— Reply to this email directly or view it on GitHub https://github.com/Civcraft/MusterCull/pull/37#issuecomment-114412475.

idoash4 commented 9 years ago

In addition to the code cleanup I added a new config option to limit the multiplier of each entity so players can't "afk a mob" and get a ridiculous amount of drops / they still have to make their farm efficient and kill the mobs ASAP. Support for sheeps was also added - the multiplier will affect the amount of wool the sheep drops when sheared by a player. I only have to fix one more thing before we can go live with the changes(adding limits in-game and saving them on server restart).

ttk2 commented 9 years ago

nice, just let me know when to upload stuff to Civtest.

idoash4 commented 9 years ago

You can put it on civtest now. I will deal with adding limits in-game later - its not high priority at all and I am having some hard time with it.

idoash4 commented 9 years ago

Update the config file on civtest too.

ttk2 commented 9 years ago

ok to test

ttk2 commented 9 years ago

on civtest

idoash4 commented 9 years ago

Are you getting stacks? I dont see a single mob on civtest.

ttk2 commented 9 years ago

nope all is quiet, maybe someone changed the gamemode?

idoash4 commented 9 years ago

I dont think that's the case. Can I get the logs of MusterCull? Especially the ones from when the server restarted.

ttk2 commented 9 years ago

looks like the log file did not get updated right, downloaded a new one, try now.

idoash4 commented 9 years ago

Still no mobs.

ttk2 commented 9 years ago

I think somthing must be up with mustercull, not a single message from it once it was enabled.

ttk2 commented 9 years ago

or not up with mustercull maybe no mobs=no messages?

idoash4 commented 9 years ago

This is really weird. I am running the same version on my local server and it is working just fine. Can you post all the logs from when it was enabled? maybe something is wrong with the config.

ttk2 commented 9 years ago

2015-06-25 07:44:09 [INFO] [MusterCull] Enabling MusterCull v1.4.3 2015-06-25 07:44:09 [INFO] [MusterCull] Warning: damage is <= 0, possibly wasting cpu cycles. 2015-06-25 07:44:09 [INFO] [MusterCull] Warning: damage_chance is <= 0, possibly wasting cpu cycles. 2015-06-25 07:44:09 [INFO] [MusterCull] Warning: damage_count is <= 0, possibly wasting cpu cycles. 2015-06-25 07:44:09 [INFO] [MusterCull] MusterCull will damage something every 0 ticks. 2015-06-25 07:44:09 [INFO] [MusterCull] Warning: ticks_between_damage is < 20, probably won't run that fast. 2015-06-25 07:44:09 [INFO] [MusterCull] Warning: merge_count is <= 0, possibly wasting cpu cycles. 2015-06-25 07:44:09 [INFO] [MusterCull] MusterCull will merge something every 0 ticks. 2015-06-25 07:44:09 [INFO] [MusterCull] Warning: ticks_between_merge is < 20, probably won't run that fast. 2015-06-25 07:44:09 [INFO] [MusterCull] Monster cull: Up to 30 mobs per run, aggression is 0 to 0. 2015-06-25 07:44:09 [INFO] [MusterCull] Monster cull: Up to 30 mobs per run, aggression is 0 to 0. 2015-06-25 07:44:09 [INFO] [MusterCull] Monster cull: Up to 0 mobs per run, aggression is 0 to 0. 2015-06-25 07:44:09 [INFO] [MusterCull] MusterCull will kill something every 0 ticks. 2015-06-25 07:44:09 [WARN] [MusterCull] ticks_between_hard_cap is < 200, ignoring this and setting to 200. 2015-06-25 07:44:09 [WARN] [MusterCull] hard_cap_culling_strategy not an allowed value (needs RANDOM or PRIORITY - has null.

thats it

idoash4 commented 9 years ago

It doesnt find the config file. Did you put the config.yml from this pull in MusterCull's data folder?

Edit: I think I did something wrong. I will update this pull soon.

ttk2 commented 9 years ago

found it I was downloading the plugin.yml instead of the config, should work now.

On Thu, Jun 25, 2015 at 6:51 AM BlackXnt notifications@github.com wrote:

It doesnt find the config file. Did you put the config.yml from this pull in the mustercull's data folder?

— Reply to this email directly or view it on GitHub https://github.com/Civcraft/MusterCull/pull/37#issuecomment-115220692.

idoash4 commented 9 years ago

Great! I need to change the default settings so it won't just completely remove all the mobs. I am going to do the final round of testing today. I suggest we go online with the changes only with zombie pigman and see how it affects portal farms before applying the changes to the rest of the mobs.

ttk2 commented 9 years ago

Ok then. Just let me know when its ready to stage.

On Thu, Jun 25, 2015, 7:21 AM BlackXnt notifications@github.com wrote:

Great! I need to change the default settings so it won't just completely remove all the mobs. I am going to do the final round of testing today. I suggest we go online with the changes only with zombie pigman at the start and see how it affects portal farms before applying the changes to the rest of the mobs.

— Reply to this email directly or view it on GitHub https://github.com/Civcraft/MusterCull/pull/37#issuecomment-115232040.

idoash4 commented 9 years ago

Are you getting stacks now?

ttk2 commented 9 years ago

nope no stacks.

On Thu, Jun 25, 2015 at 12:45 PM BlackXnt notifications@github.com wrote:

Are you getting stacks now?

— Reply to this email directly or view it on GitHub https://github.com/Civcraft/MusterCull/pull/37#issuecomment-115342229.

ttk2 commented 9 years ago

just go this one on restart.

2015-06-25 19:12:35 [ERROR] Error occurred while enabling MusterCull v1.4.3 (Is it up to date?) java.lang.IllegalArgumentException: No enum constant org.bukkit.entity.EntityType.CAVESPIDER at java.lang.Enum.valueOf(Enum.java:238) ~[?:1.8.0_45-internal] at org.bukkit.entity.EntityType.valueOf(EntityType.java:1) ~[spigot.jar:git-Spigot-1d14d5f-7722428] at com.untamedears.mustercull.configurations.Configuration.load(Configuration.java:217) ~[?:?] at com.untamedears.mustercull.MusterCull.onEnable(MusterCull.java:107) ~[?:?] at org.bukkit.plugin.java.JavaPlugin.setEnabled(JavaPlugin.java:321) ~[spigot.jar:git-Spigot-1d14d5f-7722428] at org.bukkit.plugin.java.JavaPluginLoader.enablePlugin(JavaPluginLoader.java:335) [spigot.jar:git-Spigot-1d14d5f-7722428] at org.bukkit.plugin.SimplePluginManager.enablePlugin(SimplePluginManager.java:405) [spigot.jar:git-Spigot-1d14d5f-7722428] at org.bukkit.craftbukkit.v1_8_R2.CraftServer.loadPlugin(CraftServer.java:356) [spigot.jar:git-Spigot-1d14d5f-7722428] at org.bukkit.craftbukkit.v1_8_R2.CraftServer.enablePlugins(CraftServer.java:316) [spigot.jar:git-Spigot-1d14d5f-7722428] at net.minecraft.server.v1_8_R2.MinecraftServer.r(MinecraftServer.java:416) [spigot.jar:git-Spigot-1d14d5f-7722428] at net.minecraft.server.v1_8_R2.MinecraftServer.k(MinecraftServer.java:382) [spigot.jar:git-Spigot-1d14d5f-7722428] at net.minecraft.server.v1_8_R2.MinecraftServer.a(MinecraftServer.java:337) [spigot.jar:git-Spigot-1d14d5f-7722428] at net.minecraft.server.v1_8_R2.DedicatedServer.init(DedicatedServer.java:257) [spigot.jar:git-Spigot-1d14d5f-7722428] at net.minecraft.server.v1_8_R2.MinecraftServer.run(MinecraftServer.java:522) [spigot.jar:git-Spigot-1d14d5f-7722428] at java.lang.Thread.run(Thread.java:745) [?:1.8.0_45-internal]

idoash4 commented 9 years ago

You are not running the updated config. In the config of this pull it is CAVE_SPIDER not CAVESPIDER.

ttk2 commented 9 years ago

corrected, sorry.

idoash4 commented 9 years ago

I finished testing, I am not going to find any new bugs on a testing server. I have added zombie pigs to the config of this pull, this is ready to go online.

ttk2 commented 9 years ago

ok then, I will set it up for tomorrow morning.

ttk2 commented 9 years ago

ok to test

ttk2 commented 9 years ago

ok to test

idoash4 commented 9 years ago

Make sure you get the right config :D

ttk2 commented 9 years ago

I just did, its all on civtest for final checking, also please write a changelog blurb about what exactly this is and how players will be affected by it.

idoash4 commented 9 years ago

I will make a post on the forum today/tomorrow morning.