Skip to content

Commit

Permalink
Adding some changes I missed
Browse files Browse the repository at this point in the history
  • Loading branch information
Narimm committed Apr 6, 2019
1 parent 19c5e83 commit a14c5ff
Show file tree
Hide file tree
Showing 176 changed files with 27,244 additions and 27,244 deletions.
114 changes: 57 additions & 57 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
jooq_codegen
deploy.sh
pass.txt
dev.sh
dependency-reduced-pom.xml

# Numerous always-ignore extensions
*.diff
*.err
*.orig
*.log
*.rej
*.swo
*.swp
*.vi
*~
# OS or Editor folders
.DS_Store
.cache
.project
.settings
.tmproj
nbproject
Thumbs.db

# Dreamweaver added files
_notes
dwsync.xml

# Komodo
*.komodoproject
.komodotools

# Folders to ignore
.hg
.svn
.CVS
intermediate
publish
.idea


# Eclipse stuff
.classpath
build.xml
target

# various other potential build files
build
bin
dist
manifest.mf

# Mac filesystem dust


*.iml
jooq_codegen
deploy.sh
pass.txt
dev.sh
dependency-reduced-pom.xml

# Numerous always-ignore extensions
*.diff
*.err
*.orig
*.log
*.rej
*.swo
*.swp
*.vi
*~
# OS or Editor folders
.DS_Store
.cache
.project
.settings
.tmproj
nbproject
Thumbs.db

# Dreamweaver added files
_notes
dwsync.xml

# Komodo
*.komodoproject
.komodotools

# Folders to ignore
.hg
.svn
.CVS
intermediate
publish
.idea


# Eclipse stuff
.classpath
build.xml
target

# various other potential build files
build
bin
dist
manifest.mf

# Mac filesystem dust


*.iml
752 changes: 376 additions & 376 deletions LICENSE

Large diffs are not rendered by default.

156 changes: 78 additions & 78 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,78 +1,78 @@
**GPrism** is a Bukkit plugin that tracks changes to a Minecraft world. These changes can be looked
up, rolled back, restored, etc. There are also various anti-griefing tools.

GPrism is a downstream fork of @viveleroi's [Prism-Bukkit][PRISM], with various fixes and feature
additions by a few GitHub contributors and Roy Curtis.

For information on how to use GPrism, [see the original Prism wiki.][WIKI]

# Differences from upstream

## Pulled in from other forks

* 1.9, 1.9.4 and 1.10 support by @Jikoo
* UTF-8 MySQL support by @paulmory
* Inspect hand item and wand fixes by @Siggi88 and @Jikoo
* Removal of NMS usage and chat component API fixes by @Jikoo
* Item frame rollback fixes by @PhanaticD
* `-raw` flag for non-JSON output by @cbarber

## By Roy Curtis

* **Major changes to data storage format of items (full metadata support)**
* Fixed rollback of villager trades and riches
* Optimized data storage of entities
* Removed duplicate GSON dependency and included Elixr (repository down)
* Added `useSSL=false` to MySQL string (due to spam from new versions)
* Hid purge cycle messages if 0 rows affected (reduces noise)
* More fixes to item frame tracking and rollbacks
* Made `item-rotate` action rollbackable and more accurate
* Fixed rollbacks of torches against walls and end rods broken by water
* Updated entity events and rollbacks to handle all the new 1.11 horse subtypes (incl. llamas)
* Fixed attribute rollbacks of killed horses
* Fixed tracking and attribution of frost walker ice
* Added wait messages to `/pr i` and `/pr near`
* Added support for rabbit types
* Attributed lingering potion deaths to players
* Java 1.8 language level
* POM file cleanup and improvements

# Support

Prism-Bukkit was abandoned in favor of the [Sponge rewrite][SPONGE]. This fork is not intended to be
a long-term continuation of Prism; this is only for our fixes, to keep Prism-Bukkit working. We may
remove features that we don't use or think should be provided by GPrism.

That said; please feel free to cherry pick commits or fork from this fork, or contribute to this
fork with issues and pull requests.

**Only the latest server version (1.11.2) is supported; older servers may break GPrism.**

# Building, debugging and debug logging

For instructions and screenshots on how to. . .

* Compile this plugin from scratch
* Build a JAR of this plugin
* Debug this plugin on a server
* Enable debug logging levels such as `FINE` and `FINER`

. . .[please follow the linked guide on this Google document.][BUILD] However, for debugging, [you
*must* configure your IDE to extract (or "shade") these dependencies in any artifacts:][SHADE]

