Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Registry system and license change #29

Draft
wants to merge 39 commits into
base: ver/1.0
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
4bd5178
feat: basic registry objects
Codestech1 Aug 13, 2024
ebf7efc
feat: registry registering
Codestech1 Aug 15, 2024
b8055b8
chore: add safer entry registering
Codestech1 Aug 15, 2024
418724c
feat: biomes
Codestech1 Aug 15, 2024
ebb177a
chore: send registry packets to players
Codestech1 Aug 15, 2024
4c6ca82
feat: biome registry encoding
Codestech1 Aug 18, 2024
af4c421
chore: optimize imports
Codestech1 Aug 18, 2024
f405c26
chore: apply updates from jet data
Codestech1 Sep 2, 2024
14848ca
chore: apply updates from jet data
Codestech1 Sep 2, 2024
6edd62f
feat: dimension type registry
Codestech1 Sep 4, 2024
e989a32
feat: painting variant registry
Codestech1 Sep 5, 2024
94f6010
feat: banner pattern registry
Codestech1 Sep 5, 2024
f80382c
chore: repackage registry binary tag codecs
Codestech1 Sep 5, 2024
7dacf47
feat: armor trim material registry
Codestech1 Sep 5, 2024
73d568f
feat: armor trim pattern registry
Codestech1 Sep 5, 2024
509a627
feat: WIP chat decorations (i'm distro hopping, again)
Codestech1 Sep 7, 2024
707799b
feat: chat type registry
Codestech1 Sep 13, 2024
c5e6632
feat: damage type registry
Codestech1 Sep 13, 2024
0b10136
feat: wolf variant registry
Codestech1 Sep 14, 2024
e69cf43
chore: fix compilation
Codestech1 Sep 14, 2024
9c990d0
fix: invalid asset id field
Codestech1 Sep 14, 2024
ff81d92
chore: cleanup
Codestech1 Sep 14, 2024
bca2025
fix: asset name is serialized as a key instead of a key value
Codestech1 Sep 15, 2024
6f85ac7
chore: bump gradle wrapper version
Codestech1 Sep 11, 2024
adb31b6
feat: data pack handling
Codestech1 Oct 5, 2024
5f369be
chore: skip data from data packs that are not enabled
Codestech1 Oct 5, 2024
04c5e55
feat: better data pack handling
Codestech1 Oct 5, 2024
33459e9
chore: bump jet data
Codestech1 Oct 12, 2024
9ad210e
feat: 1.21.2-pre3 protocol
Codestech1 Oct 12, 2024
b4fafd7
feat: first join with new registry system on 1.21.2-pre3
Codestech1 Oct 13, 2024
1cfb394
feat: block registry
Codestech1 Oct 14, 2024
f5d3ab0
chore: bump Jet data
Codestech1 Oct 14, 2024
0703524
GPL -> AGPL
Codestech1 Oct 16, 2024
4a5e53e
Update README to follow the new license
Codestech1 Oct 16, 2024
bed3872
chore: bump Jet data
Codestech1 Oct 19, 2024
58d74a9
feat: acquisition api
Codestech1 Oct 26, 2024
f186f68
feat: new, safe session system (finally)
Codestech1 Nov 12, 2024
27745c4
feat: map acquisitions
Codestech1 Nov 12, 2024
6d46c2a
feat: tag updating
Codestech1 Nov 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 68 additions & 81 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007

Copyright (C) 2007 Free Software Foundation, Inc. <https://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 GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.

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
our General Public Licenses are 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.
software for all its users.

When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
Expand All @@ -26,44 +24,34 @@ 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.
Developers that use our General Public Licenses protect your rights
with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.

A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.

The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.

An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing under
this license.

The precise terms and conditions for copying, distribution and
modification follow.
Expand All @@ -72,7 +60,7 @@ modification follow.

0. Definitions.

"This License" refers to version 3 of the GNU General Public License.
"This License" refers to version 3 of the GNU Affero General Public License.

"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
Expand Down Expand Up @@ -549,35 +537,45 @@ 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.
13. Remote Network Interaction; Use with the GNU General Public License.

Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your version
supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
following paragraph.

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
under version 3 of the GNU 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.
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.

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
the GNU Affero 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
Program specifies that a certain numbered version of the GNU Affero 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
GNU Affero 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
versions of the GNU Affero 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.

Expand Down Expand Up @@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
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
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.

You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://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".
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.

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
For more information on this, and how to apply and follow the GNU AGPL, see
<https://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
<https://www.gnu.org/licenses/why-not-lgpl.html>.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,6 @@ You can contribute to Jet easily by creating pull requests, without any other ne
To not waste your time, make sure to join our [Discord server](https://discord.com/invite/kS4CuPvYD2) and ask if your contribution would be merged or not. You can also make that via an issue, however it may take longer to get a response.

## License
All Jet components (except of API) are licensed under a GPL 3.0 license. However, the API is licensed under a MIT license to allow plugins to be done like their authors want.
All Jet components (except of API) are licensed under an AGPL 3.0 license.

License of the API however is a MIT license, allowing plugins freedom of licensing or even being close-sourced.
26 changes: 13 additions & 13 deletions api/src/main/java/net/hypejet/jet/MinecraftServer.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package net.hypejet.jet;

import net.hypejet.jet.acquisition.Acquisition;
import net.hypejet.jet.command.CommandManager;
import net.hypejet.jet.configuration.ServerConfiguration;
import net.hypejet.jet.entity.player.Player;
import net.hypejet.jet.event.node.EventNode;
import net.hypejet.jet.plugin.PluginManager;
import net.hypejet.jet.protocol.ProtocolState;
import net.hypejet.jet.registry.RegistryManager;
import net.hypejet.jet.world.WorldManager;
import org.checkerframework.checker.nullness.qual.NonNull;

Expand Down Expand Up @@ -69,25 +71,15 @@ public interface MinecraftServer {
void shutdown();

/**
* Gets all players, which are connected to the server.
* Creates {@linkplain Acquisition an acquisition} of all players, which are connected to the server.
*
* <p>Note that all players are returned, even those, which are not in {@linkplain ProtocolState#PLAY play
* protocol state} yet.</p>
*
* @return the players
* @return the acquisition
* @since 1.0
*/
@NonNull Collection<Player> players();

/**
* Gets all players, which are connected to the server and are in a {@linkplain ProtocolState protocol state}
* specified.
*
* @param state the protocol state
* @return the players
* @since 1.0
*/
@NonNull Collection<Player> players(@NonNull ProtocolState state);
@NonNull Acquisition<? extends Collection<? extends Player>> players();

/**
* Gets a {@linkplain WorldManager world manager} of the server.
Expand All @@ -112,4 +104,12 @@ public interface MinecraftServer {
* @since 1.0
*/
@NonNull PluginManager pluginManager();

/**
* Gets a {@linkplain RegistryManager registry manager} of the server.
*
* @return the registry manager
* @since 1.0
*/
@NonNull RegistryManager registryManager();
}
44 changes: 44 additions & 0 deletions api/src/main/java/net/hypejet/jet/acquisition/Acquisition.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package net.hypejet.jet.acquisition;

import org.checkerframework.checker.nullness.qual.NonNull;

/**
* Represents an acquisition of a {@linkplain java.util.concurrent.locks.Lock lock}. Acquisitions allow getting
* and values guarded by their locks safely in multithreaded environments.
*
* <p>{@linkplain #close()} A close method} should be called when the value was consumed and the work using it
* has finished.</p>
*
* @param <V> a type of the value
* @since 0
* @author Codestech
*/
public interface Acquisition<V> extends AutoCloseable {
/**
* Gets the value.
*
* @return the value
* @since 1.0
* @throws IllegalStateException if the acquisition has been already unlocked
* @throws IllegalArgumentException if the caller thread does not own the acquisition
*/
@NonNull V get();

/**
* Gets whether the {@linkplain Acquisition acquisition} has been unlocked.
*
* @return {@code true} if the acquisition has been unlocked, {@code false} otherwise
* @since 1.0
* @throws IllegalArgumentException if the caller thread does not own the acquisition
*/
boolean isUnlocked();

/**
* Unlocks the {@linkplain Acquisition acquisition}, does nothing if the acquisition has been already unlocked.
*
* @since 1.0
* @throws IllegalArgumentException if the caller thread does not own the acquisition
*/
@Override
void close();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package net.hypejet.jet.acquisition;

import org.checkerframework.checker.nullness.qual.NonNull;

/**
* Represents {@linkplain Acquisition an acquisition} whose value can be set.
*
* @param <V> a type of the value
* @since 1.0
* @author Codestech
*/
public interface MutableAcquisition<V> extends Acquisition<V> {
/**
* Sets the value.
*
* @param value the value
* @since 1.0
* @throws IllegalStateException if the acquisition has been already unlocked
* @throws IllegalArgumentException if the caller thread does not own the acquisition
*/
void set(@NonNull V value);
}
Loading