erocs/PrisonPearl — pull request #33 by spaceFountain (2014-01-05 02:37:20+00:00)
Title: Update to 1.7.4

To the best of my knowledge this works, but there may be problems related to CombatTags.

The most likely change to cause problems is relate to a new class GameProfile which is now required in place of a name to spawn EntityHumans. It holds a name and an id, but I think from looking at the code a bit it will be ok to only set the name. Beside that the major change is with getting the class for an type of item. Previously they were public static variables in the Item class for each type where now there is a system to register and request classes through the use of the RegistryMaterials class still accessed through a static variable in Item.

I've updated CombatTag to include the modifications in the current version running on the server, but CombatTag did away with PlayerDataContainer class and I've not attempted to add it instead removing PrisonPearl's requirement for it. I'll try working out how to submit a pull request for my updated CombatTag, but as it's branched from the 1.7.4 CombatTag and then updated with Civcraft stuff rather than being branched from your version of CombatTag I don't think I can.

Citadel appears to compile and run fine for 1.7.4 so I haven't touched it.

I don't feel confident updating EnderExpansion and I don't think it's currently running anyway so I've removed it from PrisonPearl.