* Bumped version to 2.10.0-SNAPSHOT.
* Added zombified piglin, piglin, hoglin, zoglin and strider to the by default enabled mob types. If you are updating, you will have to manually add these to your config's 'enabled-living-shops' setting.
* During my quick initial testing I did not encounter any major issues with these new mobs, but there are some oddities you might want to be aware of:
* We don't support changing the baby property of piglin and zoglin shopkeepers yet. However, we at least ensure that they always spawn as adult.
* The zombified piglin, hoglin and strider already support changing the baby property.
* The strider constantly shakes when being spawned outside the nether and randomly spawns with saddle.
* The pig zombie mob type has been removed from the by default enabled mob types. If you are updating to MC 1.16, it will get automatically removed from your config. To prevent your config from losing its comments and formatting during this small migration, consider manually removing this mob type before your update.
* If you are updating to MC 1.16, your pig zombie shopkeepers get automatically converted to zombified pigman shopkeepers.
* Internal: Any internal references to the pig zombie mob type have been removed to prevent any kind of binary problems to arise.
Other changes:
* Improved/Fixed: Some mobs randomly spawn with passengers. We remove those passengers now.
Those will only be available when run on a Spigot-based server.
Other changes:
* Added a few new utility methods to TextUtils.
* Slightly changed how TextUtils#getPlayerString deals with a missing player name.
* Made CollectionUtils#getIdealHashMapCapacity public.
Internally this new format uses Bukkit's item serialization for parsing
the item data, which allows it to support the specification of arbitrary
item data and hopefully not require any major updating/maintenance for
future minecraft versions. At the same time it tries to stay (slightly)
more user-friendly than Bukkit's item serialization by omitting any data
that can be restored by the plugin, by avoiding one level of nesting
between the item type and item data, by translating ampersand ('&')
color codes in display name and lore, and by offering a compact
representation for specifying an item only by its type.
This change also allows a more detailed specification of some of the
editor button items. However, many editor buttons still miss
corresponding config settings. Also keep in mind that the display name
and lore for these button items get specified via corresponding message
settings, so any specified item display name and lore will get replaced
by that.
When checking if an in-game item matches the item data specified in the
config, only the specified data gets compared. So this does not check
for item data equality, but instead the checked item is able to contain
additional data but still get matched (like before, but previously this
was limited to checking display name and lore).
The previous item data gets automatically migrated to the new format
(config version 2).
Other changes:
* Internal: Moved config migrations into a separate package.
* Internal: Moved some function(s) into ConfigUtils.
* Internal: Slightly changed how the plugin checks whether the high
currency is enabled.
* Internal: Avoiding ItemStack#hasItemMeta calls before getting an
item's ItemMeta, since this might be heavier than simply getting the
ItemMeta directly and performing only the relevant checks on that.
Internally ItemStack#hasItemMeta checks emptiness for all item
attributes and might (for CraftItemStacks) even first copy all the
item's data into a new ItemMeta object. And even if the item actually
has no data (Bukkit ItemStack with null ItemMeta), ItemStack#getItemMeta
will simply create a new empty ItemMeta object without having to copy
any data, so this is still a similarly lightweight operation anyways.
* Internal: Added ItemData tests. Unfortunately this requires
CraftBukkit as test dependency.
ShopkeepersAPI.
Adjusted Eclipse classpath to make tests work. There seems to be
something off with the maven setup for the individual child modules
though.
* Dropped support for MC 1.13. This version only supports MC 1.14.
* If you are upgrading, make sure that you have successfully updated
shopkeepers to 1.13 first. Migration from older MC are not supported and
might not work. Reverting to older versions isn't supported either.
* Removed pre 1.13 sheep color migration.
* Villager shopkeepers:
* Changed default profession from farmer to 'none'.
* Priest villagers get converted to 'cleric' and blacksmiths become
'armorer'. Previous regular farmer villagers stay farmers (but they look
different now).
* Changed the items representing the villager professions in the
editor.
* Note: Wandering traders are not a villager sub-variant, but a
different mob type.
* Ocelot shopkeepers of cat types have been converted to corresponding
cat shopkeepers. You might have to adapt your players' permissions,
since cat and ocelot shopkeepers require different permissions now. With
this migration players can end up with cat shopkeepers even though they
don't have the permission to freshly create those if they wanted. The
different cat types are represented by colored leather armor inside the
editor.
* Any settings affecting regular villagers will affect wandering traders
as well now. There are no settings (for now?) to handle wandering
traders differently. When preventing regular villagers from spawning,
the trader llamas of the wandering trader are prevented from spawning as
well. When hiring a wandering trader its leashed llama should get
unleashed due to the removal of the wandering trader.
* Added: Sign shops can now switch between different wood types.
TODO:
* This has not yet been tested. Spigot 1.14-pre5 seems to still have
some other issues which prevent me from testing this currently.
* New entities have not yet been tested.
* Support for changing between different villager biome types would be
nice.
* Updated for MC 1.13.1. Dropped support for 1.13, since 1.13.1 is a bug
fix release and there should be no reason not to update.
* Bumped Bukkit dependency to 1.13.1-R0.1.
* Removed additional version check again (added in a recent commit).
* Fixed: There might have been some trading issue related to undamaged
damageable items not being considered matching since 1.13.
This is not yet complete! This is still missing:
* Importing and validating previous trades data! (blocking)
* Testing and adding the various new mobs.
* The MC 1.11 migration code inside the shopkeeper storage can be
removed now. Some other old offers/costs migration code as well.
* This is completely untested so far.
Overview of the changes so far:
* Dropped all backwards compatibility support (1.8 - 1.12). It is only
compatible with the latest versions of Spigot/CraftBukkit 1.13.
* Some older migration code has been removed, so it is
recommended/required to first update to MC 1.12 and Shopkeepers v2.2.1
before installing this or any later versions.
* Added a config migration to update previous materials and data values
to the new materials.
* Item ids in the config are no longer supported at all. Those will have
to be updated manually before installing this update.
Other changes:
* Since only 1.13 and above is supported now, various code was cleaned
up and updated that was only there for backwards compatibility reasons.
* Removed skip-custom-head-saving setting: Previously this was meant
to workaround some issue with saving custom head items (head items with
custom texture and no player name) causing corrupted save data. The data
corruption / crashing should be fixed by bukkit by now. However, bukkit
also completely dropped 'support' for those custom head items.
* Removed support for loading old serialized item attributes.
* Reduced the amount of version specific code since for many things
there are bukkit alternatives available by now.
* Slightly improved the chest and sign protection to take block
explosions into account.
* Improvement: Added warning messages when not able to load a cat type
or sheep color and falling back to the default in that case.
* Internal: Sheep colors were previous saved by using the old wool data
values. They are now converted and saved by their color names.
* Improvement: When testing if a player can access a chest, it now
clears the off hand as well during the check (making the check more
accurate).
* Internal: Using player ids instead of player names for temporary data
at a few places now.
* Removed reference to old Cube-Nation repository.
* Added a separate parent pom and renamed the old parent to 'sk-root'.
Only sk-main uses sk-root as parent now. The api project therefore
relies only on a minimal set of dependencies now.
* Shopkeepers and ShopkeepersAPI get installed and deployed with a
flattened pom now. This should allow depending on those without having
to also deploy the various versions of the parent poms or child modules.
* The different child modules that get bundled and deployed as part of
the final plugin jar use the 'provided' scope now, in order to not be
transitive for projects depending on Shopkeepers internals.
* Added a separate nms-parent pom, to further reduce duplicate contents
in the nms handler child modules.
* All api source code was moved into a separate source folder (added a
corresponding entry in the classpath of the root eclipse project, so it
finds it).
* A separate ShopkeepersAPI artifacts gets created and installed and
deployed.
* The main module depends and bundles the api artifact.
Moved various distribution related configuration into the parent pom.
* The old 'API' module is now called 'main' and is responsible for fully
building everything related to the core plugin contents.
* The old 'Shopkeepers' module is now called 'dist' and only responsible
for creating the assembly containing all the different module outputs
(main and various version-specific contents).
* The plugin version is now automatically propagated from the parent
project to the child modules by letting maven inherit the parent
version. To not have to update the parent versions with every new
release, the parent is specified with an open ranged version (should
therefore always pick the latest version it finds).
* To not pollute the local maven repository with the build artifacts of
the various child modules of various different versions, all modules
except 'dist' skip the install goal. (TODO maybe also install sk-main,
in case something wants to depend on that alone?).
* All common plugins configuration is now located in the parent and any
plugins that are configured by maven by default are omitted in the child
modules.
* Fixed: The LICENSE file gets properly included in the plugin jar now.
* Using ${project.parent.relativePath} variable everywhere, removing
unneeded/inherited entries and properties, moved a bunch of general
information into properties in the parent pom (version, urls, etc.),
updated scm information to point to the new repository.
* The plugin.yml now uses the dbo url defined in the maven pom.
* Added custom charts for supported third-party plugins, used (vault)
economy, usage of various features and total shopkeeper count.
* Added a few plugins as soft dependencies: Vault, WorldGuard, Towny,
Gringotts.
* Added an additional config setting 'enable-metrics', with which bStats
metrics can be disabled for Shopkeepers only.
Maven cleanup:
* All scopes are now explicitly specified.
* Removed duplicate group-ids form child-modules.
* Moved junit dependency into parent.
From a quick test, illusioner and parrot seem to work fine.
Updating player inventory after cancelling interaction. This helps in
cases whe the interaction would modify the inventory(ex. animal
feeding).
Due to some villager profession changes in bukkit, data about villager
professions gets converted to a new storage format (stored by name
instead of id) (not backwards compatible!).
Using bukkit's new API for setting entities silent on MC 1.10.
Minor changes to the compatibility mode, which didn't work for the past
few minecraft updates. Might still not work, as it wasn't fully tested.
Removed support for MC 1.7.10.
Removed 'use-strict-item-comparison' setting (minecraft is performing a
strict item comparison already itself since MC 1.8).
Removed uuid conversion related code: PlayerShops are expected to have a
valid owner uuid by now.
Slightly refactored handling of issues during shop creation and loading,
so that shopkeepers with invalid data (ex. missing owner uuids) can now
communicate to the loading procedure that the loading failed.
Players are now also allowed to place a shopkeeper if the region they
are in has WorldGuard's ALLOW_SHOP flag set (regardless if they can
build in that region).
Updated WorldGuard dependency to 5.9, added dependency to WorldEdit 5.6
(otherwise it wouldn't let me compile..) and added sk89q's official
maven repository.
the core with bukkit 1.6.2 R1.0 again and moving all bukkit version
specific stuff into the NMSCallProvider (maybe rename it to something
like 'VersionProvider' or similar, as it is not only used for NMS
related stuff anymore..?).
could probably be improved: instead of having to go through all the
available mob types with the creation item, it might be better to just
create a living entity shop of some type the player is allowed to use,
and then given him the option to change the type via the editor menu.
Also a few small things in direction of adding the citizen support (like
some setting) are already included in this commit.
The different entity type settings were removed and replaced with a list
of 'disabled entity types', also the selected messages were replaced
with a generic one.
especially move things out of the main plugin class and make some things
slightly more abstract:
* all living shopkeeper types share one listener now
* made the shopkeeper types more abstract
* made the shop object types more abstract
* tried to make the user interface stuff (trading, hiring, editor
windows) more abstract (though, I am not quite sure yet if that was an
improvement..)
* many more tiny changes everywhere..
Work in progress.
player logs in. The playername gets used for display purposes and as
identifier for the owner as long as we don't have an owner uuid yet.
Caveat which is probably left: the 'remove shopkeeper after certain time
of inactivity of player' gets an OfflinePlayer to determine when the
player was last online. This however can now (since 1.7.8) freeze the
server when it has to lookup the name or uuid via the mojang services.
However, this is currently considered a minor 'issue' as those lookups
can only happen once per plugin load (and reload), and the server might
cache the result from those lookups.
blablubbabc
Xephi