mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2025-12-19 23:19:21 +00:00
Compare commits
212 Commits
old/iris3
...
2.3.13-1.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ffc64231b | ||
|
|
fe112c3ba5 | ||
|
|
2fa03aac3b | ||
|
|
6ac5ad880d | ||
|
|
54f14392d9 | ||
|
|
c7ecdaf8a8 | ||
|
|
497c24a3b6 | ||
|
|
00aa26e602 | ||
|
|
3796381156 | ||
|
|
b0c5700cf5 | ||
|
|
78a4b1d2ce | ||
|
|
e5e6b9848f | ||
|
|
3e36f57f14 | ||
|
|
d794ede4d8 | ||
|
|
7a4d97d76a | ||
|
|
e76ab1d367 | ||
|
|
9731feff7f | ||
|
|
4ce790082d | ||
|
|
065b748036 | ||
|
|
76891d246f | ||
|
|
0832007991 | ||
|
|
87302a046c | ||
|
|
f0f7453b32 | ||
|
|
2991bea248 | ||
|
|
673b42c2f5 | ||
|
|
7d994e27e3 | ||
|
|
5f2b82aac7 | ||
|
|
af1a03cb67 | ||
|
|
85fbbeca9d | ||
|
|
a64272620f | ||
|
|
ef9966d02b | ||
|
|
a28e5bb38a | ||
|
|
34670759e9 | ||
|
|
7dd1d3881a | ||
|
|
7b93542014 | ||
|
|
ea1ac0a154 | ||
|
|
35c7068fa6 | ||
|
|
db4cbb2ea6 | ||
|
|
fa7c073999 | ||
|
|
72a077662d | ||
|
|
137abb04b2 | ||
|
|
211b15332d | ||
|
|
f6fbcade17 | ||
|
|
1ef115fee8 | ||
|
|
7973444fc5 | ||
|
|
2bdb0bfa69 | ||
|
|
bfb6f82ea3 | ||
|
|
7729ce3753 | ||
|
|
f6ea171669 | ||
|
|
ff081ebc11 | ||
|
|
0818f971fe | ||
|
|
27070f44c7 | ||
|
|
8331cbe375 | ||
|
|
f533ec34b0 | ||
|
|
23d4fcb827 | ||
|
|
a248962f1b | ||
|
|
afa8fad8e9 | ||
|
|
4c423bb493 | ||
|
|
e660fe9e1e | ||
|
|
23c1d12e73 | ||
|
|
9cf2785626 | ||
|
|
b8b65c7e3e | ||
|
|
dcb467280a | ||
|
|
6aa802b42d | ||
|
|
d78f6ca589 | ||
|
|
493f8e0cc0 | ||
|
|
119563c553 | ||
|
|
2d61e6af66 | ||
|
|
aa1be934a9 | ||
|
|
f9c98b0a60 | ||
|
|
bd66fa3bf5 | ||
|
|
380f191f6a | ||
|
|
7e217b5fba | ||
|
|
c4a516a858 | ||
|
|
bdf181e348 | ||
|
|
f4ea1343b4 | ||
|
|
a37ccddd38 | ||
|
|
243ef8c0be | ||
|
|
00d099383b | ||
|
|
dda3f0b8e9 | ||
|
|
00f4d8b1ee | ||
|
|
2f5198d533 | ||
|
|
148261f876 | ||
|
|
60843b3bb9 | ||
|
|
2ad9a525bd | ||
|
|
78e9f21439 | ||
|
|
a66d60eaea | ||
|
|
3aa3c13477 | ||
|
|
cc850522e6 | ||
|
|
6d28f57f88 | ||
|
|
563e0a7cd4 | ||
|
|
2f2f857e98 | ||
|
|
251c52a2ee | ||
|
|
7528bd343b | ||
|
|
06d9f279ac | ||
|
|
044403b829 | ||
|
|
5a24dd3b49 | ||
|
|
3189b3c7a5 | ||
|
|
3bf1c6a282 | ||
|
|
7c7309c3ab | ||
|
|
da777da476 | ||
|
|
3d0c0a11ed | ||
|
|
e545269b93 | ||
|
|
141ca76647 | ||
|
|
94557830f5 | ||
|
|
49acb7faba | ||
|
|
1904f67662 | ||
|
|
5b2bf38344 | ||
|
|
494c38a153 | ||
|
|
dd4b85cbfe | ||
|
|
8f7b54a5a4 | ||
|
|
cec502340e | ||
|
|
64e27c7fb0 | ||
|
|
b2bbd31548 | ||
|
|
17df92a07c | ||
|
|
2b749b5ab7 | ||
|
|
28e3402d88 | ||
|
|
d96bb061e0 | ||
|
|
e6def804f8 | ||
|
|
a5be48c07c | ||
|
|
fe3909f594 | ||
|
|
f37d91a530 | ||
|
|
614ef78771 | ||
|
|
fb294fc03c | ||
|
|
8c7e7c3d48 | ||
|
|
98b6280652 | ||
|
|
7c4c2d6382 | ||
|
|
1a29ea302e | ||
|
|
be39fce741 | ||
|
|
4fed2e6e5f | ||
|
|
14ae5809b0 | ||
|
|
0f66aa47c9 | ||
|
|
cf85d300f4 | ||
|
|
91d60e56df | ||
|
|
1d3681beb4 | ||
|
|
0b403cf329 | ||
|
|
8ba75899e3 | ||
|
|
4d4ed72159 | ||
|
|
b72bf072b3 | ||
|
|
4edcb54b31 | ||
|
|
eae7fc0e53 | ||
|
|
fddacd4410 | ||
|
|
de6c4b9a30 | ||
|
|
6990e34138 | ||
|
|
d9883697ef | ||
|
|
05a26ff8b2 | ||
|
|
84bb082d44 | ||
|
|
a0db94d84f | ||
|
|
0367b4ecd7 | ||
|
|
dbc425dce6 | ||
|
|
116c017c6d | ||
|
|
9c387475f0 | ||
|
|
0765c21cef | ||
|
|
2871038584 | ||
|
|
340885f939 | ||
|
|
1e32e47f54 | ||
|
|
3c759f3b01 | ||
|
|
6615f34d20 | ||
|
|
3a4aac1ee4 | ||
|
|
4d6c092615 | ||
|
|
93421a1dc9 | ||
|
|
209458a856 | ||
|
|
82bd94620e | ||
|
|
af9f017871 | ||
|
|
2f8922ea87 | ||
|
|
0ea936f3fe | ||
|
|
d1870ee0a8 | ||
|
|
d2151690ad | ||
|
|
dff373e7d5 | ||
|
|
0aec2a664f | ||
|
|
723b696393 | ||
|
|
f5f89eb4e4 | ||
|
|
df15332c7f | ||
|
|
61d9e5a869 | ||
|
|
9628b66a97 | ||
|
|
5e041366d4 | ||
|
|
3ecae8d72c | ||
|
|
5709ce9d82 | ||
|
|
ce3c334ac5 | ||
|
|
2ed5aa8730 | ||
|
|
8480a63dda | ||
|
|
132a1695f3 | ||
|
|
21775630c3 | ||
|
|
eac2ef7c6d | ||
|
|
386997f646 | ||
|
|
637b90ad62 | ||
|
|
95d755c2ec | ||
|
|
781aeebef6 | ||
|
|
5e133fd51a | ||
|
|
85f62a3b9d | ||
|
|
a32de58c8b | ||
|
|
1cb2ea6c17 | ||
|
|
6a37ab7af2 | ||
|
|
e0f0aaf767 | ||
|
|
3d7c5b050a | ||
|
|
6bc57c255f | ||
|
|
b82edfe688 | ||
|
|
6b32eb3441 | ||
|
|
23a07fa8a5 | ||
|
|
b019faedd2 | ||
|
|
4430433a10 | ||
|
|
f52cd29e7b | ||
|
|
6a44e593a6 | ||
|
|
f7065fe034 | ||
|
|
0a247956f7 | ||
|
|
03836acded | ||
|
|
b5fb277982 | ||
|
|
e523d3c166 | ||
|
|
41477e4aa6 | ||
|
|
fbaf42a8c4 | ||
|
|
1c3668047b | ||
|
|
7d78c69b6e |
1
.github/ISSUE_TEMPLATE/bug.yml
vendored
1
.github/ISSUE_TEMPLATE/bug.yml
vendored
@@ -39,6 +39,7 @@ body:
|
|||||||
- 1.17
|
- 1.17
|
||||||
- 1.17.1
|
- 1.17.1
|
||||||
- 1.18
|
- 1.18
|
||||||
|
- 1.19
|
||||||
validations:
|
validations:
|
||||||
required: true
|
required: true
|
||||||
- type: input
|
- type: input
|
||||||
|
|||||||
24
build.gradle
24
build.gradle
@@ -24,21 +24,22 @@ plugins {
|
|||||||
id "de.undercouch.download" version "5.0.1"
|
id "de.undercouch.download" version "5.0.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
version '2.2.1-1.19' // Needs to be version specific
|
version '2.3.13-1.19.3' // Needs to be version specific
|
||||||
def nmsVersion = "1.19"
|
def nmsVersion = "1.19.3" //[NMS]
|
||||||
def apiVersion = '1.19'
|
def apiVersion = '1.19'
|
||||||
def spigotJarVersion = '1.19-R0.1-SNAPSHOT'
|
def specialSourceVersion = '1.11.0' //[NMS]
|
||||||
|
def spigotJarVersion = '1.19.3-R0.1-SNAPSHOT' //[NMS]
|
||||||
def name = getRootProject().getName() // Defined in settings.gradle
|
def name = getRootProject().getName() // Defined in settings.gradle
|
||||||
def main = 'com.volmit.iris.Iris'
|
def main = 'com.volmit.iris.Iris'
|
||||||
|
|
||||||
// ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED
|
// ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED
|
||||||
// ======================== WINDOWS =============================
|
// ======================== WINDOWS =============================
|
||||||
registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins')
|
registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins')
|
||||||
registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins')
|
registerCustomOutputTask('Psycho', 'C://Dan/MinecraftDevelopment/Server/plugins')
|
||||||
registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins')
|
registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins')
|
||||||
registerCustomOutputTask('Coco', 'D://Documents/MC/plugins')
|
registerCustomOutputTask('Coco', 'D://Documents/MC/plugins')
|
||||||
registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins')
|
registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins')
|
||||||
registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.19/plugins')
|
registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.19.3/plugins')
|
||||||
// ========================== UNIX ==============================
|
// ========================== UNIX ==============================
|
||||||
registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/development/server/plugins')
|
registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/development/server/plugins')
|
||||||
registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Desktop/REMOTES/RemoteMinecraft/plugins')
|
registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Desktop/REMOTES/RemoteMinecraft/plugins')
|
||||||
@@ -73,11 +74,8 @@ repositories {
|
|||||||
includeGroup("org.spigotmc")
|
includeGroup("org.spigotmc")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
maven { url "https://dl.cloudsmith.io/public/arcane/archive/maven/" }
|
maven { url "https://arcanearts.jfrog.io/artifactory/archives" }
|
||||||
maven { url "https://maven.enginehub.org/repo/" }
|
|
||||||
mavenCentral()
|
|
||||||
mavenLocal()
|
|
||||||
maven { url "https://jitpack.io"}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -124,10 +122,10 @@ dependencies {
|
|||||||
// Provided or Classpath
|
// Provided or Classpath
|
||||||
compileOnly 'org.projectlombok:lombok:1.18.24'
|
compileOnly 'org.projectlombok:lombok:1.18.24'
|
||||||
annotationProcessor 'org.projectlombok:lombok:1.18.24'
|
annotationProcessor 'org.projectlombok:lombok:1.18.24'
|
||||||
implementation 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT'
|
implementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT'
|
||||||
implementation 'me.clip:placeholderapi:2.11.1'
|
implementation 'me.clip:placeholderapi:2.11.1'
|
||||||
implementation 'io.th0rgal:oraxen:1.94.0'
|
implementation 'io.th0rgal:oraxen:1.94.0'
|
||||||
implementation 'org.bukkit:craftbukkit:1.19-R0.1-SNAPSHOT:remapped-mojang'
|
implementation 'org.bukkit:craftbukkit:1.19.3-R0.1-SNAPSHOT:remapped-mojang' //[NMS]
|
||||||
implementation 'com.github.LoneDev6:api-itemsadder:3.1.0b'
|
implementation 'com.github.LoneDev6:api-itemsadder:3.1.0b'
|
||||||
|
|
||||||
// Shaded
|
// Shaded
|
||||||
@@ -194,7 +192,7 @@ task downloadBuildtools(type: Download) {
|
|||||||
|
|
||||||
task downloadSpecialSource(type: Download) {
|
task downloadSpecialSource(type: Download) {
|
||||||
group "remapping"
|
group "remapping"
|
||||||
src 'https://repo.maven.apache.org/maven2/net/md-5/SpecialSource/1.10.0/SpecialSource-1.10.0-shaded.jar'
|
src 'https://repo.maven.apache.org/maven2/net/md-5/SpecialSource/' + specialSourceVersion + '/SpecialSource-'+specialSourceVersion+'-shaded.jar'
|
||||||
dest specialSourceJar
|
dest specialSourceJar
|
||||||
onlyIf {
|
onlyIf {
|
||||||
!specialSourceJar.exists()
|
!specialSourceJar.exists()
|
||||||
|
|||||||
3
gource.bat
Normal file
3
gource.bat
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
@echo off
|
||||||
|
cd gource
|
||||||
|
gource -f -a 1 -s 0.01 -t 100000 --colour-images --max-file-lag 35 --title MyGuide --user-scale 1.67 --max-user-speed 725 --filename-time 11 -title Chimera --user-friction 2.5 --padding 1.2 --user-scale 1.25 --filename-time 2 --bloom-intensity 0.1 --bloom-multiplier 3 --hide filenames,dirnames
|
||||||
674
gource/COPYING.txt
Normal file
674
gource/COPYING.txt
Normal file
@@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||||
298
gource/ChangeLog.txt
Normal file
298
gource/ChangeLog.txt
Normal file
@@ -0,0 +1,298 @@
|
|||||||
|
0.51:
|
||||||
|
* Fixed --font-file relative path handling.
|
||||||
|
* Fixed a bug in resolving the repository root directory from a relative path.
|
||||||
|
|
||||||
|
0.50:
|
||||||
|
* Right mouse button rotation now pivots around the camera.
|
||||||
|
* Added --font-file option.
|
||||||
|
* Added --enable-font-file option to configure.
|
||||||
|
* Added --no-time-travel option (Lars Schmertmann).
|
||||||
|
* Added --dir-name-position option (Lars Schmertmann).
|
||||||
|
* Added --file-extension-fallback option (Lars Schmertmann).
|
||||||
|
* Added --user-show-filter option (Victor Lopez).
|
||||||
|
* Added --disable-input option (Joey Parrish).
|
||||||
|
* Added --loop-delay-seconds option (Joey Parrish).
|
||||||
|
* Added --font-scale option.
|
||||||
|
* Added filename, dirname and user font size options (Carl Colena).
|
||||||
|
* Added workaround for FFMpeg error parsing Gource PPM video output.
|
||||||
|
* Fixed a bug in the Mercurial log parser that caused changes to be missed.
|
||||||
|
* Fixed file removal being cancelled by an action with an earlier timestamp.
|
||||||
|
* Fixed a bug in the log file format detection that could result in the wrong
|
||||||
|
first entry being displayed for a custom log.
|
||||||
|
* Fixed a bug where automatically cycling through a config with multiple
|
||||||
|
repositories reset settings to their defaults.
|
||||||
|
|
||||||
|
0.49:
|
||||||
|
* Fixed compatibility with GLM 0.9.9.0.
|
||||||
|
|
||||||
|
0.48:
|
||||||
|
* Can now generate logs from git sub module directories.
|
||||||
|
|
||||||
|
0.47:
|
||||||
|
* Fixed low mouse movement speed with some mice while repositioning camera.
|
||||||
|
|
||||||
|
0.46:
|
||||||
|
* Added --screen option.
|
||||||
|
|
||||||
|
0.45:
|
||||||
|
* Added --window-position XxY option.
|
||||||
|
* Added --frameless option.
|
||||||
|
* Added --file-show-filter REGEX option (swoogles).
|
||||||
|
* Added --filename-time and filename-colour options (gh2k).
|
||||||
|
* Improved handling of very low seconds-per-day values (malengrin).
|
||||||
|
* Fixed crash when SVN log lacks author information (obarthel).
|
||||||
|
* Additional git log command validation (cym13).
|
||||||
|
* Allow lower case hex colours in custom logs (HSorensen).
|
||||||
|
* Enabled STDOUT support with --output-stream '-' on Windows (circulosmeos).
|
||||||
|
* Now requires SDL 2 to build (deprecated SDL 1.2 support removed).
|
||||||
|
|
||||||
|
0.44:
|
||||||
|
* Fixed crash when taking a screenshot with an odd resolution.
|
||||||
|
* Fixed type deduction compilation error with newer versions of GCC.
|
||||||
|
* Documentation improvements.
|
||||||
|
|
||||||
|
0.43:
|
||||||
|
* Updated boost autoconf macros to fix multi-arch detection.
|
||||||
|
|
||||||
|
0.42:
|
||||||
|
* Fixed bzr log command when no start date was specified (chrisf).
|
||||||
|
* Fixed hg log commit order when date range specified.
|
||||||
|
* Fixed hg log command line on Windows.
|
||||||
|
* Fixed parser bug in date range filtering code.
|
||||||
|
|
||||||
|
0.41:
|
||||||
|
* Multi-monitor support using SDL 2.0 when available.
|
||||||
|
* SDL 1.2 support is deprecated.
|
||||||
|
* Full screen mode now uses desktop resolution by default.
|
||||||
|
* Added --start-date, --stop-date 'YYYY-MM-DD hh:mm:ss' options.
|
||||||
|
* Added --dir-name-depth option.
|
||||||
|
* Changed --file-idle-time default value to 0.
|
||||||
|
* Changed screenshot format to PNG.
|
||||||
|
|
||||||
|
0.40:
|
||||||
|
* Added caption support.
|
||||||
|
* Improved command line interoperability on Windows.
|
||||||
|
* Fixed directory deletion short circuiting processing the rest of a commit.
|
||||||
|
* Fixed issue loading non-ascii user image filenames on windows.
|
||||||
|
* Ignore UTF-8 byte order mark at the start of lines in custom log files.
|
||||||
|
* Fix to boost macros for Macs and non-GNU systems (mistydemeo).
|
||||||
|
* Autotools improvements (flameeyes).
|
||||||
|
|
||||||
|
0.39:
|
||||||
|
* Fixed blurry non power of 2 logos.
|
||||||
|
* File colour changes now supported in custom logs (rmyorston).
|
||||||
|
* Fixed building against Boost 1.50 (svenstaro).
|
||||||
|
* Updated boost autoconf macros (flameeyes).
|
||||||
|
* Autogen script (matthiaskrgr).
|
||||||
|
|
||||||
|
0.38:
|
||||||
|
* New high quality sprites.
|
||||||
|
* Fullscreen toggle with alt + enter.
|
||||||
|
* Window is now resizable. -WIDTHxHEIGHT! creates a non-resizable window.
|
||||||
|
* Lowered minimum zoom distance.
|
||||||
|
* Use AM_CPPFLAGS in Makefile.am to allow passing custom CPPFLAGS.
|
||||||
|
* Don't add files that match the path of a known directory.
|
||||||
|
* Fixed divide by zero in text shader causing artifacts on some video cards.
|
||||||
|
* Recursively search for repository directory when log-format not specified
|
||||||
|
(thanks to Jörg Bachmann for original concept / prototype).
|
||||||
|
* New dependency on Boost Filesystem.
|
||||||
|
* Doubled the maximum zoom out distance.
|
||||||
|
* Allow negative timestamps before 1970 in custom log (artzub).
|
||||||
|
* Fix for UTF8-CPP checked.h compilation issue (vszakats).
|
||||||
|
* Fixed bug causing missing characters in text.
|
||||||
|
* Fixed --highlight-users option not using highlight-colour.
|
||||||
|
* highlight-colour default changed to white.
|
||||||
|
* Added --selection-colour option (applied to selected users and files).
|
||||||
|
* Added --dir-colour option (applied to directories).
|
||||||
|
|
||||||
|
0.37:
|
||||||
|
* Made SVN log GMT timestamp conversion fix portable.
|
||||||
|
|
||||||
|
0.36:
|
||||||
|
* Fixed SVN log GMT timestamp conversion.
|
||||||
|
* Fixed issue with sub-dirs of deleted dir not being removed in some cases.
|
||||||
|
|
||||||
|
0.35:
|
||||||
|
* Added long file extension truncation handling to file key (--key).
|
||||||
|
* Treat changes in Mercurial log files with the same time/user as one commit.
|
||||||
|
* Fixed handling of spaces in directory names with Mercurial.
|
||||||
|
* Fixed --font-colour option.
|
||||||
|
|
||||||
|
0.34:
|
||||||
|
* Now using VBOs and shaders for faster rendering when OpenGL 2.0 is available.
|
||||||
|
* Eliminated bloom colour banding artifacts (requires OpenGL 2.0).
|
||||||
|
* New font rendering library derived from FTGL (FTGL no longer required).
|
||||||
|
* Single pass font/shadow rendering (with lots of help from Chris Forbes).
|
||||||
|
* Added --no-vsync option.
|
||||||
|
* Fixed bug where tree is out of alignment with object positions in windowed
|
||||||
|
mode due to using the wrong display dimensions internally.
|
||||||
|
* Removed default max-files limit.
|
||||||
|
|
||||||
|
0.33:
|
||||||
|
* Added --hide root option to not draw branches from the root directory.
|
||||||
|
* Fixed log parsing of Bazaar merges and tagged commits.
|
||||||
|
* --output-custom-log now skips unparsed log entries instead of exiting.
|
||||||
|
|
||||||
|
0.32:
|
||||||
|
* Fixed behaviour of user camera tracking.
|
||||||
|
|
||||||
|
0.31:
|
||||||
|
* Added --with-tinyxml option to configure (use the system TinyXML library).
|
||||||
|
|
||||||
|
0.30:
|
||||||
|
* Fixed crash when SVN log entry contains no 'paths' element.
|
||||||
|
* Handle directory deletion (happens in SVN logs).
|
||||||
|
|
||||||
|
0.29:
|
||||||
|
* SVN built-in support.
|
||||||
|
* cvs2cl log support (cvs-exp support is now deprecated).
|
||||||
|
* Made camera behaviour when zooming and selecting objects more intuitive.
|
||||||
|
* Improved interactive performance.
|
||||||
|
* Added file extension key (--key or toggled with 'K').
|
||||||
|
* Added mouse-over tool tips.
|
||||||
|
* Added --highlight-colour option.
|
||||||
|
* Added --hash-seed option. The S key now randomizes colours.
|
||||||
|
* Added --output-custom-log option.
|
||||||
|
* Exposed --time-scale option (previously only available interactively).
|
||||||
|
* Removed arbitrary 1024 maximum length limit for log lines.
|
||||||
|
* Fixed two file colouring bugs (quoted files from git, period in file path).
|
||||||
|
* Fix handling of avatars for UTF-8 usernames on MACOSX (Christian Köstlin).
|
||||||
|
* Recover from video mode failing to set due to multi-sampling (Siddhesh Poyarekar).
|
||||||
|
|
||||||
|
0.28:
|
||||||
|
* Bazaar support for merged commits (Nick Moffit).
|
||||||
|
* C++ efficiency improvements (Oliver Smith).
|
||||||
|
* Improved cvs-exp log compatibility.
|
||||||
|
* Re-show name of user when adding a new action if user is idle.
|
||||||
|
* Added --padding option to control camera view padding.
|
||||||
|
* More accurate camera tracking (tracks the bounding boxes of objects).
|
||||||
|
* Improved automatic rotation logic.
|
||||||
|
|
||||||
|
0.27:
|
||||||
|
* Display time stops at the time of the last commit.
|
||||||
|
* Users fade out when end reached rather than ending abruptly.
|
||||||
|
* Position slider is now hidden by default if recording a video.
|
||||||
|
* Automatic camera rotation for better use of screen space.
|
||||||
|
* Support international keyboards (Peter Kjellerstedt).
|
||||||
|
* C++ efficiency improvements (Jacob Metcalfe).
|
||||||
|
* Fixed crash when reading from STDIN.
|
||||||
|
* Fixed intermittent crash closing Gource when using --output-ppm-stream.
|
||||||
|
* Added ini style config file support (see --load/save-config).
|
||||||
|
* Added screenshot button (F12). Screenshots respect the alpha channel.
|
||||||
|
* Added --transparent to make the background see-through (for screenshots).
|
||||||
|
* Added --logo and --background-image options.
|
||||||
|
* Added --dont-stop option for manual exiting when recording videos.
|
||||||
|
* Added --stop-at-time option to stop Gource after a number of seconds.
|
||||||
|
* Added --hide 'mouse' option.
|
||||||
|
* Added --highlight-dirs option.
|
||||||
|
* Added --file-extensions to show filename extensions only.
|
||||||
|
* Added --user-filter REGEX option.
|
||||||
|
* Allow --file-idle-time 0 (files will never expire).
|
||||||
|
* Allow --start-position 'random' to set a random start position.
|
||||||
|
* --log-command VCS replaces multiple --log-command-VCS options.
|
||||||
|
* Replaced --disable-progress and --disable-bloom with arguments to --hide.
|
||||||
|
|
||||||
|
0.26a:
|
||||||
|
* Updated to latest version of GL autoconf macros.
|
||||||
|
|
||||||
|
0.26:
|
||||||
|
* Improved mouse dragging.
|
||||||
|
* Holding right mouse button and moving the mouse rotates the view.
|
||||||
|
* The middle mouse button now toggles the camera mode.
|
||||||
|
* Username positions now scale correctly.
|
||||||
|
* Simulation time no longer incremented while paused, counting towards file time lag.
|
||||||
|
* M key now toggles mouse visibility.
|
||||||
|
* Added --hide option to use instead of multiple --hide-ELEMENT options.
|
||||||
|
|
||||||
|
0.25:
|
||||||
|
* Bazaar support (John Arbash Meinel).
|
||||||
|
* Dragging the mouse on the background moves the camera.
|
||||||
|
* Added --camera-mode option (track,overview).
|
||||||
|
* Support DOS line endings in logs.
|
||||||
|
* Improved compatibility of hg log command (Brendan Cully).
|
||||||
|
* Fixed PPM exporter producing blank images on some video cards.
|
||||||
|
* Fixed parsing of negative timezones from cvs-exp.pl logs.
|
||||||
|
* Fixed various gdb and compiler warnings.
|
||||||
|
|
||||||
|
0.24:
|
||||||
|
* PPM output speed improvements, including using a second thread (HighlandSun).
|
||||||
|
* Now using standard autotools (Flameeyes).
|
||||||
|
* Fixed --max-file-lag not working with some custom log files.
|
||||||
|
* Gource will stop at the end of the log by default when recording a video.
|
||||||
|
* Fixed STDIN stopping working after the first lot of records with tail -f.
|
||||||
|
* Added proper exception handling.
|
||||||
|
* Print errors to stderr.
|
||||||
|
|
||||||
|
0.23:
|
||||||
|
* Hiding filenames no longer hides directory names.
|
||||||
|
* Fixed --stop-on-idle option.
|
||||||
|
* Added --stop-at-end option (more intuitive than --stop-position 1.0).
|
||||||
|
|
||||||
|
0.22:
|
||||||
|
* Fixed Mercurial log order.
|
||||||
|
|
||||||
|
0.21b:
|
||||||
|
* Fixed windows build.
|
||||||
|
|
||||||
|
0.21:
|
||||||
|
* Some documentation fixes.
|
||||||
|
|
||||||
|
0.20:
|
||||||
|
* Added bloom effect (turn off with --disable-bloom).
|
||||||
|
* Added support for Mercurial (thanks to Justin Love for gource.style).
|
||||||
|
* --start-position option now works in combination with --disable-progress.
|
||||||
|
|
||||||
|
0.19:
|
||||||
|
* Use time_t instead of long for timestamps.
|
||||||
|
|
||||||
|
0.18:
|
||||||
|
* Fixed camera movement while the simulation is paused.
|
||||||
|
|
||||||
|
0.17:
|
||||||
|
* Show correct month for CVS logs.
|
||||||
|
* Added time scaling (Bitshifter).
|
||||||
|
|
||||||
|
0.16:
|
||||||
|
* Added --hide-dirnames option.
|
||||||
|
* Added --user-scale option.
|
||||||
|
* Added --date-format option (Pat Notz).
|
||||||
|
* Fix bug when encountering long log lines.
|
||||||
|
* Fixed incorrect parsing of trivial merges.
|
||||||
|
* Fixed building issues on OSX.
|
||||||
|
|
||||||
|
0.15:
|
||||||
|
* Added PPM output support for creating videos (Johannes Schindelin).
|
||||||
|
* Added experimental Apache combined access log support (--log-format apache).
|
||||||
|
* Added --stop-position and --stop-on-idle options (useful for making videos).
|
||||||
|
* Added --max-file-lag option to limit how long after a commit file changes can take to appear.
|
||||||
|
* Added --no-renames to the git log command as they don't display correctly.
|
||||||
|
* Added --max-user-speed and --user-friction as options.
|
||||||
|
* Now builds on OSX Leopard (with the required libaries installed).
|
||||||
|
* Caught raw exception from replace_invalid().
|
||||||
|
* Added CXXFLAGS. You may want to override the default (eg CXXFLAGS=-O3 ./configure).
|
||||||
|
|
||||||
|
0.14:
|
||||||
|
* Updated SVN instructions.
|
||||||
|
|
||||||
|
0.13:
|
||||||
|
* Removed single quotes from log command (fixes running gource --git-log-command in back ticks)
|
||||||
|
* Added SVN instructions.
|
||||||
|
* Fixed manpage hyphens.
|
||||||
|
|
||||||
|
0.12:
|
||||||
|
* Added --enable-ttf-font-dir=DIR option to configure (to specify the ttf-freefont directory).
|
||||||
|
* UTF-8 support using UTF8-CPP (http://utfcpp.sourceforge.net/).
|
||||||
|
* Changed the git log command (see --git-log-command) to require less work to parse.
|
||||||
|
Log files generated with the previous git-log command used by gource should continue to work.
|
||||||
|
* Allow --seconds-per-day value less than 1.0.
|
||||||
|
* Added --git-branch command.
|
||||||
|
* Added --loop command.
|
||||||
|
* Added --crop command.
|
||||||
|
|
||||||
|
0.11:
|
||||||
|
* Made N key skip to next entry.
|
||||||
|
* Documented --user-image-dir flag.
|
||||||
|
* temp file name now uses uid instead of time
|
||||||
|
|
||||||
|
0.1:
|
||||||
|
* First release.
|
||||||
469
gource/README.txt
Normal file
469
gource/README.txt
Normal file
@@ -0,0 +1,469 @@
|
|||||||
|
|
||||||
|
Gource
|
||||||
|
|
||||||
|
software version control visualization
|
||||||
|
|
||||||
|
Copyright (C) 2009 Andrew Caudwell
|
||||||
|
|
||||||
|
http://gource.io
|
||||||
|
|
||||||
|
Contents
|
||||||
|
========
|
||||||
|
|
||||||
|
1. Description
|
||||||
|
2. Requirements
|
||||||
|
3. Using Gource
|
||||||
|
4. Copyright
|
||||||
|
|
||||||
|
1. Description
|
||||||
|
==============
|
||||||
|
|
||||||
|
OpenGL-based 3D visualisation tool for source control repositories.
|
||||||
|
|
||||||
|
The repository is displayed as a tree where the root of the repository is the
|
||||||
|
centre, directories are branches and files are leaves. Contributors to the
|
||||||
|
source code appear and disappear as they contribute to specific files and
|
||||||
|
directories.
|
||||||
|
|
||||||
|
2. Requirements
|
||||||
|
===============
|
||||||
|
|
||||||
|
Gource's display is rendered using OpenGL and requires a 3D accelerated video
|
||||||
|
card to run.
|
||||||
|
|
||||||
|
3. Using Gource
|
||||||
|
===============
|
||||||
|
|
||||||
|
gource [options] [path]
|
||||||
|
|
||||||
|
options:
|
||||||
|
|
||||||
|
-h, --help
|
||||||
|
Help ('-H' for extended help).
|
||||||
|
|
||||||
|
-WIDTHxHEIGHT, --viewport WIDTHxHEIGHT
|
||||||
|
Set the viewport size. If -f is also supplied, will attempt to set
|
||||||
|
the video mode to this also. Add ! to make the window non-resizable.
|
||||||
|
|
||||||
|
--screen SCREEN
|
||||||
|
Set the number of the screen to display on.
|
||||||
|
|
||||||
|
--window-position XxY
|
||||||
|
Initial window position on your desktop which may be made up of
|
||||||
|
multiple monitors.
|
||||||
|
|
||||||
|
This will override the screen setting so don't specify both.
|
||||||
|
|
||||||
|
--frameless
|
||||||
|
Frameless window.
|
||||||
|
|
||||||
|
-f, --fullscreen
|
||||||
|
Fullscreen.
|
||||||
|
|
||||||
|
-w, --windowed
|
||||||
|
Windowed.
|
||||||
|
|
||||||
|
--transparent
|
||||||
|
Make the background transparent. Only really useful for screenshots.
|
||||||
|
|
||||||
|
--start-date "YYYY-MM-DD hh:mm:ss +tz"
|
||||||
|
Start with the first entry after the supplied date and optional time.
|
||||||
|
|
||||||
|
If a time zone offset isn't specified the local time zone is used.
|
||||||
|
|
||||||
|
Example accepted formats:
|
||||||
|
|
||||||
|
"2012-06-30"
|
||||||
|
"2012-06-30 12:00"
|
||||||
|
"2012-06-30 12:00:00 +12"
|
||||||
|
|
||||||
|
--stop-date "YYYY-MM-DD hh:mm:ss +tz"
|
||||||
|
Stop after the last entry prior to the supplied date and optional time.
|
||||||
|
|
||||||
|
Uses the same format as --start-date.
|
||||||
|
|
||||||
|
-p, --start-position POSITION
|
||||||
|
Begin at some position in the log (between 0.0 and 1.0 or 'random').
|
||||||
|
|
||||||
|
--stop-position POSITION
|
||||||
|
Stop (exit) at some position in the log (does not work with STDIN).
|
||||||
|
|
||||||
|
-t, --stop-at-time SECONDS
|
||||||
|
Stop (exit) after a specified number of seconds.
|
||||||
|
|
||||||
|
--stop-at-end
|
||||||
|
Stop (exit) at the end of the log / stream.
|
||||||
|
|
||||||
|
--loop
|
||||||
|
Loop back to the start of the log when the end is reached.
|
||||||
|
|
||||||
|
--loop-delay-seconds
|
||||||
|
Seconds to delay before looping.
|
||||||
|
|
||||||
|
-a, --auto-skip-seconds SECONDS
|
||||||
|
Skip to next entry if nothing happens for a number of seconds.
|
||||||
|
|
||||||
|
-s, --seconds-per-day SECONDS
|
||||||
|
Speed of simulation in seconds per day.
|
||||||
|
|
||||||
|
--realtime
|
||||||
|
Realtime playback speed.
|
||||||
|
|
||||||
|
--no-time-travel
|
||||||
|
Use the time of the last commit if the time of a commit is in the past.
|
||||||
|
|
||||||
|
-c, --time-scale SCALE
|
||||||
|
Change simulation time scale.
|
||||||
|
|
||||||
|
-i, --file-idle-time SECONDS
|
||||||
|
Time in seconds files remain idle before they are removed or 0
|
||||||
|
for no limit.
|
||||||
|
|
||||||
|
-e, --elasticity FLOAT
|
||||||
|
Elasticity of nodes.
|
||||||
|
|
||||||
|
-b, --background-colour FFFFFF
|
||||||
|
Background colour in hex.
|
||||||
|
|
||||||
|
--background-image IMAGE
|
||||||
|
Set a background image.
|
||||||
|
|
||||||
|
--logo IMAGE
|
||||||
|
Logo to display in the foreground.
|
||||||
|
|
||||||
|
--logo-offset XxY
|
||||||
|
Offset position of the logo.
|
||||||
|
|
||||||
|
--title TITLE
|
||||||
|
Set a title.
|
||||||
|
|
||||||
|
--font-file FILE
|
||||||
|
Specify the font. Should work with most font file formats supported by FreeType, such as TTF and OTF, among others.
|
||||||
|
|
||||||
|
--font-scale SCALE
|
||||||
|
Scale the size of all fonts.
|
||||||
|
|
||||||
|
--font-size SIZE
|
||||||
|
Font size used by the date and title.
|
||||||
|
|
||||||
|
--file-font-size SIZE
|
||||||
|
Font size of filenames.
|
||||||
|
|
||||||
|
--dir-font-size SIZE
|
||||||
|
Font size of directory names
|
||||||
|
|
||||||
|
--user-font-size SIZE
|
||||||
|
Font size of user names.
|
||||||
|
|
||||||
|
--font-colour FFFFFF
|
||||||
|
Font colour used by the date and title in hex.
|
||||||
|
|
||||||
|
--key
|
||||||
|
Show file extension key.
|
||||||
|
|
||||||
|
--date-format FORMAT
|
||||||
|
Specify display date string (strftime format).
|
||||||
|
|
||||||
|
--log-command VCS
|
||||||
|
Show the VCS log command used by gource (git,svn,hg,bzr,cvs2cl).
|
||||||
|
|
||||||
|
--log-format VCS
|
||||||
|
Specify the log format (git,svn,hg,bzr,cvs2cl,custom).
|
||||||
|
|
||||||
|
Required when reading from STDIN.
|
||||||
|
|
||||||
|
--git-branch
|
||||||
|
Get the git log of a branch other than the current one.
|
||||||
|
|
||||||
|
--follow-user USER
|
||||||
|
Have the camera automatically follow a particular user.
|
||||||
|
|
||||||
|
--highlight-dirs
|
||||||
|
Highlight the names of all directories.
|
||||||
|
|
||||||
|
--highlight-user USER
|
||||||
|
Highlight the names of a particular user.
|
||||||
|
|
||||||
|
--highlight-users
|
||||||
|
Highlight the names of all users.
|
||||||
|
|
||||||
|
--highlight-colour FFFFFF
|
||||||
|
Font colour for highlighted users in hex.
|
||||||
|
|
||||||
|
--selection-colour FFFFFF
|
||||||
|
Font colour for selected users and files.
|
||||||
|
|
||||||
|
--filename-colour FFFFFF
|
||||||
|
Font colour for filenames.
|
||||||
|
|
||||||
|
--dir-colour FFFFFF
|
||||||
|
Font colour for directories.
|
||||||
|
|
||||||
|
--dir-name-depth DEPTH
|
||||||
|
Draw names of directories down to a specific depth in the tree.
|
||||||
|
|
||||||
|
--dir-name-position FLOAT
|
||||||
|
Position along edge of the directory name
|
||||||
|
(between 0.1 and 1.0, default is 0.5).
|
||||||
|
|
||||||
|
--filename-time SECONDS
|
||||||
|
Duration to keep filenames on screen (>= 2.0).
|
||||||
|
|
||||||
|
--file-extensions
|
||||||
|
Show filename extensions only.
|
||||||
|
|
||||||
|
--file-extension-fallback
|
||||||
|
Use filename as extension if the extension is missing or empty.
|
||||||
|
|
||||||
|
--file-filter REGEX
|
||||||
|
Filter out file paths matching the specified regular expression.
|
||||||
|
|
||||||
|
--file-show-filter REGEX
|
||||||
|
Show only file paths matching the specified regular expression.
|
||||||
|
|
||||||
|
--user-filter REGEX
|
||||||
|
Filter usernames matching the specified regular expression.
|
||||||
|
|
||||||
|
--user-show-filter REGEX
|
||||||
|
Show only usernames matching the specified regular expression.
|
||||||
|
|
||||||
|
--user-image-dir DIRECTORY
|
||||||
|
Directory containing .jpg or .png images of users
|
||||||
|
(eg "Full Name.png") to use as avatars.
|
||||||
|
|
||||||
|
--default-user-image IMAGE
|
||||||
|
Path of .jpg or .png to use as the default user image.
|
||||||
|
|
||||||
|
--colour-images
|
||||||
|
Colourize user images.
|
||||||
|
|
||||||
|
--crop AXIS
|
||||||
|
Crop view on an axis (vertical,horizontal).
|
||||||
|
|
||||||
|
--padding FLOAT
|
||||||
|
Camera view padding.
|
||||||
|
|
||||||
|
--multi-sampling
|
||||||
|
Enable multi-sampling.
|
||||||
|
|
||||||
|
--no-vsync
|
||||||
|
Disable vsync.
|
||||||
|
|
||||||
|
--bloom-multiplier FLOAT
|
||||||
|
Adjust the amount of bloom.
|
||||||
|
|
||||||
|
--bloom-intensity FLOAT
|
||||||
|
Adjust the intensity of the bloom.
|
||||||
|
|
||||||
|
--max-files NUMBER
|
||||||
|
Set the maximum number of files or 0 for no limit.
|
||||||
|
|
||||||
|
Excess files will be discarded.
|
||||||
|
|
||||||
|
--max-file-lag SECONDS
|
||||||
|
Max time files of a commit can take to appear.
|
||||||
|
|
||||||
|
Use -1 for no limit.
|
||||||
|
|
||||||
|
--max-user-speed UNITS
|
||||||
|
Max speed users can travel per second.
|
||||||
|
|
||||||
|
--user-friction SECONDS
|
||||||
|
Time users take to come to a halt.
|
||||||
|
|
||||||
|
--user-scale SCALE
|
||||||
|
Change scale of user avatars.
|
||||||
|
|
||||||
|
--camera-mode MODE
|
||||||
|
Camera mode (overview,track).
|
||||||
|
|
||||||
|
--disable-auto-rotate
|
||||||
|
Disable automatic camera rotation.
|
||||||
|
|
||||||
|
--disable-input
|
||||||
|
Disable keyboard and mouse input.
|
||||||
|
|
||||||
|
--hide DISPLAY_ELEMENT
|
||||||
|
Hide one or more display elements from the list below:
|
||||||
|
|
||||||
|
bloom - bloom effect
|
||||||
|
date - current date
|
||||||
|
dirnames - names of directories
|
||||||
|
files - file icons
|
||||||
|
filenames - names of files
|
||||||
|
mouse - mouse cursor
|
||||||
|
progress - progress bar widget
|
||||||
|
root - root directory of tree
|
||||||
|
tree - animated tree structure
|
||||||
|
users - user avatars
|
||||||
|
usernames - names of users
|
||||||
|
|
||||||
|
Separate multiple elements with commas (eg "mouse,progress")
|
||||||
|
|
||||||
|
--hash-seed SEED
|
||||||
|
Change the seed of hash function.
|
||||||
|
|
||||||
|
--caption-file FILE
|
||||||
|
Caption file (see Caption Log Format).
|
||||||
|
|
||||||
|
--caption-size SIZE
|
||||||
|
Caption size.
|
||||||
|
|
||||||
|
--caption-colour FFFFFF
|
||||||
|
Caption colour in hex.
|
||||||
|
|
||||||
|
--caption-duration SECONDS
|
||||||
|
Caption duration.
|
||||||
|
|
||||||
|
--caption-offset X
|
||||||
|
Caption horizontal offset (0 to centre captions).
|
||||||
|
|
||||||
|
-o, --output-ppm-stream FILE
|
||||||
|
Output a PPM image stream to a file ('-' for STDOUT).
|
||||||
|
|
||||||
|
This will automatically hide the progress bar initially and
|
||||||
|
enable 'stop-at-end' unless other behaviour is specified.
|
||||||
|
|
||||||
|
-r, --output-framerate FPS
|
||||||
|
Framerate of output (25,30,60). Used with --output-ppm-stream.
|
||||||
|
|
||||||
|
--output-custom-log FILE
|
||||||
|
Output a custom format log file ('-' for STDOUT).
|
||||||
|
|
||||||
|
--load-config CONFIG_FILE
|
||||||
|
Load a gource conf file.
|
||||||
|
|
||||||
|
--save-config CONFIG_FILE
|
||||||
|
Save a gource conf file with the current options.
|
||||||
|
|
||||||
|
--path PATH
|
||||||
|
|
||||||
|
path Either a supported version control directory, a pre-generated log
|
||||||
|
file (see log commands or the custom log format), a Gource conf
|
||||||
|
file or '-' to read STDIN.
|
||||||
|
|
||||||
|
If path is omitted, gource will attempt to read a log from the
|
||||||
|
current directory.
|
||||||
|
|
||||||
|
Git, Bazaar, Mercurial and SVN Examples:
|
||||||
|
|
||||||
|
View the log of the repository in the current path:
|
||||||
|
|
||||||
|
gource
|
||||||
|
|
||||||
|
View the log of a project in the specified directory:
|
||||||
|
|
||||||
|
gource my-project-dir
|
||||||
|
|
||||||
|
For large projects, generating a log of the project history may take a long
|
||||||
|
time. For centralized VCS like SVN, generating the log may also put load on
|
||||||
|
the central VCS server.
|
||||||
|
|
||||||
|
In these cases, you may like to save a copy of the log for later use.
|
||||||
|
|
||||||
|
You can generate a log in the VCS specific log format using
|
||||||
|
the --log-command VCS option:
|
||||||
|
|
||||||
|
cd my-svn-project
|
||||||
|
`gource --log-command svn` > my-svn-project.log
|
||||||
|
gource my-svn-project.log
|
||||||
|
|
||||||
|
You can also have Gource write a copy of the log file in its own format:
|
||||||
|
|
||||||
|
gource --output-custom-log my-project-custom.log
|
||||||
|
|
||||||
|
CVS Support:
|
||||||
|
|
||||||
|
Use 'cvs2cl' to generate the log and then pass it to Gource:
|
||||||
|
|
||||||
|
cvs2cl --chrono --stdout --xml -g-q > my-cvs-project.log
|
||||||
|
gource my-cvs-project.log
|
||||||
|
|
||||||
|
Custom Log Format:
|
||||||
|
|
||||||
|
If you want to use Gource with something other than the supported systems,
|
||||||
|
there is a pipe ('|') delimited custom log format:
|
||||||
|
|
||||||
|
timestamp - A unix timestamp of when the update occured.
|
||||||
|
username - The name of the user who made the update.
|
||||||
|
type - initial for the update type - (A)dded, (M)odified or (D)eleted.
|
||||||
|
file - Path of the file updated.
|
||||||
|
colour - A colour for the file in hex (FFFFFF) format. Optional.
|
||||||
|
|
||||||
|
Caption Log Format:
|
||||||
|
|
||||||
|
Gource can display captions along the timeline by specifying a caption file
|
||||||
|
(using --caption-file) in the pipe ('|') delimited format below:
|
||||||
|
|
||||||
|
timestamp - A unix timestamp of when to display the caption.
|
||||||
|
caption - The caption
|
||||||
|
|
||||||
|
Recording Videos:
|
||||||
|
|
||||||
|
See the guide on the homepage for examples of recording videos with Gource:
|
||||||
|
|
||||||
|
https://github.com/acaudwell/Gource/wiki/Videos
|
||||||
|
|
||||||
|
More Information:
|
||||||
|
|
||||||
|
Visit the Gource homepage for guides and examples of using Gource with various
|
||||||
|
version control systems:
|
||||||
|
|
||||||
|
http://gource.io
|
||||||
|
|
||||||
|
Interface:
|
||||||
|
|
||||||
|
The time shown in the top left of the screen is set initially from the first
|
||||||
|
log entry read and is incremented according to the simulation speed
|
||||||
|
(--seconds-per-day).
|
||||||
|
|
||||||
|
Pressing SPACE at any time will pause/resume the simulation. While paused you
|
||||||
|
may use the mouse to inspect the detail of individual files and users.
|
||||||
|
|
||||||
|
TAB cycles through selecting the current visible users.
|
||||||
|
|
||||||
|
The camera mode, either tracking activity or showing the entire code tree, can
|
||||||
|
be toggled using the Middle mouse button.
|
||||||
|
|
||||||
|
You can drag the left mouse button to manually control the camera. The right
|
||||||
|
mouse button rotates the view.
|
||||||
|
|
||||||
|
Interactive keyboard commands:
|
||||||
|
|
||||||
|
(V) Toggle camera mode
|
||||||
|
(C) Displays Gource logo
|
||||||
|
(K) Toggle file extension key
|
||||||
|
(M) Toggle mouse visibility
|
||||||
|
(N) Jump forward in time to next log entry
|
||||||
|
(S) Randomize colours
|
||||||
|
(D) Toggle directory name display mode
|
||||||
|
(F) Toggle file name display mode
|
||||||
|
(U) Toggle user name display mode
|
||||||
|
(G) Toggle display of users
|
||||||
|
(T) Toggle display of directory tree edges
|
||||||
|
(R) Toggle display of root directory edges
|
||||||
|
(+-) Adjust simulation speed
|
||||||
|
(<>) Adjust time scale
|
||||||
|
(TAB) Cycle through visible users
|
||||||
|
(F12) Screenshot
|
||||||
|
(Alt+Enter) Fullscreen toggle
|
||||||
|
(ESC) Quit
|
||||||
|
|
||||||
|
4. Copyright
|
||||||
|
============
|
||||||
|
|
||||||
|
Gource - software version control visualization
|
||||||
|
Copyright (C) 2009 Andrew Caudwell <acaudwell@gmail.com>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
BIN
gource/SDL2.dll
Normal file
BIN
gource/SDL2.dll
Normal file
Binary file not shown.
BIN
gource/SDL2_image.dll
Normal file
BIN
gource/SDL2_image.dll
Normal file
Binary file not shown.
1
gource/THANKS.txt
Normal file
1
gource/THANKS.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Cheers to everyone at Catalyst IT for their support and encouragement.
|
||||||
3
gource/cmd/gource
Normal file
3
gource/cmd/gource
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
GOURCE_CMD_DIR=`dirname "$0"`
|
||||||
|
"$GOURCE_CMD_DIR/../gource.exe" "$@"
|
||||||
2
gource/cmd/gource.cmd
Normal file
2
gource/cmd/gource.cmd
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
@echo off
|
||||||
|
"%~dp0\..\gource.exe" %*
|
||||||
BIN
gource/data/beam.png
Normal file
BIN
gource/data/beam.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 358 B |
BIN
gource/data/bloom.tga
Normal file
BIN
gource/data/bloom.tga
Normal file
Binary file not shown.
BIN
gource/data/bloom_alpha.tga
Normal file
BIN
gource/data/bloom_alpha.tga
Normal file
Binary file not shown.
BIN
gource/data/file.png
Normal file
BIN
gource/data/file.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
BIN
gource/data/fonts/FreeSans.ttf
Normal file
BIN
gource/data/fonts/FreeSans.ttf
Normal file
Binary file not shown.
108
gource/data/fonts/README.txt
Normal file
108
gource/data/fonts/README.txt
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
-*-text-*-
|
||||||
|
GNU FreeFont
|
||||||
|
|
||||||
|
The GNU FreeFont project aims to provide a useful set of free scalable
|
||||||
|
(i.e., OpenType) fonts covering as much as possible of the ISO 10646/Unicode
|
||||||
|
UCS (Universal Character Set).
|
||||||
|
|
||||||
|
Statement of Purpose
|
||||||
|
--------------------
|
||||||
|
|
||||||
|
The practical reason for putting glyphs together in a single font face is
|
||||||
|
to conveniently mix symbols and characters from different writing systems,
|
||||||
|
without having to switch fonts.
|
||||||
|
|
||||||
|
Coverage
|
||||||
|
--------
|
||||||
|
|
||||||
|
FreeFont covers the following character sets
|
||||||
|
|
||||||
|
* ISO 8859 parts 1-15
|
||||||
|
* CEN MES-3 European Unicode Subset
|
||||||
|
http://www.evertype.com/standards/iso10646/pdf/cwa13873.pdf
|
||||||
|
* IBM/Microsoft code pages 437, 850, 852, 1250, 1252 and more
|
||||||
|
* Microsoft/Adobe Windows Glyph List 4 (WGL4)
|
||||||
|
http://www.microsoft.com/typography/otspec/WGL4.htm
|
||||||
|
* KOI8-R and KOI8-RU
|
||||||
|
* DEC VT100 graphics symbols
|
||||||
|
* International Phonetic Alphabet
|
||||||
|
* Arabic, Hebrew, Armenian, Georgian, Ethiopian and Thai alphabets,
|
||||||
|
including Arabic presentation forms A/B
|
||||||
|
* mathematical symbols, including the whole TeX repertoire of symbols
|
||||||
|
* APL symbols
|
||||||
|
etc.
|
||||||
|
|
||||||
|
Editing
|
||||||
|
-------
|
||||||
|
|
||||||
|
The free outline font editor, George Williams's FontForge
|
||||||
|
<http://fontforge.sourceforge.net/> is used for editing the fonts.
|
||||||
|
|
||||||
|
Design Issues
|
||||||
|
-------------
|
||||||
|
|
||||||
|
Which font shapes should be made? Historical style terms like Renaissance
|
||||||
|
or Baroque letterforms cannot be applied beyond Latin/Cyrillic/Greek
|
||||||
|
scripts to any greater extent than Kufi or Nashki can be applied beyond
|
||||||
|
Arabic script; "italic" is really only meaningful for Latin letters.
|
||||||
|
|
||||||
|
However, most modern writing systems have typographic formulations for
|
||||||
|
contrasting uniform and modulated character stroke widths, and have some
|
||||||
|
history with "oblique", faces. Since the advent of the typewriter, most
|
||||||
|
have developed a typographic style with uniform-width characters.
|
||||||
|
|
||||||
|
Accordingly, the FreeFont family has one monospaced - FreeMono - and two
|
||||||
|
proportional faces (one with uniform stroke - FreeSans - and one with
|
||||||
|
modulated stroke - FreeSerif).
|
||||||
|
|
||||||
|
To make text from different writing systems look good side-by-side, each
|
||||||
|
FreeFont face is meant to contain characters of similar style and weight.
|
||||||
|
|
||||||
|
Licensing
|
||||||
|
---------
|
||||||
|
|
||||||
|
Free UCS scalable fonts is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU General Public License as published
|
||||||
|
by the Free Software Foundation; either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
The fonts are distributed in the hope that they will be useful, but
|
||||||
|
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||||
|
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
|
As a special exception, if you create a document which uses this font, and
|
||||||
|
embed this font or unaltered portions of this font into the document, this
|
||||||
|
font does not by itself cause the resulting document to be covered by the
|
||||||
|
GNU General Public License. This exception does not however invalidate any
|
||||||
|
other reasons why the document might be covered by the GNU General Public
|
||||||
|
License. If you modify this font, you may extend this exception to your
|
||||||
|
version of the font, but you are not obligated to do so. If you do not
|
||||||
|
wish to do so, delete this exception statement from your version.
|
||||||
|
|
||||||
|
|
||||||
|
Files and their suffixes
|
||||||
|
------------------------
|
||||||
|
|
||||||
|
The files with .sfd (Spline Font Database) are in FontForge's native format.
|
||||||
|
Please use these if you plan to modify the font files.
|
||||||
|
|
||||||
|
TrueType fonts for immediate consumption are the files with the .ttf
|
||||||
|
(TrueType Font) suffix. These are ready to use in Xwindows based
|
||||||
|
systems using FreeType, on Mac OS, and on older Windows systems.
|
||||||
|
|
||||||
|
OpenType fonts (with suffix .otf) are for use in Windows Vista.
|
||||||
|
Note that although they can be installed on Linux, but many applications
|
||||||
|
in Linux still don't support them.
|
||||||
|
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------
|
||||||
|
Primoz Peterlin, <primoz.peterlin@biofiz.mf.uni-lj.si>
|
||||||
|
Steve White <stevan.white@googlemail.com>
|
||||||
|
|
||||||
|
Free UCS scalable fonts: http://savannah.gnu.org/projects/freefont/
|
||||||
|
$Id: README,v 1.7 2009/01/13 08:43:23 Stevan_White Exp $
|
||||||
5
gource/data/gource.style
Normal file
5
gource/data/gource.style
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
changeset = '{file_adds}{file_copies}{file_mods}{file_dels}'
|
||||||
|
file_mod = "{date|hgdate}|{author|person}|M|{file_mod}\n"
|
||||||
|
file_add = "{date|hgdate}|{author|person}|A|{file_add}\n"
|
||||||
|
file_del = "{date|hgdate}|{author|person}|D|{file_del}\n"
|
||||||
|
file_copy = "{date|hgdate}|{author|person}|A|{name}\n"
|
||||||
16
gource/data/shaders/bloom.frag
Normal file
16
gource/data/shaders/bloom.frag
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
|
||||||
|
varying vec3 pos;
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
float r = fract(sin(dot(pos.xy ,vec2(11.3713,67.3219))) * 2351.3718);
|
||||||
|
|
||||||
|
float offset = (0.5 - r) * gl_TexCoord[0].x * 0.045;
|
||||||
|
|
||||||
|
float intensity = min(1.0, cos((length(pos*2.0)+offset)/gl_TexCoord[0].x));
|
||||||
|
float gradient = intensity * smoothstep(0.0, 2.0, intensity);
|
||||||
|
|
||||||
|
gradient *= smoothstep(1.0,0.67+r*0.33, 1.0-intensity);
|
||||||
|
|
||||||
|
gl_FragColor = gl_Color * gradient;
|
||||||
|
}
|
||||||
10
gource/data/shaders/bloom.vert
Normal file
10
gource/data/shaders/bloom.vert
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
|
||||||
|
varying vec3 pos;
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
pos = gl_Vertex.xyz - gl_MultiTexCoord0.yzw;
|
||||||
|
gl_TexCoord[0] = gl_MultiTexCoord0;
|
||||||
|
gl_FrontColor = gl_Color;
|
||||||
|
gl_Position = ftransform();
|
||||||
|
}
|
||||||
9
gource/data/shaders/shadow.frag
Normal file
9
gource/data/shaders/shadow.frag
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
uniform sampler2D tex;
|
||||||
|
uniform float shadow_strength;
|
||||||
|
|
||||||
|
void main(void)
|
||||||
|
{
|
||||||
|
vec4 colour = texture2D(tex,gl_TexCoord[0].st);
|
||||||
|
|
||||||
|
gl_FragColor = vec4(0.0, 0.0, 0.0, gl_Color.w * colour.w * shadow_strength);
|
||||||
|
}
|
||||||
6
gource/data/shaders/shadow.vert
Normal file
6
gource/data/shaders/shadow.vert
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
void main(void)
|
||||||
|
{
|
||||||
|
gl_TexCoord[0] = gl_MultiTexCoord0;
|
||||||
|
gl_FrontColor = gl_Color;
|
||||||
|
gl_Position = ftransform();
|
||||||
|
}
|
||||||
15
gource/data/shaders/text.frag
Normal file
15
gource/data/shaders/text.frag
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
uniform sampler2D tex;
|
||||||
|
uniform float shadow_strength;
|
||||||
|
uniform float texel_size;
|
||||||
|
|
||||||
|
void main(void)
|
||||||
|
{
|
||||||
|
float colour_alpha = texture2D(tex,gl_TexCoord[0].xy).w;
|
||||||
|
float shadow_alpha = texture2D(tex,gl_TexCoord[0].xy - vec2(texel_size)).w * shadow_strength;
|
||||||
|
|
||||||
|
float combined_alpha = 1.0 - (1.0-shadow_alpha)*(1.0-colour_alpha);
|
||||||
|
|
||||||
|
if(combined_alpha > 0.0) colour_alpha /= combined_alpha;
|
||||||
|
|
||||||
|
gl_FragColor = gl_Color * vec4(vec3(colour_alpha), combined_alpha);
|
||||||
|
}
|
||||||
6
gource/data/shaders/text.vert
Normal file
6
gource/data/shaders/text.vert
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
void main(void)
|
||||||
|
{
|
||||||
|
gl_TexCoord[0] = gl_MultiTexCoord0;
|
||||||
|
gl_FrontColor = gl_Color;
|
||||||
|
gl_Position = ftransform();
|
||||||
|
}
|
||||||
BIN
gource/data/user.png
Normal file
BIN
gource/data/user.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 61 KiB |
BIN
gource/glew32.dll
Normal file
BIN
gource/glew32.dll
Normal file
Binary file not shown.
BIN
gource/gource.exe
Normal file
BIN
gource/gource.exe
Normal file
Binary file not shown.
BIN
gource/libboost_filesystem-mt.dll
Normal file
BIN
gource/libboost_filesystem-mt.dll
Normal file
Binary file not shown.
BIN
gource/libbz2-1.dll
Normal file
BIN
gource/libbz2-1.dll
Normal file
Binary file not shown.
BIN
gource/libfreetype-6.dll
Normal file
BIN
gource/libfreetype-6.dll
Normal file
Binary file not shown.
BIN
gource/libgcc_s_seh-1.dll
Normal file
BIN
gource/libgcc_s_seh-1.dll
Normal file
Binary file not shown.
BIN
gource/libglib-2.0-0.dll
Normal file
BIN
gource/libglib-2.0-0.dll
Normal file
Binary file not shown.
BIN
gource/libgraphite2.dll
Normal file
BIN
gource/libgraphite2.dll
Normal file
Binary file not shown.
BIN
gource/libharfbuzz-0.dll
Normal file
BIN
gource/libharfbuzz-0.dll
Normal file
Binary file not shown.
BIN
gource/libiconv-2.dll
Normal file
BIN
gource/libiconv-2.dll
Normal file
Binary file not shown.
BIN
gource/libintl-8.dll
Normal file
BIN
gource/libintl-8.dll
Normal file
Binary file not shown.
BIN
gource/libjpeg-8.dll
Normal file
BIN
gource/libjpeg-8.dll
Normal file
Binary file not shown.
BIN
gource/liblzma-5.dll
Normal file
BIN
gource/liblzma-5.dll
Normal file
Binary file not shown.
BIN
gource/libpcre-1.dll
Normal file
BIN
gource/libpcre-1.dll
Normal file
Binary file not shown.
BIN
gource/libpng16-16.dll
Normal file
BIN
gource/libpng16-16.dll
Normal file
Binary file not shown.
BIN
gource/libstdc++-6.dll
Normal file
BIN
gource/libstdc++-6.dll
Normal file
Binary file not shown.
BIN
gource/libtiff-5.dll
Normal file
BIN
gource/libtiff-5.dll
Normal file
Binary file not shown.
BIN
gource/libwebp-7.dll
Normal file
BIN
gource/libwebp-7.dll
Normal file
Binary file not shown.
BIN
gource/libwinpthread-1.dll
Normal file
BIN
gource/libwinpthread-1.dll
Normal file
Binary file not shown.
BIN
gource/libzstd.dll
Normal file
BIN
gource/libzstd.dll
Normal file
Binary file not shown.
BIN
gource/zlib1.dll
Normal file
BIN
gource/zlib1.dll
Normal file
Binary file not shown.
@@ -20,7 +20,6 @@ pluginManagement {
|
|||||||
mavenLocal()
|
mavenLocal()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
maven { url "https://dl.cloudsmith.io/public/arcane/archive/maven/" }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
rootProject.name = 'Iris'
|
rootProject.name = 'Iris'
|
||||||
@@ -23,9 +23,13 @@ import com.google.gson.JsonParseException;
|
|||||||
import com.google.gson.JsonParser;
|
import com.google.gson.JsonParser;
|
||||||
import com.volmit.iris.core.IrisSettings;
|
import com.volmit.iris.core.IrisSettings;
|
||||||
import com.volmit.iris.core.ServerConfigurator;
|
import com.volmit.iris.core.ServerConfigurator;
|
||||||
import com.volmit.iris.core.link.*;
|
import com.volmit.iris.core.link.IrisPapiExpansion;
|
||||||
|
import com.volmit.iris.core.link.MultiverseCoreLink;
|
||||||
|
import com.volmit.iris.core.link.MythicMobsLink;
|
||||||
import com.volmit.iris.core.loader.IrisData;
|
import com.volmit.iris.core.loader.IrisData;
|
||||||
import com.volmit.iris.core.nms.INMS;
|
import com.volmit.iris.core.nms.INMS;
|
||||||
|
import com.volmit.iris.core.nms.v19_3.NMSBinding19_3;
|
||||||
|
import com.volmit.iris.core.pregenerator.LazyPregenerator;
|
||||||
import com.volmit.iris.core.service.StudioSVC;
|
import com.volmit.iris.core.service.StudioSVC;
|
||||||
import com.volmit.iris.core.tools.IrisToolbelt;
|
import com.volmit.iris.core.tools.IrisToolbelt;
|
||||||
import com.volmit.iris.engine.EnginePanic;
|
import com.volmit.iris.engine.EnginePanic;
|
||||||
@@ -40,7 +44,10 @@ import com.volmit.iris.util.exceptions.IrisException;
|
|||||||
import com.volmit.iris.util.format.C;
|
import com.volmit.iris.util.format.C;
|
||||||
import com.volmit.iris.util.format.Form;
|
import com.volmit.iris.util.format.Form;
|
||||||
import com.volmit.iris.util.function.NastyRunnable;
|
import com.volmit.iris.util.function.NastyRunnable;
|
||||||
import com.volmit.iris.util.io.*;
|
import com.volmit.iris.util.io.FileWatcher;
|
||||||
|
import com.volmit.iris.util.io.IO;
|
||||||
|
import com.volmit.iris.util.io.InstanceState;
|
||||||
|
import com.volmit.iris.util.io.JarScanner;
|
||||||
import com.volmit.iris.util.math.M;
|
import com.volmit.iris.util.math.M;
|
||||||
import com.volmit.iris.util.math.RNG;
|
import com.volmit.iris.util.math.RNG;
|
||||||
import com.volmit.iris.util.parallel.MultiBurst;
|
import com.volmit.iris.util.parallel.MultiBurst;
|
||||||
@@ -55,11 +62,7 @@ import com.volmit.iris.util.scheduling.ShurikenQueue;
|
|||||||
import io.papermc.lib.PaperLib;
|
import io.papermc.lib.PaperLib;
|
||||||
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
||||||
import net.kyori.adventure.text.serializer.ComponentSerializer;
|
import net.kyori.adventure.text.serializer.ComponentSerializer;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.*;
|
||||||
import org.bukkit.GameMode;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.WorldCreator;
|
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
@@ -81,11 +84,13 @@ import java.lang.annotation.Annotation;
|
|||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
@SuppressWarnings("CanBeFinal")
|
@SuppressWarnings("CanBeFinal")
|
||||||
public class Iris extends VolmitPlugin implements Listener {
|
public class Iris extends VolmitPlugin implements Listener {
|
||||||
|
public static final String OVERWORLD_TAG = "2092";
|
||||||
|
|
||||||
private static final Queue<Runnable> syncJobs = new ShurikenQueue<>();
|
private static final Queue<Runnable> syncJobs = new ShurikenQueue<>();
|
||||||
|
|
||||||
public static Iris instance;
|
public static Iris instance;
|
||||||
public static BukkitAudiences audiences;
|
public static BukkitAudiences audiences;
|
||||||
public static MultiverseCoreLink linkMultiverseCore;
|
public static MultiverseCoreLink linkMultiverseCore;
|
||||||
@@ -182,6 +187,7 @@ public class Iris extends VolmitPlugin implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static File getCached(String name, String url) {
|
public static File getCached(String name, String url) {
|
||||||
String h = IO.hash(name + "@" + url);
|
String h = IO.hash(name + "@" + url);
|
||||||
File f = Iris.instance.getDataFile("cache", h.substring(0, 2), h.substring(3, 5), h);
|
File f = Iris.instance.getDataFile("cache", h.substring(0, 2), h.substring(3, 5), h);
|
||||||
@@ -381,6 +387,44 @@ public class Iris extends VolmitPlugin implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void dump() {
|
||||||
|
try {
|
||||||
|
File fi = Iris.instance.getDataFile("dump", "td-" + new java.sql.Date(M.ms()) + ".txt");
|
||||||
|
FileOutputStream fos = new FileOutputStream(fi);
|
||||||
|
Map<Thread, StackTraceElement[]> f = Thread.getAllStackTraces();
|
||||||
|
PrintWriter pw = new PrintWriter(fos);
|
||||||
|
for (Thread i : f.keySet()) {
|
||||||
|
pw.println("========================================");
|
||||||
|
pw.println("Thread: '" + i.getName() + "' ID: " + i.getId() + " STATUS: " + i.getState().name());
|
||||||
|
|
||||||
|
for (StackTraceElement j : f.get(i)) {
|
||||||
|
pw.println(" @ " + j.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
pw.println("========================================");
|
||||||
|
pw.println();
|
||||||
|
pw.println();
|
||||||
|
}
|
||||||
|
|
||||||
|
pw.close();
|
||||||
|
System.out.println("DUMPED! See " + fi.getAbsolutePath());
|
||||||
|
} catch (Throwable e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void panic() {
|
||||||
|
EnginePanic.panic();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void addPanic(String s, String v) {
|
||||||
|
EnginePanic.add(s, v);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void fixShading() {
|
||||||
|
ShadeFix.fix(ComponentSerializer.class);
|
||||||
|
}
|
||||||
|
|
||||||
private void enable() {
|
private void enable() {
|
||||||
instance = this;
|
instance = this;
|
||||||
services = new KMap<>();
|
services = new KMap<>();
|
||||||
@@ -400,6 +444,7 @@ public class Iris extends VolmitPlugin implements Listener {
|
|||||||
J.s(() -> {
|
J.s(() -> {
|
||||||
J.a(() -> PaperLib.suggestPaper(this));
|
J.a(() -> PaperLib.suggestPaper(this));
|
||||||
J.a(() -> IO.delete(getTemp()));
|
J.a(() -> IO.delete(getTemp()));
|
||||||
|
J.a(LazyPregenerator::loadLazyGenerators, 100);
|
||||||
J.a(this::bstats);
|
J.a(this::bstats);
|
||||||
J.ar(this::checkConfigHotload, 60);
|
J.ar(this::checkConfigHotload, 60);
|
||||||
J.sr(this::tickQueue, 0);
|
J.sr(this::tickQueue, 0);
|
||||||
@@ -417,8 +462,8 @@ public class Iris extends VolmitPlugin implements Listener {
|
|||||||
FileConfiguration fc = new YamlConfiguration();
|
FileConfiguration fc = new YamlConfiguration();
|
||||||
try {
|
try {
|
||||||
fc.load(new File("bukkit.yml"));
|
fc.load(new File("bukkit.yml"));
|
||||||
searching: for(String i : fc.getKeys(true))
|
searching:
|
||||||
{
|
for (String i : fc.getKeys(true)) {
|
||||||
if (i.startsWith("worlds.") && i.endsWith(".generator")) {
|
if (i.startsWith("worlds.") && i.endsWith(".generator")) {
|
||||||
String worldName = i.split("\\Q.\\E")[1];
|
String worldName = i.split("\\Q.\\E")[1];
|
||||||
String generator = IrisSettings.get().getGenerator().getDefaultWorldType();
|
String generator = IrisSettings.get().getGenerator().getDefaultWorldType();
|
||||||
@@ -430,10 +475,8 @@ public class Iris extends VolmitPlugin implements Listener {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(World j : Bukkit.getWorlds())
|
for (World j : Bukkit.getWorlds()) {
|
||||||
{
|
if (j.getName().equals(worldName)) {
|
||||||
if(j.getName().equals(worldName))
|
|
||||||
{
|
|
||||||
continue searching;
|
continue searching;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -482,48 +525,15 @@ public class Iris extends VolmitPlugin implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void dump() {
|
|
||||||
try {
|
|
||||||
File fi = Iris.instance.getDataFile("dump", "td-" + new java.sql.Date(M.ms()) + ".txt");
|
|
||||||
FileOutputStream fos = new FileOutputStream(fi);
|
|
||||||
Map<Thread, StackTraceElement[]> f = Thread.getAllStackTraces();
|
|
||||||
PrintWriter pw = new PrintWriter(fos);
|
|
||||||
for(Thread i : f.keySet()) {
|
|
||||||
pw.println("========================================");
|
|
||||||
pw.println("Thread: '" + i.getName() + "' ID: " + i.getId() + " STATUS: " + i.getState().name());
|
|
||||||
|
|
||||||
for(StackTraceElement j : f.get(i)) {
|
|
||||||
pw.println(" @ " + j.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
pw.println("========================================");
|
|
||||||
pw.println();
|
|
||||||
pw.println();
|
|
||||||
}
|
|
||||||
|
|
||||||
pw.close();
|
|
||||||
System.out.println("DUMPED! See " + fi.getAbsolutePath());
|
|
||||||
} catch(Throwable e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void postShutdown(Runnable r) {
|
public void postShutdown(Runnable r) {
|
||||||
postShutdown.add(r);
|
postShutdown.add(r);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void panic() {
|
|
||||||
EnginePanic.panic();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void addPanic(String s, String v) {
|
|
||||||
EnginePanic.add(s, v);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
enable();
|
enable();
|
||||||
super.onEnable();
|
super.onEnable();
|
||||||
Bukkit.getPluginManager().registerEvents(this, this);
|
Bukkit.getPluginManager().registerEvents(this, this);
|
||||||
|
setupChecks();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onDisable() {
|
public void onDisable() {
|
||||||
@@ -536,10 +546,6 @@ public class Iris extends VolmitPlugin implements Listener {
|
|||||||
super.onDisable();
|
super.onDisable();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void fixShading() {
|
|
||||||
ShadeFix.fix(ComponentSerializer.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setupPapi() {
|
private void setupPapi() {
|
||||||
if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
|
if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
|
||||||
new IrisPapiExpansion().register();
|
new IrisPapiExpansion().register();
|
||||||
@@ -561,6 +567,31 @@ public class Iris extends VolmitPlugin implements Listener {
|
|||||||
return C.BOLD + "" + C.DARK_GRAY + "[" + C.BOLD + "" + C.IRIS + "Iris" + C.BOLD + C.DARK_GRAY + "]" + C.RESET + "" + C.GRAY + ": ";
|
return C.BOLD + "" + C.DARK_GRAY + "[" + C.BOLD + "" + C.IRIS + "Iris" + C.BOLD + C.DARK_GRAY + "]" + C.RESET + "" + C.GRAY + ": ";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private boolean setupChecks() {
|
||||||
|
boolean passed = true;
|
||||||
|
Iris.info("Version Information: " + instance.getServer().getVersion() + " | " + instance.getServer().getBukkitVersion());
|
||||||
|
if (!instance.getServer().getBukkitVersion().contains(NMSBinding19_3.NMS_VERSION)) {
|
||||||
|
passed = false;
|
||||||
|
Iris.warn("============================================");
|
||||||
|
Iris.warn("=");
|
||||||
|
Iris.warn("=");
|
||||||
|
Iris.warn("=");
|
||||||
|
Iris.warn("Iris is not compatible with this version of Minecraft.\nPlease use " + NMSBinding19_3.NMS_VERSION + " or use an older version of Iris.");
|
||||||
|
Iris.warn("=");
|
||||||
|
Iris.warn("=");
|
||||||
|
Iris.warn("=");
|
||||||
|
Iris.warn("============================================");
|
||||||
|
}
|
||||||
|
if (!instance.getServer().getVersion().contains("Purpur")) {
|
||||||
|
passed = false;
|
||||||
|
Iris.info("We recommend using Purpur for the best experience with Iris.");
|
||||||
|
Iris.info("Purpur is a fork of Paper that is optimized for performance and stability.");
|
||||||
|
Iris.info("Plugins that work on Spigot / Paper work on Purpur.");
|
||||||
|
Iris.info("You can download it here: https://purpurmc.org");
|
||||||
|
}
|
||||||
|
return passed;
|
||||||
|
}
|
||||||
|
|
||||||
private void checkConfigHotload() {
|
private void checkConfigHotload() {
|
||||||
if (configWatcher.checkModified()) {
|
if (configWatcher.checkModified()) {
|
||||||
IrisSettings.invalidate();
|
IrisSettings.invalidate();
|
||||||
@@ -653,7 +684,7 @@ public class Iris extends VolmitPlugin implements Listener {
|
|||||||
.name(worldName)
|
.name(worldName)
|
||||||
.seed(1337)
|
.seed(1337)
|
||||||
.environment(dim.getEnvironment())
|
.environment(dim.getEnvironment())
|
||||||
.worldFolder(new File(worldName))
|
.worldFolder(new File(Bukkit.getWorldContainer(), worldName))
|
||||||
.minHeight(dim.getMinHeight())
|
.minHeight(dim.getMinHeight())
|
||||||
.maxHeight(dim.getMaxHeight())
|
.maxHeight(dim.getMaxHeight())
|
||||||
.build();
|
.build();
|
||||||
@@ -697,6 +728,7 @@ public class Iris extends VolmitPlugin implements Listener {
|
|||||||
Iris.info("Bukkit version: " + Bukkit.getBukkitVersion());
|
Iris.info("Bukkit version: " + Bukkit.getBukkitVersion());
|
||||||
Iris.info("Java version: " + getJavaVersion());
|
Iris.info("Java version: " + getJavaVersion());
|
||||||
Iris.info("Custom Biomes: " + INMS.get().countCustomBiomes());
|
Iris.info("Custom Biomes: " + INMS.get().countCustomBiomes());
|
||||||
|
setupChecks();
|
||||||
printPacks();
|
printPacks();
|
||||||
|
|
||||||
for (int i = 0; i < info.length; i++) {
|
for (int i = 0; i < info.length; i++) {
|
||||||
@@ -723,7 +755,8 @@ public class Iris extends VolmitPlugin implements Listener {
|
|||||||
JsonObject json = JsonParser.parseReader(r).getAsJsonObject();
|
JsonObject json = JsonParser.parseReader(r).getAsJsonObject();
|
||||||
if (json.has("version"))
|
if (json.has("version"))
|
||||||
version = json.get("version").getAsString();
|
version = json.get("version").getAsString();
|
||||||
} catch(IOException | JsonParseException ignored) { }
|
} catch (IOException | JsonParseException ignored) {
|
||||||
|
}
|
||||||
Iris.info(" " + dimName + " v" + version);
|
Iris.info(" " + dimName + " v" + version);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,6 +50,57 @@ public class IrisSettings {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static IrisSettings get() {
|
||||||
|
if (settings != null) {
|
||||||
|
return settings;
|
||||||
|
}
|
||||||
|
|
||||||
|
settings = new IrisSettings();
|
||||||
|
|
||||||
|
File s = Iris.instance.getDataFile("settings.json");
|
||||||
|
|
||||||
|
if (!s.exists()) {
|
||||||
|
try {
|
||||||
|
IO.writeAll(s, new JSONObject(new Gson().toJson(settings)).toString(4));
|
||||||
|
} catch (JSONException | IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
Iris.reportError(e);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
String ss = IO.readAll(s);
|
||||||
|
settings = new Gson().fromJson(ss, IrisSettings.class);
|
||||||
|
try {
|
||||||
|
IO.writeAll(s, new JSONObject(new Gson().toJson(settings)).toString(4));
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
} catch (Throwable ee) {
|
||||||
|
// Iris.reportError(ee); causes a self-reference & stackoverflow
|
||||||
|
Iris.error("Configuration Error in settings.json! " + ee.getClass().getSimpleName() + ": " + ee.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return settings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void invalidate() {
|
||||||
|
synchronized (settings) {
|
||||||
|
settings = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void forceSave() {
|
||||||
|
File s = Iris.instance.getDataFile("settings.json");
|
||||||
|
|
||||||
|
try {
|
||||||
|
IO.writeAll(s, new JSONObject(new Gson().toJson(settings)).toString(4));
|
||||||
|
} catch (JSONException | IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
Iris.reportError(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public static class IrisSettingsAutoconfiguration {
|
public static class IrisSettingsAutoconfiguration {
|
||||||
public boolean configureSpigotTimeoutTime = true;
|
public boolean configureSpigotTimeoutTime = true;
|
||||||
@@ -132,55 +183,4 @@ public class IrisSettings {
|
|||||||
public boolean disableTimeAndWeather = true;
|
public boolean disableTimeAndWeather = true;
|
||||||
public boolean autoStartDefaultStudio = false;
|
public boolean autoStartDefaultStudio = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IrisSettings get() {
|
|
||||||
if(settings != null) {
|
|
||||||
return settings;
|
|
||||||
}
|
|
||||||
|
|
||||||
settings = new IrisSettings();
|
|
||||||
|
|
||||||
File s = Iris.instance.getDataFile("settings.json");
|
|
||||||
|
|
||||||
if(!s.exists()) {
|
|
||||||
try {
|
|
||||||
IO.writeAll(s, new JSONObject(new Gson().toJson(settings)).toString(4));
|
|
||||||
} catch(JSONException | IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
Iris.reportError(e);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
try {
|
|
||||||
String ss = IO.readAll(s);
|
|
||||||
settings = new Gson().fromJson(ss, IrisSettings.class);
|
|
||||||
try {
|
|
||||||
IO.writeAll(s, new JSONObject(new Gson().toJson(settings)).toString(4));
|
|
||||||
} catch(IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
} catch(Throwable ee) {
|
|
||||||
// Iris.reportError(ee); causes a self-reference & stackoverflow
|
|
||||||
Iris.error("Configuration Error in settings.json! " + ee.getClass().getSimpleName() + ": " + ee.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return settings;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void invalidate() {
|
|
||||||
synchronized(settings) {
|
|
||||||
settings = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void forceSave() {
|
|
||||||
File s = Iris.instance.getDataFile("settings.json");
|
|
||||||
|
|
||||||
try {
|
|
||||||
IO.writeAll(s, new JSONObject(new Gson().toJson(settings)).toString(4));
|
|
||||||
} catch(JSONException | IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
Iris.reportError(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ import com.volmit.iris.engine.object.IrisDimension;
|
|||||||
import com.volmit.iris.util.collection.KList;
|
import com.volmit.iris.util.collection.KList;
|
||||||
import com.volmit.iris.util.collection.KSet;
|
import com.volmit.iris.util.collection.KSet;
|
||||||
import com.volmit.iris.util.format.C;
|
import com.volmit.iris.util.format.C;
|
||||||
import com.volmit.iris.util.io.IO;
|
|
||||||
import com.volmit.iris.util.plugin.VolmitSender;
|
import com.volmit.iris.util.plugin.VolmitSender;
|
||||||
import com.volmit.iris.util.scheduling.J;
|
import com.volmit.iris.util.scheduling.J;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
@@ -38,6 +37,7 @@ import org.bukkit.entity.Player;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.List;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
public class ServerConfigurator {
|
public class ServerConfigurator {
|
||||||
@@ -82,41 +82,19 @@ public class ServerConfigurator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static File getDatapacksFolder() {
|
private static List<File> getDatapacksFolder() {
|
||||||
if (!IrisSettings.get().getGeneral().forceMainWorld.isEmpty()) {
|
if (!IrisSettings.get().getGeneral().forceMainWorld.isEmpty()) {
|
||||||
return new File(IrisSettings.get().getGeneral().forceMainWorld + "/datapacks");
|
return new KList<File>().qadd(new File(Bukkit.getWorldContainer(), IrisSettings.get().getGeneral().forceMainWorld + "/datapacks"));
|
||||||
|
}
|
||||||
|
KList<File> worlds = new KList<>();
|
||||||
|
Bukkit.getServer().getWorlds().forEach(w -> worlds.add(new File(w.getWorldFolder(), "datapacks")));
|
||||||
|
return worlds;
|
||||||
}
|
}
|
||||||
|
|
||||||
File props = new File("server.properties");
|
|
||||||
|
|
||||||
if(props.exists()) {
|
|
||||||
try {
|
|
||||||
KList<String> m = new KList<>(IO.readAll(props).split("\\Q\n\\E"));
|
|
||||||
|
|
||||||
for(String i : m) {
|
|
||||||
if(i.trim().startsWith("level-name=")) {
|
|
||||||
return new File(i.trim().split("\\Q=\\E")[1] + "/datapacks");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch(IOException e) {
|
|
||||||
Iris.reportError(e);
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void installDataPacks(boolean fullInstall) {
|
public static void installDataPacks(boolean fullInstall) {
|
||||||
Iris.info("Checking Data Packs...");
|
Iris.info("Checking Data Packs...");
|
||||||
boolean reboot = false;
|
|
||||||
File packs = new File("plugins/Iris/packs");
|
File packs = new File("plugins/Iris/packs");
|
||||||
File dpacks = getDatapacksFolder();
|
|
||||||
|
|
||||||
if(dpacks == null) {
|
|
||||||
Iris.error("Cannot find the datapacks folder! Please try generating a default world first maybe? Is this a new server?");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (packs.exists()) {
|
if (packs.exists()) {
|
||||||
for (File i : packs.listFiles()) {
|
for (File i : packs.listFiles()) {
|
||||||
@@ -135,8 +113,8 @@ public class ServerConfigurator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Iris.verbose(" Checking Dimension " + dim.getLoadFile().getPath());
|
Iris.verbose(" Checking Dimension " + dim.getLoadFile().getPath());
|
||||||
if(dim.installDataPack(() -> data, dpacks)) {
|
for (File dpack : getDatapacksFolder()) {
|
||||||
reboot = true;
|
dim.installDataPack(() -> data, dpack);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -147,19 +125,12 @@ public class ServerConfigurator {
|
|||||||
|
|
||||||
Iris.info("Data Packs Setup!");
|
Iris.info("Data Packs Setup!");
|
||||||
|
|
||||||
if(fullInstall) {
|
if (fullInstall)
|
||||||
verifyDataPacksPost(IrisSettings.get().getAutoConfiguration().isAutoRestartOnCustomBiomeInstall());
|
verifyDataPacksPost(IrisSettings.get().getAutoConfiguration().isAutoRestartOnCustomBiomeInstall());
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private static void verifyDataPacksPost(boolean allowRestarting) {
|
private static void verifyDataPacksPost(boolean allowRestarting) {
|
||||||
File packs = new File("plugins/Iris/packs");
|
File packs = new File("plugins/Iris/packs");
|
||||||
File dpacks = getDatapacksFolder();
|
|
||||||
|
|
||||||
if(dpacks == null) {
|
|
||||||
Iris.error("Cannot find the datapacks folder! Please try generating a default world first maybe? Is this a new server?");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean bad = false;
|
boolean bad = false;
|
||||||
if (packs.exists()) {
|
if (packs.exists()) {
|
||||||
|
|||||||
@@ -20,20 +20,14 @@ package com.volmit.iris.core.commands;
|
|||||||
|
|
||||||
import com.volmit.iris.Iris;
|
import com.volmit.iris.Iris;
|
||||||
import com.volmit.iris.core.service.StudioSVC;
|
import com.volmit.iris.core.service.StudioSVC;
|
||||||
import com.volmit.iris.engine.object.IrisBiome;
|
import com.volmit.iris.engine.object.*;
|
||||||
import com.volmit.iris.engine.object.IrisCave;
|
|
||||||
import com.volmit.iris.engine.object.IrisDimension;
|
|
||||||
import com.volmit.iris.engine.object.IrisJigsawPiece;
|
|
||||||
import com.volmit.iris.engine.object.IrisJigsawPool;
|
|
||||||
import com.volmit.iris.engine.object.IrisJigsawStructure;
|
|
||||||
import com.volmit.iris.engine.object.IrisRegion;
|
|
||||||
import com.volmit.iris.util.decree.DecreeExecutor;
|
import com.volmit.iris.util.decree.DecreeExecutor;
|
||||||
import com.volmit.iris.util.decree.DecreeOrigin;
|
import com.volmit.iris.util.decree.DecreeOrigin;
|
||||||
import com.volmit.iris.util.decree.annotations.Decree;
|
import com.volmit.iris.util.decree.annotations.Decree;
|
||||||
import com.volmit.iris.util.decree.annotations.Param;
|
import com.volmit.iris.util.decree.annotations.Param;
|
||||||
import com.volmit.iris.util.format.C;
|
import com.volmit.iris.util.format.C;
|
||||||
|
|
||||||
import java.awt.Desktop;
|
import java.awt.*;
|
||||||
|
|
||||||
|
|
||||||
@Decree(name = "edit", origin = DecreeOrigin.PLAYER, studio = true, description = "Edit something")
|
@Decree(name = "edit", origin = DecreeOrigin.PLAYER, studio = true, description = "Edit something")
|
||||||
|
|||||||
@@ -76,6 +76,20 @@ public class CommandFind implements DecreeExecutor {
|
|||||||
e.gotoJigsaw(structure, player());
|
e.gotoJigsaw(structure, player());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Decree(description = "Find a point of interest.")
|
||||||
|
public void poi(
|
||||||
|
@Param(description = "The type of PoI to look for.")
|
||||||
|
String type
|
||||||
|
) {
|
||||||
|
Engine e = engine();
|
||||||
|
if (e == null) {
|
||||||
|
sender().sendMessage(C.GOLD + "Not in an Iris World!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
e.gotoPOI(type, player());
|
||||||
|
}
|
||||||
|
|
||||||
@Decree(description = "Find an object")
|
@Decree(description = "Find an object")
|
||||||
public void object(
|
public void object(
|
||||||
@Param(description = "The object to look for", customHandler = ObjectHandler.class)
|
@Param(description = "The object to look for", customHandler = ObjectHandler.class)
|
||||||
|
|||||||
@@ -38,10 +38,12 @@ import com.volmit.iris.util.parallel.MultiBurst;
|
|||||||
import com.volmit.iris.util.plugin.VolmitSender;
|
import com.volmit.iris.util.plugin.VolmitSender;
|
||||||
import com.volmit.iris.util.scheduling.J;
|
import com.volmit.iris.util.scheduling.J;
|
||||||
import com.volmit.iris.util.scheduling.jobs.QueueJob;
|
import com.volmit.iris.util.scheduling.jobs.QueueJob;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Chunk;
|
import org.bukkit.Chunk;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
import java.util.concurrent.Future;
|
import java.util.concurrent.Future;
|
||||||
|
|
||||||
@@ -71,13 +73,11 @@ public class CommandIris implements DecreeExecutor {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(new File(name).exists()) {
|
if (new File(Bukkit.getWorldContainer(), name).exists()) {
|
||||||
sender().sendMessage(C.RED + "That folder already exists!");
|
sender().sendMessage(C.RED + "That folder already exists!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sender().sendMessage(C.RED + "You should not be using this command to create new worlds. Instead, use the tutorial: https://docs.volmit.com/iris/getting-started");
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
IrisToolbelt.createWorld()
|
IrisToolbelt.createWorld()
|
||||||
.dimension(type.getLoadKey())
|
.dimension(type.getLoadKey())
|
||||||
@@ -96,6 +96,37 @@ public class CommandIris implements DecreeExecutor {
|
|||||||
sender().sendMessage(C.GREEN + "Successfully created your world!");
|
sender().sendMessage(C.GREEN + "Successfully created your world!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Decree(description = "Remove an Iris world", aliases = {"del", "rm"}, sync = true)
|
||||||
|
public void remove(
|
||||||
|
@Param(description = "The world to remove")
|
||||||
|
World world,
|
||||||
|
@Param(description = "Whether to also remove the folder (if set to false, just does not load the world)", defaultValue = "true")
|
||||||
|
boolean delete
|
||||||
|
) {
|
||||||
|
if (!IrisToolbelt.isIrisWorld(world)) {
|
||||||
|
sender().sendMessage(C.RED + "This is not an Iris world. Iris worlds: " + String.join(", ", Bukkit.getServer().getWorlds().stream().filter(IrisToolbelt::isIrisWorld).map(World::getName).toList()));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
sender().sendMessage(C.GREEN + "Removing world: " + world.getName());
|
||||||
|
try {
|
||||||
|
if (IrisToolbelt.removeWorld(world)) {
|
||||||
|
sender().sendMessage(C.GREEN + "Successfully removed " + world.getName() + " from bukkit.yml");
|
||||||
|
} else {
|
||||||
|
sender().sendMessage(C.YELLOW + "Looks like the world was already removed from bukkit.yml");
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
sender().sendMessage(C.RED + "Failed to save bukkit.yml because of " + e.getMessage());
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
IrisToolbelt.evacuate(world, "Deleting world");
|
||||||
|
Bukkit.unloadWorld(world, false);
|
||||||
|
if (delete && world.getWorldFolder().delete()) {
|
||||||
|
sender().sendMessage(C.GREEN + "Successfully removed world folder");
|
||||||
|
} else {
|
||||||
|
sender().sendMessage(C.RED + "Failed to remove world folder");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Decree(description = "Print version information")
|
@Decree(description = "Print version information")
|
||||||
public void version() {
|
public void version() {
|
||||||
sender().sendMessage(C.GREEN + "Iris v" + Iris.instance.getDescription().getVersion() + " by Volmit Software");
|
sender().sendMessage(C.GREEN + "Iris v" + Iris.instance.getDescription().getVersion() + " by Volmit Software");
|
||||||
@@ -107,6 +138,12 @@ public class CommandIris implements DecreeExecutor {
|
|||||||
sender().sendMessage(C.GREEN + "Total Height: " + (sender().player().getWorld().getMaxHeight() - sender().player().getWorld().getMinHeight()));
|
sender().sendMessage(C.GREEN + "Total Height: " + (sender().player().getWorld().getMaxHeight() - sender().player().getWorld().getMinHeight()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Decree(description = "QOL command to open a overworld studio world.", sync = true)
|
||||||
|
public void so() {
|
||||||
|
sender().sendMessage(C.GREEN + "Opening studio for the \"Overworld\" pack (seed: 1337)");
|
||||||
|
Iris.service(StudioSVC.class).open(sender(), 1337, "overworld");
|
||||||
|
}
|
||||||
|
|
||||||
@Decree(description = "Set aura spins")
|
@Decree(description = "Set aura spins")
|
||||||
public void aura(
|
public void aura(
|
||||||
@Param(description = "The h color value", defaultValue = "-20")
|
@Param(description = "The h color value", defaultValue = "-20")
|
||||||
@@ -170,10 +207,14 @@ public class CommandIris implements DecreeExecutor {
|
|||||||
@Param(name = "overwrite", description = "Whether or not to overwrite the pack with the downloaded one", aliases = "force", defaultValue = "false")
|
@Param(name = "overwrite", description = "Whether or not to overwrite the pack with the downloaded one", aliases = "force", defaultValue = "false")
|
||||||
boolean overwrite
|
boolean overwrite
|
||||||
) {
|
) {
|
||||||
branch = pack.equals("overworld") ? "stable" : branch;
|
|
||||||
sender().sendMessage(C.GREEN + "Downloading pack: " + pack + "/" + branch + (trim ? " trimmed" : "") + (overwrite ? " overwriting" : ""));
|
sender().sendMessage(C.GREEN + "Downloading pack: " + pack + "/" + branch + (trim ? " trimmed" : "") + (overwrite ? " overwriting" : ""));
|
||||||
|
if (pack.equals("overworld")) {
|
||||||
|
String url = "https://github.com/IrisDimensions/overworld/releases/download/" + Iris.OVERWORLD_TAG + "/overworld.zip";
|
||||||
|
Iris.service(StudioSVC.class).downloadRelease(sender(), url, trim, overwrite);
|
||||||
|
} else {
|
||||||
Iris.service(StudioSVC.class).downloadSearch(sender(), "IrisDimensions/" + pack + "/" + branch, trim, overwrite);
|
Iris.service(StudioSVC.class).downloadSearch(sender(), "IrisDimensions/" + pack + "/" + branch, trim, overwrite);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Decree(description = "Get metrics for your world", aliases = "measure", origin = DecreeOrigin.PLAYER)
|
@Decree(description = "Get metrics for your world", aliases = "measure", origin = DecreeOrigin.PLAYER)
|
||||||
public void metrics() {
|
public void metrics() {
|
||||||
|
|||||||
@@ -25,13 +25,7 @@ import com.volmit.iris.core.service.ObjectSVC;
|
|||||||
import com.volmit.iris.core.service.StudioSVC;
|
import com.volmit.iris.core.service.StudioSVC;
|
||||||
import com.volmit.iris.core.service.WandSVC;
|
import com.volmit.iris.core.service.WandSVC;
|
||||||
import com.volmit.iris.engine.framework.Engine;
|
import com.volmit.iris.engine.framework.Engine;
|
||||||
import com.volmit.iris.engine.object.IObjectPlacer;
|
import com.volmit.iris.engine.object.*;
|
||||||
import com.volmit.iris.engine.object.IrisDimension;
|
|
||||||
import com.volmit.iris.engine.object.IrisObject;
|
|
||||||
import com.volmit.iris.engine.object.IrisObjectPlacement;
|
|
||||||
import com.volmit.iris.engine.object.IrisObjectPlacementScaleInterpolator;
|
|
||||||
import com.volmit.iris.engine.object.IrisObjectRotation;
|
|
||||||
import com.volmit.iris.engine.object.TileData;
|
|
||||||
import com.volmit.iris.util.data.Cuboid;
|
import com.volmit.iris.util.data.Cuboid;
|
||||||
import com.volmit.iris.util.decree.DecreeExecutor;
|
import com.volmit.iris.util.decree.DecreeExecutor;
|
||||||
import com.volmit.iris.util.decree.DecreeOrigin;
|
import com.volmit.iris.util.decree.DecreeOrigin;
|
||||||
@@ -53,15 +47,7 @@ import org.bukkit.util.Vector;
|
|||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.text.NumberFormat;
|
import java.text.NumberFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.TreeSet;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
@Decree(name = "object", aliases = "o", origin = DecreeOrigin.PLAYER, studio = true, description = "Iris object manipulation")
|
@Decree(name = "object", aliases = "o", origin = DecreeOrigin.PLAYER, studio = true, description = "Iris object manipulation")
|
||||||
public class CommandObject implements DecreeExecutor {
|
public class CommandObject implements DecreeExecutor {
|
||||||
@@ -180,7 +166,7 @@ public class CommandObject implements DecreeExecutor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
List<Material> sortedMatsList = amounts.keySet().stream().map(BlockData::getMaterial)
|
List<Material> sortedMatsList = amounts.keySet().stream().map(BlockData::getMaterial)
|
||||||
.sorted().collect(Collectors.toList());
|
.sorted().toList();
|
||||||
Set<Material> sortedMats = new TreeSet<>(Comparator.comparingInt(materials::get).reversed());
|
Set<Material> sortedMats = new TreeSet<>(Comparator.comparingInt(materials::get).reversed());
|
||||||
sortedMats.addAll(sortedMatsList);
|
sortedMats.addAll(sortedMatsList);
|
||||||
sender().sendMessage("== Blocks in object ==");
|
sender().sendMessage("== Blocks in object ==");
|
||||||
@@ -229,6 +215,9 @@ public class CommandObject implements DecreeExecutor {
|
|||||||
|
|
||||||
|
|
||||||
Location[] b = WandSVC.getCuboid(player());
|
Location[] b = WandSVC.getCuboid(player());
|
||||||
|
if (b == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
Location a1 = b[0].clone();
|
Location a1 = b[0].clone();
|
||||||
Location a2 = b[1].clone();
|
Location a2 = b[1].clone();
|
||||||
Cuboid cursor = new Cuboid(a1, a2);
|
Cuboid cursor = new Cuboid(a1, a2);
|
||||||
@@ -255,6 +244,9 @@ public class CommandObject implements DecreeExecutor {
|
|||||||
if (WandSVC.isHoldingWand(player())) {
|
if (WandSVC.isHoldingWand(player())) {
|
||||||
Location[] g = WandSVC.getCuboid(player());
|
Location[] g = WandSVC.getCuboid(player());
|
||||||
|
|
||||||
|
if (g == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (!here) {
|
if (!here) {
|
||||||
// TODO: WARNING HEIGHT
|
// TODO: WARNING HEIGHT
|
||||||
g[1] = player().getTargetBlock(null, 256).getLocation().clone();
|
g[1] = player().getTargetBlock(null, 256).getLocation().clone();
|
||||||
@@ -278,6 +270,10 @@ public class CommandObject implements DecreeExecutor {
|
|||||||
if (WandSVC.isHoldingIrisWand(player())) {
|
if (WandSVC.isHoldingIrisWand(player())) {
|
||||||
Location[] g = WandSVC.getCuboid(player());
|
Location[] g = WandSVC.getCuboid(player());
|
||||||
|
|
||||||
|
if (g == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!here) {
|
if (!here) {
|
||||||
// TODO: WARNING HEIGHT
|
// TODO: WARNING HEIGHT
|
||||||
g[0] = player().getTargetBlock(null, 256).getLocation().clone();
|
g[0] = player().getTargetBlock(null, 256).getLocation().clone();
|
||||||
@@ -319,8 +315,7 @@ public class CommandObject implements DecreeExecutor {
|
|||||||
|
|
||||||
Map<Block, BlockData> futureChanges = new HashMap<>();
|
Map<Block, BlockData> futureChanges = new HashMap<>();
|
||||||
|
|
||||||
if(scale != 1)
|
if (scale != 1) {
|
||||||
{
|
|
||||||
o = o.scaled(scale, IrisObjectPlacementScaleInterpolator.TRICUBIC);
|
o = o.scaled(scale, IrisObjectPlacementScaleInterpolator.TRICUBIC);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -397,6 +392,9 @@ public class CommandObject implements DecreeExecutor {
|
|||||||
Location a1 = b[0].clone();
|
Location a1 = b[0].clone();
|
||||||
Location a2 = b[1].clone();
|
Location a2 = b[1].clone();
|
||||||
Direction d = Direction.closest(player().getLocation().getDirection()).reverse();
|
Direction d = Direction.closest(player().getLocation().getDirection()).reverse();
|
||||||
|
if (d == null) {
|
||||||
|
return; // HOW DID THIS HAPPEN
|
||||||
|
}
|
||||||
a1.add(d.toVector().multiply(amount));
|
a1.add(d.toVector().multiply(amount));
|
||||||
a2.add(d.toVector().multiply(amount));
|
a2.add(d.toVector().multiply(amount));
|
||||||
Cuboid cursor = new Cuboid(a1, a2);
|
Cuboid cursor = new Cuboid(a1, a2);
|
||||||
@@ -427,8 +425,7 @@ public class CommandObject implements DecreeExecutor {
|
|||||||
|
|
||||||
Cuboid locs = WorldEditLink.getSelection(sender().player());
|
Cuboid locs = WorldEditLink.getSelection(sender().player());
|
||||||
|
|
||||||
if(locs == null)
|
if (locs == null) {
|
||||||
{
|
|
||||||
sender().sendMessage(C.RED + "You don't have a WorldEdit selection in this world.");
|
sender().sendMessage(C.RED + "You don't have a WorldEdit selection in this world.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,20 +28,7 @@ import com.volmit.iris.core.service.ConversionSVC;
|
|||||||
import com.volmit.iris.core.service.StudioSVC;
|
import com.volmit.iris.core.service.StudioSVC;
|
||||||
import com.volmit.iris.core.tools.IrisToolbelt;
|
import com.volmit.iris.core.tools.IrisToolbelt;
|
||||||
import com.volmit.iris.engine.framework.Engine;
|
import com.volmit.iris.engine.framework.Engine;
|
||||||
import com.volmit.iris.engine.object.InventorySlotType;
|
import com.volmit.iris.engine.object.*;
|
||||||
import com.volmit.iris.engine.object.IrisBiome;
|
|
||||||
import com.volmit.iris.engine.object.IrisBiomePaletteLayer;
|
|
||||||
import com.volmit.iris.engine.object.IrisDimension;
|
|
||||||
import com.volmit.iris.engine.object.IrisEntity;
|
|
||||||
import com.volmit.iris.engine.object.IrisGenerator;
|
|
||||||
import com.volmit.iris.engine.object.IrisInterpolator;
|
|
||||||
import com.volmit.iris.engine.object.IrisLootTable;
|
|
||||||
import com.volmit.iris.engine.object.IrisNoiseGenerator;
|
|
||||||
import com.volmit.iris.engine.object.IrisObject;
|
|
||||||
import com.volmit.iris.engine.object.IrisObjectPlacement;
|
|
||||||
import com.volmit.iris.engine.object.IrisRegion;
|
|
||||||
import com.volmit.iris.engine.object.IrisScript;
|
|
||||||
import com.volmit.iris.engine.object.NoiseStyle;
|
|
||||||
import com.volmit.iris.util.collection.KList;
|
import com.volmit.iris.util.collection.KList;
|
||||||
import com.volmit.iris.util.collection.KMap;
|
import com.volmit.iris.util.collection.KMap;
|
||||||
import com.volmit.iris.util.collection.KSet;
|
import com.volmit.iris.util.collection.KSet;
|
||||||
@@ -61,28 +48,15 @@ import com.volmit.iris.util.math.M;
|
|||||||
import com.volmit.iris.util.math.RNG;
|
import com.volmit.iris.util.math.RNG;
|
||||||
import com.volmit.iris.util.math.Spiraler;
|
import com.volmit.iris.util.math.Spiraler;
|
||||||
import com.volmit.iris.util.noise.CNG;
|
import com.volmit.iris.util.noise.CNG;
|
||||||
import com.volmit.iris.util.parallel.MultiBurst;
|
|
||||||
import com.volmit.iris.util.scheduling.J;
|
|
||||||
import com.volmit.iris.util.scheduling.O;
|
import com.volmit.iris.util.scheduling.O;
|
||||||
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
|
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
|
||||||
import com.volmit.iris.util.scheduling.jobs.Job;
|
|
||||||
import com.volmit.iris.util.scheduling.jobs.JobCollection;
|
|
||||||
import com.volmit.iris.util.scheduling.jobs.QueueJob;
|
|
||||||
import com.volmit.iris.util.scheduling.jobs.SingleJob;
|
|
||||||
import io.papermc.lib.PaperLib;
|
import io.papermc.lib.PaperLib;
|
||||||
|
import org.bukkit.*;
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.Chunk;
|
|
||||||
import org.bukkit.FluidCollisionMode;
|
|
||||||
import org.bukkit.GameMode;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.event.inventory.InventoryType;
|
import org.bukkit.event.inventory.InventoryType;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
import org.bukkit.util.BlockVector;
|
import org.bukkit.util.BlockVector;
|
||||||
import org.bukkit.util.Vector;
|
import org.bukkit.util.Vector;
|
||||||
|
|
||||||
import java.awt.*;
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -93,20 +67,16 @@ import java.time.Duration;
|
|||||||
import java.time.temporal.ChronoUnit;
|
import java.time.temporal.ChronoUnit;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
import java.util.concurrent.Future;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
@Decree(name = "studio", aliases = {"std", "s"}, description = "Studio Commands", studio = true)
|
@Decree(name = "studio", aliases = {"std", "s"}, description = "Studio Commands", studio = true)
|
||||||
public class CommandStudio implements DecreeExecutor {
|
public class CommandStudio implements DecreeExecutor {
|
||||||
public static String hrf(Duration duration) {
|
|
||||||
return duration.toString().substring(2).replaceAll("(\\d[HMS])(?!$)", "$1 ").toLowerCase();
|
|
||||||
}
|
|
||||||
|
|
||||||
private CommandFind find;
|
private CommandFind find;
|
||||||
private CommandEdit edit;
|
private CommandEdit edit;
|
||||||
|
|
||||||
|
public static String hrf(Duration duration) {
|
||||||
|
return duration.toString().substring(2).replaceAll("(\\d[HMS])(?!$)", "$1 ").toLowerCase();
|
||||||
|
}
|
||||||
|
|
||||||
@Decree(description = "Download a project.", aliases = "dl")
|
@Decree(description = "Download a project.", aliases = "dl")
|
||||||
public void download(
|
public void download(
|
||||||
@@ -165,130 +135,6 @@ public class CommandStudio implements DecreeExecutor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Decree(description = "Clean an Iris Project, optionally beautifying JSON & fixing block ids with missing keys. Also rebuilds the vscode schemas. ")
|
|
||||||
public void clean(
|
|
||||||
@Param(description = "The project to update", contextual = true)
|
|
||||||
IrisDimension project,
|
|
||||||
|
|
||||||
@Param(defaultValue = "true", description = "Filters all valid JSON files with a beautifier (indentation: 4)")
|
|
||||||
boolean beautify,
|
|
||||||
|
|
||||||
@Param(name = "fix-ids", defaultValue = "true", description = "Fixes any block ids used such as \"dirt\" will be converted to \"minecraft:dirt\"")
|
|
||||||
boolean fixIds,
|
|
||||||
|
|
||||||
@Param(name = "rewrite-objects", defaultValue = "false", description = "Imports all objects and re-writes them cleaning up positions & block data in the process.")
|
|
||||||
boolean rewriteObjects
|
|
||||||
) {
|
|
||||||
KList<Job> jobs = new KList<>();
|
|
||||||
KList<File> files = new KList<File>();
|
|
||||||
files(Iris.instance.getDataFolder("packs", project.getLoadKey()), files);
|
|
||||||
MultiBurst burst = MultiBurst.burst;
|
|
||||||
|
|
||||||
jobs.add(new SingleJob("Updating Workspace", () -> {
|
|
||||||
if(!new IrisProject(Iris.service(StudioSVC.class).getWorkspaceFolder(project.getLoadKey())).updateWorkspace()) {
|
|
||||||
sender().sendMessage(C.GOLD + "Invalid project: " + project.getLoadKey() + ". Try deleting the code-workspace file and try again.");
|
|
||||||
}
|
|
||||||
J.sleep(250);
|
|
||||||
}));
|
|
||||||
|
|
||||||
sender().sendMessage("Files: " + files.size());
|
|
||||||
|
|
||||||
if(fixIds) {
|
|
||||||
QueueJob<File> r = new QueueJob<>() {
|
|
||||||
@Override
|
|
||||||
public void execute(File f) {
|
|
||||||
try {
|
|
||||||
JSONObject p = new JSONObject(IO.readAll(f));
|
|
||||||
fixBlocks(p);
|
|
||||||
J.sleep(1);
|
|
||||||
IO.writeAll(f, p.toString(4));
|
|
||||||
|
|
||||||
} catch(IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
return "Fixing IDs";
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
r.queue(files);
|
|
||||||
jobs.add(r);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(beautify) {
|
|
||||||
QueueJob<File> r = new QueueJob<>() {
|
|
||||||
@Override
|
|
||||||
public void execute(File f) {
|
|
||||||
try {
|
|
||||||
JSONObject p = new JSONObject(IO.readAll(f));
|
|
||||||
IO.writeAll(f, p.toString(4));
|
|
||||||
J.sleep(1);
|
|
||||||
} catch(IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
return "Beautify";
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
r.queue(files);
|
|
||||||
jobs.add(r);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(rewriteObjects) {
|
|
||||||
QueueJob<Runnable> q = new QueueJob<>() {
|
|
||||||
@Override
|
|
||||||
public void execute(Runnable runnable) {
|
|
||||||
runnable.run();
|
|
||||||
J.sleep(50);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
return "Rewriting Objects";
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
IrisData data = IrisData.get(Iris.service(StudioSVC.class).getWorkspaceFolder(project.getLoadKey()));
|
|
||||||
for(String f : data.getObjectLoader().getPossibleKeys()) {
|
|
||||||
Future<?> gg = burst.complete(() -> {
|
|
||||||
File ff = data.getObjectLoader().findFile(f);
|
|
||||||
IrisObject oo = new IrisObject(0, 0, 0);
|
|
||||||
try {
|
|
||||||
oo.read(ff);
|
|
||||||
} catch(Throwable e) {
|
|
||||||
Iris.error("FAILER TO READ: " + f);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
oo.write(ff);
|
|
||||||
} catch(IOException e) {
|
|
||||||
Iris.error("FAILURE TO WRITE: " + oo.getLoadFile());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
q.queue(() -> {
|
|
||||||
try {
|
|
||||||
gg.get();
|
|
||||||
} catch(InterruptedException | ExecutionException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
jobs.add(q);
|
|
||||||
}
|
|
||||||
|
|
||||||
new JobCollection("Cleaning", jobs).execute(sender());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Decree(description = "Get the version of a pack")
|
@Decree(description = "Get the version of a pack")
|
||||||
public void version(
|
public void version(
|
||||||
@Param(defaultValue = "default", description = "The dimension get the version of", aliases = "dim", contextual = true)
|
@Param(defaultValue = "default", description = "The dimension get the version of", aliases = "dim", contextual = true)
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ public class CommandWhat implements DecreeExecutor {
|
|||||||
@Decree(description = "What biome am i in?", origin = DecreeOrigin.PLAYER)
|
@Decree(description = "What biome am i in?", origin = DecreeOrigin.PLAYER)
|
||||||
public void biome() {
|
public void biome() {
|
||||||
try {
|
try {
|
||||||
IrisBiome b = engine().getBiome(player().getLocation().getBlockX(), player().getLocation().getBlockY(), player().getLocation().getBlockZ());
|
IrisBiome b = engine().getBiome(player().getLocation().getBlockX(), player().getLocation().getBlockY() - player().getWorld().getMinHeight(), player().getLocation().getBlockZ());
|
||||||
sender().sendMessage("IBiome: " + b.getLoadKey() + " (" + b.getDerivative().name() + ")");
|
sender().sendMessage("IBiome: " + b.getLoadKey() + " (" + b.getDerivative().name() + ")");
|
||||||
|
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
|
|||||||
@@ -19,14 +19,9 @@
|
|||||||
package com.volmit.iris.core.edit;
|
package com.volmit.iris.core.edit;
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.JsonObject;
|
|
||||||
import com.volmit.iris.Iris;
|
import com.volmit.iris.Iris;
|
||||||
import com.volmit.iris.core.service.WandSVC;
|
import com.volmit.iris.core.service.WandSVC;
|
||||||
import com.volmit.iris.engine.object.IrisDirection;
|
import com.volmit.iris.engine.object.*;
|
||||||
import com.volmit.iris.engine.object.IrisJigsawPiece;
|
|
||||||
import com.volmit.iris.engine.object.IrisJigsawPieceConnector;
|
|
||||||
import com.volmit.iris.engine.object.IrisObject;
|
|
||||||
import com.volmit.iris.engine.object.IrisPosition;
|
|
||||||
import com.volmit.iris.util.collection.KList;
|
import com.volmit.iris.util.collection.KList;
|
||||||
import com.volmit.iris.util.collection.KMap;
|
import com.volmit.iris.util.collection.KMap;
|
||||||
import com.volmit.iris.util.data.Cuboid;
|
import com.volmit.iris.util.data.Cuboid;
|
||||||
@@ -71,8 +66,7 @@ public class JigsawEditor implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
editors.put(player, this);
|
editors.put(player, this);
|
||||||
if(object == null)
|
if (object == null) {
|
||||||
{
|
|
||||||
throw new RuntimeException("Object is null! " + piece.getObject());
|
throw new RuntimeException("Object is null! " + piece.getObject());
|
||||||
}
|
}
|
||||||
this.object = object;
|
this.object = object;
|
||||||
@@ -157,10 +151,8 @@ public class JigsawEditor implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void removeKey(JSONObject o, String... path)
|
private void removeKey(JSONObject o, String... path) {
|
||||||
{
|
if (path.length == 1) {
|
||||||
if(path.length == 1)
|
|
||||||
{
|
|
||||||
o.remove(path[0]);
|
o.remove(path[0]);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -170,13 +162,11 @@ public class JigsawEditor implements Listener {
|
|||||||
removeKey(o.getJSONObject(path[0]), s.toArray(new String[0]));
|
removeKey(o.getJSONObject(path[0]), s.toArray(new String[0]));
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<JSONObject> getObjectsInArray(JSONObject a, String key)
|
private List<JSONObject> getObjectsInArray(JSONObject a) { // This gets all the objects in an array that are connectors
|
||||||
{
|
|
||||||
KList<JSONObject> o = new KList<>();
|
KList<JSONObject> o = new KList<>();
|
||||||
|
|
||||||
for(int i = 0; i < a.getJSONArray(key).length(); i++)
|
for (int i = 0; i < a.getJSONArray("connectors").length(); i++) {
|
||||||
{
|
o.add(a.getJSONArray("connectors").getJSONObject(i));
|
||||||
o.add(a.getJSONArray(key).getJSONObject(i));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return o;
|
return o;
|
||||||
@@ -195,8 +185,7 @@ public class JigsawEditor implements Listener {
|
|||||||
j.remove("placementOptions"); // otherwise
|
j.remove("placementOptions"); // otherwise
|
||||||
|
|
||||||
// Remove key in all objects in array
|
// Remove key in all objects in array
|
||||||
for(JSONObject i : getObjectsInArray(j, "connectors"))
|
for (JSONObject i : getObjectsInArray(j)) {
|
||||||
{
|
|
||||||
removeKey(i, "rotateConnector");
|
removeKey(i, "rotateConnector");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,24 +35,9 @@ import org.bukkit.event.EventHandler;
|
|||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
|
|
||||||
import javax.imageio.ImageIO;
|
import javax.imageio.ImageIO;
|
||||||
import javax.swing.JComboBox;
|
import javax.swing.*;
|
||||||
import javax.swing.JComponent;
|
import java.awt.*;
|
||||||
import javax.swing.JFrame;
|
import java.awt.event.*;
|
||||||
import javax.swing.JLayeredPane;
|
|
||||||
import javax.swing.JPanel;
|
|
||||||
import javax.swing.JViewport;
|
|
||||||
import java.awt.Color;
|
|
||||||
import java.awt.Dimension;
|
|
||||||
import java.awt.EventQueue;
|
|
||||||
import java.awt.Graphics;
|
|
||||||
import java.awt.Graphics2D;
|
|
||||||
import java.awt.Point;
|
|
||||||
import java.awt.Rectangle;
|
|
||||||
import java.awt.event.MouseAdapter;
|
|
||||||
import java.awt.event.MouseEvent;
|
|
||||||
import java.awt.event.MouseMotionListener;
|
|
||||||
import java.awt.event.MouseWheelEvent;
|
|
||||||
import java.awt.event.MouseWheelListener;
|
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -148,7 +133,7 @@ public class NoiseExplorerGUI extends JPanel implements MouseWheelListener, List
|
|||||||
JFrame frame = new JFrame("Noise Explorer");
|
JFrame frame = new JFrame("Noise Explorer");
|
||||||
NoiseExplorerGUI nv = new NoiseExplorerGUI();
|
NoiseExplorerGUI nv = new NoiseExplorerGUI();
|
||||||
frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
|
frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
|
||||||
KList<String> li = new KList<>(NoiseStyle.values()).toStringList();
|
KList<String> li = new KList<>(NoiseStyle.values()).toStringList().sort();
|
||||||
combo = new JComboBox<>(li.toArray(new String[0]));
|
combo = new JComboBox<>(li.toArray(new String[0]));
|
||||||
combo.setSelectedItem("STATIC");
|
combo.setSelectedItem("STATIC");
|
||||||
combo.setFocusable(false);
|
combo.setFocusable(false);
|
||||||
@@ -292,8 +277,7 @@ public class NoiseExplorerGUI extends JPanel implements MouseWheelListener, List
|
|||||||
Color color = colorMode ? Color.getHSBColor((float) (n), 1f - (float) (n * n * n * n * n * n), 1f - (float) n) : Color.getHSBColor(0f, 0f, (float) n);
|
Color color = colorMode ? Color.getHSBColor((float) (n), 1f - (float) (n * n * n * n * n * n), 1f - (float) n) : Color.getHSBColor(0f, 0f, (float) n);
|
||||||
int rgb = color.getRGB();
|
int rgb = color.getRGB();
|
||||||
img.setRGB(xx, z, rgb);
|
img.setRGB(xx, z, rgb);
|
||||||
} catch(Throwable xxx) {
|
} catch (Throwable ignored) {
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -35,12 +35,8 @@ import com.volmit.iris.util.math.Position2;
|
|||||||
import com.volmit.iris.util.scheduling.ChronoLatch;
|
import com.volmit.iris.util.scheduling.ChronoLatch;
|
||||||
import com.volmit.iris.util.scheduling.J;
|
import com.volmit.iris.util.scheduling.J;
|
||||||
|
|
||||||
import javax.swing.JFrame;
|
import javax.swing.*;
|
||||||
import javax.swing.JPanel;
|
import java.awt.*;
|
||||||
import java.awt.Color;
|
|
||||||
import java.awt.Font;
|
|
||||||
import java.awt.Graphics;
|
|
||||||
import java.awt.Graphics2D;
|
|
||||||
import java.awt.event.KeyEvent;
|
import java.awt.event.KeyEvent;
|
||||||
import java.awt.event.KeyListener;
|
import java.awt.event.KeyListener;
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
@@ -66,12 +62,12 @@ public class PregeneratorJob implements PregenListener {
|
|||||||
private final IrisPregenerator pregenerator;
|
private final IrisPregenerator pregenerator;
|
||||||
private final Position2 min;
|
private final Position2 min;
|
||||||
private final Position2 max;
|
private final Position2 max;
|
||||||
|
private final ChronoLatch cl = new ChronoLatch(TimeUnit.MINUTES.toMillis(1));
|
||||||
|
private final Engine engine;
|
||||||
private JFrame frame;
|
private JFrame frame;
|
||||||
private PregenRenderer renderer;
|
private PregenRenderer renderer;
|
||||||
private int rgc = 0;
|
private int rgc = 0;
|
||||||
private final ChronoLatch cl = new ChronoLatch(TimeUnit.MINUTES.toMillis(1));
|
|
||||||
private String[] info;
|
private String[] info;
|
||||||
private final Engine engine;
|
|
||||||
|
|
||||||
public PregeneratorJob(PregenTask task, PregeneratorMethod method, Engine engine) {
|
public PregeneratorJob(PregenTask task, PregeneratorMethod method, Engine engine) {
|
||||||
this.engine = engine;
|
this.engine = engine;
|
||||||
@@ -83,7 +79,6 @@ public class PregeneratorJob implements PregenListener {
|
|||||||
this.pregenerator = new IrisPregenerator(task, method, this);
|
this.pregenerator = new IrisPregenerator(task, method, this);
|
||||||
max = new Position2(0, 0);
|
max = new Position2(0, 0);
|
||||||
min = new Position2(0, 0);
|
min = new Position2(0, 0);
|
||||||
KList<Runnable> draw = new KList<>();
|
|
||||||
task.iterateRegions((xx, zz) -> {
|
task.iterateRegions((xx, zz) -> {
|
||||||
min.setX(Math.min(xx << 5, min.getX()));
|
min.setX(Math.min(xx << 5, min.getX()));
|
||||||
min.setZ(Math.min(zz << 5, min.getZ()));
|
min.setZ(Math.min(zz << 5, min.getZ()));
|
||||||
@@ -98,10 +93,6 @@ public class PregeneratorJob implements PregenListener {
|
|||||||
J.a(this.pregenerator::start, 20);
|
J.a(this.pregenerator::start, 20);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Mantle getMantle() {
|
|
||||||
return pregenerator.getMantle();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean shutdownInstance() {
|
public static boolean shutdownInstance() {
|
||||||
if (instance == null) {
|
if (instance == null) {
|
||||||
return false;
|
return false;
|
||||||
@@ -148,6 +139,10 @@ public class PregeneratorJob implements PregenListener {
|
|||||||
return Color.RED;
|
return Color.RED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Mantle getMantle() {
|
||||||
|
return pregenerator.getMantle();
|
||||||
|
}
|
||||||
|
|
||||||
public PregeneratorJob onProgress(Consumer<Double> c) {
|
public PregeneratorJob onProgress(Consumer<Double> c) {
|
||||||
onProgress.add(c);
|
onProgress.add(c);
|
||||||
return this;
|
return this;
|
||||||
@@ -159,12 +154,10 @@ public class PregeneratorJob implements PregenListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void drawRegion(int x, int z, Color color) {
|
public void drawRegion(int x, int z, Color color) {
|
||||||
J.a(() -> {
|
J.a(() -> PregenTask.iterateRegion(x, z, (xx, zz) -> {
|
||||||
PregenTask.iterateRegion(x, z, (xx, zz) -> {
|
|
||||||
draw(xx, zz, color);
|
draw(xx, zz, color);
|
||||||
J.sleep(3);
|
J.sleep(3);
|
||||||
});
|
}));
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void draw(int x, int z, Color color) {
|
public void draw(int x, int z, Color color) {
|
||||||
@@ -173,7 +166,7 @@ public class PregeneratorJob implements PregenListener {
|
|||||||
renderer.func.accept(new Position2(x, z), color);
|
renderer.func.accept(new Position2(x, z), color);
|
||||||
}
|
}
|
||||||
} catch (Throwable ignored) {
|
} catch (Throwable ignored) {
|
||||||
|
Iris.error("Failed to draw pregen");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -191,8 +184,8 @@ public class PregeneratorJob implements PregenListener {
|
|||||||
monitor.close();
|
monitor.close();
|
||||||
J.sleep(3000);
|
J.sleep(3000);
|
||||||
frame.setVisible(false);
|
frame.setVisible(false);
|
||||||
} catch(Throwable e) {
|
} catch (Throwable ignored) {
|
||||||
|
Iris.error("Error closing pregen gui");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -206,8 +199,7 @@ public class PregeneratorJob implements PregenListener {
|
|||||||
renderer.l = new ReentrantLock();
|
renderer.l = new ReentrantLock();
|
||||||
renderer.frame = frame;
|
renderer.frame = frame;
|
||||||
renderer.job = this;
|
renderer.job = this;
|
||||||
renderer.func = (c, b) ->
|
renderer.func = (c, b) -> {
|
||||||
{
|
|
||||||
renderer.l.lock();
|
renderer.l.lock();
|
||||||
renderer.order.add(() -> renderer.draw(c, b, renderer.bg));
|
renderer.order.add(() -> renderer.draw(c, b, renderer.bg));
|
||||||
renderer.l.unlock();
|
renderer.l.unlock();
|
||||||
@@ -215,8 +207,8 @@ public class PregeneratorJob implements PregenListener {
|
|||||||
frame.add(renderer);
|
frame.add(renderer);
|
||||||
frame.setSize(1000, 1000);
|
frame.setSize(1000, 1000);
|
||||||
frame.setVisible(true);
|
frame.setVisible(true);
|
||||||
} catch(Throwable e) {
|
} catch (Throwable ignored) {
|
||||||
|
Iris.error("Error opening pregen gui");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -239,10 +231,6 @@ public class PregeneratorJob implements PregenListener {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onChunkGenerating(int x, int z) {
|
public void onChunkGenerating(int x, int z) {
|
||||||
if(engine != null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
draw(x, z, COLOR_GENERATING);
|
draw(x, z, COLOR_GENERATING);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -44,16 +44,10 @@ import org.bukkit.entity.LivingEntity;
|
|||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import javax.imageio.ImageIO;
|
import javax.imageio.ImageIO;
|
||||||
import javax.swing.JFrame;
|
import javax.swing.*;
|
||||||
import javax.swing.JPanel;
|
|
||||||
import javax.swing.event.MouseInputListener;
|
import javax.swing.event.MouseInputListener;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.awt.event.KeyEvent;
|
import java.awt.event.*;
|
||||||
import java.awt.event.KeyListener;
|
|
||||||
import java.awt.event.MouseEvent;
|
|
||||||
import java.awt.event.MouseMotionListener;
|
|
||||||
import java.awt.event.MouseWheelEvent;
|
|
||||||
import java.awt.event.MouseWheelListener;
|
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -218,12 +212,18 @@ public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener
|
|||||||
BiFunction<Double, Double, Integer> colorFunction = (d, dx) -> Color.black.getRGB();
|
BiFunction<Double, Double, Integer> colorFunction = (d, dx) -> Color.black.getRGB();
|
||||||
|
|
||||||
switch (currentType) {
|
switch (currentType) {
|
||||||
case BIOME, DECORATOR_LOAD, OBJECT_LOAD, LAYER_LOAD -> colorFunction = (x, z) -> engine.getComplex().getTrueBiomeStream().get(x, z).getColor(engine, currentType).getRGB();
|
case BIOME, DECORATOR_LOAD, OBJECT_LOAD, LAYER_LOAD ->
|
||||||
case BIOME_LAND -> colorFunction = (x, z) -> engine.getComplex().getLandBiomeStream().get(x, z).getColor(engine, currentType).getRGB();
|
colorFunction = (x, z) -> engine.getComplex().getTrueBiomeStream().get(x, z).getColor(engine, currentType).getRGB();
|
||||||
case BIOME_SEA -> colorFunction = (x, z) -> engine.getComplex().getSeaBiomeStream().get(x, z).getColor(engine, currentType).getRGB();
|
case BIOME_LAND ->
|
||||||
case REGION -> colorFunction = (x, z) -> engine.getComplex().getRegionStream().get(x, z).getColor(engine.getComplex(), currentType).getRGB();
|
colorFunction = (x, z) -> engine.getComplex().getLandBiomeStream().get(x, z).getColor(engine, currentType).getRGB();
|
||||||
case CAVE_LAND -> colorFunction = (x, z) -> engine.getComplex().getCaveBiomeStream().get(x, z).getColor(engine, currentType).getRGB();
|
case BIOME_SEA ->
|
||||||
case HEIGHT -> colorFunction = (x, z) -> Color.getHSBColor(engine.getComplex().getHeightStream().get(x, z).floatValue(), 100, 100).getRGB();
|
colorFunction = (x, z) -> engine.getComplex().getSeaBiomeStream().get(x, z).getColor(engine, currentType).getRGB();
|
||||||
|
case REGION ->
|
||||||
|
colorFunction = (x, z) -> engine.getComplex().getRegionStream().get(x, z).getColor(engine.getComplex(), currentType).getRGB();
|
||||||
|
case CAVE_LAND ->
|
||||||
|
colorFunction = (x, z) -> engine.getComplex().getCaveBiomeStream().get(x, z).getColor(engine, currentType).getRGB();
|
||||||
|
case HEIGHT ->
|
||||||
|
colorFunction = (x, z) -> Color.getHSBColor(engine.getComplex().getHeightStream().get(x, z).floatValue(), 100, 100).getRGB();
|
||||||
}
|
}
|
||||||
|
|
||||||
return colorFunction.apply(wx, wz);
|
return colorFunction.apply(wx, wz);
|
||||||
@@ -433,13 +433,9 @@ public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener
|
|||||||
|
|
||||||
if (engine.isClosed()) {
|
if (engine.isClosed()) {
|
||||||
EventQueue.invokeLater(() -> {
|
EventQueue.invokeLater(() -> {
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
setVisible(false);
|
setVisible(false);
|
||||||
}
|
} catch (Throwable e) {
|
||||||
|
|
||||||
catch(Throwable e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -739,7 +735,8 @@ public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener
|
|||||||
IrisComplex complex = engine.getComplex();
|
IrisComplex complex = engine.getComplex();
|
||||||
File r = null;
|
File r = null;
|
||||||
switch (currentType) {
|
switch (currentType) {
|
||||||
case BIOME, LAYER_LOAD, DECORATOR_LOAD, OBJECT_LOAD, HEIGHT -> r = complex.getTrueBiomeStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode();
|
case BIOME, LAYER_LOAD, DECORATOR_LOAD, OBJECT_LOAD, HEIGHT ->
|
||||||
|
r = complex.getTrueBiomeStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode();
|
||||||
case BIOME_LAND -> r = complex.getLandBiomeStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode();
|
case BIOME_LAND -> r = complex.getLandBiomeStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode();
|
||||||
case BIOME_SEA -> r = complex.getSeaBiomeStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode();
|
case BIOME_SEA -> r = complex.getSeaBiomeStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode();
|
||||||
case REGION -> r = complex.getRegionStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode();
|
case REGION -> r = complex.getRegionStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode();
|
||||||
|
|||||||
@@ -21,11 +21,10 @@ package com.volmit.iris.core.gui.components;
|
|||||||
import com.volmit.iris.engine.framework.Engine;
|
import com.volmit.iris.engine.framework.Engine;
|
||||||
import com.volmit.iris.util.interpolation.IrisInterpolation;
|
import com.volmit.iris.util.interpolation.IrisInterpolation;
|
||||||
|
|
||||||
import java.awt.Color;
|
import java.awt.*;
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
import java.util.function.BiFunction;
|
import java.util.function.BiFunction;
|
||||||
|
|
||||||
@SuppressWarnings("ClassCanBeRecord")
|
|
||||||
public class IrisRenderer {
|
public class IrisRenderer {
|
||||||
private final Engine renderer;
|
private final Engine renderer;
|
||||||
|
|
||||||
@@ -38,12 +37,18 @@ public class IrisRenderer {
|
|||||||
BiFunction<Double, Double, Integer> colorFunction = (d, dx) -> Color.black.getRGB();
|
BiFunction<Double, Double, Integer> colorFunction = (d, dx) -> Color.black.getRGB();
|
||||||
|
|
||||||
switch (currentType) {
|
switch (currentType) {
|
||||||
case BIOME, DECORATOR_LOAD, OBJECT_LOAD, LAYER_LOAD -> colorFunction = (x, z) -> renderer.getComplex().getTrueBiomeStream().get(x, z).getColor(renderer, currentType).getRGB();
|
case BIOME, DECORATOR_LOAD, OBJECT_LOAD, LAYER_LOAD ->
|
||||||
case BIOME_LAND -> colorFunction = (x, z) -> renderer.getComplex().getLandBiomeStream().get(x, z).getColor(renderer, currentType).getRGB();
|
colorFunction = (x, z) -> renderer.getComplex().getTrueBiomeStream().get(x, z).getColor(renderer, currentType).getRGB();
|
||||||
case BIOME_SEA -> colorFunction = (x, z) -> renderer.getComplex().getSeaBiomeStream().get(x, z).getColor(renderer, currentType).getRGB();
|
case BIOME_LAND ->
|
||||||
case REGION -> colorFunction = (x, z) -> renderer.getComplex().getRegionStream().get(x, z).getColor(renderer.getComplex(), currentType).getRGB();
|
colorFunction = (x, z) -> renderer.getComplex().getLandBiomeStream().get(x, z).getColor(renderer, currentType).getRGB();
|
||||||
case CAVE_LAND -> colorFunction = (x, z) -> renderer.getComplex().getCaveBiomeStream().get(x, z).getColor(renderer, currentType).getRGB();
|
case BIOME_SEA ->
|
||||||
case HEIGHT -> colorFunction = (x, z) -> Color.getHSBColor(renderer.getComplex().getHeightStream().get(x, z).floatValue(), 100, 100).getRGB();
|
colorFunction = (x, z) -> renderer.getComplex().getSeaBiomeStream().get(x, z).getColor(renderer, currentType).getRGB();
|
||||||
|
case REGION ->
|
||||||
|
colorFunction = (x, z) -> renderer.getComplex().getRegionStream().get(x, z).getColor(renderer.getComplex(), currentType).getRGB();
|
||||||
|
case CAVE_LAND ->
|
||||||
|
colorFunction = (x, z) -> renderer.getComplex().getCaveBiomeStream().get(x, z).getColor(renderer, currentType).getRGB();
|
||||||
|
case HEIGHT ->
|
||||||
|
colorFunction = (x, z) -> Color.getHSBColor(renderer.getComplex().getHeightStream().get(x, z).floatValue(), 100, 100).getRGB();
|
||||||
}
|
}
|
||||||
|
|
||||||
double x, z;
|
double x, z;
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
package com.volmit.iris.core.gui.components;
|
package com.volmit.iris.core.gui.components;
|
||||||
|
|
||||||
import java.awt.Color;
|
import java.awt.*;
|
||||||
|
|
||||||
@FunctionalInterface
|
@FunctionalInterface
|
||||||
public interface Renderer {
|
public interface Renderer {
|
||||||
|
|||||||
@@ -20,25 +20,27 @@ package com.volmit.iris.core.link;
|
|||||||
|
|
||||||
import com.volmit.iris.Iris;
|
import com.volmit.iris.Iris;
|
||||||
import com.volmit.iris.core.tools.IrisToolbelt;
|
import com.volmit.iris.core.tools.IrisToolbelt;
|
||||||
|
import com.volmit.iris.engine.object.IrisBiome;
|
||||||
import com.volmit.iris.engine.platform.PlatformChunkGenerator;
|
import com.volmit.iris.engine.platform.PlatformChunkGenerator;
|
||||||
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
|
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.OfflinePlayer;
|
import org.bukkit.OfflinePlayer;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
// See/update https://app.gitbook.com/@volmitsoftware/s/iris/compatability/papi/
|
// See/update https://app.gitbook.com/@volmitsoftware/s/iris/compatability/papi/
|
||||||
public class IrisPapiExpansion extends PlaceholderExpansion {
|
public class IrisPapiExpansion extends PlaceholderExpansion {
|
||||||
@Override
|
@Override
|
||||||
public String getIdentifier() {
|
public @NotNull String getIdentifier() {
|
||||||
return "iris";
|
return "iris";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getAuthor() {
|
public @NotNull String getAuthor() {
|
||||||
return "Volmit Software";
|
return "Volmit Software";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getVersion() {
|
public @NotNull String getVersion() {
|
||||||
return Iris.instance.getDescription().getVersion();
|
return Iris.instance.getDescription().getVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -52,22 +54,22 @@ public class IrisPapiExpansion extends PlaceholderExpansion {
|
|||||||
Location l = null;
|
Location l = null;
|
||||||
PlatformChunkGenerator a = null;
|
PlatformChunkGenerator a = null;
|
||||||
|
|
||||||
if(player.isOnline()) {
|
if (player.isOnline() && player.getPlayer() != null) {
|
||||||
l = player.getPlayer().getLocation();
|
l = player.getPlayer().getLocation().add(0, 2, 0);
|
||||||
a = IrisToolbelt.access(l.getWorld());
|
a = IrisToolbelt.access(l.getWorld());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p.equalsIgnoreCase("biome_name")) {
|
if (p.equalsIgnoreCase("biome_name")) {
|
||||||
if (a != null) {
|
if (a != null) {
|
||||||
return a.getEngine().getBiome(l).getName();
|
return getBiome(a, l).getName();
|
||||||
}
|
}
|
||||||
} else if (p.equalsIgnoreCase("biome_id")) {
|
} else if (p.equalsIgnoreCase("biome_id")) {
|
||||||
if (a != null) {
|
if (a != null) {
|
||||||
return a.getEngine().getBiome(l).getLoadKey();
|
return getBiome(a, l).getLoadKey();
|
||||||
}
|
}
|
||||||
} else if (p.equalsIgnoreCase("biome_file")) {
|
} else if (p.equalsIgnoreCase("biome_file")) {
|
||||||
if (a != null) {
|
if (a != null) {
|
||||||
return a.getEngine().getBiome(l).getLoadFile().getPath();
|
return getBiome(a, l).getLoadFile().getPath();
|
||||||
}
|
}
|
||||||
} else if (p.equalsIgnoreCase("region_name")) {
|
} else if (p.equalsIgnoreCase("region_name")) {
|
||||||
if (a != null) {
|
if (a != null) {
|
||||||
@@ -107,4 +109,8 @@ public class IrisPapiExpansion extends PlaceholderExpansion {
|
|||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private IrisBiome getBiome(PlatformChunkGenerator a, Location l) {
|
||||||
|
return a.getEngine().getBiome(l.getBlockX(), l.getBlockY() - l.getWorld().getMinHeight(), l.getBlockZ());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,8 @@ public class ItemAdderDataProvider extends ExternalDataProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() { }
|
public void init() {
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BlockData getBlockData(NamespacedKey blockId) throws MissingResourceException {
|
public BlockData getBlockData(NamespacedKey blockId) throws MissingResourceException {
|
||||||
|
|||||||
@@ -50,10 +50,8 @@ public class MythicMobsLink {
|
|||||||
/**
|
/**
|
||||||
* Spawn a mythic mob at this location
|
* Spawn a mythic mob at this location
|
||||||
*
|
*
|
||||||
* @param mob
|
* @param mob The mob
|
||||||
* The mob
|
* @param location The location
|
||||||
* @param location
|
|
||||||
* The location
|
|
||||||
* @return The mob, or null if it can't be spawned
|
* @return The mob, or null if it can't be spawned
|
||||||
*/
|
*/
|
||||||
public @Nullable
|
public @Nullable
|
||||||
@@ -105,7 +103,8 @@ public class MythicMobsLink {
|
|||||||
Method getMobNames = mobManager.getClass().getDeclaredMethod("getMobNames");
|
Method getMobNames = mobManager.getClass().getDeclaredMethod("getMobNames");
|
||||||
mobs = (Collection<String>) getMobNames.invoke(mobManager);
|
mobs = (Collection<String>) getMobNames.invoke(mobManager);
|
||||||
return mobs;
|
return mobs;
|
||||||
} catch(ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
|
} catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException |
|
||||||
|
IllegalAccessException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,7 +46,9 @@ public class OraxenDataProvider extends ExternalDataProvider {
|
|||||||
|
|
||||||
private Map<String, MechanicFactory> factories;
|
private Map<String, MechanicFactory> factories;
|
||||||
|
|
||||||
public OraxenDataProvider() { super("Oraxen"); }
|
public OraxenDataProvider() {
|
||||||
|
super("Oraxen");
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() {
|
public void init() {
|
||||||
@@ -87,7 +89,8 @@ public class OraxenDataProvider extends ExternalDataProvider {
|
|||||||
NamespacedKey key = new NamespacedKey("oraxen", name);
|
NamespacedKey key = new NamespacedKey("oraxen", name);
|
||||||
if (getBlockData(key) != null)
|
if (getBlockData(key) != null)
|
||||||
names.add(key);
|
names.add(key);
|
||||||
} catch(MissingResourceException ignored) { }
|
} catch (MissingResourceException ignored) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return names.toArray(new NamespacedKey[0]);
|
return names.toArray(new NamespacedKey[0]);
|
||||||
|
|||||||
@@ -5,10 +5,8 @@ import org.bukkit.World;
|
|||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
public class WorldEditLink {
|
public class WorldEditLink {
|
||||||
public static Cuboid getSelection(Player p)
|
public static Cuboid getSelection(Player p) {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
Object instance = Class.forName("com.sk89q.worldedit.WorldEdit").getDeclaredMethod("getInstance").invoke(null);
|
Object instance = Class.forName("com.sk89q.worldedit.WorldEdit").getDeclaredMethod("getInstance").invoke(null);
|
||||||
Object sessionManager = instance.getClass().getDeclaredMethod("getSessionManager").invoke(instance);
|
Object sessionManager = instance.getClass().getDeclaredMethod("getSessionManager").invoke(instance);
|
||||||
Object player = Class.forName("com.sk89q.worldedit.bukkit.BukkitAdapter").getDeclaredMethod("adapt", Player.class).invoke(null, p);
|
Object player = Class.forName("com.sk89q.worldedit.bukkit.BukkitAdapter").getDeclaredMethod("adapt", Player.class).invoke(null, p);
|
||||||
@@ -25,13 +23,9 @@ public class WorldEditLink {
|
|||||||
(int) min.getClass().getDeclaredMethod("getY").invoke(max),
|
(int) min.getClass().getDeclaredMethod("getY").invoke(max),
|
||||||
(int) min.getClass().getDeclaredMethod("getZ").invoke(max)
|
(int) min.getClass().getDeclaredMethod("getZ").invoke(max)
|
||||||
);
|
);
|
||||||
}
|
} catch (Throwable ignored) {
|
||||||
|
|
||||||
catch(Throwable e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ import com.volmit.iris.util.scheduling.PrecisionStopwatch;
|
|||||||
import javax.imageio.ImageIO;
|
import javax.imageio.ImageIO;
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
public class ImageResourceLoader extends ResourceLoader<IrisImage> {
|
public class ImageResourceLoader extends ResourceLoader<IrisImage> {
|
||||||
public ImageResourceLoader(File root, IrisData idm, String folderName, String resourceTypeName) {
|
public ImageResourceLoader(File root, IrisData idm, String folderName, String resourceTypeName) {
|
||||||
@@ -66,6 +67,17 @@ public class ImageResourceLoader extends ResourceLoader<IrisImage> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void getPNGFiles(File directory, Set<String> m) {
|
||||||
|
for (File file : directory.listFiles()) {
|
||||||
|
if (file.isFile() && file.getName().endsWith(".png")) {
|
||||||
|
m.add(file.getName().replaceAll("\\Q.png\\E", ""));
|
||||||
|
} else if (file.isDirectory()) {
|
||||||
|
getPNGFiles(file, m);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public String[] getPossibleKeys() {
|
public String[] getPossibleKeys() {
|
||||||
if (possibleKeys != null) {
|
if (possibleKeys != null) {
|
||||||
return possibleKeys;
|
return possibleKeys;
|
||||||
@@ -74,26 +86,31 @@ public class ImageResourceLoader extends ResourceLoader<IrisImage> {
|
|||||||
Iris.debug("Building " + resourceTypeName + " Possibility Lists");
|
Iris.debug("Building " + resourceTypeName + " Possibility Lists");
|
||||||
KSet<String> m = new KSet<>();
|
KSet<String> m = new KSet<>();
|
||||||
|
|
||||||
|
|
||||||
for (File i : getFolders()) {
|
for (File i : getFolders()) {
|
||||||
for(File j : i.listFiles()) {
|
getPNGFiles(i, m);
|
||||||
if(j.isFile() && j.getName().endsWith(".png")) {
|
|
||||||
m.add(j.getName().replaceAll("\\Q.png\\E", ""));
|
|
||||||
} else if(j.isDirectory()) {
|
|
||||||
for(File k : j.listFiles()) {
|
|
||||||
if(k.isFile() && k.getName().endsWith(".png")) {
|
|
||||||
m.add(j.getName() + "/" + k.getName().replaceAll("\\Q.png\\E", ""));
|
|
||||||
} else if(k.isDirectory()) {
|
|
||||||
for(File l : k.listFiles()) {
|
|
||||||
if(l.isFile() && l.getName().endsWith(".png")) {
|
|
||||||
m.add(j.getName() + "/" + k.getName() + "/" + l.getName().replaceAll("\\Q.png\\E", ""));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// for (File i : getFolders()) {
|
||||||
|
// for (File j : i.listFiles()) {
|
||||||
|
// if (j.isFile() && j.getName().endsWith(".png")) {
|
||||||
|
// m.add(j.getName().replaceAll("\\Q.png\\E", ""));
|
||||||
|
// } else if (j.isDirectory()) {
|
||||||
|
// for (File k : j.listFiles()) {
|
||||||
|
// if (k.isFile() && k.getName().endsWith(".png")) {
|
||||||
|
// m.add(j.getName() + "/" + k.getName().replaceAll("\\Q.png\\E", ""));
|
||||||
|
// } else if (k.isDirectory()) {
|
||||||
|
// for (File l : k.listFiles()) {
|
||||||
|
// if (l.isFile() && l.getName().endsWith(".png")) {
|
||||||
|
// m.add(j.getName() + "/" + k.getName() + "/" + l.getName().replaceAll("\\Q.png\\E", ""));
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
KList<String> v = new KList<>(m);
|
KList<String> v = new KList<>(m);
|
||||||
possibleKeys = v.toArray(new String[0]);
|
possibleKeys = v.toArray(new String[0]);
|
||||||
return possibleKeys;
|
return possibleKeys;
|
||||||
|
|||||||
@@ -18,12 +18,7 @@
|
|||||||
|
|
||||||
package com.volmit.iris.core.loader;
|
package com.volmit.iris.core.loader;
|
||||||
|
|
||||||
import com.google.gson.ExclusionStrategy;
|
import com.google.gson.*;
|
||||||
import com.google.gson.FieldAttributes;
|
|
||||||
import com.google.gson.Gson;
|
|
||||||
import com.google.gson.GsonBuilder;
|
|
||||||
import com.google.gson.TypeAdapter;
|
|
||||||
import com.google.gson.TypeAdapterFactory;
|
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import com.google.gson.stream.JsonReader;
|
import com.google.gson.stream.JsonReader;
|
||||||
import com.google.gson.stream.JsonToken;
|
import com.google.gson.stream.JsonToken;
|
||||||
@@ -39,6 +34,8 @@ import com.volmit.iris.util.collection.KMap;
|
|||||||
import com.volmit.iris.util.context.IrisContext;
|
import com.volmit.iris.util.context.IrisContext;
|
||||||
import com.volmit.iris.util.format.C;
|
import com.volmit.iris.util.format.C;
|
||||||
import com.volmit.iris.util.math.RNG;
|
import com.volmit.iris.util.math.RNG;
|
||||||
|
import com.volmit.iris.util.parallel.BurstExecutor;
|
||||||
|
import com.volmit.iris.util.parallel.MultiBurst;
|
||||||
import com.volmit.iris.util.scheduling.ChronoLatch;
|
import com.volmit.iris.util.scheduling.ChronoLatch;
|
||||||
import com.volmit.iris.util.scheduling.J;
|
import com.volmit.iris.util.scheduling.J;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -116,6 +113,7 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
|
|||||||
public static IrisObject loadAnyObject(String key) {
|
public static IrisObject loadAnyObject(String key) {
|
||||||
return loadAny(key, (dm) -> dm.getObjectLoader().load(key, false));
|
return loadAny(key, (dm) -> dm.getObjectLoader().load(key, false));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IrisMatterObject loadAnyMatter(String key) {
|
public static IrisMatterObject loadAnyMatter(String key) {
|
||||||
return loadAny(key, (dm) -> dm.getMatterLoader().load(key, false));
|
return loadAny(key, (dm) -> dm.getMatterLoader().load(key, false));
|
||||||
}
|
}
|
||||||
@@ -371,8 +369,7 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
String ff = g.substring(1).split("\\Q.\\E")[0];
|
return g.substring(1).split("\\Q.\\E")[0];
|
||||||
return ff;
|
|
||||||
} else {
|
} else {
|
||||||
Iris.error("Forign file from loader " + f.getPath() + " (loader realm: " + getDataFolder().getPath() + ")");
|
Iris.error("Forign file from loader " + f.getPath() + " (loader realm: " + getDataFolder().getPath() + ")");
|
||||||
}
|
}
|
||||||
@@ -467,4 +464,38 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
|
|||||||
public boolean isClosed() {
|
public boolean isClosed() {
|
||||||
return closed;
|
return closed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void savePrefetch(Engine engine) {
|
||||||
|
BurstExecutor b = MultiBurst.burst.burst(loaders.size());
|
||||||
|
|
||||||
|
for (ResourceLoader<?> i : loaders.values()) {
|
||||||
|
b.queue(() -> {
|
||||||
|
try {
|
||||||
|
i.saveFirstAccess(engine);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
b.complete();
|
||||||
|
Iris.info("Saved Prefetch Cache to speed up future world startups");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void loadPrefetch(Engine engine) {
|
||||||
|
BurstExecutor b = MultiBurst.burst.burst(loaders.size());
|
||||||
|
|
||||||
|
for (ResourceLoader<?> i : loaders.values()) {
|
||||||
|
b.queue(() -> {
|
||||||
|
try {
|
||||||
|
i.loadFirstAccess(engine);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
b.complete();
|
||||||
|
Iris.info("Loaded Prefetch Cache to reduce generation disk use.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -29,7 +29,7 @@ import com.volmit.iris.util.json.JSONObject;
|
|||||||
import com.volmit.iris.util.plugin.VolmitSender;
|
import com.volmit.iris.util.plugin.VolmitSender;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.awt.Desktop;
|
import java.awt.*;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ import com.volmit.iris.util.scheduling.PrecisionStopwatch;
|
|||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
public class MatterObjectResourceLoader extends ResourceLoader<IrisMatterObject> {
|
public class MatterObjectResourceLoader extends ResourceLoader<IrisMatterObject> {
|
||||||
|
private String[] possibleKeys;
|
||||||
|
|
||||||
public MatterObjectResourceLoader(File root, IrisData idm, String folderName, String resourceTypeName) {
|
public MatterObjectResourceLoader(File root, IrisData idm, String folderName, String resourceTypeName) {
|
||||||
super(root, idm, folderName, resourceTypeName, IrisMatterObject.class);
|
super(root, idm, folderName, resourceTypeName, IrisMatterObject.class);
|
||||||
loadCache = new KCache<>(this::loadRaw, IrisSettings.get().getPerformance().getObjectLoaderCacheSize());
|
loadCache = new KCache<>(this::loadRaw, IrisSettings.get().getPerformance().getObjectLoaderCacheSize());
|
||||||
@@ -63,6 +65,16 @@ public class MatterObjectResourceLoader extends ResourceLoader<IrisMatterObject>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void findMatFiles(File dir, KSet<String> m) {
|
||||||
|
for (File file : dir.listFiles()) {
|
||||||
|
if (file.isFile() && file.getName().endsWith(".mat")) {
|
||||||
|
m.add(file.getName().replaceAll("\\Q.mat\\E", ""));
|
||||||
|
} else if (file.isDirectory()) {
|
||||||
|
findMatFiles(file, m);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public String[] getPossibleKeys() {
|
public String[] getPossibleKeys() {
|
||||||
if (possibleKeys != null) {
|
if (possibleKeys != null) {
|
||||||
return possibleKeys;
|
return possibleKeys;
|
||||||
@@ -71,24 +83,8 @@ public class MatterObjectResourceLoader extends ResourceLoader<IrisMatterObject>
|
|||||||
Iris.debug("Building " + resourceTypeName + " Possibility Lists");
|
Iris.debug("Building " + resourceTypeName + " Possibility Lists");
|
||||||
KSet<String> m = new KSet<>();
|
KSet<String> m = new KSet<>();
|
||||||
|
|
||||||
for(File i : getFolders()) {
|
for (File folder : getFolders()) {
|
||||||
for(File j : i.listFiles()) {
|
findMatFiles(folder, m);
|
||||||
if(j.isFile() && j.getName().endsWith(".mat")) {
|
|
||||||
m.add(j.getName().replaceAll("\\Q.mat\\E", ""));
|
|
||||||
} else if(j.isDirectory()) {
|
|
||||||
for(File k : j.listFiles()) {
|
|
||||||
if(k.isFile() && k.getName().endsWith(".mat")) {
|
|
||||||
m.add(j.getName() + "/" + k.getName().replaceAll("\\Q.mat\\E", ""));
|
|
||||||
} else if(k.isDirectory()) {
|
|
||||||
for(File l : k.listFiles()) {
|
|
||||||
if(l.isFile() && l.getName().endsWith(".mat")) {
|
|
||||||
m.add(j.getName() + "/" + k.getName() + "/" + l.getName().replaceAll("\\Q.mat\\E", ""));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
KList<String> v = new KList<>(m);
|
KList<String> v = new KList<>(m);
|
||||||
@@ -96,6 +92,40 @@ public class MatterObjectResourceLoader extends ResourceLoader<IrisMatterObject>
|
|||||||
return possibleKeys;
|
return possibleKeys;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// public String[] getPossibleKeys() {
|
||||||
|
// if (possibleKeys != null) {
|
||||||
|
// return possibleKeys;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// Iris.debug("Building " + resourceTypeName + " Possibility Lists");
|
||||||
|
// KSet<String> m = new KSet<>();
|
||||||
|
//
|
||||||
|
// for (File i : getFolders()) {
|
||||||
|
// for (File j : i.listFiles()) {
|
||||||
|
// if (j.isFile() && j.getName().endsWith(".mat")) {
|
||||||
|
// m.add(j.getName().replaceAll("\\Q.mat\\E", ""));
|
||||||
|
// } else if (j.isDirectory()) {
|
||||||
|
// for (File k : j.listFiles()) {
|
||||||
|
// if (k.isFile() && k.getName().endsWith(".mat")) {
|
||||||
|
// m.add(j.getName() + "/" + k.getName().replaceAll("\\Q.mat\\E", ""));
|
||||||
|
// } else if (k.isDirectory()) {
|
||||||
|
// for (File l : k.listFiles()) {
|
||||||
|
// if (l.isFile() && l.getName().endsWith(".mat")) {
|
||||||
|
// m.add(j.getName() + "/" + k.getName() + "/" + l.getName().replaceAll("\\Q.mat\\E", ""));
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// KList<String> v = new KList<>(m);
|
||||||
|
// possibleKeys = v.toArray(new String[0]);
|
||||||
|
// return possibleKeys;
|
||||||
|
// }
|
||||||
|
|
||||||
public File findFile(String name) {
|
public File findFile(String name) {
|
||||||
for (File i : getFolders(name)) {
|
for (File i : getFolders(name)) {
|
||||||
for (File j : i.listFiles()) {
|
for (File j : i.listFiles()) {
|
||||||
|
|||||||
@@ -68,33 +68,26 @@ public class ObjectResourceLoader extends ResourceLoader<IrisObject> {
|
|||||||
if (possibleKeys != null) {
|
if (possibleKeys != null) {
|
||||||
return possibleKeys;
|
return possibleKeys;
|
||||||
}
|
}
|
||||||
|
|
||||||
Iris.debug("Building " + resourceTypeName + " Possibility Lists");
|
Iris.debug("Building " + resourceTypeName + " Possibility Lists");
|
||||||
KSet<String> m = new KSet<>();
|
KSet<String> m = new KSet<>();
|
||||||
|
|
||||||
for (File i : getFolders()) {
|
for (File i : getFolders()) {
|
||||||
for(File j : i.listFiles()) {
|
m.addAll(getFiles(i, ".iob", true));
|
||||||
if(j.isFile() && j.getName().endsWith(".iob")) {
|
|
||||||
m.add(j.getName().replaceAll("\\Q.iob\\E", ""));
|
|
||||||
} else if(j.isDirectory()) {
|
|
||||||
for(File k : j.listFiles()) {
|
|
||||||
if(k.isFile() && k.getName().endsWith(".iob")) {
|
|
||||||
m.add(j.getName() + "/" + k.getName().replaceAll("\\Q.iob\\E", ""));
|
|
||||||
} else if(k.isDirectory()) {
|
|
||||||
for(File l : k.listFiles()) {
|
|
||||||
if(l.isFile() && l.getName().endsWith(".iob")) {
|
|
||||||
m.add(j.getName() + "/" + k.getName() + "/" + l.getName().replaceAll("\\Q.iob\\E", ""));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
possibleKeys = m.toArray(new String[0]);
|
||||||
|
return possibleKeys;
|
||||||
}
|
}
|
||||||
|
|
||||||
KList<String> v = new KList<>(m);
|
private KList<String> getFiles(File dir, String ext, boolean skipDirName) {
|
||||||
possibleKeys = v.toArray(new String[0]);
|
KList<String> paths = new KList<>();
|
||||||
return possibleKeys;
|
String name = skipDirName ? "" : dir.getName() + "/";
|
||||||
|
for (File f : dir.listFiles()) {
|
||||||
|
if (f.isFile() && f.getName().endsWith(ext)) {
|
||||||
|
paths.add(name + f.getName().replaceAll("\\Q" + ext + "\\E", ""));
|
||||||
|
} else if (f.isDirectory()) {
|
||||||
|
getFiles(f, ext, false).forEach(e -> paths.add(name + e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return paths;
|
||||||
}
|
}
|
||||||
|
|
||||||
public File findFile(String name) {
|
public File findFile(String name) {
|
||||||
|
|||||||
@@ -23,37 +23,44 @@ import com.volmit.iris.Iris;
|
|||||||
import com.volmit.iris.core.IrisSettings;
|
import com.volmit.iris.core.IrisSettings;
|
||||||
import com.volmit.iris.core.project.SchemaBuilder;
|
import com.volmit.iris.core.project.SchemaBuilder;
|
||||||
import com.volmit.iris.core.service.PreservationSVC;
|
import com.volmit.iris.core.service.PreservationSVC;
|
||||||
|
import com.volmit.iris.engine.framework.Engine;
|
||||||
import com.volmit.iris.engine.framework.MeteredCache;
|
import com.volmit.iris.engine.framework.MeteredCache;
|
||||||
import com.volmit.iris.util.collection.KList;
|
import com.volmit.iris.util.collection.KList;
|
||||||
import com.volmit.iris.util.collection.KSet;
|
import com.volmit.iris.util.collection.KSet;
|
||||||
import com.volmit.iris.util.data.KCache;
|
import com.volmit.iris.util.data.KCache;
|
||||||
import com.volmit.iris.util.format.C;
|
import com.volmit.iris.util.format.C;
|
||||||
import com.volmit.iris.util.format.Form;
|
import com.volmit.iris.util.format.Form;
|
||||||
|
import com.volmit.iris.util.io.CustomOutputStream;
|
||||||
import com.volmit.iris.util.io.IO;
|
import com.volmit.iris.util.io.IO;
|
||||||
import com.volmit.iris.util.json.JSONArray;
|
import com.volmit.iris.util.json.JSONArray;
|
||||||
import com.volmit.iris.util.json.JSONObject;
|
import com.volmit.iris.util.json.JSONObject;
|
||||||
|
import com.volmit.iris.util.parallel.BurstExecutor;
|
||||||
|
import com.volmit.iris.util.parallel.MultiBurst;
|
||||||
import com.volmit.iris.util.scheduling.ChronoLatch;
|
import com.volmit.iris.util.scheduling.ChronoLatch;
|
||||||
import com.volmit.iris.util.scheduling.J;
|
import com.volmit.iris.util.scheduling.J;
|
||||||
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
|
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.*;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
import java.util.concurrent.atomic.AtomicReference;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
import java.util.zip.GZIPInputStream;
|
||||||
|
import java.util.zip.GZIPOutputStream;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class ResourceLoader<T extends IrisRegistrant> implements MeteredCache {
|
public class ResourceLoader<T extends IrisRegistrant> implements MeteredCache {
|
||||||
public static final AtomicDouble tlt = new AtomicDouble(0);
|
public static final AtomicDouble tlt = new AtomicDouble(0);
|
||||||
private static final int CACHE_SIZE = 100000;
|
private static final int CACHE_SIZE = 100000;
|
||||||
|
protected final AtomicReference<KList<File>> folderCache;
|
||||||
|
protected KSet<String> firstAccess;
|
||||||
protected File root;
|
protected File root;
|
||||||
protected String folderName;
|
protected String folderName;
|
||||||
protected String resourceTypeName;
|
protected String resourceTypeName;
|
||||||
protected KCache<String, T> loadCache;
|
protected KCache<String, T> loadCache;
|
||||||
protected final AtomicReference<KList<File>> folderCache;
|
|
||||||
protected Class<? extends T> objectClass;
|
protected Class<? extends T> objectClass;
|
||||||
protected String cname;
|
protected String cname;
|
||||||
protected String[] possibleKeys = null;
|
protected String[] possibleKeys = null;
|
||||||
@@ -63,6 +70,7 @@ public class ResourceLoader<T extends IrisRegistrant> implements MeteredCache {
|
|||||||
|
|
||||||
public ResourceLoader(File root, IrisData manager, String folderName, String resourceTypeName, Class<? extends T> objectClass) {
|
public ResourceLoader(File root, IrisData manager, String folderName, String resourceTypeName, Class<? extends T> objectClass) {
|
||||||
this.manager = manager;
|
this.manager = manager;
|
||||||
|
firstAccess = new KSet<>();
|
||||||
folderCache = new AtomicReference<>();
|
folderCache = new AtomicReference<>();
|
||||||
sec = new ChronoLatch(5000);
|
sec = new ChronoLatch(5000);
|
||||||
loads = new AtomicInteger();
|
loads = new AtomicInteger();
|
||||||
@@ -221,6 +229,24 @@ public class ResourceLoader<T extends IrisRegistrant> implements MeteredCache {
|
|||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public KList<T> loadAllParallel(KList<String> s) {
|
||||||
|
KList<T> m = new KList<>();
|
||||||
|
BurstExecutor burst = MultiBurst.burst.burst(s.size());
|
||||||
|
|
||||||
|
for (String i : s) {
|
||||||
|
burst.queue(() -> {
|
||||||
|
T t = load(i);
|
||||||
|
|
||||||
|
if (t != null) {
|
||||||
|
m.add(t);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
burst.complete();
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
public KList<T> loadAll(KList<String> s, Consumer<T> postLoad) {
|
public KList<T> loadAll(KList<String> s, Consumer<T> postLoad) {
|
||||||
KList<T> m = new KList<>();
|
KList<T> m = new KList<>();
|
||||||
|
|
||||||
@@ -282,12 +308,52 @@ public class ResourceLoader<T extends IrisRegistrant> implements MeteredCache {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
firstAccess.add(name);
|
||||||
return loadCache.get(name);
|
return loadCache.get(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void loadFirstAccess(Engine engine) throws IOException {
|
||||||
|
String id = "DIM" + Math.abs(engine.getSeedManager().getSeed() + engine.getDimension().getVersion() + engine.getDimension().getLoadKey().hashCode());
|
||||||
|
File file = Iris.instance.getDataFile("prefetch/" + id + "/" + Math.abs(getFolderName().hashCode()) + ".ipfch");
|
||||||
|
|
||||||
|
if (!file.exists()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
FileInputStream fin = new FileInputStream(file);
|
||||||
|
GZIPInputStream gzi = new GZIPInputStream(fin);
|
||||||
|
DataInputStream din = new DataInputStream(gzi);
|
||||||
|
int m = din.readInt();
|
||||||
|
KList<String> s = new KList<>();
|
||||||
|
|
||||||
|
for (int i = 0; i < m; i++) {
|
||||||
|
s.add(din.readUTF());
|
||||||
|
}
|
||||||
|
|
||||||
|
din.close();
|
||||||
|
file.deleteOnExit();
|
||||||
|
Iris.info("Loading " + s.size() + " prefetch " + getFolderName());
|
||||||
|
loadAllParallel(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void saveFirstAccess(Engine engine) throws IOException {
|
||||||
|
String id = "DIM" + Math.abs(engine.getSeedManager().getSeed() + engine.getDimension().getVersion() + engine.getDimension().getLoadKey().hashCode());
|
||||||
|
File file = Iris.instance.getDataFile("prefetch/" + id + "/" + Math.abs(getFolderName().hashCode()) + ".ipfch");
|
||||||
|
file.getParentFile().mkdirs();
|
||||||
|
FileOutputStream fos = new FileOutputStream(file);
|
||||||
|
GZIPOutputStream gzo = new CustomOutputStream(fos, 9);
|
||||||
|
DataOutputStream dos = new DataOutputStream(gzo);
|
||||||
|
dos.writeInt(firstAccess.size());
|
||||||
|
|
||||||
|
for (String i : firstAccess) {
|
||||||
|
dos.writeUTF(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
dos.flush();
|
||||||
|
dos.close();
|
||||||
|
}
|
||||||
|
|
||||||
public KList<File> getFolders() {
|
public KList<File> getFolders() {
|
||||||
|
|
||||||
|
|
||||||
synchronized (folderCache) {
|
synchronized (folderCache) {
|
||||||
if (folderCache.get() == null) {
|
if (folderCache.get() == null) {
|
||||||
KList<File> fc = new KList<>();
|
KList<File> fc = new KList<>();
|
||||||
|
|||||||
@@ -21,13 +21,13 @@ package com.volmit.iris.core.loader;
|
|||||||
import com.volmit.iris.Iris;
|
import com.volmit.iris.Iris;
|
||||||
import com.volmit.iris.core.IrisSettings;
|
import com.volmit.iris.core.IrisSettings;
|
||||||
import com.volmit.iris.engine.object.IrisScript;
|
import com.volmit.iris.engine.object.IrisScript;
|
||||||
import com.volmit.iris.util.collection.KList;
|
|
||||||
import com.volmit.iris.util.collection.KSet;
|
|
||||||
import com.volmit.iris.util.data.KCache;
|
import com.volmit.iris.util.data.KCache;
|
||||||
import com.volmit.iris.util.io.IO;
|
import com.volmit.iris.util.io.IO;
|
||||||
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
|
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
public class ScriptResourceLoader extends ResourceLoader<IrisScript> {
|
public class ScriptResourceLoader extends ResourceLoader<IrisScript> {
|
||||||
public ScriptResourceLoader(File root, IrisData idm, String folderName, String resourceTypeName) {
|
public ScriptResourceLoader(File root, IrisData idm, String folderName, String resourceTypeName) {
|
||||||
@@ -60,39 +60,70 @@ public class ScriptResourceLoader extends ResourceLoader<IrisScript> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public String[] getPossibleKeys() {
|
public String[] getPossibleKeys() {
|
||||||
if (possibleKeys != null) {
|
if (possibleKeys != null) {
|
||||||
return possibleKeys;
|
return possibleKeys;
|
||||||
}
|
}
|
||||||
|
|
||||||
Iris.debug("Building " + resourceTypeName + " Possibility Lists");
|
Iris.debug("Building " + resourceTypeName + " Possibility Lists");
|
||||||
KSet<String> m = new KSet<>();
|
Set<String> keys = new HashSet<>();
|
||||||
|
|
||||||
for (File i : getFolders()) {
|
for (File i : getFolders()) {
|
||||||
for(File j : i.listFiles()) {
|
if (i.isDirectory()) {
|
||||||
if(j.isFile() && j.getName().endsWith(".js")) {
|
keys.addAll(getKeysInDirectory(i));
|
||||||
m.add(j.getName().replaceAll("\\Q.js\\E", ""));
|
|
||||||
} else if(j.isDirectory()) {
|
|
||||||
for(File k : j.listFiles()) {
|
|
||||||
if(k.isFile() && k.getName().endsWith(".js")) {
|
|
||||||
m.add(j.getName() + "/" + k.getName().replaceAll("\\Q.js\\E", ""));
|
|
||||||
} else if(k.isDirectory()) {
|
|
||||||
for(File l : k.listFiles()) {
|
|
||||||
if(l.isFile() && l.getName().endsWith(".js")) {
|
|
||||||
m.add(j.getName() + "/" + k.getName() + "/" + l.getName().replaceAll("\\Q.js\\E", ""));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
KList<String> v = new KList<>(m);
|
possibleKeys = keys.toArray(new String[0]);
|
||||||
possibleKeys = v.toArray(new String[0]);
|
|
||||||
return possibleKeys;
|
return possibleKeys;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Set<String> getKeysInDirectory(File directory) {
|
||||||
|
Set<String> keys = new HashSet<>();
|
||||||
|
for (File file : directory.listFiles()) {
|
||||||
|
if (file.isFile() && file.getName().endsWith(".js")) {
|
||||||
|
keys.add(file.getName().replaceAll("\\Q.js\\E", ""));
|
||||||
|
} else if (file.isDirectory()) {
|
||||||
|
keys.addAll(getKeysInDirectory(file));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return keys;
|
||||||
|
}
|
||||||
|
|
||||||
|
// public String[] getPossibleKeys() {
|
||||||
|
// if (possibleKeys != null) {
|
||||||
|
// return possibleKeys;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// Iris.debug("Building " + resourceTypeName + " Possibility Lists");
|
||||||
|
// KSet<String> m = new KSet<>();
|
||||||
|
//
|
||||||
|
// for (File i : getFolders()) {
|
||||||
|
// for (File j : i.listFiles()) {
|
||||||
|
// if (j.isFile() && j.getName().endsWith(".js")) {
|
||||||
|
// m.add(j.getName().replaceAll("\\Q.js\\E", ""));
|
||||||
|
// } else if (j.isDirectory()) {
|
||||||
|
// for (File k : j.listFiles()) {
|
||||||
|
// if (k.isFile() && k.getName().endsWith(".js")) {
|
||||||
|
// m.add(j.getName() + "/" + k.getName().replaceAll("\\Q.js\\E", ""));
|
||||||
|
// } else if (k.isDirectory()) {
|
||||||
|
// for (File l : k.listFiles()) {
|
||||||
|
// if (l.isFile() && l.getName().endsWith(".js")) {
|
||||||
|
// m.add(j.getName() + "/" + k.getName() + "/" + l.getName().replaceAll("\\Q.js\\E", ""));
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// KList<String> v = new KList<>(m);
|
||||||
|
// possibleKeys = v.toArray(new String[0]);
|
||||||
|
// return possibleKeys;
|
||||||
|
// }
|
||||||
|
|
||||||
public File findFile(String name) {
|
public File findFile(String name) {
|
||||||
for (File i : getFolders(name)) {
|
for (File i : getFolders(name)) {
|
||||||
for (File j : i.listFiles()) {
|
for (File j : i.listFiles()) {
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ package com.volmit.iris.core.nms;
|
|||||||
|
|
||||||
import com.volmit.iris.Iris;
|
import com.volmit.iris.Iris;
|
||||||
import com.volmit.iris.core.IrisSettings;
|
import com.volmit.iris.core.IrisSettings;
|
||||||
import com.volmit.iris.core.nms.v19_1.NMSBinding19_1;
|
import com.volmit.iris.core.nms.v19_3.NMSBinding19_3;
|
||||||
import com.volmit.iris.core.nms.v1X.NMSBinding1X;
|
import com.volmit.iris.core.nms.v1X.NMSBinding1X;
|
||||||
import com.volmit.iris.util.collection.KMap;
|
import com.volmit.iris.util.collection.KMap;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
@@ -28,7 +28,7 @@ import org.bukkit.Bukkit;
|
|||||||
public class INMS {
|
public class INMS {
|
||||||
//@builder
|
//@builder
|
||||||
private static final KMap<String, Class<? extends INMSBinding>> bindings = new KMap<String, Class<? extends INMSBinding>>()
|
private static final KMap<String, Class<? extends INMSBinding>> bindings = new KMap<String, Class<? extends INMSBinding>>()
|
||||||
.qput("v1_19_R1", NMSBinding19_1.class);
|
.qput("v1_19_R2", NMSBinding19_3.class);
|
||||||
//@done
|
//@done
|
||||||
private static final INMSBinding binding = bind();
|
private static final INMSBinding binding = bind();
|
||||||
|
|
||||||
|
|||||||
@@ -18,9 +18,11 @@
|
|||||||
|
|
||||||
package com.volmit.iris.core.nms;
|
package com.volmit.iris.core.nms;
|
||||||
|
|
||||||
|
import com.volmit.iris.util.mantle.Mantle;
|
||||||
import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer;
|
import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer;
|
||||||
import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess;
|
import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess;
|
||||||
import com.volmit.iris.util.nbt.tag.CompoundTag;
|
import com.volmit.iris.util.nbt.tag.CompoundTag;
|
||||||
|
import org.bukkit.Chunk;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.WorldCreator;
|
import org.bukkit.WorldCreator;
|
||||||
@@ -54,8 +56,11 @@ public interface INMSBinding {
|
|||||||
String getTrueBiomeBaseKey(Location location);
|
String getTrueBiomeBaseKey(Location location);
|
||||||
|
|
||||||
Object getCustomBiomeBaseFor(String mckey);
|
Object getCustomBiomeBaseFor(String mckey);
|
||||||
|
|
||||||
Object getCustomBiomeBaseHolderFor(String mckey);
|
Object getCustomBiomeBaseHolderFor(String mckey);
|
||||||
|
|
||||||
|
int getBiomeBaseIdForKey(String key);
|
||||||
|
|
||||||
String getKeyForBiomeBase(Object biomeBase);
|
String getKeyForBiomeBase(Object biomeBase);
|
||||||
|
|
||||||
Object getBiomeBase(World world, Biome biome);
|
Object getBiomeBase(World world, Biome biome);
|
||||||
@@ -83,4 +88,6 @@ public interface INMSBinding {
|
|||||||
}
|
}
|
||||||
|
|
||||||
MCAPaletteAccess createPalette();
|
MCAPaletteAccess createPalette();
|
||||||
|
|
||||||
|
void injectBiomesFromMantle(Chunk e, Mantle mantle);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,159 +0,0 @@
|
|||||||
/*
|
|
||||||
* Iris is a World Generator for Minecraft Bukkit Servers
|
|
||||||
* Copyright (c) 2022 Arcane Arts (Volmit Software)
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.volmit.iris.core.nms;
|
|
||||||
|
|
||||||
import com.volmit.iris.Iris;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public enum NMSVersion {
|
|
||||||
R1_19_1,
|
|
||||||
R1_18_2,
|
|
||||||
R1_18,
|
|
||||||
R1_17,
|
|
||||||
R1_16,
|
|
||||||
R1_15,
|
|
||||||
R1_14,
|
|
||||||
R1_13,
|
|
||||||
R1_13_1,
|
|
||||||
R1_12,
|
|
||||||
R1_11,
|
|
||||||
R1_10,
|
|
||||||
R1_9_4,
|
|
||||||
R1_9_2,
|
|
||||||
R1_8;
|
|
||||||
|
|
||||||
public static NMSVersion getMinimum() {
|
|
||||||
return values()[values().length - 1];
|
|
||||||
}
|
|
||||||
|
|
||||||
public static NMSVersion getMaximum() {
|
|
||||||
return values()[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
public static NMSVersion current() {
|
|
||||||
if(tryVersion("1_8_R3")) {
|
|
||||||
return R1_8;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tryVersion("1_9_R1")) {
|
|
||||||
return R1_9_2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tryVersion("1_9_R2")) {
|
|
||||||
return R1_9_4;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tryVersion("1_10_R1")) {
|
|
||||||
return R1_10;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tryVersion("1_11_R1")) {
|
|
||||||
return R1_11;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tryVersion("1_12_R1")) {
|
|
||||||
return R1_12;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tryVersion("1_13_R1")) {
|
|
||||||
return R1_13;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tryVersion("1_13_R2")) {
|
|
||||||
return R1_13_1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tryVersion("1_14_R1")) {
|
|
||||||
return R1_14;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tryVersion("1_15_R1")) {
|
|
||||||
return R1_15;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tryVersion("1_16_R1")) {
|
|
||||||
return R1_16;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tryVersion("1_17_R1")) {
|
|
||||||
return R1_17;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tryVersion("1_18_R1")) {
|
|
||||||
return R1_18;
|
|
||||||
}
|
|
||||||
if(tryVersion("1_18_R2")) {
|
|
||||||
return R1_18_2;
|
|
||||||
}
|
|
||||||
if(tryVersion("1_19_R1")) {
|
|
||||||
return R1_19_1;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean tryVersion(String v) {
|
|
||||||
try {
|
|
||||||
Class.forName("org.bukkit.craftbukkit.v" + v + ".CraftWorld");
|
|
||||||
return true;
|
|
||||||
} catch(Throwable e) {
|
|
||||||
Iris.reportError(e);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<NMSVersion> getAboveInclusive() {
|
|
||||||
List<NMSVersion> n = new ArrayList<>();
|
|
||||||
|
|
||||||
for(NMSVersion i : values()) {
|
|
||||||
if(i.ordinal() >= ordinal()) {
|
|
||||||
n.add(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<NMSVersion> betweenInclusive(NMSVersion other) {
|
|
||||||
List<NMSVersion> n = new ArrayList<>();
|
|
||||||
|
|
||||||
for(NMSVersion i : values()) {
|
|
||||||
if(i.ordinal() <= Math.max(other.ordinal(), ordinal()) && i.ordinal() >= Math.min(ordinal(), other.ordinal())) {
|
|
||||||
n.add(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<NMSVersion> getBelowInclusive() {
|
|
||||||
List<NMSVersion> n = new ArrayList<>();
|
|
||||||
|
|
||||||
for(NMSVersion i : values()) {
|
|
||||||
if(i.ordinal() <= ordinal()) {
|
|
||||||
n.add(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,151 @@
|
|||||||
|
package com.volmit.iris.core.nms.v19_3;
|
||||||
|
|
||||||
|
import com.mojang.serialization.Codec;
|
||||||
|
import com.volmit.iris.Iris;
|
||||||
|
import com.volmit.iris.engine.data.cache.AtomicCache;
|
||||||
|
import com.volmit.iris.engine.framework.Engine;
|
||||||
|
import com.volmit.iris.engine.object.IrisBiome;
|
||||||
|
import com.volmit.iris.engine.object.IrisBiomeCustom;
|
||||||
|
import com.volmit.iris.util.collection.KMap;
|
||||||
|
import com.volmit.iris.util.math.RNG;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.Registry;
|
||||||
|
import net.minecraft.core.RegistryAccess;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.level.biome.Biome;
|
||||||
|
import net.minecraft.world.level.biome.BiomeSource;
|
||||||
|
import net.minecraft.world.level.biome.Climate;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.World;
|
||||||
|
import org.bukkit.craftbukkit.v1_19_R2.CraftServer;
|
||||||
|
import org.bukkit.craftbukkit.v1_19_R2.CraftWorld;
|
||||||
|
import org.bukkit.craftbukkit.v1_19_R2.block.CraftBlock;
|
||||||
|
|
||||||
|
import java.lang.reflect.Field;
|
||||||
|
import java.lang.reflect.Method;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class CustomBiomeSource extends BiomeSource {
|
||||||
|
private final long seed;
|
||||||
|
private final Engine engine;
|
||||||
|
private final Registry<Biome> biomeCustomRegistry;
|
||||||
|
private final Registry<Biome> biomeRegistry;
|
||||||
|
private final AtomicCache<RegistryAccess> registryAccess = new AtomicCache<>();
|
||||||
|
private final RNG rng;
|
||||||
|
private final KMap<String, Holder<Biome>> customBiomes;
|
||||||
|
|
||||||
|
public CustomBiomeSource(long seed, Engine engine, World world) {
|
||||||
|
super(getAllBiomes(
|
||||||
|
((RegistryAccess) getFor(RegistryAccess.Frozen.class, ((CraftServer) Bukkit.getServer()).getHandle().getServer()))
|
||||||
|
.registry(Registries.BIOME).orElse(null),
|
||||||
|
((CraftWorld) world).getHandle().registryAccess().registry(Registries.BIOME).orElse(null),
|
||||||
|
engine));
|
||||||
|
this.engine = engine;
|
||||||
|
this.seed = seed;
|
||||||
|
this.biomeCustomRegistry = registry().registry(Registries.BIOME).orElse(null);
|
||||||
|
this.biomeRegistry = ((CraftWorld) world).getHandle().registryAccess().registry(Registries.BIOME).orElse(null);
|
||||||
|
this.rng = new RNG(engine.getSeedManager().getBiome());
|
||||||
|
this.customBiomes = fillCustomBiomes(biomeCustomRegistry, engine);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<Holder<Biome>> getAllBiomes(Registry<Biome> customRegistry, Registry<Biome> registry, Engine engine) {
|
||||||
|
List<Holder<Biome>> b = new ArrayList<>();
|
||||||
|
|
||||||
|
for (IrisBiome i : engine.getAllBiomes()) {
|
||||||
|
if (i.isCustom()) {
|
||||||
|
for (IrisBiomeCustom j : i.getCustomDerivitives()) {
|
||||||
|
b.add(customRegistry.getHolder(customRegistry.getResourceKey(customRegistry
|
||||||
|
.get(new ResourceLocation(engine.getDimension().getLoadKey() + ":" + j.getId()))).get()).get());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
b.add(CraftBlock.biomeToBiomeBase(registry, i.getVanillaDerivative()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return b;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Object getFor(Class<?> type, Object source) {
|
||||||
|
Object o = fieldFor(type, source);
|
||||||
|
|
||||||
|
if (o != null) {
|
||||||
|
return o;
|
||||||
|
}
|
||||||
|
|
||||||
|
return invokeFor(type, source);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Object fieldFor(Class<?> returns, Object in) {
|
||||||
|
return fieldForClass(returns, in.getClass(), in);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Object invokeFor(Class<?> returns, Object in) {
|
||||||
|
for (Method i : in.getClass().getMethods()) {
|
||||||
|
if (i.getReturnType().equals(returns)) {
|
||||||
|
i.setAccessible(true);
|
||||||
|
try {
|
||||||
|
Iris.debug("[NMS] Found " + returns.getSimpleName() + " in " + in.getClass().getSimpleName() + "." + i.getName() + "()");
|
||||||
|
return i.invoke(in);
|
||||||
|
} catch (Throwable e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private static <T> T fieldForClass(Class<T> returnType, Class<?> sourceType, Object in) {
|
||||||
|
for (Field i : sourceType.getDeclaredFields()) {
|
||||||
|
if (i.getType().equals(returnType)) {
|
||||||
|
i.setAccessible(true);
|
||||||
|
try {
|
||||||
|
Iris.debug("[NMS] Found " + returnType.getSimpleName() + " in " + sourceType.getSimpleName() + "." + i.getName());
|
||||||
|
return (T) i.get(in);
|
||||||
|
} catch (IllegalAccessException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private KMap<String, Holder<Biome>> fillCustomBiomes(Registry<Biome> customRegistry, Engine engine) {
|
||||||
|
KMap<String, Holder<Biome>> m = new KMap<>();
|
||||||
|
|
||||||
|
for (IrisBiome i : engine.getAllBiomes()) {
|
||||||
|
if (i.isCustom()) {
|
||||||
|
for (IrisBiomeCustom j : i.getCustomDerivitives()) {
|
||||||
|
m.put(j.getId(), customRegistry.getHolder(customRegistry.getResourceKey(customRegistry
|
||||||
|
.get(new ResourceLocation(engine.getDimension().getLoadKey() + ":" + j.getId()))).get()).get());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
private RegistryAccess registry() {
|
||||||
|
return registryAccess.aquire(() -> (RegistryAccess) getFor(RegistryAccess.Frozen.class, ((CraftServer) Bukkit.getServer()).getHandle().getServer()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Codec<? extends BiomeSource> codec() {
|
||||||
|
throw new UnsupportedOperationException("Not supported");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Holder<Biome> getNoiseBiome(int x, int y, int z, Climate.Sampler sampler) {
|
||||||
|
int m = (y - engine.getMinHeight()) << 2;
|
||||||
|
IrisBiome ib = engine.getComplex().getTrueBiomeStream().get(x << 2, z << 2);
|
||||||
|
if (ib.isCustom()) {
|
||||||
|
return customBiomes.get(ib.getCustomBiome(rng, x << 2, m, z << 2).getId());
|
||||||
|
} else {
|
||||||
|
org.bukkit.block.Biome v = ib.getSkyBiome(rng, x << 2, m, z << 2);
|
||||||
|
return CraftBlock.biomeToBiomeBase(biomeRegistry, v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,49 +16,40 @@
|
|||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.volmit.iris.core.nms.v19_1;
|
package com.volmit.iris.core.nms.v19_3;
|
||||||
|
|
||||||
|
|
||||||
import com.volmit.iris.Iris;
|
import com.volmit.iris.Iris;
|
||||||
import com.volmit.iris.core.nms.INMSBinding;
|
import com.volmit.iris.core.nms.INMSBinding;
|
||||||
import com.volmit.iris.engine.data.cache.AtomicCache;
|
import com.volmit.iris.engine.data.cache.AtomicCache;
|
||||||
import com.volmit.iris.util.collection.KMap;
|
import com.volmit.iris.util.collection.KMap;
|
||||||
|
import com.volmit.iris.util.hunk.Hunk;
|
||||||
|
import com.volmit.iris.util.mantle.Mantle;
|
||||||
|
import com.volmit.iris.util.matter.MatterBiomeInject;
|
||||||
import com.volmit.iris.util.nbt.io.NBTUtil;
|
import com.volmit.iris.util.nbt.io.NBTUtil;
|
||||||
import com.volmit.iris.util.nbt.mca.NBTWorld;
|
import com.volmit.iris.util.nbt.mca.NBTWorld;
|
||||||
import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer;
|
import com.volmit.iris.util.nbt.mca.palette.*;
|
||||||
import com.volmit.iris.util.nbt.mca.palette.MCAChunkBiomeContainer;
|
|
||||||
import com.volmit.iris.util.nbt.mca.palette.MCAGlobalPalette;
|
|
||||||
import com.volmit.iris.util.nbt.mca.palette.MCAIdMap;
|
|
||||||
import com.volmit.iris.util.nbt.mca.palette.MCAIdMapper;
|
|
||||||
import com.volmit.iris.util.nbt.mca.palette.MCAPalette;
|
|
||||||
import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess;
|
|
||||||
import com.volmit.iris.util.nbt.mca.palette.MCAPalettedContainer;
|
|
||||||
import com.volmit.iris.util.nbt.mca.palette.MCAWrappedPalettedContainer;
|
|
||||||
import com.volmit.iris.util.nbt.tag.CompoundTag;
|
import com.volmit.iris.util.nbt.tag.CompoundTag;
|
||||||
import it.unimi.dsi.fastutil.objects.Object2IntMap;
|
import it.unimi.dsi.fastutil.objects.Object2IntMap;
|
||||||
import net.minecraft.core.*;
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.Registry;
|
||||||
|
import net.minecraft.core.RegistryAccess;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
import net.minecraft.nbt.NbtIo;
|
import net.minecraft.nbt.NbtIo;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.util.BitStorage;
|
|
||||||
import net.minecraft.util.Mth;
|
|
||||||
import net.minecraft.world.level.block.Block;
|
import net.minecraft.world.level.block.Block;
|
||||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
import net.minecraft.world.level.chunk.ChunkAccess;
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
import net.minecraft.world.level.chunk.LevelChunkSection;
|
import net.minecraft.world.level.chunk.LevelChunk;
|
||||||
import net.minecraft.world.level.chunk.Palette;
|
import org.bukkit.*;
|
||||||
import net.minecraft.world.level.chunk.PalettedContainer;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.block.Biome;
|
import org.bukkit.block.Biome;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
|
import org.bukkit.craftbukkit.v1_19_R2.CraftChunk;
|
||||||
|
import org.bukkit.craftbukkit.v1_19_R2.CraftServer;
|
||||||
import org.bukkit.craftbukkit.v1_19_R1.CraftServer;
|
import org.bukkit.craftbukkit.v1_19_R2.CraftWorld;
|
||||||
import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
|
import org.bukkit.craftbukkit.v1_19_R2.block.data.CraftBlockData;
|
||||||
import org.bukkit.craftbukkit.v1_19_R1.block.data.CraftBlockData;
|
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.generator.ChunkGenerator;
|
import org.bukkit.generator.ChunkGenerator;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -68,14 +59,14 @@ import java.io.ByteArrayOutputStream;
|
|||||||
import java.io.DataInputStream;
|
import java.io.DataInputStream;
|
||||||
import java.io.DataOutputStream;
|
import java.io.DataOutputStream;
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
public class NMSBinding19_1 implements INMSBinding {
|
public class NMSBinding19_3 implements INMSBinding {
|
||||||
|
|
||||||
|
public static final String NMS_VERSION = "1.19.3";
|
||||||
private final KMap<Biome, Object> baseBiomeCache = new KMap<>();
|
private final KMap<Biome, Object> baseBiomeCache = new KMap<>();
|
||||||
private final BlockData AIR = Material.AIR.createBlockData();
|
private final BlockData AIR = Material.AIR.createBlockData();
|
||||||
private final AtomicCache<MCAIdMap<net.minecraft.world.level.biome.Biome>> biomeMapCache = new AtomicCache<>();
|
private final AtomicCache<MCAIdMap<net.minecraft.world.level.biome.Biome>> biomeMapCache = new AtomicCache<>();
|
||||||
@@ -85,6 +76,56 @@ public class NMSBinding19_1 implements INMSBinding {
|
|||||||
private final AtomicCache<Method> byIdRef = new AtomicCache<>();
|
private final AtomicCache<Method> byIdRef = new AtomicCache<>();
|
||||||
private Field biomeStorageCache = null;
|
private Field biomeStorageCache = null;
|
||||||
|
|
||||||
|
private static Object getFor(Class<?> type, Object source) {
|
||||||
|
Object o = fieldFor(type, source);
|
||||||
|
|
||||||
|
if (o != null) {
|
||||||
|
return o;
|
||||||
|
}
|
||||||
|
|
||||||
|
return invokeFor(type, source);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Object invokeFor(Class<?> returns, Object in) {
|
||||||
|
for (Method i : in.getClass().getMethods()) {
|
||||||
|
if (i.getReturnType().equals(returns)) {
|
||||||
|
i.setAccessible(true);
|
||||||
|
try {
|
||||||
|
Iris.debug("[NMS] Found " + returns.getSimpleName() + " in " + in.getClass().getSimpleName() + "." + i.getName() + "()");
|
||||||
|
return i.invoke(in);
|
||||||
|
} catch (Throwable e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Object fieldFor(Class<?> returns, Object in) {
|
||||||
|
return fieldForClass(returns, in.getClass(), in);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private static <T> T fieldForClass(Class<T> returnType, Class<?> sourceType, Object in) {
|
||||||
|
for (Field i : sourceType.getDeclaredFields()) {
|
||||||
|
if (i.getType().equals(returnType)) {
|
||||||
|
i.setAccessible(true);
|
||||||
|
try {
|
||||||
|
Iris.debug("[NMS] Found " + returnType.getSimpleName() + " in " + sourceType.getSimpleName() + "." + i.getName());
|
||||||
|
return (T) i.get(in);
|
||||||
|
} catch (IllegalAccessException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Class<?> getClassType(Class<?> type, int ordinal) {
|
||||||
|
return type.getDeclaredClasses()[ordinal];
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasTile(Location l) {
|
public boolean hasTile(Location l) {
|
||||||
return ((CraftWorld) l.getWorld()).getHandle().getBlockEntity(new BlockPos(l.getBlockX(), l.getBlockY(), l.getBlockZ()), false) != null;
|
return ((CraftWorld) l.getWorld()).getHandle().getBlockEntity(new BlockPos(l.getBlockX(), l.getBlockY(), l.getBlockZ()), false) != null;
|
||||||
@@ -157,32 +198,16 @@ public class NMSBinding19_1 implements INMSBinding {
|
|||||||
|
|
||||||
private Registry<net.minecraft.world.level.biome.Biome> getCustomBiomeRegistry() {
|
private Registry<net.minecraft.world.level.biome.Biome> getCustomBiomeRegistry() {
|
||||||
|
|
||||||
return registry().registry(Registry.BIOME_REGISTRY).orElse(null);
|
return registry().registry(Registries.BIOME).orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Registry<Block> getBlockRegistry() {
|
private Registry<Block> getBlockRegistry() {
|
||||||
return registry().registry(Registry.BLOCK_REGISTRY).orElse(null);
|
return registry().registry(Registries.BLOCK).orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object getBiomeBaseFromId(int id) {
|
public Object getBiomeBaseFromId(int id) {
|
||||||
try {
|
return getCustomBiomeRegistry().getHolder(id);
|
||||||
return byIdRef.aquire(() -> {
|
|
||||||
for(Method i : IdMap.class.getDeclaredMethods()) {
|
|
||||||
if(i.getParameterCount() == 1 && i.getParameterTypes()[0].equals(int.class)) {
|
|
||||||
Iris.info("[NMS] Found byId method in " + IdMap.class.getSimpleName() + "." + i.getName() + "(int) => " + Biome.class.getSimpleName());
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Iris.error("Cannot find byId method!");
|
|
||||||
return null;
|
|
||||||
}).invoke(getCustomBiomeRegistry(), id);
|
|
||||||
} catch(IllegalAccessException | InvocationTargetException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -197,7 +222,7 @@ public class NMSBinding19_1 implements INMSBinding {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getTrueBiomeBaseId(Object biomeBase) {
|
public int getTrueBiomeBaseId(Object biomeBase) {
|
||||||
return getCustomBiomeRegistry().getId((net.minecraft.world.level.biome.Biome) biomeBase);
|
return getCustomBiomeRegistry().getId(((Holder<net.minecraft.world.level.biome.Biome>) biomeBase).value());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -214,11 +239,16 @@ public class NMSBinding19_1 implements INMSBinding {
|
|||||||
public Object getCustomBiomeBaseFor(String mckey) {
|
public Object getCustomBiomeBaseFor(String mckey) {
|
||||||
return getCustomBiomeRegistry().get(new ResourceLocation(mckey));
|
return getCustomBiomeRegistry().get(new ResourceLocation(mckey));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object getCustomBiomeBaseHolderFor(String mckey) {
|
public Object getCustomBiomeBaseHolderFor(String mckey) {
|
||||||
return getCustomBiomeRegistry().getHolder(getTrueBiomeBaseId(getCustomBiomeRegistry().get(new ResourceLocation(mckey)))).get();
|
return getCustomBiomeRegistry().getHolder(getTrueBiomeBaseId(getCustomBiomeRegistry().get(new ResourceLocation(mckey)))).get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getBiomeBaseIdForKey(String key) {
|
||||||
|
return getCustomBiomeRegistry().getId(getCustomBiomeRegistry().get(new ResourceLocation(key)));
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getKeyForBiomeBase(Object biomeBase) {
|
public String getKeyForBiomeBase(Object biomeBase) {
|
||||||
return getCustomBiomeRegistry().getKey((net.minecraft.world.level.biome.Biome) biomeBase).getPath(); // something, not something:something
|
return getCustomBiomeRegistry().getKey((net.minecraft.world.level.biome.Biome) biomeBase).getPath(); // something, not something:something
|
||||||
@@ -226,7 +256,8 @@ public class NMSBinding19_1 implements INMSBinding {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object getBiomeBase(World world, Biome biome) {
|
public Object getBiomeBase(World world, Biome biome) {
|
||||||
return getBiomeBase(((CraftWorld) world).getHandle().registryAccess().registry(Registry.BIOME_REGISTRY).orElse(null), biome);
|
return org.bukkit.craftbukkit.v1_19_R2.block.CraftBlock.biomeToBiomeBase(((CraftWorld) world).getHandle()
|
||||||
|
.registryAccess().registry(Registries.BIOME).orElse(null), biome);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -237,13 +268,13 @@ public class NMSBinding19_1 implements INMSBinding {
|
|||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
//noinspection unchecked
|
//noinspection unchecked
|
||||||
v = org.bukkit.craftbukkit.v1_19_R1.block.CraftBlock.biomeToBiomeBase((Registry<net.minecraft.world.level.biome.Biome>) registry, biome);
|
v = org.bukkit.craftbukkit.v1_19_R2.block.CraftBlock.biomeToBiomeBase((Registry<net.minecraft.world.level.biome.Biome>) registry, biome);
|
||||||
if (v == null) {
|
if (v == null) {
|
||||||
// Ok so there is this new biome name called "CUSTOM" in Paper's new releases.
|
// Ok so there is this new biome name called "CUSTOM" in Paper's new releases.
|
||||||
// But, this does NOT exist within CraftBukkit which makes it return an error.
|
// But, this does NOT exist within CraftBukkit which makes it return an error.
|
||||||
// So, we will just return the ID that the plains biome returns instead.
|
// So, we will just return the ID that the plains biome returns instead.
|
||||||
//noinspection unchecked
|
//noinspection unchecked
|
||||||
return org.bukkit.craftbukkit.v1_19_R1.block.CraftBlock.biomeToBiomeBase((Registry<net.minecraft.world.level.biome.Biome>) registry, Biome.PLAINS);
|
return org.bukkit.craftbukkit.v1_19_R2.block.CraftBlock.biomeToBiomeBase((Registry<net.minecraft.world.level.biome.Biome>) registry, Biome.PLAINS);
|
||||||
}
|
}
|
||||||
baseBiomeCache.put(biome, v);
|
baseBiomeCache.put(biome, v);
|
||||||
return v;
|
return v;
|
||||||
@@ -258,7 +289,7 @@ public class NMSBinding19_1 implements INMSBinding {
|
|||||||
public int getBiomeId(Biome biome) {
|
public int getBiomeId(Biome biome) {
|
||||||
for (World i : Bukkit.getWorlds()) {
|
for (World i : Bukkit.getWorlds()) {
|
||||||
if (i.getEnvironment().equals(World.Environment.NORMAL)) {
|
if (i.getEnvironment().equals(World.Environment.NORMAL)) {
|
||||||
Registry<net.minecraft.world.level.biome.Biome> registry = ((CraftWorld) i).getHandle().registryAccess().registry(Registry.BIOME_REGISTRY).orElse(null);
|
Registry<net.minecraft.world.level.biome.Biome> registry = ((CraftWorld) i).getHandle().registryAccess().registry(Registries.BIOME).orElse(null);
|
||||||
return registry.getId((net.minecraft.world.level.biome.Biome) getBiomeBase(registry, biome));
|
return registry.getId((net.minecraft.world.level.biome.Biome) getBiomeBase(registry, biome));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -338,50 +369,24 @@ public class NMSBinding19_1 implements INMSBinding {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setBiomes(int cx, int cz, World world, Hunk<Object> biomes) {
|
||||||
|
LevelChunk c = ((CraftWorld) world).getHandle().getChunk(cx, cz);
|
||||||
|
biomes.iterateSync((x, y, z, b) -> c.setBiome(x, y, z, (Holder<net.minecraft.world.level.biome.Biome>) b));
|
||||||
|
c.setUnsaved(true);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void forceBiomeInto(int x, int y, int z, Object somethingVeryDirty, ChunkGenerator.BiomeGrid chunk) {
|
public void forceBiomeInto(int x, int y, int z, Object somethingVeryDirty, ChunkGenerator.BiomeGrid chunk) {
|
||||||
try {
|
try {
|
||||||
ChunkAccess s = (ChunkAccess) getFieldForBiomeStorage(chunk).get(chunk);
|
ChunkAccess s = (ChunkAccess) getFieldForBiomeStorage(chunk).get(chunk);
|
||||||
Holder<net.minecraft.world.level.biome.Biome> biome = (Holder<net.minecraft.world.level.biome.Biome>) somethingVeryDirty;
|
Holder<net.minecraft.world.level.biome.Biome> biome = (Holder<net.minecraft.world.level.biome.Biome>) somethingVeryDirty;
|
||||||
s.setBiome(x, y, z, biome);
|
s.setBiome(x, y, z, biome);
|
||||||
/*int l = QuartPos.fromBlock(s.getMinBuildHeight());
|
|
||||||
int i1 = l + QuartPos.fromBlock(s.getHeight()) - 1;
|
|
||||||
PalettedContainer<Holder<net.minecraft.world.level.biome.Biome>> palette = getPalette(s, s.getSectionIndex(QuartPos.toBlock(Mth.clamp(y, l, i1))));
|
|
||||||
int index = getPaletteIndex(x, y, z, s, palette);
|
|
||||||
int data = getPaletteDataId(palette, biome);
|
|
||||||
setPaletteData(palette, index, data);*/
|
|
||||||
} catch (IllegalAccessException e) {
|
} catch (IllegalAccessException e) {
|
||||||
Iris.reportError(e);
|
Iris.reportError(e);
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private PalettedContainer<Holder<net.minecraft.world.level.biome.Biome>> getPalette(ChunkAccess ca, int index) {
|
|
||||||
LevelChunkSection[] sections = fieldForClass(LevelChunkSection[].class, ChunkAccess.class, ca);
|
|
||||||
return fieldForClass(PalettedContainer.class, LevelChunkSection.class, sections[index]);
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getPaletteIndex(int x, int y, int z, ChunkAccess s, PalettedContainer<?> palette) {
|
|
||||||
int l = QuartPos.fromBlock(s.getMinBuildHeight());
|
|
||||||
int i1 = l + QuartPos.fromBlock(s.getHeight()) - 1;
|
|
||||||
int j1 = Mth.clamp(y, l, i1);
|
|
||||||
return fieldForClass(PalettedContainer.Strategy.class, PalettedContainer.class, palette).getIndex(x & 3, j1 & 3, z & 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
private <T extends Holder<?>> int getPaletteDataId(PalettedContainer<T> palette, T data) throws ClassNotFoundException {
|
|
||||||
Class<?> dataType = getClassType(PalettedContainer.class, 1);
|
|
||||||
Object paletteData = fieldFor(dataType, palette);
|
|
||||||
Palette<T> fuckinFinally = fieldForClass(Palette.class,dataType, paletteData);
|
|
||||||
return fuckinFinally.idFor(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setPaletteData(PalettedContainer<?> palette, int index, int data) throws ClassNotFoundException {
|
|
||||||
Class<?> dataType = getClassType(PalettedContainer.class, 1);
|
|
||||||
Object paletteData = fieldFor(dataType, palette);
|
|
||||||
BitStorage storage = fieldForClass(BitStorage.class, dataType, paletteData);
|
|
||||||
storage.set(index, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Field getFieldForBiomeStorage(Object storage) {
|
private Field getFieldForBiomeStorage(Object storage) {
|
||||||
Field f = biomeStorageCache;
|
Field f = biomeStorageCache;
|
||||||
|
|
||||||
@@ -428,53 +433,21 @@ public class NMSBinding19_1 implements INMSBinding {
|
|||||||
i -> ((CraftBlockData) NBTWorld.getBlockData(i)).getState());
|
i -> ((CraftBlockData) NBTWorld.getBlockData(i)).getState());
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Object getFor(Class<?> type, Object source) {
|
@Override
|
||||||
Object o = fieldFor(type, source);
|
public void injectBiomesFromMantle(Chunk e, Mantle mantle) {
|
||||||
|
LevelChunk chunk = ((CraftChunk) e).getHandle();
|
||||||
if(o != null) {
|
AtomicInteger c = new AtomicInteger();
|
||||||
return o;
|
AtomicInteger r = new AtomicInteger();
|
||||||
}
|
mantle.iterateChunk(e.getX(), e.getZ(), MatterBiomeInject.class, (x, y, z, b) -> {
|
||||||
|
if (b != null) {
|
||||||
return invokeFor(type, source);
|
if (b.isCustom()) {
|
||||||
}
|
chunk.setBiome(x, y, z, getCustomBiomeRegistry().getHolder(b.getBiomeId()).get());
|
||||||
|
c.getAndIncrement();
|
||||||
private static Object invokeFor(Class<?> returns, Object in) {
|
} else {
|
||||||
for(Method i : in.getClass().getMethods()) {
|
chunk.setBiome(x, y, z, (Holder<net.minecraft.world.level.biome.Biome>) getBiomeBase(e.getWorld(), b.getBiome()));
|
||||||
if(i.getReturnType().equals(returns)) {
|
r.getAndIncrement();
|
||||||
i.setAccessible(true);
|
|
||||||
try {
|
|
||||||
Iris.debug("[NMS] Found " + returns.getSimpleName() + " in " + in.getClass().getSimpleName() + "." + i.getName() + "()");
|
|
||||||
return i.invoke(in);
|
|
||||||
} catch(Throwable e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Object fieldFor(Class<?> returns, Object in) {
|
|
||||||
return fieldForClass(returns, in.getClass(), in);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
private static <T> T fieldForClass(Class<T> returnType, Class<?> sourceType, Object in) {
|
|
||||||
for(Field i : sourceType.getDeclaredFields()) {
|
|
||||||
if(i.getType().equals(returnType)) {
|
|
||||||
i.setAccessible(true);
|
|
||||||
try {
|
|
||||||
Iris.debug("[NMS] Found " + returnType.getSimpleName() + " in " + sourceType.getSimpleName() + "." + i.getName());
|
|
||||||
return (T) i.get(in);
|
|
||||||
} catch(IllegalAccessException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Class<?> getClassType(Class<?> type, int ordinal) {
|
|
||||||
return type.getDeclaredClasses()[ordinal];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -20,9 +20,11 @@ package com.volmit.iris.core.nms.v1X;
|
|||||||
|
|
||||||
import com.volmit.iris.Iris;
|
import com.volmit.iris.Iris;
|
||||||
import com.volmit.iris.core.nms.INMSBinding;
|
import com.volmit.iris.core.nms.INMSBinding;
|
||||||
|
import com.volmit.iris.util.mantle.Mantle;
|
||||||
import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer;
|
import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer;
|
||||||
import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess;
|
import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess;
|
||||||
import com.volmit.iris.util.nbt.tag.CompoundTag;
|
import com.volmit.iris.util.nbt.tag.CompoundTag;
|
||||||
|
import org.bukkit.Chunk;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.block.Biome;
|
import org.bukkit.block.Biome;
|
||||||
@@ -57,6 +59,11 @@ public class NMSBinding1X implements INMSBinding {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void injectBiomesFromMantle(Chunk e, Mantle mantle) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void deserializeTile(CompoundTag s, Location newPosition) {
|
public void deserializeTile(CompoundTag s, Location newPosition) {
|
||||||
|
|
||||||
@@ -117,6 +124,11 @@ public class NMSBinding1X implements INMSBinding {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getBiomeBaseIdForKey(String key) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getKeyForBiomeBase(Object biomeBase) {
|
public String getKeyForBiomeBase(Object biomeBase) {
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -54,8 +54,7 @@ public class IrisPack {
|
|||||||
* Create an iris pack backed by a data folder
|
* Create an iris pack backed by a data folder
|
||||||
* the data folder is assumed to be in the Iris/packs/NAME folder
|
* the data folder is assumed to be in the Iris/packs/NAME folder
|
||||||
*
|
*
|
||||||
* @param name
|
* @param name the name
|
||||||
* the name
|
|
||||||
*/
|
*/
|
||||||
public IrisPack(String name) {
|
public IrisPack(String name) {
|
||||||
this(packsPack(name));
|
this(packsPack(name));
|
||||||
@@ -64,8 +63,7 @@ public class IrisPack {
|
|||||||
/**
|
/**
|
||||||
* Create an iris pack backed by a data folder
|
* Create an iris pack backed by a data folder
|
||||||
*
|
*
|
||||||
* @param folder
|
* @param folder the folder of the pack. Must be a directory
|
||||||
* the folder of the pack. Must be a directory
|
|
||||||
*/
|
*/
|
||||||
public IrisPack(File folder) {
|
public IrisPack(File folder) {
|
||||||
this.folder = folder;
|
this.folder = folder;
|
||||||
@@ -84,13 +82,10 @@ public class IrisPack {
|
|||||||
/**
|
/**
|
||||||
* Create a new pack from the input url
|
* Create a new pack from the input url
|
||||||
*
|
*
|
||||||
* @param sender
|
* @param sender the sender
|
||||||
* the sender
|
* @param url the url, or name, or really anything see IrisPackRepository.from(String)
|
||||||
* @param url
|
|
||||||
* the url, or name, or really anything see IrisPackRepository.from(String)
|
|
||||||
* @return the iris pack
|
* @return the iris pack
|
||||||
* @throws IrisException
|
* @throws IrisException fails
|
||||||
* fails
|
|
||||||
*/
|
*/
|
||||||
public static Future<IrisPack> from(VolmitSender sender, String url) throws IrisException {
|
public static Future<IrisPack> from(VolmitSender sender, String url) throws IrisException {
|
||||||
IrisPackRepository repo = IrisPackRepository.from(url);
|
IrisPackRepository repo = IrisPackRepository.from(url);
|
||||||
@@ -108,13 +103,10 @@ public class IrisPack {
|
|||||||
/**
|
/**
|
||||||
* Create a pack from a repo
|
* Create a pack from a repo
|
||||||
*
|
*
|
||||||
* @param sender
|
* @param sender the sender
|
||||||
* the sender
|
* @param repo the repo
|
||||||
* @param repo
|
|
||||||
* the repo
|
|
||||||
* @return the pack
|
* @return the pack
|
||||||
* @throws MalformedURLException
|
* @throws MalformedURLException shit happens
|
||||||
* shit happens
|
|
||||||
*/
|
*/
|
||||||
public static Future<IrisPack> from(VolmitSender sender, IrisPackRepository repo) throws MalformedURLException {
|
public static Future<IrisPack> from(VolmitSender sender, IrisPackRepository repo) throws MalformedURLException {
|
||||||
CompletableFuture<IrisPack> pack = new CompletableFuture<>();
|
CompletableFuture<IrisPack> pack = new CompletableFuture<>();
|
||||||
@@ -127,11 +119,9 @@ public class IrisPack {
|
|||||||
/**
|
/**
|
||||||
* Create a blank pack with a given name
|
* Create a blank pack with a given name
|
||||||
*
|
*
|
||||||
* @param name
|
* @param name the name of the pack
|
||||||
* the name of the pack
|
|
||||||
* @return the pack
|
* @return the pack
|
||||||
* @throws IrisException
|
* @throws IrisException if the pack already exists or another error
|
||||||
* if the pack already exists or another error
|
|
||||||
*/
|
*/
|
||||||
public static IrisPack blank(String name) throws IrisException {
|
public static IrisPack blank(String name) throws IrisException {
|
||||||
File f = packsPack(name);
|
File f = packsPack(name);
|
||||||
@@ -159,8 +149,7 @@ public class IrisPack {
|
|||||||
/**
|
/**
|
||||||
* Get a packs pack folder for a name. Such that overworld would resolve as Iris/packs/overworld
|
* Get a packs pack folder for a name. Such that overworld would resolve as Iris/packs/overworld
|
||||||
*
|
*
|
||||||
* @param name
|
* @param name the name
|
||||||
* the name
|
|
||||||
* @return the file path
|
* @return the file path
|
||||||
*/
|
*/
|
||||||
public static File packsPack(String name) {
|
public static File packsPack(String name) {
|
||||||
@@ -243,8 +232,7 @@ public class IrisPack {
|
|||||||
/**
|
/**
|
||||||
* Install this pack into a world
|
* Install this pack into a world
|
||||||
*
|
*
|
||||||
* @param world
|
* @param world the world to install into (world/iris/pack)
|
||||||
* the world to install into (world/iris/pack)
|
|
||||||
* @return the installed pack
|
* @return the installed pack
|
||||||
*/
|
*/
|
||||||
public IrisPack install(World world) throws IrisException {
|
public IrisPack install(World world) throws IrisException {
|
||||||
@@ -254,8 +242,7 @@ public class IrisPack {
|
|||||||
/**
|
/**
|
||||||
* Install this pack into a world
|
* Install this pack into a world
|
||||||
*
|
*
|
||||||
* @param world
|
* @param world the world to install into (world/iris/pack)
|
||||||
* the world to install into (world/iris/pack)
|
|
||||||
* @return the installed pack
|
* @return the installed pack
|
||||||
*/
|
*/
|
||||||
public IrisPack install(IrisWorld world) throws IrisException {
|
public IrisPack install(IrisWorld world) throws IrisException {
|
||||||
@@ -265,8 +252,7 @@ public class IrisPack {
|
|||||||
/**
|
/**
|
||||||
* Install this pack into a world
|
* Install this pack into a world
|
||||||
*
|
*
|
||||||
* @param folder
|
* @param folder the folder to install this pack into
|
||||||
* the folder to install this pack into
|
|
||||||
* @return the installed pack
|
* @return the installed pack
|
||||||
*/
|
*/
|
||||||
public IrisPack install(File folder) throws IrisException {
|
public IrisPack install(File folder) throws IrisException {
|
||||||
@@ -289,8 +275,7 @@ public class IrisPack {
|
|||||||
* Create a new pack using this pack as a template. The new pack will be renamed & have a renamed dimension
|
* Create a new pack using this pack as a template. The new pack will be renamed & have a renamed dimension
|
||||||
* to match it.
|
* to match it.
|
||||||
*
|
*
|
||||||
* @param newName
|
* @param newName the new pack name
|
||||||
* the new pack name
|
|
||||||
* @return the new IrisPack
|
* @return the new IrisPack
|
||||||
*/
|
*/
|
||||||
public IrisPack install(String newName) throws IrisException {
|
public IrisPack install(String newName) throws IrisException {
|
||||||
@@ -345,8 +330,7 @@ public class IrisPack {
|
|||||||
/**
|
/**
|
||||||
* Find all files in this pack with the given extension
|
* Find all files in this pack with the given extension
|
||||||
*
|
*
|
||||||
* @param fileExtension
|
* @param fileExtension the extension
|
||||||
* the extension
|
|
||||||
* @return the list of files
|
* @return the list of files
|
||||||
*/
|
*/
|
||||||
public KList<File> collectFiles(String fileExtension) {
|
public KList<File> collectFiles(String fileExtension) {
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ public class IrisPregenerator {
|
|||||||
private final KSet<Position2> retry;
|
private final KSet<Position2> retry;
|
||||||
private final KSet<Position2> net;
|
private final KSet<Position2> net;
|
||||||
private final ChronoLatch cl;
|
private final ChronoLatch cl;
|
||||||
|
private final ChronoLatch saveLatch = new ChronoLatch(30000);
|
||||||
|
|
||||||
public IrisPregenerator(PregenTask task, PregeneratorMethod generator, PregenListener listener) {
|
public IrisPregenerator(PregenTask task, PregeneratorMethod generator, PregenListener listener) {
|
||||||
this.listener = listenify(listener);
|
this.listener = listenify(listener);
|
||||||
@@ -140,6 +141,7 @@ public class IrisPregenerator {
|
|||||||
generator.close();
|
generator.close();
|
||||||
ticker.interrupt();
|
ticker.interrupt();
|
||||||
listener.onClose();
|
listener.onClose();
|
||||||
|
getMantle().trim(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void visitRegion(int x, int z, boolean regions) {
|
private void visitRegion(int x, int z, boolean regions) {
|
||||||
@@ -167,13 +169,23 @@ public class IrisPregenerator {
|
|||||||
} else if (!regions) {
|
} else if (!regions) {
|
||||||
hit = true;
|
hit = true;
|
||||||
listener.onRegionGenerating(x, z);
|
listener.onRegionGenerating(x, z);
|
||||||
PregenTask.iterateRegion(x, z, (xx, zz) -> generator.generateChunk(xx, zz, listener));
|
PregenTask.iterateRegion(x, z, (xx, zz) -> {
|
||||||
|
while (paused.get() && !shutdown.get()) {
|
||||||
|
J.sleep(50);
|
||||||
|
}
|
||||||
|
|
||||||
|
generator.generateChunk(xx, zz, listener);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hit) {
|
if (hit) {
|
||||||
listener.onRegionGenerated(x, z);
|
listener.onRegionGenerated(x, z);
|
||||||
|
|
||||||
|
if (saveLatch.flip()) {
|
||||||
listener.onSaving();
|
listener.onSaving();
|
||||||
generator.save();
|
generator.save();
|
||||||
|
}
|
||||||
|
|
||||||
generatedRegions.add(pos);
|
generatedRegions.add(pos);
|
||||||
checkRegions();
|
checkRegions();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,163 @@
|
|||||||
|
package com.volmit.iris.core.pregenerator;
|
||||||
|
|
||||||
|
import com.google.gson.Gson;
|
||||||
|
import com.volmit.iris.Iris;
|
||||||
|
import com.volmit.iris.util.format.Form;
|
||||||
|
import com.volmit.iris.util.io.IO;
|
||||||
|
import com.volmit.iris.util.math.Position2;
|
||||||
|
import com.volmit.iris.util.math.Spiraler;
|
||||||
|
import com.volmit.iris.util.scheduling.ChronoLatch;
|
||||||
|
import com.volmit.iris.util.scheduling.J;
|
||||||
|
import io.papermc.lib.PaperLib;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.World;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
import org.bukkit.event.world.WorldUnloadEvent;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
|
public class LazyPregenerator extends Thread implements Listener {
|
||||||
|
private final LazyPregenJob job;
|
||||||
|
private final File destination;
|
||||||
|
private final int maxPosition;
|
||||||
|
private final World world;
|
||||||
|
private final long rate;
|
||||||
|
private final ChronoLatch latch;
|
||||||
|
|
||||||
|
public LazyPregenerator(LazyPregenJob job, File destination) {
|
||||||
|
this.job = job;
|
||||||
|
this.destination = destination;
|
||||||
|
this.maxPosition = new Spiraler(job.getRadiusBlocks() * 2, job.getRadiusBlocks() * 2, (x, z) -> {
|
||||||
|
}).count();
|
||||||
|
this.world = Bukkit.getWorld(job.getWorld());
|
||||||
|
this.rate = Math.round((1D / (job.chunksPerMinute / 60D)) * 1000D);
|
||||||
|
this.latch = new ChronoLatch(60000);
|
||||||
|
}
|
||||||
|
|
||||||
|
public LazyPregenerator(File file) throws IOException {
|
||||||
|
this(new Gson().fromJson(IO.readAll(file), LazyPregenJob.class), file);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void loadLazyGenerators() {
|
||||||
|
for (World i : Bukkit.getWorlds()) {
|
||||||
|
File lazygen = new File(i.getWorldFolder(), "lazygen.json");
|
||||||
|
|
||||||
|
if (lazygen.exists()) {
|
||||||
|
try {
|
||||||
|
LazyPregenerator p = new LazyPregenerator(lazygen);
|
||||||
|
p.start();
|
||||||
|
Iris.info("Started Lazy Pregenerator: " + p.job);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void on(WorldUnloadEvent e) {
|
||||||
|
if (e.getWorld().equals(world)) {
|
||||||
|
interrupt();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void run() {
|
||||||
|
while (!interrupted()) {
|
||||||
|
J.sleep(rate);
|
||||||
|
tick();
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
saveNow();
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void tick() {
|
||||||
|
if (latch.flip()) {
|
||||||
|
save();
|
||||||
|
Iris.info("LazyGen: " + world.getName() + " RTT: " + Form.duration((Math.pow((job.radiusBlocks / 16D), 2) / job.chunksPerMinute) * 60 * 1000, 2));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (job.getPosition() >= maxPosition) {
|
||||||
|
if (job.isHealing()) {
|
||||||
|
int pos = (job.getHealingPosition() + 1) % maxPosition;
|
||||||
|
job.setHealingPosition(pos);
|
||||||
|
tickRegenerate(getChunk(pos));
|
||||||
|
} else {
|
||||||
|
Iris.verbose("Completed Lazy Gen!");
|
||||||
|
interrupt();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
int pos = job.getPosition() + 1;
|
||||||
|
job.setPosition(pos);
|
||||||
|
tickGenerate(getChunk(pos));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void tickGenerate(Position2 chunk) {
|
||||||
|
if (PaperLib.isPaper()) {
|
||||||
|
PaperLib.getChunkAtAsync(world, chunk.getX(), chunk.getZ(), true).thenAccept((i) -> Iris.verbose("Generated Async " + chunk));
|
||||||
|
} else {
|
||||||
|
J.s(() -> world.getChunkAt(chunk.getX(), chunk.getZ()));
|
||||||
|
Iris.verbose("Generated " + chunk);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void tickRegenerate(Position2 chunk) {
|
||||||
|
J.s(() -> world.regenerateChunk(chunk.getX(), chunk.getZ()));
|
||||||
|
Iris.verbose("Regenerated " + chunk);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Position2 getChunk(int position) {
|
||||||
|
int p = -1;
|
||||||
|
AtomicInteger xx = new AtomicInteger();
|
||||||
|
AtomicInteger zz = new AtomicInteger();
|
||||||
|
Spiraler s = new Spiraler(job.getRadiusBlocks() * 2, job.getRadiusBlocks() * 2, (x, z) -> {
|
||||||
|
xx.set(x);
|
||||||
|
zz.set(z);
|
||||||
|
});
|
||||||
|
|
||||||
|
while (s.hasNext() && p++ < position) {
|
||||||
|
s.next();
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Position2(xx.get(), zz.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void save() {
|
||||||
|
J.a(() -> {
|
||||||
|
try {
|
||||||
|
saveNow();
|
||||||
|
} catch (Throwable e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void saveNow() throws IOException {
|
||||||
|
IO.writeAll(this.destination, new Gson().toJson(job));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
public static class LazyPregenJob {
|
||||||
|
private String world;
|
||||||
|
@Builder.Default
|
||||||
|
private int healingPosition = 0;
|
||||||
|
@Builder.Default
|
||||||
|
private boolean healing = false;
|
||||||
|
@Builder.Default
|
||||||
|
private int chunksPerMinute = 32; // 48 hours is roughly 5000 radius
|
||||||
|
@Builder.Default
|
||||||
|
private int radiusBlocks = 5000;
|
||||||
|
@Builder.Default
|
||||||
|
private int position = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -49,7 +49,7 @@ public class PregenTask {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void iterateRegion(int xr, int zr, Spiraled s) {
|
public static void iterateRegion(int xr, int zr, Spiraled s) {
|
||||||
iterateRegion(xr, zr, s, new Position2(0, 0));
|
iterateRegion(xr, zr, s, new Position2(-(xr << 5), -(zr << 5)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static KList<Position2> computeOrder(Position2 pull) {
|
private static KList<Position2> computeOrder(Position2 pull) {
|
||||||
|
|||||||
@@ -43,10 +43,8 @@ public interface PregeneratorMethod {
|
|||||||
/**
|
/**
|
||||||
* Return true if regions can be generated
|
* Return true if regions can be generated
|
||||||
*
|
*
|
||||||
* @param x
|
* @param x the x region
|
||||||
* the x region
|
* @param z the z region
|
||||||
* @param z
|
|
||||||
* the z region
|
|
||||||
* @return true if they can be
|
* @return true if they can be
|
||||||
*/
|
*/
|
||||||
boolean supportsRegions(int x, int z, PregenListener listener);
|
boolean supportsRegions(int x, int z, PregenListener listener);
|
||||||
@@ -54,10 +52,8 @@ public interface PregeneratorMethod {
|
|||||||
/**
|
/**
|
||||||
* Return the name of the method being used
|
* Return the name of the method being used
|
||||||
*
|
*
|
||||||
* @param x
|
* @param x the x region
|
||||||
* the x region
|
* @param z the z region
|
||||||
* @param z
|
|
||||||
* the z region
|
|
||||||
* @return the name
|
* @return the name
|
||||||
*/
|
*/
|
||||||
String getMethod(int x, int z);
|
String getMethod(int x, int z);
|
||||||
@@ -66,22 +62,17 @@ public interface PregeneratorMethod {
|
|||||||
* Called to generate a region. Execute sync, if multicore internally, wait
|
* Called to generate a region. Execute sync, if multicore internally, wait
|
||||||
* for the task to complete
|
* for the task to complete
|
||||||
*
|
*
|
||||||
* @param x
|
* @param x the x
|
||||||
* the x
|
* @param z the z
|
||||||
* @param z
|
* @param listener signal chunks generating & generated. Parallel capable.
|
||||||
* the z
|
|
||||||
* @param listener
|
|
||||||
* signal chunks generating & generated. Parallel capable.
|
|
||||||
*/
|
*/
|
||||||
void generateRegion(int x, int z, PregenListener listener);
|
void generateRegion(int x, int z, PregenListener listener);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called to generate a chunk. You can go async so long as save will wait on the threads to finish
|
* Called to generate a chunk. You can go async so long as save will wait on the threads to finish
|
||||||
*
|
*
|
||||||
* @param x
|
* @param x the x
|
||||||
* the x
|
* @param z the z
|
||||||
* @param z
|
|
||||||
* the z
|
|
||||||
*/
|
*/
|
||||||
void generateChunk(int x, int z, PregenListener listener);
|
void generateChunk(int x, int z, PregenListener listener);
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
package com.volmit.iris.core.pregenerator.methods;
|
package com.volmit.iris.core.pregenerator.methods;
|
||||||
|
|
||||||
import com.volmit.iris.Iris;
|
import com.volmit.iris.Iris;
|
||||||
import com.volmit.iris.core.IrisSettings;
|
|
||||||
import com.volmit.iris.core.pregenerator.PregenListener;
|
import com.volmit.iris.core.pregenerator.PregenListener;
|
||||||
import com.volmit.iris.core.pregenerator.PregeneratorMethod;
|
import com.volmit.iris.core.pregenerator.PregeneratorMethod;
|
||||||
import com.volmit.iris.core.tools.IrisToolbelt;
|
import com.volmit.iris.core.tools.IrisToolbelt;
|
||||||
@@ -31,6 +30,7 @@ import io.papermc.lib.PaperLib;
|
|||||||
import org.bukkit.Chunk;
|
import org.bukkit.Chunk;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.concurrent.Future;
|
import java.util.concurrent.Future;
|
||||||
|
|
||||||
public class AsyncPregenMethod implements PregeneratorMethod {
|
public class AsyncPregenMethod implements PregeneratorMethod {
|
||||||
@@ -68,18 +68,44 @@ public class AsyncPregenMethod implements PregeneratorMethod {
|
|||||||
|
|
||||||
private void completeChunk(int x, int z, PregenListener listener) {
|
private void completeChunk(int x, int z, PregenListener listener) {
|
||||||
try {
|
try {
|
||||||
PaperLib.getChunkAtAsync(world, x, z, true).get();
|
future.add(PaperLib.getChunkAtAsync(world, x, z, true).thenApply((i) -> {
|
||||||
|
if (i == null) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
listener.onChunkGenerated(x, z);
|
listener.onChunkGenerated(x, z);
|
||||||
listener.onChunkCleaned(x, z);
|
listener.onChunkCleaned(x, z);
|
||||||
|
return 0;
|
||||||
|
}));
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
J.sleep(5);
|
}
|
||||||
future.add(burst.complete(() -> completeChunk(x, z, listener)));
|
}
|
||||||
|
|
||||||
|
private void waitForChunksPartial(int maxWaiting) {
|
||||||
|
future.removeWhere(Objects::isNull);
|
||||||
|
|
||||||
|
while (future.size() > maxWaiting) {
|
||||||
|
try {
|
||||||
|
Future<?> i = future.remove(0);
|
||||||
|
|
||||||
|
if (i == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
i.get();
|
||||||
|
} catch (Throwable e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void waitForChunks() {
|
private void waitForChunks() {
|
||||||
for (Future<?> i : future.copy()) {
|
for (Future<?> i : future.copy()) {
|
||||||
|
if (i == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
i.get();
|
i.get();
|
||||||
future.remove(i);
|
future.remove(i);
|
||||||
@@ -87,6 +113,8 @@ public class AsyncPregenMethod implements PregeneratorMethod {
|
|||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
future.removeWhere(Objects::isNull);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -107,7 +135,7 @@ public class AsyncPregenMethod implements PregeneratorMethod {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void save() {
|
public void save() {
|
||||||
waitForChunks();
|
waitForChunksPartial(256);
|
||||||
unloadAndSaveAllChunks();
|
unloadAndSaveAllChunks();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -123,11 +151,10 @@ public class AsyncPregenMethod implements PregeneratorMethod {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void generateChunk(int x, int z, PregenListener listener) {
|
public void generateChunk(int x, int z, PregenListener listener) {
|
||||||
if(future.size() > IrisSettings.getThreadCount(IrisSettings.get().getConcurrency().getParallelism())) { // TODO: FIX
|
|
||||||
waitForChunks();
|
|
||||||
}
|
|
||||||
|
|
||||||
listener.onChunkGenerating(x, z);
|
listener.onChunkGenerating(x, z);
|
||||||
|
if (future.size() > 256) {
|
||||||
|
waitForChunksPartial(256);
|
||||||
|
}
|
||||||
future.add(burst.complete(() -> completeChunk(x, z, listener)));
|
future.add(burst.complete(() -> completeChunk(x, z, listener)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,17 +18,11 @@
|
|||||||
|
|
||||||
package com.volmit.iris.core.pregenerator.methods;
|
package com.volmit.iris.core.pregenerator.methods;
|
||||||
|
|
||||||
import com.volmit.iris.Iris;
|
|
||||||
import com.volmit.iris.core.IrisSettings;
|
|
||||||
import com.volmit.iris.core.pregenerator.PregenListener;
|
import com.volmit.iris.core.pregenerator.PregenListener;
|
||||||
import com.volmit.iris.core.pregenerator.PregeneratorMethod;
|
import com.volmit.iris.core.pregenerator.PregeneratorMethod;
|
||||||
import com.volmit.iris.core.tools.IrisToolbelt;
|
|
||||||
import com.volmit.iris.util.mantle.Mantle;
|
import com.volmit.iris.util.mantle.Mantle;
|
||||||
import com.volmit.iris.util.math.Position2;
|
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
|
|
||||||
public class HybridPregenMethod implements PregeneratorMethod {
|
public class HybridPregenMethod implements PregeneratorMethod {
|
||||||
private final PregeneratorMethod inWorld;
|
private final PregeneratorMethod inWorld;
|
||||||
private final World world;
|
private final World world;
|
||||||
|
|||||||
@@ -25,16 +25,7 @@ import com.volmit.iris.core.loader.IrisData;
|
|||||||
import com.volmit.iris.core.loader.IrisRegistrant;
|
import com.volmit.iris.core.loader.IrisRegistrant;
|
||||||
import com.volmit.iris.core.loader.ResourceLoader;
|
import com.volmit.iris.core.loader.ResourceLoader;
|
||||||
import com.volmit.iris.core.tools.IrisToolbelt;
|
import com.volmit.iris.core.tools.IrisToolbelt;
|
||||||
import com.volmit.iris.engine.object.IrisBiome;
|
import com.volmit.iris.engine.object.*;
|
||||||
import com.volmit.iris.engine.object.IrisBlockData;
|
|
||||||
import com.volmit.iris.engine.object.IrisDimension;
|
|
||||||
import com.volmit.iris.engine.object.IrisEntity;
|
|
||||||
import com.volmit.iris.engine.object.IrisGenerator;
|
|
||||||
import com.volmit.iris.engine.object.IrisLootTable;
|
|
||||||
import com.volmit.iris.engine.object.IrisObject;
|
|
||||||
import com.volmit.iris.engine.object.IrisObjectPlacement;
|
|
||||||
import com.volmit.iris.engine.object.IrisRegion;
|
|
||||||
import com.volmit.iris.engine.object.IrisSpawner;
|
|
||||||
import com.volmit.iris.engine.object.annotations.Snippet;
|
import com.volmit.iris.engine.object.annotations.Snippet;
|
||||||
import com.volmit.iris.engine.platform.PlatformChunkGenerator;
|
import com.volmit.iris.engine.platform.PlatformChunkGenerator;
|
||||||
import com.volmit.iris.util.collection.KList;
|
import com.volmit.iris.util.collection.KList;
|
||||||
@@ -60,8 +51,7 @@ import org.bukkit.GameMode;
|
|||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.zeroturnaround.zip.ZipUtil;
|
import org.zeroturnaround.zip.ZipUtil;
|
||||||
|
|
||||||
import java.awt.Desktop;
|
import java.awt.*;
|
||||||
import java.awt.GraphicsEnvironment;
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|||||||
@@ -22,17 +22,7 @@ import com.volmit.iris.Iris;
|
|||||||
import com.volmit.iris.core.loader.IrisData;
|
import com.volmit.iris.core.loader.IrisData;
|
||||||
import com.volmit.iris.core.loader.IrisRegistrant;
|
import com.volmit.iris.core.loader.IrisRegistrant;
|
||||||
import com.volmit.iris.core.loader.ResourceLoader;
|
import com.volmit.iris.core.loader.ResourceLoader;
|
||||||
import com.volmit.iris.engine.object.annotations.ArrayType;
|
import com.volmit.iris.engine.object.annotations.*;
|
||||||
import com.volmit.iris.engine.object.annotations.Desc;
|
|
||||||
import com.volmit.iris.engine.object.annotations.MaxNumber;
|
|
||||||
import com.volmit.iris.engine.object.annotations.MinNumber;
|
|
||||||
import com.volmit.iris.engine.object.annotations.RegistryListBlockType;
|
|
||||||
import com.volmit.iris.engine.object.annotations.RegistryListFont;
|
|
||||||
import com.volmit.iris.engine.object.annotations.RegistryListItemType;
|
|
||||||
import com.volmit.iris.engine.object.annotations.RegistryListResource;
|
|
||||||
import com.volmit.iris.engine.object.annotations.RegistryListSpecialEntity;
|
|
||||||
import com.volmit.iris.engine.object.annotations.Required;
|
|
||||||
import com.volmit.iris.engine.object.annotations.Snippet;
|
|
||||||
import com.volmit.iris.util.collection.KList;
|
import com.volmit.iris.util.collection.KList;
|
||||||
import com.volmit.iris.util.collection.KMap;
|
import com.volmit.iris.util.collection.KMap;
|
||||||
import com.volmit.iris.util.data.B;
|
import com.volmit.iris.util.data.B;
|
||||||
@@ -41,7 +31,7 @@ import com.volmit.iris.util.json.JSONObject;
|
|||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
import org.bukkit.potion.PotionEffectType;
|
import org.bukkit.potion.PotionEffectType;
|
||||||
|
|
||||||
import java.awt.GraphicsEnvironment;
|
import java.awt.*;
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.lang.reflect.Modifier;
|
import java.lang.reflect.Modifier;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -52,7 +42,7 @@ public class SchemaBuilder {
|
|||||||
private static final String SYMBOL_LIMIT__N = "*";
|
private static final String SYMBOL_LIMIT__N = "*";
|
||||||
private static final String SYMBOL_TYPE__N = "";
|
private static final String SYMBOL_TYPE__N = "";
|
||||||
private static final JSONArray POTION_TYPES = getPotionTypes();
|
private static final JSONArray POTION_TYPES = getPotionTypes();
|
||||||
private static final JSONArray ENCHANT_TYPES = getEnchantmentTypes();
|
private static final JSONArray ENCHANT_TYPES = getEnchantTypes();
|
||||||
private static final JSONArray ITEM_TYPES = new JSONArray(B.getItemTypes());
|
private static final JSONArray ITEM_TYPES = new JSONArray(B.getItemTypes());
|
||||||
private static final JSONArray FONT_TYPES = new JSONArray(GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
|
private static final JSONArray FONT_TYPES = new JSONArray(GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
|
||||||
private final KMap<String, JSONObject> definitions;
|
private final KMap<String, JSONObject> definitions;
|
||||||
@@ -67,16 +57,6 @@ public class SchemaBuilder {
|
|||||||
this.root = root;
|
this.root = root;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static JSONArray getEnchantmentTypes() {
|
|
||||||
JSONArray a = new JSONArray();
|
|
||||||
|
|
||||||
for(Field gg : Enchantment.class.getDeclaredFields()) {
|
|
||||||
a.put(gg.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
return a;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static JSONArray getPotionTypes() {
|
private static JSONArray getPotionTypes() {
|
||||||
JSONArray a = new JSONArray();
|
JSONArray a = new JSONArray();
|
||||||
|
|
||||||
@@ -87,6 +67,14 @@ public class SchemaBuilder {
|
|||||||
return a;
|
return a;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static JSONArray getEnchantTypes() {
|
||||||
|
JSONArray array = new JSONArray();
|
||||||
|
for (Enchantment e : Enchantment.values()) {
|
||||||
|
array.put(e.getKey().getKey());
|
||||||
|
}
|
||||||
|
return array;
|
||||||
|
}
|
||||||
|
|
||||||
public JSONObject construct() {
|
public JSONObject construct() {
|
||||||
JSONObject schema = new JSONObject();
|
JSONObject schema = new JSONObject();
|
||||||
schema.put("$schema", "http://json-schema.org/draft-07/schema#");
|
schema.put("$schema", "http://json-schema.org/draft-07/schema#");
|
||||||
@@ -309,7 +297,7 @@ public class SchemaBuilder {
|
|||||||
prop.put("$ref", "#/definitions/" + key);
|
prop.put("$ref", "#/definitions/" + key);
|
||||||
description.add(SYMBOL_TYPE__N + " Must be a valid Font Family (use ctrl+space for auto complete!)");
|
description.add(SYMBOL_TYPE__N + " Must be a valid Font Family (use ctrl+space for auto complete!)");
|
||||||
|
|
||||||
} else if(k.getType().equals(Enchantment.class)) {
|
} else if (k.isAnnotationPresent(RegistryListEnchantment.class)) {
|
||||||
String key = "enum-enchantment";
|
String key = "enum-enchantment";
|
||||||
|
|
||||||
if (!definitions.containsKey(key)) {
|
if (!definitions.containsKey(key)) {
|
||||||
@@ -483,7 +471,7 @@ public class SchemaBuilder {
|
|||||||
items.put("$ref", "#/definitions/" + key);
|
items.put("$ref", "#/definitions/" + key);
|
||||||
prop.put("items", items);
|
prop.put("items", items);
|
||||||
description.add(SYMBOL_TYPE__N + " Must be a valid Font Family (use ctrl+space for auto complete!)");
|
description.add(SYMBOL_TYPE__N + " Must be a valid Font Family (use ctrl+space for auto complete!)");
|
||||||
} else if(t.type().equals(Enchantment.class)) {
|
} else if (k.isAnnotationPresent(RegistryListEnchantment.class)) {
|
||||||
fancyType = "List of Enchantment Types";
|
fancyType = "List of Enchantment Types";
|
||||||
String key = "enum-enchantment";
|
String key = "enum-enchantment";
|
||||||
|
|
||||||
@@ -552,7 +540,8 @@ public class SchemaBuilder {
|
|||||||
warnings.add("Undefined array type for field " + k.getName() + " (" + k.getType().getSimpleName() + ") in class " + cl.getSimpleName());
|
warnings.add("Undefined array type for field " + k.getName() + " (" + k.getType().getSimpleName() + ") in class " + cl.getSimpleName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
default -> warnings.add("Unexpected Schema Type: " + type + " for field " + k.getName() + " (" + k.getType().getSimpleName() + ") in class " + cl.getSimpleName());
|
default ->
|
||||||
|
warnings.add("Unexpected Schema Type: " + type + " for field " + k.getName() + " (" + k.getType().getSimpleName() + ") in class " + cl.getSimpleName());
|
||||||
}
|
}
|
||||||
|
|
||||||
KList<String> d = new KList<>();
|
KList<String> d = new KList<>();
|
||||||
|
|||||||
@@ -38,8 +38,8 @@ import java.util.concurrent.CompletableFuture;
|
|||||||
|
|
||||||
public class CommandSVC implements IrisService, DecreeSystem {
|
public class CommandSVC implements IrisService, DecreeSystem {
|
||||||
private final KMap<String, CompletableFuture<String>> futures = new KMap<>();
|
private final KMap<String, CompletableFuture<String>> futures = new KMap<>();
|
||||||
private CompletableFuture<String> consoleFuture = null;
|
|
||||||
private final transient AtomicCache<VirtualDecreeCommand> commandCache = new AtomicCache<>();
|
private final transient AtomicCache<VirtualDecreeCommand> commandCache = new AtomicCache<>();
|
||||||
|
private CompletableFuture<String> consoleFuture = null;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
|
|||||||
@@ -20,12 +20,7 @@ package com.volmit.iris.core.service;
|
|||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.volmit.iris.Iris;
|
import com.volmit.iris.Iris;
|
||||||
import com.volmit.iris.engine.object.IrisDirection;
|
import com.volmit.iris.engine.object.*;
|
||||||
import com.volmit.iris.engine.object.IrisJigsawPiece;
|
|
||||||
import com.volmit.iris.engine.object.IrisJigsawPieceConnector;
|
|
||||||
import com.volmit.iris.engine.object.IrisJigsawPool;
|
|
||||||
import com.volmit.iris.engine.object.IrisObject;
|
|
||||||
import com.volmit.iris.engine.object.IrisPosition;
|
|
||||||
import com.volmit.iris.util.collection.KList;
|
import com.volmit.iris.util.collection.KList;
|
||||||
import com.volmit.iris.util.collection.KMap;
|
import com.volmit.iris.util.collection.KMap;
|
||||||
import com.volmit.iris.util.format.Form;
|
import com.volmit.iris.util.format.Form;
|
||||||
|
|||||||
@@ -19,13 +19,27 @@
|
|||||||
package com.volmit.iris.core.service;
|
package com.volmit.iris.core.service;
|
||||||
|
|
||||||
import com.volmit.iris.core.tools.IrisToolbelt;
|
import com.volmit.iris.core.tools.IrisToolbelt;
|
||||||
|
import com.volmit.iris.engine.framework.Engine;
|
||||||
|
import com.volmit.iris.util.documentation.ChunkCoordinates;
|
||||||
|
import com.volmit.iris.util.function.Consumer4;
|
||||||
|
import com.volmit.iris.util.math.Spiraler;
|
||||||
|
import com.volmit.iris.util.matter.MatterStructurePOI;
|
||||||
import com.volmit.iris.util.plugin.IrisService;
|
import com.volmit.iris.util.plugin.IrisService;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.Sound;
|
||||||
|
import org.bukkit.SoundCategory;
|
||||||
|
import org.bukkit.craftbukkit.v1_19_R2.entity.CraftDolphin;
|
||||||
|
import org.bukkit.entity.Dolphin;
|
||||||
import org.bukkit.entity.EntityType;
|
import org.bukkit.entity.EntityType;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.player.PlayerInteractEntityEvent;
|
import org.bukkit.event.player.PlayerInteractEntityEvent;
|
||||||
|
import org.bukkit.generator.structure.StructureType;
|
||||||
|
|
||||||
|
import java.util.concurrent.atomic.AtomicReference;
|
||||||
|
|
||||||
public class DolphinSVC implements IrisService {
|
public class DolphinSVC implements IrisService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
|
|
||||||
@@ -36,10 +50,6 @@ public class DolphinSVC implements IrisService {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Prevents dolphins from being fed, to locate a treasure map.
|
|
||||||
* Note: This results in odd dolphin behaviour, but it's the best we can do.
|
|
||||||
*/
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void on(PlayerInteractEntityEvent event) {
|
public void on(PlayerInteractEntityEvent event) {
|
||||||
if (!IrisToolbelt.isIrisWorld(event.getPlayer().getWorld())) {
|
if (!IrisToolbelt.isIrisWorld(event.getPlayer().getWorld())) {
|
||||||
@@ -48,7 +58,38 @@ public class DolphinSVC implements IrisService {
|
|||||||
|
|
||||||
Material hand = event.getPlayer().getInventory().getItem(event.getHand()).getType();
|
Material hand = event.getPlayer().getInventory().getItem(event.getHand()).getType();
|
||||||
if (event.getRightClicked().getType().equals(EntityType.DOLPHIN) && (hand.equals(Material.TROPICAL_FISH) || hand.equals(Material.PUFFERFISH) || hand.equals(Material.COD) || hand.equals(Material.SALMON))) {
|
if (event.getRightClicked().getType().equals(EntityType.DOLPHIN) && (hand.equals(Material.TROPICAL_FISH) || hand.equals(Material.PUFFERFISH) || hand.equals(Material.COD) || hand.equals(Material.SALMON))) {
|
||||||
|
Engine e = IrisToolbelt.access(event.getPlayer().getWorld()).getEngine();
|
||||||
|
searchNearestTreasure(e, event.getPlayer().getLocation().getBlockX() >> 4, event.getPlayer().getLocation().getBlockZ() >> 4, e.getMantle().getRadius() - 1, StructureType.BURIED_TREASURE, (x, y, z, p) -> {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
|
Dolphin d = (Dolphin) event.getRightClicked();
|
||||||
|
CraftDolphin cd = (CraftDolphin) d;
|
||||||
|
d.getWorld().playSound(d, Sound.ENTITY_DOLPHIN_EAT, SoundCategory.NEUTRAL, 1, 1);
|
||||||
|
cd.getHandle().setTreasurePos(new BlockPos(x, y, z));
|
||||||
|
cd.getHandle().setGotFish(true);
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ChunkCoordinates
|
||||||
|
public void findTreasure(Engine engine, int chunkX, int chunkY, StructureType type, Consumer4<Integer, Integer, Integer, MatterStructurePOI> consumer) {
|
||||||
|
AtomicReference<MatterStructurePOI> ref = new AtomicReference<>();
|
||||||
|
engine.getMantle().getMantle().iterateChunk(chunkX, chunkY, MatterStructurePOI.class, ref.get() == null ? (x, y, z, d) -> {
|
||||||
|
if (d.getType().equals(type.getKey().getKey())) {
|
||||||
|
ref.set(d);
|
||||||
|
consumer.accept(x, y, z, d);
|
||||||
|
}
|
||||||
|
} : (x, y, z, d) -> {
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@ChunkCoordinates
|
||||||
|
public void searchNearestTreasure(Engine engine, int chunkX, int chunkY, int radius, StructureType type, Consumer4<Integer, Integer, Integer, MatterStructurePOI> consumer) {
|
||||||
|
AtomicReference<MatterStructurePOI> ref = new AtomicReference<>();
|
||||||
|
new Spiraler(radius * 2, radius * 2, (x, z) -> findTreasure(engine, x, z, type, ref.get() == null ? (i, d, g, a) -> {
|
||||||
|
ref.set(a);
|
||||||
|
consumer.accept(i, d, g, a);
|
||||||
|
} : (i, d, g, a) -> {
|
||||||
|
})).setOffset(chunkX, chunkY).drain();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,8 @@ public class ExternalDataSVC implements IrisService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDisable() { }
|
public void onDisable() {
|
||||||
|
}
|
||||||
|
|
||||||
public void addProvider(ExternalDataProvider... provider) {
|
public void addProvider(ExternalDataProvider... provider) {
|
||||||
for (ExternalDataProvider p : provider) {
|
for (ExternalDataProvider p : provider) {
|
||||||
|
|||||||
@@ -23,35 +23,97 @@ public class LogFilterSVC implements IrisService, Filter {
|
|||||||
((Logger) LogManager.getRootLogger()).addFilter(this);
|
((Logger) LogManager.getRootLogger()).addFilter(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void initialize() { }
|
public void initialize() {
|
||||||
public void start() { }
|
|
||||||
public void stop() { }
|
|
||||||
public void onDisable() { }
|
|
||||||
public boolean isStarted() { return true; }
|
|
||||||
public boolean isStopped() { return false; }
|
|
||||||
|
|
||||||
public State getState() {
|
|
||||||
try { return State.STARTED; }
|
|
||||||
catch (Exception var2) { return null; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Filter.Result getOnMatch() { return Result.NEUTRAL; }
|
public void start() {
|
||||||
public Filter.Result getOnMismatch() { return Result.NEUTRAL; }
|
}
|
||||||
|
|
||||||
public Result filter(LogEvent event) { return check(event.getMessage().getFormattedMessage()); }
|
public void stop() {
|
||||||
public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) { return check(msg.toString()); }
|
}
|
||||||
public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) { return check(msg.getFormattedMessage()); }
|
|
||||||
public Result filter(Logger logger, Level level, Marker marker, String message, Object... params) { return check(message); }
|
public void onDisable() {
|
||||||
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0) { return check(message); }
|
}
|
||||||
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1) { return check(message); }
|
|
||||||
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2) { return check(message); }
|
public boolean isStarted() {
|
||||||
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3) { return check(message); }
|
return true;
|
||||||
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4) { return check(message); }
|
}
|
||||||
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { return check(message); }
|
|
||||||
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { return check(message); }
|
public boolean isStopped() {
|
||||||
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { return check(message); }
|
return false;
|
||||||
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { return check(message); }
|
}
|
||||||
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { return check(message); }
|
|
||||||
|
public State getState() {
|
||||||
|
try {
|
||||||
|
return State.STARTED;
|
||||||
|
} catch (Exception var2) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Filter.Result getOnMatch() {
|
||||||
|
return Result.NEUTRAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Filter.Result getOnMismatch() {
|
||||||
|
return Result.NEUTRAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(LogEvent event) {
|
||||||
|
return check(event.getMessage().getFormattedMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) {
|
||||||
|
return check(msg.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) {
|
||||||
|
return check(msg.getFormattedMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(Logger logger, Level level, Marker marker, String message, Object... params) {
|
||||||
|
return check(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0) {
|
||||||
|
return check(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1) {
|
||||||
|
return check(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2) {
|
||||||
|
return check(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3) {
|
||||||
|
return check(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4) {
|
||||||
|
return check(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) {
|
||||||
|
return check(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) {
|
||||||
|
return check(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) {
|
||||||
|
return check(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) {
|
||||||
|
return check(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) {
|
||||||
|
return check(message);
|
||||||
|
}
|
||||||
|
|
||||||
private Result check(String string) {
|
private Result check(String string) {
|
||||||
if (FILTERS.stream().anyMatch(string::contains))
|
if (FILTERS.stream().anyMatch(string::contains))
|
||||||
|
|||||||
@@ -65,8 +65,7 @@ public class ObjectSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Reverts all the block changes provided, 200 blocks per tick
|
* Reverts all the block changes provided, 200 blocks per tick
|
||||||
*
|
*
|
||||||
* @param blocks
|
* @param blocks The blocks to remove
|
||||||
* The blocks to remove
|
|
||||||
*/
|
*/
|
||||||
private void revert(Map<Block, BlockData> blocks) {
|
private void revert(Map<Block, BlockData> blocks) {
|
||||||
int amount = 0;
|
int amount = 0;
|
||||||
|
|||||||
@@ -36,8 +36,8 @@ import java.util.stream.Collectors;
|
|||||||
public class PreservationSVC implements IrisService {
|
public class PreservationSVC implements IrisService {
|
||||||
private final List<Thread> threads = new CopyOnWriteArrayList<>();
|
private final List<Thread> threads = new CopyOnWriteArrayList<>();
|
||||||
private final List<ExecutorService> services = new CopyOnWriteArrayList<>();
|
private final List<ExecutorService> services = new CopyOnWriteArrayList<>();
|
||||||
private Looper dereferencer;
|
|
||||||
private final List<MeteredCache> caches = new CopyOnWriteArrayList<>();
|
private final List<MeteredCache> caches = new CopyOnWriteArrayList<>();
|
||||||
|
private Looper dereferencer;
|
||||||
|
|
||||||
public void register(Thread t) {
|
public void register(Thread t) {
|
||||||
threads.add(t);
|
threads.add(t);
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ public class StudioSVC implements IrisService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
J.a(() -> {
|
J.s(() -> {
|
||||||
String pack = IrisSettings.get().getGenerator().getDefaultWorldType();
|
String pack = IrisSettings.get().getGenerator().getDefaultWorldType();
|
||||||
File f = IrisPack.packsPack(pack);
|
File f = IrisPack.packsPack(pack);
|
||||||
|
|
||||||
@@ -171,7 +171,7 @@ public class StudioSVC implements IrisService {
|
|||||||
String[] nodes = url.split("\\Q/\\E");
|
String[] nodes = url.split("\\Q/\\E");
|
||||||
String repo = nodes.length == 1 ? "IrisDimensions/" + nodes[0] : nodes[0] + "/" + nodes[1];
|
String repo = nodes.length == 1 ? "IrisDimensions/" + nodes[0] : nodes[0] + "/" + nodes[1];
|
||||||
branch = nodes.length > 2 ? nodes[2] : branch;
|
branch = nodes.length > 2 ? nodes[2] : branch;
|
||||||
download(sender, repo, branch, trim, forceOverwrite);
|
download(sender, repo, branch, trim, forceOverwrite, false);
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
Iris.reportError(e);
|
Iris.reportError(e);
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
@@ -179,12 +179,22 @@ public class StudioSVC implements IrisService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void download(VolmitSender sender, String repo, String branch, boolean trim) throws JsonSyntaxException, IOException {
|
public void downloadRelease(VolmitSender sender, String url, boolean trim, boolean forceOverwrite) {
|
||||||
download(sender, repo, branch, trim, false);
|
try {
|
||||||
|
download(sender, "IrisDimensions", url, trim, forceOverwrite, true);
|
||||||
|
} catch (Throwable e) {
|
||||||
|
Iris.reportError(e);
|
||||||
|
e.printStackTrace();
|
||||||
|
sender.sendMessage("Failed to download 'IrisDimensions/overworld' from " + url + ".");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void download(VolmitSender sender, String repo, String branch, boolean trim, boolean forceOverwrite) throws JsonSyntaxException, IOException {
|
public void download(VolmitSender sender, String repo, String branch, boolean trim) throws JsonSyntaxException, IOException {
|
||||||
String url = "https://codeload.github.com/" + repo + "/zip/refs/heads/" + branch;
|
download(sender, repo, branch, trim, false, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void download(VolmitSender sender, String repo, String branch, boolean trim, boolean forceOverwrite, boolean directUrl) throws JsonSyntaxException, IOException {
|
||||||
|
String url = directUrl ? branch : "https://codeload.github.com/" + repo + "/zip/refs/heads/" + branch;
|
||||||
sender.sendMessage("Downloading " + url + " "); //The extra space stops a bug in adventure API from repeating the last letter of the URL
|
sender.sendMessage("Downloading " + url + " "); //The extra space stops a bug in adventure API from repeating the last letter of the URL
|
||||||
File zip = Iris.getNonCachedFile("pack-" + trim + "-" + repo, url);
|
File zip = Iris.getNonCachedFile("pack-" + trim + "-" + repo, url);
|
||||||
File temp = Iris.getTemp();
|
File temp = Iris.getTemp();
|
||||||
|
|||||||
@@ -22,15 +22,7 @@ import com.volmit.iris.Iris;
|
|||||||
import com.volmit.iris.core.loader.IrisData;
|
import com.volmit.iris.core.loader.IrisData;
|
||||||
import com.volmit.iris.core.tools.IrisToolbelt;
|
import com.volmit.iris.core.tools.IrisToolbelt;
|
||||||
import com.volmit.iris.engine.framework.Engine;
|
import com.volmit.iris.engine.framework.Engine;
|
||||||
import com.volmit.iris.engine.object.IObjectPlacer;
|
import com.volmit.iris.engine.object.*;
|
||||||
import com.volmit.iris.engine.object.IrisBiome;
|
|
||||||
import com.volmit.iris.engine.object.IrisDimension;
|
|
||||||
import com.volmit.iris.engine.object.IrisObject;
|
|
||||||
import com.volmit.iris.engine.object.IrisObjectPlacement;
|
|
||||||
import com.volmit.iris.engine.object.IrisRegion;
|
|
||||||
import com.volmit.iris.engine.object.IrisTreeModes;
|
|
||||||
import com.volmit.iris.engine.object.IrisTreeSize;
|
|
||||||
import com.volmit.iris.engine.object.TileData;
|
|
||||||
import com.volmit.iris.engine.platform.PlatformChunkGenerator;
|
import com.volmit.iris.engine.platform.PlatformChunkGenerator;
|
||||||
import com.volmit.iris.util.collection.KList;
|
import com.volmit.iris.util.collection.KList;
|
||||||
import com.volmit.iris.util.collection.KMap;
|
import com.volmit.iris.util.collection.KMap;
|
||||||
@@ -39,12 +31,7 @@ import com.volmit.iris.util.math.BlockPosition;
|
|||||||
import com.volmit.iris.util.math.RNG;
|
import com.volmit.iris.util.math.RNG;
|
||||||
import com.volmit.iris.util.plugin.IrisService;
|
import com.volmit.iris.util.plugin.IrisService;
|
||||||
import com.volmit.iris.util.scheduling.J;
|
import com.volmit.iris.util.scheduling.J;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.*;
|
||||||
import org.bukkit.HeightMap;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.TreeType;
|
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.BlockState;
|
import org.bukkit.block.BlockState;
|
||||||
import org.bukkit.block.TileState;
|
import org.bukkit.block.TileState;
|
||||||
@@ -79,8 +66,7 @@ public class TreeSVC implements IrisService {
|
|||||||
* <br>4. Check biome, region and dimension for overrides for that sapling type -> Found -> use</br>
|
* <br>4. Check biome, region and dimension for overrides for that sapling type -> Found -> use</br>
|
||||||
* <br>5. Exit if none are found, cancel event if one or more are.</br>
|
* <br>5. Exit if none are found, cancel event if one or more are.</br>
|
||||||
*
|
*
|
||||||
* @param event
|
* @param event Checks the given event for sapling overrides
|
||||||
* Checks the given event for sapling overrides
|
|
||||||
*/
|
*/
|
||||||
@EventHandler(priority = EventPriority.HIGHEST)
|
@EventHandler(priority = EventPriority.HIGHEST)
|
||||||
public void on(StructureGrowEvent event) {
|
public void on(StructureGrowEvent event) {
|
||||||
@@ -242,14 +228,10 @@ public class TreeSVC implements IrisService {
|
|||||||
* Finds a single object placement (which may contain more than one object) for the requirements species, location &
|
* Finds a single object placement (which may contain more than one object) for the requirements species, location &
|
||||||
* size
|
* size
|
||||||
*
|
*
|
||||||
* @param worldAccess
|
* @param worldAccess The world to access (check for biome, region, dimension, etc)
|
||||||
* The world to access (check for biome, region, dimension, etc)
|
* @param location The location of the growth event (For biome/region finding)
|
||||||
* @param location
|
* @param type The bukkit TreeType to match
|
||||||
* The location of the growth event (For biome/region finding)
|
* @param size The size of the sapling area
|
||||||
* @param type
|
|
||||||
* The bukkit TreeType to match
|
|
||||||
* @param size
|
|
||||||
* The size of the sapling area
|
|
||||||
* @return An object placement which contains the matched tree, or null if none were found / it's disabled.
|
* @return An object placement which contains the matched tree, or null if none were found / it's disabled.
|
||||||
*/
|
*/
|
||||||
private IrisObjectPlacement getObjectPlacement(PlatformChunkGenerator worldAccess, Location location, TreeType type, IrisTreeSize size) {
|
private IrisObjectPlacement getObjectPlacement(PlatformChunkGenerator worldAccess, Location location, TreeType type, IrisTreeSize size) {
|
||||||
@@ -274,12 +256,9 @@ public class TreeSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Filters out mismatches and returns matches
|
* Filters out mismatches and returns matches
|
||||||
*
|
*
|
||||||
* @param objects
|
* @param objects The object placements to check
|
||||||
* The object placements to check
|
* @param size The size of the sapling area to filter with
|
||||||
* @param size
|
* @param type The type of the tree to filter with
|
||||||
* The size of the sapling area to filter with
|
|
||||||
* @param type
|
|
||||||
* The type of the tree to filter with
|
|
||||||
* @return A list of objectPlacements that matched. May be empty.
|
* @return A list of objectPlacements that matched. May be empty.
|
||||||
*/
|
*/
|
||||||
private KList<IrisObjectPlacement> matchObjectPlacements(KList<IrisObjectPlacement> objects, IrisTreeSize size, TreeType type) {
|
private KList<IrisObjectPlacement> matchObjectPlacements(KList<IrisObjectPlacement> objects, IrisTreeSize size, TreeType type) {
|
||||||
@@ -298,12 +277,9 @@ public class TreeSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Get the Cuboid of sapling sizes at a location & blockData predicate
|
* Get the Cuboid of sapling sizes at a location & blockData predicate
|
||||||
*
|
*
|
||||||
* @param at
|
* @param at this location
|
||||||
* this location
|
* @param valid with this blockData predicate
|
||||||
* @param valid
|
* @param world the world to check in
|
||||||
* with this blockData predicate
|
|
||||||
* @param world
|
|
||||||
* the world to check in
|
|
||||||
* @return A cuboid containing only saplings
|
* @return A cuboid containing only saplings
|
||||||
*/
|
*/
|
||||||
public Cuboid getSaplings(Location at, Predicate<BlockData> valid, World world) {
|
public Cuboid getSaplings(Location at, Predicate<BlockData> valid, World world) {
|
||||||
@@ -355,14 +331,10 @@ public class TreeSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Grows the blockPosition list by means of checking neighbours in
|
* Grows the blockPosition list by means of checking neighbours in
|
||||||
*
|
*
|
||||||
* @param world
|
* @param world the world to check in
|
||||||
* the world to check in
|
* @param center the location of this position
|
||||||
* @param center
|
* @param valid validation on blockData to check block with
|
||||||
* the location of this position
|
* @param l list of block positions to add new neighbors too
|
||||||
* @param valid
|
|
||||||
* validation on blockData to check block with
|
|
||||||
* @param l
|
|
||||||
* list of block positions to add new neighbors too
|
|
||||||
*/
|
*/
|
||||||
private void grow(World world, BlockPosition center, Predicate<BlockData> valid, KList<BlockPosition> l) {
|
private void grow(World world, BlockPosition center, Predicate<BlockData> valid, KList<BlockPosition> l) {
|
||||||
// Make sure size is less than 50, the block to check isn't already in, and make sure the blockData still matches
|
// Make sure size is less than 50, the block to check isn't already in, and make sure the blockData still matches
|
||||||
|
|||||||
@@ -21,17 +21,13 @@ package com.volmit.iris.core.service;
|
|||||||
import com.volmit.iris.Iris;
|
import com.volmit.iris.Iris;
|
||||||
import com.volmit.iris.core.tools.IrisToolbelt;
|
import com.volmit.iris.core.tools.IrisToolbelt;
|
||||||
import com.volmit.iris.engine.object.IrisDimension;
|
import com.volmit.iris.engine.object.IrisDimension;
|
||||||
import com.volmit.iris.engine.object.IrisVillagerOverride;
|
|
||||||
import com.volmit.iris.engine.object.IrisVillagerTrade;
|
|
||||||
import com.volmit.iris.util.format.C;
|
import com.volmit.iris.util.format.C;
|
||||||
import com.volmit.iris.util.plugin.IrisService;
|
import com.volmit.iris.util.plugin.IrisService;
|
||||||
import com.volmit.iris.util.plugin.VolmitSender;
|
import com.volmit.iris.util.plugin.VolmitSender;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.entity.Villager;
|
import org.bukkit.entity.Villager;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.entity.VillagerAcquireTradeEvent;
|
|
||||||
import org.bukkit.event.entity.VillagerCareerChangeEvent;
|
import org.bukkit.event.entity.VillagerCareerChangeEvent;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|||||||
@@ -33,11 +33,7 @@ import com.volmit.iris.util.matter.WorldMatter;
|
|||||||
import com.volmit.iris.util.plugin.IrisService;
|
import com.volmit.iris.util.plugin.IrisService;
|
||||||
import com.volmit.iris.util.plugin.VolmitSender;
|
import com.volmit.iris.util.plugin.VolmitSender;
|
||||||
import com.volmit.iris.util.scheduling.J;
|
import com.volmit.iris.util.scheduling.J;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.*;
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.Particle;
|
|
||||||
import org.bukkit.Sound;
|
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@@ -66,8 +62,7 @@ public class WandSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Creates an Iris Object from the 2 coordinates selected with a wand
|
* Creates an Iris Object from the 2 coordinates selected with a wand
|
||||||
*
|
*
|
||||||
* @param p
|
* @param p The wand player
|
||||||
* The wand player
|
|
||||||
* @return The new object
|
* @return The new object
|
||||||
*/
|
*/
|
||||||
public static IrisObject createSchematic(Player p) {
|
public static IrisObject createSchematic(Player p) {
|
||||||
@@ -122,8 +117,7 @@ public class WandSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Converts a user friendly location string to an actual Location
|
* Converts a user friendly location string to an actual Location
|
||||||
*
|
*
|
||||||
* @param s
|
* @param s The string
|
||||||
* The string
|
|
||||||
* @return The location
|
* @return The location
|
||||||
*/
|
*/
|
||||||
public static Location stringToLocation(String s) {
|
public static Location stringToLocation(String s) {
|
||||||
@@ -140,8 +134,7 @@ public class WandSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Get a user friendly string of a location
|
* Get a user friendly string of a location
|
||||||
*
|
*
|
||||||
* @param loc
|
* @param loc The location
|
||||||
* The location
|
|
||||||
* @return The string
|
* @return The string
|
||||||
*/
|
*/
|
||||||
public static String locationToString(Location loc) {
|
public static String locationToString(Location loc) {
|
||||||
@@ -182,8 +175,7 @@ public class WandSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Finds an existing wand in a users inventory
|
* Finds an existing wand in a users inventory
|
||||||
*
|
*
|
||||||
* @param inventory
|
* @param inventory The inventory to search
|
||||||
* The inventory to search
|
|
||||||
* @return The slot number the wand is in. Or -1 if none are found
|
* @return The slot number the wand is in. Or -1 if none are found
|
||||||
*/
|
*/
|
||||||
public static int findWand(Inventory inventory) {
|
public static int findWand(Inventory inventory) {
|
||||||
@@ -207,10 +199,8 @@ public class WandSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Creates an Iris wand. The locations should be the currently selected locations, or null
|
* Creates an Iris wand. The locations should be the currently selected locations, or null
|
||||||
*
|
*
|
||||||
* @param a
|
* @param a Location A
|
||||||
* Location A
|
* @param b Location B
|
||||||
* @param b
|
|
||||||
* Location B
|
|
||||||
* @return A new wand
|
* @return A new wand
|
||||||
*/
|
*/
|
||||||
public static ItemStack createWand(Location a, Location b) {
|
public static ItemStack createWand(Location a, Location b) {
|
||||||
@@ -232,15 +222,13 @@ public class WandSVC implements IrisService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Location[] getCuboid(Player p) {
|
public static Location[] getCuboid(Player p) {
|
||||||
if(isHoldingIrisWand(p))
|
if (isHoldingIrisWand(p)) {
|
||||||
{
|
|
||||||
return getCuboidFromItem(p.getInventory().getItemInMainHand());
|
return getCuboidFromItem(p.getInventory().getItemInMainHand());
|
||||||
}
|
}
|
||||||
|
|
||||||
Cuboid c = WorldEditLink.getSelection(p);
|
Cuboid c = WorldEditLink.getSelection(p);
|
||||||
|
|
||||||
if(c != null)
|
if (c != null) {
|
||||||
{
|
|
||||||
return new Location[]{c.getLowerNE(), c.getUpperSW()};
|
return new Location[]{c.getLowerNE(), c.getUpperSW()};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -259,8 +247,7 @@ public class WandSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Is the itemstack passed an Iris wand
|
* Is the itemstack passed an Iris wand
|
||||||
*
|
*
|
||||||
* @param is
|
* @param is The itemstack
|
||||||
* The itemstack
|
|
||||||
* @return True if it is
|
* @return True if it is
|
||||||
*/
|
*/
|
||||||
public static boolean isWand(ItemStack is) {
|
public static boolean isWand(ItemStack is) {
|
||||||
@@ -307,10 +294,8 @@ public class WandSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Draw the outline of a selected region
|
* Draw the outline of a selected region
|
||||||
*
|
*
|
||||||
* @param d
|
* @param d The cuboid
|
||||||
* The cuboid
|
* @param p The player to show it to
|
||||||
* @param p
|
|
||||||
* The player to show it to
|
|
||||||
*/
|
*/
|
||||||
public void draw(Cuboid d, Player p) {
|
public void draw(Cuboid d, Player p) {
|
||||||
draw(new Location[]{d.getLowerNE(), d.getUpperSW()}, p);
|
draw(new Location[]{d.getLowerNE(), d.getUpperSW()}, p);
|
||||||
@@ -319,10 +304,8 @@ public class WandSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Draw the outline of a selected region
|
* Draw the outline of a selected region
|
||||||
*
|
*
|
||||||
* @param d
|
* @param d A pair of locations
|
||||||
* A pair of locations
|
* @param p The player to show them to
|
||||||
* @param p
|
|
||||||
* The player to show them to
|
|
||||||
*/
|
*/
|
||||||
public void draw(Location[] d, Player p) {
|
public void draw(Location[] d, Player p) {
|
||||||
Vector gx = Vector.getRandom().subtract(Vector.getRandom()).normalize().clone().multiply(0.65);
|
Vector gx = Vector.getRandom().subtract(Vector.getRandom()).normalize().clone().multiply(0.65);
|
||||||
@@ -427,8 +410,7 @@ public class WandSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Is the player holding Dust?
|
* Is the player holding Dust?
|
||||||
*
|
*
|
||||||
* @param p
|
* @param p The player
|
||||||
* The player
|
|
||||||
* @return True if they are
|
* @return True if they are
|
||||||
*/
|
*/
|
||||||
public boolean isHoldingDust(Player p) {
|
public boolean isHoldingDust(Player p) {
|
||||||
@@ -439,8 +421,7 @@ public class WandSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Is the itemstack passed Iris dust?
|
* Is the itemstack passed Iris dust?
|
||||||
*
|
*
|
||||||
* @param is
|
* @param is The itemstack
|
||||||
* The itemstack
|
|
||||||
* @return True if it is
|
* @return True if it is
|
||||||
*/
|
*/
|
||||||
public boolean isDust(ItemStack is) {
|
public boolean isDust(ItemStack is) {
|
||||||
@@ -450,12 +431,9 @@ public class WandSVC implements IrisService {
|
|||||||
/**
|
/**
|
||||||
* Update the location on an Iris wand
|
* Update the location on an Iris wand
|
||||||
*
|
*
|
||||||
* @param left
|
* @param left True for first location, false for second
|
||||||
* True for first location, false for second
|
* @param a The location
|
||||||
* @param a
|
* @param item The wand
|
||||||
* The location
|
|
||||||
* @param item
|
|
||||||
* The wand
|
|
||||||
* @return The updated wand
|
* @return The updated wand
|
||||||
*/
|
*/
|
||||||
public ItemStack update(boolean left, Location a, ItemStack item) {
|
public ItemStack update(boolean left, Location a, ItemStack item) {
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user