* `org.apache.tomcat:tomcat-jdbc:7.0.52`
* `org.apache.tomcat:tomcat-juli:7.0.52`
* `mkremins:fanciful:0.3.3-SNAPSHOT`

## License

As GPrism is a fork of Prism by viveleroi, GPrism is licensed the under the Creative Commons
Attribution-NonCommercial-ShareAlike 3.0 Unported. Please see `LICENSE` or [this website][LICENSE]
for the full license.

[PRISM]: https://github.com/prism/Prism-Bukkit
[SPONGE]: https://github.com/prism/Prism
[WIKI]: http://discover-prism.com/wiki/
[BUILD]: https://docs.google.com/document/d/1TTDXG7IZ9M0D2-rzbILAWg1CKjynHK8fNGxbf3W4wBk/view
[SHADE]: http://i.imgur.com/9eqRiwR.png
[LICENSE]: http://creativecommons.org/licenses/by-nc-sa/3.0/us/
**GPrism** is a Bukkit plugin that tracks changes to a Minecraft world. These changes can be looked
up, rolled back, restored, etc. There are also various anti-griefing tools.

GPrism is a downstream fork of @viveleroi's [Prism-Bukkit][PRISM], with various fixes and feature
additions by a few GitHub contributors and Roy Curtis.

For information on how to use GPrism, [see the original Prism wiki.][WIKI]

# Differences from upstream

## Pulled in from other forks

* 1.9, 1.9.4 and 1.10 support by @Jikoo
* UTF-8 MySQL support by @paulmory
* Inspect hand item and wand fixes by @Siggi88 and @Jikoo
* Removal of NMS usage and chat component API fixes by @Jikoo
* Item frame rollback fixes by @PhanaticD
* `-raw` flag for non-JSON output by @cbarber

## By Roy Curtis

* **Major changes to data storage format of items (full metadata support)**
* Fixed rollback of villager trades and riches
* Optimized data storage of entities
* Removed duplicate GSON dependency and included Elixr (repository down)
* Added `useSSL=false` to MySQL string (due to spam from new versions)
* Hid purge cycle messages if 0 rows affected (reduces noise)
* More fixes to item frame tracking and rollbacks
* Made `item-rotate` action rollbackable and more accurate
* Fixed rollbacks of torches against walls and end rods broken by water
* Updated entity events and rollbacks to handle all the new 1.11 horse subtypes (incl. llamas)
* Fixed attribute rollbacks of killed horses
* Fixed tracking and attribution of frost walker ice
* Added wait messages to `/pr i` and `/pr near`
* Added support for rabbit types
* Attributed lingering potion deaths to players
* Java 1.8 language level
* POM file cleanup and improvements

# Support

Prism-Bukkit was abandoned in favor of the [Sponge rewrite][SPONGE]. This fork is not intended to be
a long-term continuation of Prism; this is only for our fixes, to keep Prism-Bukkit working. We may
remove features that we don't use or think should be provided by GPrism.

That said; please feel free to cherry pick commits or fork from this fork, or contribute to this
fork with issues and pull requests.

**Only the latest server version (1.11.2) is supported; older servers may break GPrism.**

# Building, debugging and debug logging

For instructions and screenshots on how to. . .

* Compile this plugin from scratch
* Build a JAR of this plugin
* Debug this plugin on a server
* Enable debug logging levels such as `FINE` and `FINER`

. . .[please follow the linked guide on this Google document.][BUILD] However, for debugging, [you
*must* configure your IDE to extract (or "shade") these dependencies in any artifacts:][SHADE]

* `org.apache.tomcat:tomcat-jdbc:7.0.52`
* `org.apache.tomcat:tomcat-juli:7.0.52`
* `mkremins:fanciful:0.3.3-SNAPSHOT`

## License

As GPrism is a fork of Prism by viveleroi, GPrism is licensed the under the Creative Commons
Attribution-NonCommercial-ShareAlike 3.0 Unported. Please see `LICENSE` or [this website][LICENSE]
for the full license.

[PRISM]: https://github.com/prism/Prism-Bukkit
[SPONGE]: https://github.com/prism/Prism
[WIKI]: http://discover-prism.com/wiki/
[BUILD]: https://docs.google.com/document/d/1TTDXG7IZ9M0D2-rzbILAWg1CKjynHK8fNGxbf3W4wBk/view
[SHADE]: http://i.imgur.com/9eqRiwR.png
[LICENSE]: http://creativecommons.org/licenses/by-nc-sa/3.0/us/
Loading

0 comments on commit a14c5ff

Please sign in to comment.