Compare commits

...
This repository has been archived on 2024-10-31. You can view files and clone it, but you cannot make any changes to it's state, such as pushing and creating new issues, pull requests or comments.

86 commits
main ... 1.20.1

Author SHA1 Message Date
c3e2cc23c1 Do not crash when no DB is present. 2024-06-18 15:03:57 -07:00
1ad275a970 Adds sanity checks 2024-06-18 14:45:41 -07:00
a85c032253 Fix a typo 2024-04-30 15:34:34 -07:00
aa9f0c5235 Go back and revise the database migrations. Breaking change 2024-04-30 15:31:53 -07:00
0d735ec2e8 Fix a exception being thrown and crashing the server 2024-04-30 15:24:29 -07:00
bd15d1f244 Produce a test build to attempt to fix database not being properly set 2024-04-30 15:13:01 -07:00
58a732782d Handle the redstone property different 2024-04-30 04:04:48 -07:00
65a21bcefc Add another helper method for redstone 2024-04-30 03:13:19 -07:00
29245e45cf Attempt to fix the Redstone block implementation 2024-04-30 02:47:50 -07:00
7bbafe58fe Update restore queue uploader 2024-04-30 01:41:19 -07:00
6ac212a0b7 Update class visibility 2024-04-26 11:15:49 -07:00
ee74638b9f Update input power blockstate in prototype class 2024-04-26 06:35:24 -07:00
a747846585 Add a redstone prototype for making blocks that use redstone 2024-04-26 06:34:38 -07:00
840fa0a157 Moves commonly used block prototypes into the library 2024-04-26 05:48:00 -07:00
b6987978d1 Clients were still not being notified of block changes 2024-04-25 05:28:11 -07:00
dd592ebe88 Fix clients not being notified of block restores 2024-04-25 05:11:05 -07:00
c6e6ed9ffe Switch the block queue to cache blocks locally, then upload, to reduce lag when snapshotting. 2024-04-25 04:10:53 -07:00
c19e971e92 Restore blocks until correct block has been restored and verified 2024-04-25 03:39:29 -07:00
0dcf38ce2a Fix the block queue not setting the hasBlocks flag to false 2024-04-25 03:21:32 -07:00
4bf127bc14 Adds some Tag helper functions 2024-04-25 02:30:31 -07:00
aa6cb0e367 Add some more sanity checks to cut down on database query spam 2024-04-25 02:15:31 -07:00
f54faa6f9e Fix restore runner being executed too frequently 2024-04-25 02:01:43 -07:00
5af11674cd Prevent null exceptions. Check if no more blocks. 2024-04-25 00:39:12 -07:00
05e6fb1e29 Queue runner was not running when in database mode 2024-04-25 00:24:02 -07:00
995e78dec8 Don't crash the server when duplicate block at position 2024-04-24 23:53:43 -07:00
ab6f9130f0 Fix the blocks table index 2024-04-24 04:15:31 -07:00
43a1a44a8f Add a new migration to the blocks table 2024-04-24 03:40:23 -07:00
0e4d9a832a Fix class visibility 2024-04-24 03:07:26 -07:00
62baeb3e15 Set the version on the existing migrations 2024-04-24 03:06:49 -07:00
5895772c58 Remove the reverse list instruction 2024-04-24 02:17:18 -07:00
e0545ce9af Update indexes for the prepared statement 2024-04-24 01:27:12 -07:00
4fefc79f5f Migrations were not being properly updated 2024-04-24 00:46:08 -07:00
e7f289d709 Add a sanity check for migrations, only execute when migration is newer than current table 2024-04-24 00:19:41 -07:00
b534287c51 Attempt to fix database not being set 2024-04-23 23:48:28 -07:00
a3d4ae321e Fix null errors related to Migrations 2024-04-23 23:40:54 -07:00
965bea2982 Fix libzontreck's packets not being functional 2024-04-23 23:29:50 -07:00
f039eb2abf Again... try to fix null config sections 2024-04-23 22:53:07 -07:00
09426dc0b4 Database config was null and not loading properly 2024-04-23 22:40:21 -07:00
fe383b2973 Settings file was not being initialized 2024-04-23 22:24:41 -07:00
378f44b769 Fix a crash 2024-04-23 22:02:28 -07:00
1275ff422f Add missing NBT entry in the server config 2024-04-23 20:51:16 -07:00
b91ce4e912 Add some missing calls in restore queue with database addition 2024-04-23 20:25:52 -07:00
c8fc5f4c81 Finish implementation 1 of Block Snapshotting 2024-04-23 18:39:02 -07:00
40ce8774fb More implementation of the block restore queue functionality 2024-04-23 15:40:43 -07:00
b20e56a7d8 Fix compile error 2024-04-12 08:33:26 -07:00
a9885635c1 Remove old events that are not used anymore 2024-04-12 08:32:32 -07:00
20a756277d Bump version. Add event for restore queue registration 2024-04-12 08:28:40 -07:00
25aa4b2f9d Bump version number and push to build server to get a test version 2024-04-12 07:52:46 -07:00
7d924f7740 LZ-#17 - Finish initial implementation 2024-04-12 07:52:00 -07:00
059055044d Last commit for the night. Hook up some more components of the snapshotting system 2024-04-11 03:15:51 -07:00
7472db98d5 Adds the block restore code to the Runner 2024-04-11 03:11:55 -07:00
01f269e123 #17: Start implementing more of the block restore and queue systems. 2024-04-11 03:04:26 -07:00
c03261fd7a LZ-17: Add initial block restore queue registry, and a registration event 2024-04-11 01:21:13 -07:00
3302ab14b8 Start to add in a block queue system to allow my other mods to have separate queues for different things. 2024-04-11 00:47:31 -07:00
99e38893ca Do more work on implementing a new saved block system 2024-04-09 14:23:03 -07:00
4247ae6246 Push current work 2024-04-09 13:22:41 -07:00
06cbd4fbf5 Bump build number 2024-04-07 19:52:03 -07:00
a4da2bb52b Add some more utility functions 2024-04-07 19:50:32 -07:00
ed9d9bd249 Fix compile errors 2024-04-07 16:01:28 -07:00
d86dace503 Bump version num to next major API 2024-04-07 15:53:49 -07:00
81286767f4 Migrate vectors to a dedicated API interface 2024-04-07 15:53:04 -07:00
0f01475ec3 Update bundled LibAC 2024-04-01 02:32:16 -07:00
f0fa9fbcbd Bump version 2024-04-01 02:29:13 -07:00
a4e3ef44ed Add two variations of a read only item stack handler for input and output 2024-04-01 02:28:29 -07:00
c82c15f48b Remove poss from credits. Add Ember 2024-04-01 02:28:10 -07:00
5214d31d21 Adopt and update functions from an abandoned library 2024-02-27 16:06:12 -07:00
d9113f357c Update libac, deprecate delayed executor 2024-02-18 10:00:56 -07:00
d68fa58bf9 Bundle libac patch 2024-02-18 09:26:08 -07:00
0cfede6187 oops, forgot to add getters 2024-02-18 08:38:47 -07:00
b47d24c8b2 Bump version 2024-02-18 08:34:50 -07:00
3c58a662ca Add a new event for requesting/handling teleports 2024-02-18 08:34:06 -07:00
dc99713d30 Patch libac and bump libzontreck version 2024-02-18 04:09:43 -07:00
86d1e7a26a Update the bundled libac 2024-02-16 15:38:14 -07:00
fc430f1e11 Bump libac version, and change the version numbering scheme to an adapted semver. : mcver.revision.date.time 2024-02-16 15:05:30 -07:00
c5472aef68 Remove a credits entry 2024-02-15 17:08:09 -07:00
112e0d39d1 Bump version 2024-02-14 17:59:37 -07:00
ee8f7386ee Fix mods.toml not being compiled into the jar 2024-02-14 17:15:13 -07:00
aec2a22a5a Reupdate mods.toml - it isnt in the output 2024-02-14 15:24:21 -07:00
da7bc47e29 Update the build, something went wrong? 2024-02-14 15:17:41 -07:00
a488e0671f Fix compile errors 2024-02-14 04:34:49 -07:00
6b90951ab2 Remove eventbus dependency 2024-02-14 04:31:25 -07:00
f9b221f5e7 Update the mappings 2024-02-14 04:02:26 -07:00
e5ef571346 Update to neoforge 2024-02-14 02:50:56 -07:00
9c4d5ff6db Remove default forge files 2024-02-13 22:55:17 -07:00
8c9fa42619 Fix compile errors 2024-02-13 22:47:07 -07:00
c5316a2763 Fix compile errors 2024-02-13 22:45:57 -07:00
90 changed files with 10062 additions and 1210 deletions

View file

@ -1,65 +0,0 @@
Minecraft Forge: Credits/Thank You
Forge is a set of tools and modifications to the Minecraft base game code to assist
mod developers in creating new and exciting content. It has been in development for
several years now, but I would like to take this time thank a few people who have
helped it along it's way.
First, the people who originally created the Forge projects way back in Minecraft
alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance
of me taking over the project, who knows what Minecraft modding would be today.
Secondly, someone who has worked with me, and developed some of the core features
that allow modding to be as functional, and as simple as it is, cpw. For developing
FML, which stabelized the client and server modding ecosystem. As well as the base
loading system that allows us to modify Minecraft's code as elegently as possible.
Mezz, who has stepped up as the issue and pull request manager. Helping to keep me
sane as well as guiding the community into creating better additions to Forge.
Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which
I am a part}. For creating some of the core tools needed to make Minecraft modding
both possible, and as stable as can be.
On that note, here is some specific information of the MCP data we use:
* Minecraft Coder Pack (MCP) *
Forge Mod Loader and Minecraft Forge have permission to distribute and automatically
download components of MCP and distribute MCP data files. This permission is not
transitive and others wishing to redistribute the Minecraft Forge source independently
should seek permission of MCP or remove the MCP data files and request their users
to download MCP separately.
And lastly, the countless community members who have spent time submitting bug reports,
pull requests, and just helping out the community in general. Thank you.
--LexManos
=========================================================================
This is Forge Mod Loader.
You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml
This minecraft mod is a clean open source implementation of a mod loader for minecraft servers
and minecraft clients.
The code is authored by cpw.
It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
http://www.minecraftforum.net/topic/75440-
This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.
It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
http://www.minecraftforge.net/
Additionally, it contains an implementation of topological sort based on that
published at http://keithschwarz.com/interesting/code/?dir=topological-sort
It also contains code from the Maven project for performing versioned dependency
resolution. http://maven.apache.org/
It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/
with credit to it's authors.
Forge Mod Loader downloads components from the Minecraft Coder Pack
(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team.

View file

@ -1,520 +0,0 @@
Unless noted below, Minecraft Forge, Forge Mod Loader, and all
parts herein are licensed under the terms of the LGPL 2.1 found
here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and
copied below.
Homepage: http://minecraftforge.net/
https://github.com/MinecraftForge/MinecraftForge
A note on authorship:
All source artifacts are property of their original author, with
the exclusion of the contents of the patches directory and others
copied from it from time to time. Authorship of the contents of
the patches directory is retained by the Minecraft Forge project.
This is because the patches are partially machine generated
artifacts, and are changed heavily due to the way forge works.
Individual attribution within them is impossible.
Consent:
All contributions to Forge must consent to the release of any
patch content to the Forge project.
A note on infectivity:
The LGPL is chosen specifically so that projects may depend on Forge
features without being infected with its license. That is the
purpose of the LGPL. Mods and others using this code via ordinary
Java mechanics for referencing libraries are specifically not bound
by Forge's license for the Mod code.
=== MCP Data ===
This software includes data from the Minecraft Coder Pack (MCP), with kind permission
from them. The license to MCP data is not transitive - distribution of this data by
third parties requires independent licensing from the MCP team. This data is not
redistributable without permission from the MCP team.
=== Sharing ===
I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of
the minecraft modding community. All contributions to these parts should be licensed under the same additional grant.
-- Runtime patcher --
License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher
and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses)
-- ASM transformers --
License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories)
under any alternative open source license as classified by the OSI (http://opensource.org/licenses)
=========================================================================
This software includes portions from the Apache Maven project at
http://maven.apache.org/ specifically the ComparableVersion.java code. It is
included based on guidelines at
http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html
with notices intact. The only change is a non-functional change of package name.
This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating
binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/
authored by genman, heikok, pivot.
The only changes are to replace some Trove collection types with standard Java collections, and repackaged.
=========================================================================
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
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 this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.
To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights. These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that
there is no warranty for the free library. Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder. Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.
Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License. This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License. We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.
When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library. The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom. The Lesser General
Public License permits more lax criteria for linking other code with
the library.
We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License. It also provides other free software developers Less
of an advantage over competing non-free programs. These disadvantages
are the reason we use the ordinary General Public License for many
libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software. For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.
Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (1) uses at run time a
copy of the library already present on the user's computer system,
rather than copying library functions into the executable, and (2)
will operate properly with a modified version of the library, if
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
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
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser 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 Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "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
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY 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
LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS

View file

@ -2,9 +2,9 @@ plugins {
id 'eclipse'
id 'idea'
id 'maven-publish'
id 'java-library'
id 'net.minecraftforge.gradle' version '[6.0,6.2)'
id 'org.parchmentmc.librarian.forgegradle' version '1.+'
id 'net.neoforged.gradle' version '[6.0.18,6.2)'
id 'org.spongepowered.mixin' version '0.7.+'
//id 'org.parchmentmc.librarian.forgegradle' version '1.+'
}
version = mod_version
@ -23,6 +23,9 @@ java {
configurations {
provided
compile.extendsFrom(provided)
implementation.extendsFrom(provided)
runtime.extendsFrom(provided)
minecraftLibrary.extendsFrom(provided)
}
// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
@ -58,7 +61,7 @@ minecraft {
// When true, this property will add the folder name of all declared run configurations to generated IDE run configurations.
// The folder name can be set on a run configuration using the "folderName" property.
// By default, the folder name of a run configuration is the name of the Gradle project containing it.
// generateRunFolders = true
generateRunFolders = true
// This property enables access transformers for use in development.
// They will be applied to the Minecraft artifact.
@ -73,7 +76,7 @@ minecraft {
runs {
// applies to all the run configs below
configureEach {
workingDirectory project.file('run')
workingDirectory project.file("run/${it.name}")
// Recommended logging data for a userdev environment
// The markers can be added/remove as needed separated by commas.
@ -112,8 +115,8 @@ minecraft {
}
data {
// example of overriding the workingDirectory set in configureEach above
workingDirectory project.file('run-data')
// example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
// workingDirectory project.file('run-data')
// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
@ -156,16 +159,9 @@ dependencies {
// The "userdev" classifier will be requested and setup by ForgeGradle.
// If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
// then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
minecraft "net.neoforged:forge:${minecraft_version}-${neo_version}"
provided "dev.zontreck:LibAC:${libac}"
implementation "dev.zontreck:LibAC:${libac}"
minecraftLibrary "dev.zontreck:LibAC:${libac}"
provided "dev.zontreck:EventsBus:${eventsbus}"
implementation "dev.zontreck:EventsBus:${eventsbus}"
minecraftLibrary "dev.zontreck:EventsBus:${eventsbus}"
// Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
// The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
@ -187,13 +183,20 @@ dependencies {
// A missing property will result in an error. Properties are expanded using ${} Groovy notation.
// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
tasks.named('processResources', ProcessResources).configure {
tasks.withType(ProcessResources).configureEach {
var replaceProperties = [
minecraft_version : minecraft_version, minecraft_version_range: minecraft_version_range,
forge_version : forge_version, forge_version_range: forge_version_range,
minecraft_version : minecraft_version,
minecraft_version_range: minecraft_version_range,
neo_version : neo_version,
neo_version_range: neo_version_range,
loader_version_range: loader_version_range,
mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
mod_authors : mod_authors, mod_description: mod_description,
mod_id : mod_id,
mod_name: mod_name,
mod_license: mod_license,
mod_version: mod_version,
mod_authors : mod_authors,
mod_description: mod_description,
pack_format_number: pack_format_number,
]
inputs.properties replaceProperties
@ -204,10 +207,11 @@ tasks.named('processResources', ProcessResources).configure {
// Example for how to get properties into the manifest for reading at runtime.
tasks.named('jar', Jar).configure {
from {
configurations.provided.asFileTree.collect{zipTree(it)}
}
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
duplicatesStrategy = "exclude"
from { configurations.provided.collect { it.isDirectory() ? it : zipTree(it) } }
//exclude 'META-INF/*'
manifest {
attributes([

View file

@ -4,11 +4,10 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
parchment_version=2023.09.03
# parchment_version=2023.09.03
# luckperms_api_version=5.4
libac=1.4.46
eventsbus=1.0.45
libac=1.5.11
## Environment Properties
# The Minecraft version must agree with the Forge version to get a valid artifact
@ -16,12 +15,13 @@ minecraft_version=1.20.1
# The Minecraft version range can use any release version of Minecraft as bounds.
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
# as they do not follow standard versioning conventions.
minecraft_version_range=[1.20.1,1.21)
# The Forge version must agree with the Minecraft version to get a valid artifact
forge_version=47.2.0
# The Forge version range can use any version of Forge as bounds or match the loader version range
forge_version_range=[47,)
# The loader version range can only use the major version of Forge/FML as bounds
minecraft_version_range=[1.20,1.21)
# The Neo version must agree with the Minecraft version to get a valid artifact
neo_version=47.1.65
# The Neo version range can use any version of Neo as bounds or match the loader version range
neo_version_range=[47.1,)
# The loader version range can only use the major version of Neo/FML as bounds
loader_version_range=[47,)
# The mapping channel to use for mappings.
# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
@ -37,10 +37,10 @@ loader_version_range=[47,)
#
# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge.
# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started
mapping_channel=parchment
mapping_channel=official
# The mapping version to query from the mapping channel.
# This must match the format required by the mapping channel.
mapping_version=2023.09.03-1.20.1
mapping_version=1.20.1
## Mod Properties
@ -49,11 +49,11 @@ mapping_version=2023.09.03-1.20.1
# Must match the String constant located in the main mod class annotated with @Mod.
mod_id=libzontreck
# The human-readable display name for the mod.
mod_name=Zontreck Library Mod
mod_name=Zontreck's Library Mod
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=GPLv3
# The mod version. See https://semver.org/
mod_version=1.10.021324.2257
mod_version=1201.13.061824.1459
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
@ -62,3 +62,6 @@ mod_group_id=dev.zontreck
mod_authors=zontreck
# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
mod_description=LibZontreck\nLibrary Mod!
# Pack version - this changes each minecraft release, in general.
pack_format_number=15

View file

@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View file

@ -3,32 +3,39 @@ package dev.zontreck.libzontreck;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import dev.zontreck.ariaslib.util.DelayedExecutorService;
import dev.zontreck.eventsbus.Bus;
import dev.zontreck.libzontreck.chestgui.ChestGUIRegistry;
import dev.zontreck.libzontreck.config.ServerConfig;
import dev.zontreck.libzontreck.currency.Bank;
import dev.zontreck.libzontreck.currency.CurrencyHelper;
import dev.zontreck.libzontreck.events.BlockRestoreQueueRegistrationEvent;
import dev.zontreck.libzontreck.items.ModItems;
import dev.zontreck.libzontreck.memory.world.BlockRestoreQueue;
import dev.zontreck.libzontreck.memory.world.BlockRestoreQueueRegistry;
import dev.zontreck.libzontreck.memory.world.DatabaseMigrations;
import dev.zontreck.libzontreck.memory.world.DatabaseWrapper;
import dev.zontreck.libzontreck.menus.ChestGUIScreen;
import dev.zontreck.libzontreck.types.ModMenuTypes;
import dev.zontreck.libzontreck.networking.NetworkEvents;
import net.minecraft.client.gui.screens.MenuScreens;
import net.minecraft.server.level.ServerLevel;
import org.slf4j.Logger;
import com.mojang.logging.LogUtils;
import dev.zontreck.libzontreck.commands.Commands;
import dev.zontreck.libzontreck.events.ForgeEventHandlers;
import dev.zontreck.libzontreck.memory.VolatilePlayerStorage;
import dev.zontreck.libzontreck.memory.player.VolatilePlayerStorage;
import dev.zontreck.libzontreck.networking.ModMessages;
import dev.zontreck.libzontreck.profiles.Profile;
import dev.zontreck.libzontreck.util.FileTreeDatastore;
import net.minecraft.server.MinecraftServer;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.server.ServerStartedEvent;
import net.minecraftforge.event.server.ServerStoppingEvent;
@ -45,7 +52,6 @@ public class LibZontreck {
public static final Logger LOGGER = LogUtils.getLogger();
public static final String MOD_ID = "libzontreck";
public static final Map<String, Profile> PROFILES;
public static MinecraftServer THE_SERVER;
public static VolatilePlayerStorage playerStorage;
public static boolean ALIVE=true;
public static final String FILESTORE = FileTreeDatastore.get();
@ -55,6 +61,7 @@ public class LibZontreck {
public static final UUID NULL_ID;
public static boolean LIBZONTRECK_SERVER_AVAILABLE=false;
public static ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
public static LogicalSide CURRENT_SIDE;
@ -81,6 +88,8 @@ public class LibZontreck {
IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
// Register the setup method for modloading
bus.addListener(this::setup);
ServerConfig.init();
MinecraftForge.EVENT_BUS.register(this);
@ -89,14 +98,14 @@ public class LibZontreck {
MinecraftForge.EVENT_BUS.register(new NetworkEvents());
MinecraftForge.EVENT_BUS.register(ChestGUIRegistry.class);
Bus.Reset();
ModMenuTypes.REGISTRY.register(bus);
//CreativeModeTabs.register(bus);
ModItems.register(bus);
Bus.Register(CurrencyHelper.class, null);
Bus.Register(Bank.class, null);
MinecraftForge.EVENT_BUS.register(CurrencyHelper.class);
MinecraftForge.EVENT_BUS.register(Bank.class);
}
private void setup(final FMLCommonSetupEvent event)
@ -108,16 +117,39 @@ public class LibZontreck {
@SubscribeEvent
public void onServerStarted(final ServerStartedEvent event)
{
THE_SERVER = event.getServer();
ALIVE=true;
ServerConfig.init();
try {
DatabaseWrapper.start();
}catch(RuntimeException e) {
LOGGER.warn("Database not configured properly, it will not be available.");
DatabaseWrapper.invalidate();
}
CURRENT_SIDE = LogicalSide.SERVER;
MinecraftForge.EVENT_BUS.post(new BlockRestoreQueueRegistrationEvent());
for(ServerLevel level : event.getServer().getAllLevels())
{
// Queues have been registered, but we now need to initialize the queue's data from saveddata
BlockRestoreQueueRegistry.init(level);
}
if(!DatabaseWrapper.hasDB)return;
try {
DatabaseMigrations.initMigrations();
} catch (SQLException e) {
e.printStackTrace();
}
}
@SubscribeEvent
public void onServerStopping(final ServerStoppingEvent ev)
{
ALIVE=false;
DelayedExecutorService.stop();
Iterator<Profile> iProfile = PROFILES.values().iterator();
while(iProfile.hasNext())

View file

@ -0,0 +1,138 @@
package dev.zontreck.libzontreck.api;
import dev.zontreck.libzontreck.vectors.Vector2f;
import dev.zontreck.libzontreck.vectors.Vector2i;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.phys.Vec2;
public interface Vector2<T> extends Cloneable, Comparable<Vector2<T>>
{
/**
* Converts the current Vector2 representation into a minecraft Vec2
* @return Minecraft equivalent Vec2
*/
Vec2 asMinecraftVector();
/**
* Parses a string in serialized format.
* @param vector2 Expects it in the same format returned by Vector2#toString
* @return New Vector2, or a null Vector2 initialized with zeros if invalid data
*/
static Vector2 parseString(String vector2){
throw new UnsupportedOperationException("This method is not implemented by this implementation");
}
/**
* Copies the values to a new and detached instance
* @return New Vector2
*/
Vector2 Clone();
/**
* Saves the X and Y positions to a NBT tag
* @return NBT compound tag
*/
CompoundTag serialize();
/**
* Loads a Vector2 from a NBT tag
* @param tag The NBT tag to load
*/
static Vector2 deserialize(CompoundTag tag)
{
throw new UnsupportedOperationException("This method is not implemented by this implementation");
}
/**
* Compares the two vector2 instances
* @param other The position to check
* @return True if same position
*/
boolean Same(Vector2 other);
/**
* True if the current position is inside the two points
* @param point1 Lowest point
* @param point2 Hightest Point
* @return True if inside
*/
boolean Inside(Vector2 point1, Vector2 point2);
/**
* Converts, if necessary, to Vector2d
* @return A vector2d instance
*/
Vector2f asVector2f();
/**
* Converts, if necessary, to Vector2i
* @return A vector2i instance
*/
Vector2i asVector2i();
/**
* Checks if the current vector is greater than the provided one
* @param other The other vector to check
* @return True if greater
*/
boolean greater(Vector2 other);
/**
* Checks if the current vector is less than the provided one
* @param other The vector to check
* @return True if less than other
*/
boolean less(Vector2 other);
/**
* Alias for Vector2#same
* @param other Vector to check
* @return True if same position
*/
boolean equal(Vector2 other);
/**
* Adds the two vectors together
* @param other Vector to add
* @return New instance after adding the other vector
*/
Vector2 add(Vector2 other);
/**
* Subtracts the other vector from this one
* @param other Vector to subtract
* @return New instance after subtracting
*/
Vector2 subtract(Vector2 other);
/**
* Calculates the distance between the two vectors
* @param other
* @return The distance
*/
double distance(Vector2 other);
/**
* Increments the Y axis by 1
* @return New instance
*/
Vector2 moveUp();
/**
* Decrements the Y axis by 1
* @return New instance
*/
Vector2 moveDown();
/**
* Gets the X value
* @return X
*/
T getX();
/**
* Gets the Y value
* @return Y
*/
T getY();
}

View file

@ -0,0 +1,158 @@
package dev.zontreck.libzontreck.api;
import dev.zontreck.libzontreck.vectors.Vector3d;
import dev.zontreck.libzontreck.vectors.Vector3i;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Vec3i;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.phys.Vec3;
public interface Vector3<T> extends Cloneable, Comparable<Vector3<T>>
{
/**
* Converts the current Vector3 representation into a minecraft Vec3
* @return Minecraft equivalent Vec3
*/
Vec3 asMinecraftVector();
/**
* Converts to a vec3i position
* @return Equivalent vec3i
*/
Vec3i asVec3i();
/**
* Converts to a block position
* @return Equivalent block position
*/
BlockPos asBlockPos();
/**
* Parses a string in serialized format.
* @param vector3 Expects it in the same format returned by Vector3#toString
* @return New Vector3, or a null Vector3 initialized with zeros if invalid data
*/
static Vector3 parseString(String vector3){
throw new UnsupportedOperationException("This method is not implemented by this implementation");
}
/**
* Copies the values to a new and detached instance
* @return New Vector3
*/
Vector3 Clone();
/**
* Saves the X, Y, and Z positions to a NBT tag
* @return NBT compound tag
*/
CompoundTag serialize();
/**
* Loads a Vector3 from a NBT tag
* @param tag The NBT tag to load
*/
static Vector3 deserialize(CompoundTag tag)
{
throw new UnsupportedOperationException("This method is not implemented by this implementation");
}
/**
* Compares the two vector3 instances
* @param other The position to check
* @return True if same position
*/
boolean Same(Vector3 other);
/**
* True if the current position is inside the two points
* @param point1 Lowest point
* @param point2 Hightest Point
* @return True if inside
*/
boolean Inside(Vector3 point1, Vector3 point2);
/**
* Converts, if necessary, to Vector3d
* @return A vector2d instance
*/
Vector3d asVector3d();
/**
* Converts, if necessary, to Vector3i
* @return A vector3i instance
*/
Vector3i asVector3i();
/**
* Checks if the current vector is greater than the provided one
* @param other The other vector to check
* @return True if greater
*/
boolean greater(Vector3 other);
/**
* Checks if the current vector is less than the provided one
* @param other The vector to check
* @return True if less than other
*/
boolean less(Vector3 other);
/**
* Alias for Vector3#same
* @param other Vector to check
* @return True if same position
*/
boolean equal(Vector3 other);
/**
* Adds the two vectors together
* @param other Vector to add
* @return New instance after adding the other vector
*/
Vector3 add(Vector3 other);
/**
* Subtracts the other vector from this one
* @param other Vector to subtract
* @return New instance after subtracting
*/
Vector3 subtract(Vector3 other);
/**
* Calculates the distance between the two vectors
* @param other
* @return The distance
*/
double distance(Vector3 other);
/**
* Increments the Y axis by 1
* @return New instance
*/
Vector3 moveUp();
/**
* Decrements the Y axis by 1
* @return New instance
*/
Vector3 moveDown();
/**
* Gets the X value
* @return X
*/
T getX();
/**
* Gets the Y value
* @return Y
*/
T getY();
/**
* Gets the Z value
* @return Z
*/
T getZ();
}

View file

@ -0,0 +1,22 @@
package dev.zontreck.libzontreck.blocks;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
public class BlockCustomVoxels extends PartialTransparentBlock
{
private VoxelShape superShape;
public BlockCustomVoxels(Properties p_54120_, VoxelShape shape) {
super(p_54120_);
this.superShape = shape;
}
@Override
public VoxelShape getShape(BlockState p_60555_, BlockGetter p_60556_, BlockPos p_60557_, CollisionContext p_60558_) {
return superShape;
}
}

View file

@ -0,0 +1,18 @@
package dev.zontreck.libzontreck.blocks;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.AbstractGlassBlock;
import net.minecraft.world.level.block.state.BlockState;
public class PartialTransparentBlock extends AbstractGlassBlock
{
public PartialTransparentBlock(Properties p_48729_) {
super(p_48729_);
}
@Override
public boolean propagatesSkylightDown(BlockState p_48740_, BlockGetter p_48741_, BlockPos p_48742_) {
return true;
}
}

View file

@ -0,0 +1,19 @@
package dev.zontreck.libzontreck.blocks;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.AbstractGlassBlock;
import net.minecraft.world.level.block.SlabBlock;
import net.minecraft.world.level.block.state.BlockState;
public class PartialTransparentSlabBlock extends SlabBlock
{
public PartialTransparentSlabBlock(Properties p_48729_) {
super(p_48729_);
}
@Override
public boolean propagatesSkylightDown(BlockState p_48740_, BlockGetter p_48741_, BlockPos p_48742_) {
return true;
}
}

View file

@ -0,0 +1,98 @@
package dev.zontreck.libzontreck.blocks;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelReader;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import org.jetbrains.annotations.Nullable;
import java.util.List;
public abstract class RedstoneBlock extends RotatableBlock
{
public static final BooleanProperty INPUT_POWER = BooleanProperty.create("inputpower");
public static final BooleanProperty POWERED = BlockStateProperties.POWERED;
private List<Direction> sides;
protected RedstoneBlock(Properties pProperties, Direction... validSides) {
super(pProperties);
sides=List.of(validSides);
}
@Override
public BlockState getStateForPlacement(BlockPlaceContext pContext) {
return super.getStateForPlacement(pContext).setValue(INPUT_POWER, false).setValue(POWERED, false);
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> pBuilder) {
super.createBlockStateDefinition(pBuilder);
pBuilder.add(INPUT_POWER, POWERED);
}
@Override
public boolean canConnectRedstone(BlockState state, BlockGetter level, BlockPos pos, @Nullable Direction direction) {
if(sides.contains(direction)) return true;
else return false;
}
private boolean redstoneIsActivated(LevelReader level, BlockPos pos)
{
if(level.hasNeighborSignal(pos))
return true;
else return false;
}
@Override
public int getSignal(BlockState p_60483_, BlockGetter p_60484_, BlockPos p_60485_, Direction p_60486_) {
if(!sides.contains(p_60486_)) return 0;
if(p_60483_.getValue(POWERED))
return 15;
else return 0;
}
protected abstract void onRedstone(LevelReader level, BlockPos pos, boolean on);
protected abstract void onRedstoneInputChanged(LevelReader level, BlockPos pos, boolean on);
@Override
public void onNeighborChange(BlockState state, LevelReader level, BlockPos pos, BlockPos neighbor) {
boolean rs = redstoneIsActivated(level, pos);
onRedstone(level, pos, rs);
boolean inp = state.getValue(INPUT_POWER);
state.setValue(INPUT_POWER, rs);
if(inp != rs)
onRedstoneInputChanged(level, pos, rs);
}
@Override
public void neighborChanged(BlockState state, Level level, BlockPos pos, Block block, BlockPos other, boolean unknown) {
boolean rs = redstoneIsActivated(level, pos);
onRedstone(level, pos, rs);
boolean inp = state.getValue(INPUT_POWER);
state.setValue(INPUT_POWER, rs);
if(inp != rs)
onRedstoneInputChanged(level, pos, rs);
}
@Override
public void onPlace(BlockState state, Level level, BlockPos pos, BlockState p_60569_, boolean p_60570_) {
boolean rs = redstoneIsActivated(level, pos);
onRedstone(level, pos, rs);
boolean inp = state.getValue(INPUT_POWER);
state.setValue(INPUT_POWER, rs);
if(inp != rs)
onRedstoneInputChanged(level, pos, rs);
}
}

View file

@ -0,0 +1,39 @@
package dev.zontreck.libzontreck.blocks;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.HorizontalDirectionalBlock;
import net.minecraft.world.level.block.Mirror;
import net.minecraft.world.level.block.Rotation;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
public class RotatableBlock extends HorizontalDirectionalBlock
{
public RotatableBlock(Properties pProperties) {
super(pProperties);
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> pBuilder) {
super.createBlockStateDefinition(pBuilder);
pBuilder.add(FACING);
}
@Override
public BlockState rotate(BlockState p_55115_, Rotation p_55116_) {
return p_55115_.setValue(FACING, p_55116_.rotate(p_55115_.getValue(FACING)));
}
@Override
public BlockState mirror(BlockState p_55112_, Mirror p_55113_) {
return p_55112_.rotate(p_55113_.getRotation(p_55112_.getValue(FACING)));
}
@Override
public BlockState getStateForPlacement(BlockPlaceContext pContext) {
return defaultBlockState().setValue(FACING, pContext.getHorizontalDirection());
}
}

View file

@ -0,0 +1,35 @@
package dev.zontreck.libzontreck.blocks;
import dev.zontreck.ariaslib.util.Maps;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import java.util.HashMap;
import java.util.Map;
public class RotatableBlockCustomVoxels extends RotatableBlock
{
private Map<Direction, VoxelShape> rotatedShapes = new HashMap<>();
public RotatableBlockCustomVoxels(Properties properties, VoxelShape north, VoxelShape south, VoxelShape east, VoxelShape west) {
super(properties);
rotatedShapes = Maps.of(new Maps.Entry<>(Direction.NORTH, north), new Maps.Entry<>(Direction.SOUTH, south), new Maps.Entry<>(Direction.WEST, west), new Maps.Entry<>(Direction.EAST, east), new Maps.Entry<>(Direction.NORTH, north), new Maps.Entry<>(Direction.DOWN, north));
}
@Override
public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
Direction facing = state.getValue(FACING);
return rotatedShapes.get(facing);
}
@Override
public boolean propagatesSkylightDown(BlockState p_49928_, BlockGetter p_49929_, BlockPos p_49930_) {
return true;
}
}

View file

@ -9,10 +9,8 @@ import dev.zontreck.libzontreck.networking.ModMessages;
import dev.zontreck.libzontreck.networking.packets.S2CCloseChestGUI;
import dev.zontreck.libzontreck.util.ChatHelpers;
import dev.zontreck.libzontreck.util.ServerUtilities;
import dev.zontreck.libzontreck.vectors.Vector2;
import dev.zontreck.libzontreck.vectors.Vector2f;
import dev.zontreck.libzontreck.vectors.Vector2i;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.SimpleMenuProvider;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
@ -24,8 +22,6 @@ import net.minecraftforge.network.NetworkHooks;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.function.Function;
/**
* Zontreck's ChestGUI Interface
@ -232,7 +228,7 @@ public class ChestGUI
return this.id.equals(id);
}
public void handleButtonClicked(int slot, Vector2 pos, Item item) {
public void handleButtonClicked(int slot, Vector2f pos, Item item) {
for(ChestGUIButton button : buttons)
{
if(button.getSlotNum() == slot)

View file

@ -3,10 +3,8 @@ package dev.zontreck.libzontreck.chestgui;
import dev.zontreck.libzontreck.lore.LoreContainer;
import dev.zontreck.libzontreck.lore.LoreEntry;
import dev.zontreck.libzontreck.util.ChatHelpers;
import dev.zontreck.libzontreck.vectors.Vector2;
import dev.zontreck.libzontreck.vectors.Vector2i;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtUtils;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.items.ItemStackHandler;
@ -144,7 +142,7 @@ public class ChestGUIButton
*/
public boolean matchesSlot(Vector2i slot)
{
return position.same(slot);
return position.Same(slot);
}
/**

View file

@ -0,0 +1,39 @@
package dev.zontreck.libzontreck.config;
import dev.zontreck.libzontreck.LibZontreck;
import dev.zontreck.libzontreck.config.sections.DatabaseSection;
import dev.zontreck.libzontreck.util.SNbtIo;
import net.minecraft.nbt.CompoundTag;
import java.nio.file.Path;
public class ServerConfig
{
public static final Path BASE = LibZontreck.BASE_CONFIG.resolve("server.snbt");
public static DatabaseSection database;
public static void init()
{
if(BASE.toFile().exists())
{
var config = SNbtIo.loadSnbt(BASE);
database = DatabaseSection.deserialize(config.getCompound(DatabaseSection.TAG_NAME));
commit();
} else {
database = new DatabaseSection();
commit();
}
}
public static void commit()
{
CompoundTag tag = new CompoundTag();
tag.put(DatabaseSection.TAG_NAME, database.serialize());
SNbtIo.writeSnbt(BASE, tag);
}
}

View file

@ -0,0 +1,76 @@
package dev.zontreck.libzontreck.config.sections;
import dev.zontreck.libzontreck.config.ServerConfig;
import net.minecraft.nbt.CompoundTag;
public class DatabaseSection
{
public static final String TAG_NAME = "database";
public static final String TAG_USER = "username";
public static final String TAG_PASSWORD = "password";
public static final String TAG_HOST = "host";
public static final String TAG_DATABASE = "database";
public static final String TAG_VERSION = "rev";
public String user = "root";
public String password = "";
public String host = "localhost:3306"; // IP:port
public String database = "";
public int version;
public static final int VERSION = 1;
public static DatabaseSection deserialize(CompoundTag tag)
{
DatabaseSection ret = new DatabaseSection();
ret.version = tag.getInt(TAG_VERSION);
if(ret.version == 0)
{
ret.version = VERSION;
return ret;
}
if(ret.version >= 1)
{
ret.user = tag.getString(TAG_USER);
ret.password = tag.getString(TAG_PASSWORD);
ret.host = tag.getString(TAG_HOST);
ret.database = tag.getString(TAG_DATABASE);
}
ret.version = VERSION;
return ret;
}
public DatabaseSection(){
}
public DatabaseSection(String user, String password, String host, String database)
{
this.user = user;
this.password = password;
this.host = host;
this.database = database;
}
public String getAsSQLFileName()
{
return database + ".sql";
}
public CompoundTag serialize()
{
CompoundTag tag = new CompoundTag();
tag.putString(TAG_USER, user);
tag.putString(TAG_PASSWORD, password);
tag.putString(TAG_HOST, host);
tag.putString(TAG_DATABASE, database);
tag.putInt(TAG_VERSION, version);
return tag;
}
}

View file

@ -1,7 +1,6 @@
package dev.zontreck.libzontreck.currency;
import dev.zontreck.eventsbus.Bus;
import dev.zontreck.libzontreck.chat.ChatColor;
import dev.zontreck.libzontreck.currency.events.TransactionHistoryFlushEvent;
import dev.zontreck.libzontreck.profiles.Profile;
@ -11,6 +10,7 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.NbtUtils;
import net.minecraft.nbt.Tag;
import net.minecraftforge.common.MinecraftForge;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@ -94,7 +94,7 @@ public class Account
LongTermTransactionHistoryRecord rec = LongTermTransactionHistoryRecord.of(player_id);
rec.addHistory(history);
rec.commit();
Bus.Post(new TransactionHistoryFlushEvent(this, rec, history));
MinecraftForge.EVENT_BUS.post(new TransactionHistoryFlushEvent(this, rec, history));
rec = null;
history = new ArrayList<>();
}

View file

@ -1,11 +1,6 @@
package dev.zontreck.libzontreck.currency;
import com.google.common.collect.Lists;
import dev.zontreck.eventsbus.Bus;
import dev.zontreck.eventsbus.Subscribe;
import dev.zontreck.libzontreck.LibZontreck;
import dev.zontreck.libzontreck.chat.ChatColor;
import dev.zontreck.libzontreck.chat.ChatColorFactory;
import dev.zontreck.libzontreck.currency.events.BankAccountCreatedEvent;
import dev.zontreck.libzontreck.currency.events.BankReadyEvent;
import dev.zontreck.libzontreck.currency.events.TransactionEvent;
@ -21,7 +16,10 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.NbtIo;
import net.minecraft.nbt.Tag;
import net.minecraft.server.MinecraftServer;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.server.ServerLifecycleHooks;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
@ -81,7 +79,7 @@ public class Bank
accounts.add(new Account((CompoundTag) t));
}
Bus.Post(new BankReadyEvent());
MinecraftForge.EVENT_BUS.post(new BankReadyEvent());
} catch (IOException e) {
throw new RuntimeException(e);
}
@ -128,7 +126,7 @@ public class Bank
instance.accounts.add(new Account(ID));
instance.commit();
Bus.Post(new BankAccountCreatedEvent(getAccount(ID)));
MinecraftForge.EVENT_BUS.post(new BankAccountCreatedEvent(getAccount(ID)));
}else {
}
}
@ -143,7 +141,10 @@ public class Bank
protected static boolean postTx(Transaction tx) throws InvalidSideException, InvocationTargetException, IllegalAccessException {
if(ServerUtilities.isClient())return false;
TransactionEvent ev = new TransactionEvent(tx);
if(Bus.Post(ev))
MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
if(MinecraftForge.EVENT_BUS.post(ev))
{
// Send the list of reasons to the user
String reasonStr = String.join("\n", ev.reasons);
@ -151,13 +152,14 @@ public class Bank
Account from = ev.tx.from.get();
Account to = ev.tx.to.get();
if(from.isValidPlayer())
{
ChatHelpers.broadcastTo(from.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] !Dark_Red!The transaction could not be completed because of the following reasons: " + reasonStr), LibZontreck.THE_SERVER);
ChatHelpers.broadcastTo(from.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] !Dark_Red!The transaction could not be completed because of the following reasons: " + reasonStr), server);
}
if(to.isValidPlayer())
{
ChatHelpers.broadcastTo(to.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] !Dark_Red!The transaction could not be completed because of the following reasons: " + reasonStr), LibZontreck.THE_SERVER);
ChatHelpers.broadcastTo(to.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] !Dark_Red!The transaction could not be completed because of the following reasons: " + reasonStr), server);
}
return false;
@ -198,19 +200,19 @@ public class Bank
}
if(from.isValidPlayer())
ChatHelpers.broadcastTo(from.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] !Dark_Green!You sent !White!${0} !Dark_green!to {1}", String.valueOf(tx.amount), toProf.name_color+toProf.nickname), LibZontreck.THE_SERVER);
ChatHelpers.broadcastTo(from.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] !Dark_Green!You sent !White!${0} !Dark_green!to {1}", String.valueOf(tx.amount), toProf.name_color+toProf.nickname), server);
if(to.isValidPlayer())
ChatHelpers.broadcastTo(from.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] {0} !Dark_Green!paid you ${1}", String.valueOf(tx.amount), toProf.name_color+toProf.nickname), LibZontreck.THE_SERVER);
ChatHelpers.broadcastTo(from.player_id, ChatHelpers.macro("!Dark_Gray![!Dark_Blue!Bank!Dark_Gray!] {0} !Dark_Green!paid you ${1}", String.valueOf(tx.amount), toProf.name_color+toProf.nickname), server);
if(to.isValidPlayer() && ServerUtilities.playerIsOffline(to.player_id)) Profile.unload(toProf);
if(from.isValidPlayer() && ServerUtilities.playerIsOffline(from.player_id))
Profile.unload(fromProf);
Bus.Post(new WalletUpdatedEvent(from.player_id, fromOld, from.balance, tx));
MinecraftForge.EVENT_BUS.post(new WalletUpdatedEvent(from.player_id, fromOld, from.balance, tx));
Bus.Post(new WalletUpdatedEvent(to.player_id, toOld, to.balance, tx));
MinecraftForge.EVENT_BUS.post(new WalletUpdatedEvent(to.player_id, toOld, to.balance, tx));
if(from.isValidPlayer() && !ServerUtilities.playerIsOffline(from.player_id))
{
@ -232,7 +234,7 @@ public class Bank
* This event is fired when wallets get updated. It cannot be cancelled
* @param ev The event containing the player ID and new+old wallet data
*/
@Subscribe
@SubscribeEvent
public static void onWalletUpdate(WalletUpdatedEvent ev)
{

View file

@ -1,8 +1,8 @@
package dev.zontreck.libzontreck.currency.events;
import dev.zontreck.eventsbus.Event;
import dev.zontreck.libzontreck.currency.Account;
import net.minecraftforge.eventbus.api.Event;
public class BankAccountCreatedEvent extends Event
{

View file

@ -1,7 +1,7 @@
package dev.zontreck.libzontreck.currency.events;
import dev.zontreck.eventsbus.Event;
import net.minecraftforge.eventbus.api.Event;
/**
* Contains no information by itself, it only signals that the Bank is open for business

View file

@ -1,15 +1,13 @@
package dev.zontreck.libzontreck.currency.events;
import dev.zontreck.eventsbus.Cancellable;
import dev.zontreck.eventsbus.Event;
import dev.zontreck.libzontreck.currency.Transaction;
import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.eventbus.api.Event;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
@Cancellable
@Cancelable
public class TransactionEvent extends Event
{
public Transaction tx;

View file

@ -1,10 +1,10 @@
package dev.zontreck.libzontreck.currency.events;
import dev.zontreck.eventsbus.Event;
import dev.zontreck.libzontreck.currency.Account;
import dev.zontreck.libzontreck.currency.LongTermTransactionHistoryRecord;
import dev.zontreck.libzontreck.currency.Transaction;
import net.minecraftforge.eventbus.api.Event;
import java.util.List;

View file

@ -1,8 +1,8 @@
package dev.zontreck.libzontreck.currency.events;
import dev.zontreck.eventsbus.Event;
import dev.zontreck.libzontreck.currency.Transaction;
import net.minecraft.world.entity.player.Player;
import net.minecraftforge.eventbus.api.Event;
import java.util.UUID;

View file

@ -0,0 +1,590 @@
/*
* @file Auxiliaries.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* General commonly used functionality.
*/
package dev.zontreck.libzontreck.edlibmc;
import com.mojang.blaze3d.platform.InputConstants;
import net.minecraft.ChatFormatting;
import net.minecraft.SharedConstants;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.Registry;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.ComponentUtils;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.shapes.BooleanOp;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.registries.ForgeRegistries;
import org.slf4j.Logger;
import org.lwjgl.glfw.GLFW;
import javax.annotation.Nullable;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
public class Auxiliaries {
private static String modid;
private static Logger logger;
private static Supplier<CompoundTag> server_config_supplier = CompoundTag::new;
public static void init(String modid, Logger logger, Supplier<CompoundTag> server_config_supplier) {
Auxiliaries.modid = modid;
Auxiliaries.logger = logger;
Auxiliaries.server_config_supplier = server_config_supplier;
}
// -------------------------------------------------------------------------------------------------------------------
// Mod specific exports
// -------------------------------------------------------------------------------------------------------------------
public static String modid() {
return modid;
}
public static Logger logger() {
return logger;
}
// -------------------------------------------------------------------------------------------------------------------
// Sidedness, system/environment, tagging interfaces
// -------------------------------------------------------------------------------------------------------------------
public interface IExperimentalFeature {
}
public static boolean isModLoaded(final String registry_name) {
return ModList.get().isLoaded(registry_name);
}
public static boolean isDevelopmentMode() {
return SharedConstants.IS_RUNNING_IN_IDE;
}
@OnlyIn(Dist.CLIENT)
public static boolean isShiftDown() {
return (InputConstants.isKeyDown(SidedProxy.mc().getWindow().getWindow(), GLFW.GLFW_KEY_LEFT_SHIFT) ||
InputConstants.isKeyDown(SidedProxy.mc().getWindow().getWindow(), GLFW.GLFW_KEY_RIGHT_SHIFT));
}
@OnlyIn(Dist.CLIENT)
public static boolean isCtrlDown() {
return (InputConstants.isKeyDown(SidedProxy.mc().getWindow().getWindow(), GLFW.GLFW_KEY_LEFT_CONTROL) ||
InputConstants.isKeyDown(SidedProxy.mc().getWindow().getWindow(), GLFW.GLFW_KEY_RIGHT_CONTROL));
}
// -------------------------------------------------------------------------------------------------------------------
// Logging
// -------------------------------------------------------------------------------------------------------------------
public static void logInfo(final String msg) {
logger.info(msg);
}
public static void logWarn(final String msg) {
logger.warn(msg);
}
public static void logError(final String msg) {
logger.error(msg);
}
public static void logDebug(final String msg) { /*logger.debug(msg);*/ }
// -------------------------------------------------------------------------------------------------------------------
// Localization, text formatting
// -------------------------------------------------------------------------------------------------------------------
/**
* Text localization wrapper, implicitly prepends `MODID` to the
* translation keys. Forces formatting argument, nullable if no special formatting shall be applied..
*/
public static MutableComponent localizable(String modtrkey, Object... args) {
return Component.translatable((modtrkey.startsWith("block.") || (modtrkey.startsWith("item."))) ? (modtrkey) : (modid + "." + modtrkey), args);
}
public static MutableComponent localizable(String modtrkey, @Nullable ChatFormatting color, Object... args) {
final MutableComponent tr = Component.translatable(modid + "." + modtrkey, args);
if (color != null) tr.getStyle().applyFormat(color);
return tr;
}
public static Component localizable(String modtrkey) {
return localizable(modtrkey, new Object[]{});
}
public static Component localizable_block_key(String blocksubkey) {
return Component.translatable("block." + modid + "." + blocksubkey);
}
@OnlyIn(Dist.CLIENT)
public static String localize(String translationKey, Object... args) {
Component tr = Component.translatable(translationKey, args);
tr.getStyle().applyFormat(ChatFormatting.RESET);
final String ft = tr.getString();
if (ft.contains("${")) {
// Non-recursive, non-argument lang file entry cross referencing.
Pattern pt = Pattern.compile("\\$\\{([^}]+)\\}");
Matcher mt = pt.matcher(ft);
StringBuffer sb = new StringBuffer();
while (mt.find()) {
String m = mt.group(1);
if (m.contains("?")) {
String[] kv = m.split("\\?", 2);
String key = kv[0].trim();
boolean not = key.startsWith("!");
if (not) key = key.replaceFirst("!", "");
m = kv[1].trim();
if (!server_config_supplier.get().contains(key)) {
m = "";
} else {
boolean r = server_config_supplier.get().getBoolean(key);
if (not) r = !r;
if (!r) m = "";
}
}
mt.appendReplacement(sb, Matcher.quoteReplacement((Component.translatable(m)).getString().trim()));
}
mt.appendTail(sb);
return sb.toString();
} else {
return ft;
}
}
/**
* Returns true if a given key is translated for the current language.
*/
@OnlyIn(Dist.CLIENT)
public static boolean hasTranslation(String key) {
return net.minecraft.client.resources.language.I18n.exists(key);
}
public static MutableComponent join(Collection<? extends Component> components, String separator) {
return ComponentUtils.formatList(components, Component.literal(separator), Function.identity());
}
public static MutableComponent join(Component... components) {
final MutableComponent tc = Component.empty();
for (Component c : components) {
tc.append(c);
}
return tc;
}
public static boolean isEmpty(Component component) {
return component.getSiblings().isEmpty() && component.getString().isEmpty();
}
public static final class Tooltip {
@OnlyIn(Dist.CLIENT)
public static boolean extendedTipCondition() {
return isShiftDown();
}
@OnlyIn(Dist.CLIENT)
public static boolean helpCondition() {
return isShiftDown() && isCtrlDown();
}
/**
* Adds an extended tooltip or help tooltip depending on the key states of CTRL and SHIFT.
* Returns true if the localisable help/tip was added, false if not (either not CTL/SHIFT or
* no translation found).
*/
@OnlyIn(Dist.CLIENT)
public static boolean addInformation(@Nullable String advancedTooltipTranslationKey, @Nullable String helpTranslationKey, List<Component> tooltip, TooltipFlag flag, boolean addAdvancedTooltipHints) {
// Note: intentionally not using keybinding here, this must be `control` or `shift`.
final boolean help_available = (helpTranslationKey != null) && Auxiliaries.hasTranslation(helpTranslationKey + ".help");
final boolean tip_available = (advancedTooltipTranslationKey != null) && Auxiliaries.hasTranslation(helpTranslationKey + ".tip");
if ((!help_available) && (!tip_available)) return false;
String tip_text = "";
if (helpCondition()) {
if (help_available) tip_text = localize(helpTranslationKey + ".help");
} else if (extendedTipCondition()) {
if (tip_available) tip_text = localize(advancedTooltipTranslationKey + ".tip");
} else if (addAdvancedTooltipHints) {
if (tip_available) tip_text += localize(modid + ".tooltip.hint.extended") + (help_available ? " " : "");
if (help_available) tip_text += localize(modid + ".tooltip.hint.help");
}
if (tip_text.isEmpty()) return false;
String[] tip_list = tip_text.split("\\r?\\n");
for (String tip : tip_list) {
tooltip.add(Component.literal(tip.replaceAll("\\s+$", "").replaceAll("^\\s+", "")).withStyle(ChatFormatting.GRAY));
}
return true;
}
/**
* Adds an extended tooltip or help tooltip for a given stack depending on the key states of CTRL and SHIFT.
* Format in the lang file is (e.g. for items): "item.MODID.REGISTRYNAME.tip" and "item.MODID.REGISTRYNAME.help".
* Return value see method pattern above.
*/
@OnlyIn(Dist.CLIENT)
public static boolean addInformation(ItemStack stack, @Nullable BlockGetter world, List<Component> tooltip, TooltipFlag flag, boolean addAdvancedTooltipHints) {
return addInformation(stack.getDescriptionId(), stack.getDescriptionId(), tooltip, flag, addAdvancedTooltipHints);
}
@OnlyIn(Dist.CLIENT)
public static boolean addInformation(String translation_key, List<Component> tooltip) {
if (!Auxiliaries.hasTranslation(translation_key)) return false;
tooltip.add(Component.literal(localize(translation_key).replaceAll("\\s+$", "").replaceAll("^\\s+", "")).withStyle(ChatFormatting.GRAY));
return true;
}
}
@SuppressWarnings("unused")
public static void playerChatMessage(final Player player, final String message) {
player.displayClientMessage(Component.translatable(message.trim()), true);
}
public static @Nullable Component unserializeTextComponent(String serialized) {
return Component.Serializer.fromJson(serialized);
}
public static String serializeTextComponent(Component tc) {
return (tc == null) ? ("") : (Component.Serializer.toJson(tc));
}
// -------------------------------------------------------------------------------------------------------------------
// Tag Handling
// -------------------------------------------------------------------------------------------------------------------
@SuppressWarnings("deprecation")
public static boolean isInItemTag(Item item, ResourceLocation tag) {
return ForgeRegistries.ITEMS.tags().stream().filter(tg -> tg.getKey().location().equals(tag)).anyMatch(tk -> tk.contains(item));
}
@SuppressWarnings("deprecation")
public static boolean isInBlockTag(Block block, ResourceLocation tag) {
return ForgeRegistries.BLOCKS.tags().stream().filter(tg -> tg.getKey().location().equals(tag)).anyMatch(tk -> tk.contains(block));
}
@SuppressWarnings("deprecation")
public static ResourceLocation getResourceLocation(Item item) {
return ForgeRegistries.ITEMS.getKey(item);
}
@SuppressWarnings("deprecation")
public static ResourceLocation getResourceLocation(Block block) {
return ForgeRegistries.BLOCKS.getKey(block);
}
@SuppressWarnings("deprecation")
public static ResourceLocation getResourceLocation(net.minecraft.world.inventory.MenuType<?> menu) {
return ForgeRegistries.MENU_TYPES.getKey(menu);
}
@SuppressWarnings("deprecation")
public static ResourceLocation getResourceLocation(net.minecraft.world.level.material.Fluid fluid) {
return ForgeRegistries.FLUIDS.getKey(fluid);
}
// -------------------------------------------------------------------------------------------------------------------
// Item NBT data
// -------------------------------------------------------------------------------------------------------------------
/**
* Equivalent to getDisplayName(), returns null if no custom name is set.
*/
public static @Nullable Component getItemLabel(ItemStack stack) {
CompoundTag nbt = stack.getTagElement("display");
if (nbt != null && nbt.contains("Name", 8)) {
try {
Component tc = unserializeTextComponent(nbt.getString("Name"));
if (tc != null) return tc;
nbt.remove("Name");
} catch (Exception e) {
nbt.remove("Name");
}
}
return null;
}
public static ItemStack setItemLabel(ItemStack stack, @Nullable Component name) {
if (name != null) {
CompoundTag nbt = stack.getOrCreateTagElement("display");
nbt.putString("Name", serializeTextComponent(name));
} else {
if (stack.hasTag()) stack.removeTagKey("display");
}
return stack;
}
// -------------------------------------------------------------------------------------------------------------------
// Block handling
// -------------------------------------------------------------------------------------------------------------------
public static boolean isWaterLogged(BlockState state) {
return state.hasProperty(BlockStateProperties.WATERLOGGED) && state.getValue(BlockStateProperties.WATERLOGGED);
}
public static AABB getPixeledAABB(double x0, double y0, double z0, double x1, double y1, double z1) {
return new AABB(x0 / 16.0, y0 / 16.0, z0 / 16.0, x1 / 16.0, y1 / 16.0, z1 / 16.0);
}
public static AABB getRotatedAABB(AABB bb, Direction new_facing) {
return getRotatedAABB(bb, new_facing, false);
}
public static AABB[] getRotatedAABB(AABB[] bb, Direction new_facing) {
return getRotatedAABB(bb, new_facing, false);
}
public static AABB getRotatedAABB(AABB bb, Direction new_facing, boolean horizontal_rotation) {
if (!horizontal_rotation) {
switch (new_facing.get3DDataValue()) {
case 0:
return new AABB(1 - bb.maxX, bb.minZ, bb.minY, 1 - bb.minX, bb.maxZ, bb.maxY); // D
case 1:
return new AABB(1 - bb.maxX, 1 - bb.maxZ, 1 - bb.maxY, 1 - bb.minX, 1 - bb.minZ, 1 - bb.minY); // U
case 2:
return new AABB(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); // N --> bb
case 3:
return new AABB(1 - bb.maxX, bb.minY, 1 - bb.maxZ, 1 - bb.minX, bb.maxY, 1 - bb.minZ); // S
case 4:
return new AABB(bb.minZ, bb.minY, 1 - bb.maxX, bb.maxZ, bb.maxY, 1 - bb.minX); // W
case 5:
return new AABB(1 - bb.maxZ, bb.minY, bb.minX, 1 - bb.minZ, bb.maxY, bb.maxX); // E
}
} else {
switch (new_facing.get3DDataValue()) {
case 0:
return new AABB(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); // D --> bb
case 1:
return new AABB(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); // U --> bb
case 2:
return new AABB(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); // N --> bb
case 3:
return new AABB(1 - bb.maxX, bb.minY, 1 - bb.maxZ, 1 - bb.minX, bb.maxY, 1 - bb.minZ); // S
case 4:
return new AABB(bb.minZ, bb.minY, 1 - bb.maxX, bb.maxZ, bb.maxY, 1 - bb.minX); // W
case 5:
return new AABB(1 - bb.maxZ, bb.minY, bb.minX, 1 - bb.minZ, bb.maxY, bb.maxX); // E
}
}
return bb;
}
public static AABB[] getRotatedAABB(AABB[] bbs, Direction new_facing, boolean horizontal_rotation) {
final AABB[] transformed = new AABB[bbs.length];
for (int i = 0; i < bbs.length; ++i) transformed[i] = getRotatedAABB(bbs[i], new_facing, horizontal_rotation);
return transformed;
}
public static AABB getYRotatedAABB(AABB bb, int clockwise_90deg_steps) {
final Direction[] direction_map = new Direction[]{Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST};
return getRotatedAABB(bb, direction_map[(clockwise_90deg_steps + 4096) & 0x03], true);
}
public static AABB[] getYRotatedAABB(AABB[] bbs, int clockwise_90deg_steps) {
final AABB[] transformed = new AABB[bbs.length];
for (int i = 0; i < bbs.length; ++i) transformed[i] = getYRotatedAABB(bbs[i], clockwise_90deg_steps);
return transformed;
}
public static AABB getMirroredAABB(AABB bb, Direction.Axis axis) {
return switch (axis) {
case X -> new AABB(1 - bb.maxX, bb.minY, bb.minZ, 1 - bb.minX, bb.maxY, bb.maxZ);
case Y -> new AABB(bb.minX, 1 - bb.maxY, bb.minZ, bb.maxX, 1 - bb.minY, bb.maxZ);
case Z -> new AABB(bb.minX, bb.minY, 1 - bb.maxZ, bb.maxX, bb.maxY, 1 - bb.minZ);
};
}
public static AABB[] getMirroredAABB(AABB[] bbs, Direction.Axis axis) {
final AABB[] transformed = new AABB[bbs.length];
for (int i = 0; i < bbs.length; ++i) transformed[i] = getMirroredAABB(bbs[i], axis);
return transformed;
}
public static VoxelShape getUnionShape(AABB... aabbs) {
VoxelShape shape = Shapes.empty();
for (AABB aabb : aabbs) shape = Shapes.joinUnoptimized(shape, Shapes.create(aabb), BooleanOp.OR);
return shape;
}
public static VoxelShape getUnionShape(AABB[]... aabb_list) {
VoxelShape shape = Shapes.empty();
for (AABB[] aabbs : aabb_list) {
for (AABB aabb : aabbs) shape = Shapes.joinUnoptimized(shape, Shapes.create(aabb), BooleanOp.OR);
}
return shape;
}
public static AABB[] getMappedAABB(AABB[] bbs, Function<AABB, AABB> mapper) {
final AABB[] transformed = new AABB[bbs.length];
for (int i = 0; i < bbs.length; ++i) transformed[i] = mapper.apply(bbs[i]);
return transformed;
}
public static final class BlockPosRange implements Iterable<BlockPos> {
private final int x0, x1, y0, y1, z0, z1;
public BlockPosRange(int x0, int y0, int z0, int x1, int y1, int z1) {
this.x0 = Math.min(x0, x1);
this.x1 = Math.max(x0, x1);
this.y0 = Math.min(y0, y1);
this.y1 = Math.max(y0, y1);
this.z0 = Math.min(z0, z1);
this.z1 = Math.max(z0, z1);
}
public static BlockPosRange of(AABB range) {
return new BlockPosRange(
(int) Math.floor(range.minX),
(int) Math.floor(range.minY),
(int) Math.floor(range.minZ),
(int) Math.floor(range.maxX - .0625),
(int) Math.floor(range.maxY - .0625),
(int) Math.floor(range.maxZ - .0625)
);
}
public int getXSize() {
return x1 - x0 + 1;
}
public int getYSize() {
return y1 - y0 + 1;
}
public int getZSize() {
return z1 - z0 + 1;
}
public int getArea() {
return getXSize() * getZSize();
}
public int getHeight() {
return getYSize();
}
public int getVolume() {
return getXSize() * getYSize() * getZSize();
}
public BlockPos byXZYIndex(int xyz_index) {
final int xsz = getXSize(), ysz = getYSize(), zsz = getZSize();
xyz_index = xyz_index % (xsz * ysz * zsz);
final int y = xyz_index / (xsz * zsz);
xyz_index -= y * (xsz * zsz);
final int z = xyz_index / xsz;
xyz_index -= z * xsz;
final int x = xyz_index;
return new BlockPos(x0 + x, y0 + y, z0 + z);
}
public BlockPos byXZIndex(int xz_index, int y_offset) {
final int xsz = getXSize(), zsz = getZSize();
xz_index = xz_index % (xsz * zsz);
final int z = xz_index / xsz;
xz_index -= z * xsz;
final int x = xz_index;
return new BlockPos(x0 + x, y0 + y_offset, z0 + z);
}
public static final class BlockRangeIterator implements Iterator<BlockPos> {
private final BlockPosRange range_;
private int x, y, z;
public BlockRangeIterator(BlockPosRange range) {
range_ = range;
x = range.x0;
y = range.y0;
z = range.z0;
}
@Override
public boolean hasNext() {
return (z <= range_.z1);
}
@Override
public BlockPos next() {
if (!hasNext()) throw new NoSuchElementException();
final BlockPos pos = new BlockPos(x, y, z);
++x;
if (x > range_.x1) {
x = range_.x0;
++y;
if (y > range_.y1) {
y = range_.y0;
++z;
}
}
return pos;
}
}
@Override
public BlockRangeIterator iterator() {
return new BlockRangeIterator(this);
}
public Stream<BlockPos> stream() {
return java.util.stream.StreamSupport.stream(spliterator(), false);
}
}
// -------------------------------------------------------------------------------------------------------------------
// JAR resource related
// -------------------------------------------------------------------------------------------------------------------
public static String loadResourceText(InputStream is) {
try {
if (is == null) return "";
BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
return br.lines().collect(Collectors.joining("\n"));
} catch (Throwable e) {
return "";
}
}
public static String loadResourceText(String path) {
return loadResourceText(Auxiliaries.class.getResourceAsStream(path));
}
public static void logGitVersion(String mod_name) {
try {
// Done during construction to have an exact version in case of a crash while registering.
String version = Auxiliaries.loadResourceText("/.gitversion-" + modid).trim();
logInfo(mod_name + ((version.isEmpty()) ? (" (dev build)") : (" GIT id #" + version)) + ".");
} catch (Throwable e) {
// (void)e; well, then not. Priority is not to get unneeded crashes because of version logging.
}
}
}

View file

@ -0,0 +1,138 @@
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.util.Mth;
import net.minecraft.world.Container;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.Slot;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import java.util.function.BiConsumer;
public class Containers {
// -------------------------------------------------------------------------------------------------------------------
// Slots
// -------------------------------------------------------------------------------------------------------------------
public static class StorageSlot extends Slot {
protected BiConsumer<ItemStack, ItemStack> slot_change_action_ = (oldStack, newStack) -> {
};
protected int stack_limit_ = 64;
public boolean enabled = true;
public StorageSlot(Container inventory, int index, int x, int y) {
super(inventory, index, x, y);
}
public StorageSlot setSlotStackLimit(int limit) {
stack_limit_ = Mth.clamp(limit, 1, 64);
return this;
}
public int getMaxStackSize() {
return stack_limit_;
}
public StorageSlot setSlotChangeNotifier(BiConsumer<ItemStack, ItemStack> action) {
slot_change_action_ = action;
return this;
}
@Override
public void onQuickCraft(ItemStack oldStack, ItemStack newStack) {
slot_change_action_.accept(oldStack, newStack);
} // no crafting trigger
@Override
public void set(ItemStack stack) {
if (stack.is(getItem().getItem())) {
super.set(stack);
} else {
final ItemStack before = getItem().copy();
super.set(stack); // whatever this does else next to setting inventory.
slot_change_action_.accept(before, getItem());
}
}
@Override
public boolean mayPlace(ItemStack stack) {
return enabled && this.container.canPlaceItem(this.getSlotIndex(), stack);
}
@Override
public int getMaxStackSize(ItemStack stack) {
return Math.min(getMaxStackSize(), stack_limit_);
}
@OnlyIn(Dist.CLIENT)
public boolean isActive() {
return enabled;
}
}
public static class LockedSlot extends Slot {
protected int stack_limit_ = 64;
public boolean enabled = true;
public LockedSlot(Container inventory, int index, int x, int y) {
super(inventory, index, x, y);
}
public LockedSlot setSlotStackLimit(int limit) {
stack_limit_ = Mth.clamp(limit, 1, 64);
return this;
}
public int getMaxStackSize() {
return stack_limit_;
}
@Override
public int getMaxStackSize(ItemStack stack) {
return Math.min(getMaxStackSize(), stack_limit_);
}
@Override
public boolean mayPlace(ItemStack stack) {
return false;
}
@Override
public boolean mayPickup(Player player) {
return false;
}
@OnlyIn(Dist.CLIENT)
public boolean isActive() {
return enabled;
}
}
public static class HiddenSlot extends Slot {
public HiddenSlot(Container inventory, int index) {
super(inventory, index, 0, 0);
}
@Override
public int getMaxStackSize(ItemStack stack) {
return getMaxStackSize();
}
@Override
public boolean mayPlace(ItemStack stack) {
return false;
}
@Override
public boolean mayPickup(Player player) {
return false;
}
@OnlyIn(Dist.CLIENT)
public boolean isActive() {
return false;
}
}
}

View file

@ -0,0 +1,440 @@
/*
* @file Recipes.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Recipe utility functionality.
*/
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.core.NonNullList;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import net.minecraft.util.Tuple;
import net.minecraft.world.Container;
import net.minecraft.world.SimpleContainer;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.player.StackedContents;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.CraftingContainer;
import net.minecraft.world.item.EnchantedBookItem;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.*;
import net.minecraft.world.item.enchantment.Enchantment;
import net.minecraft.world.item.enchantment.EnchantmentHelper;
import net.minecraft.world.item.enchantment.EnchantmentInstance;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.ComposterBlock;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.common.brewing.BrewingRecipeRegistry;
import javax.annotation.Nullable;
import java.util.*;
import java.util.function.BiPredicate;
public class Crafting {
// -------------------------------------------------------------------------------------------------------------------
/**
* Returns a Crafting recipe by registry name.
*/
public static Optional<CraftingRecipe> getCraftingRecipe(Level world, ResourceLocation recipe_id) {
Recipe<?> recipe = world.getRecipeManager().byKey(recipe_id).orElse(null);
return (recipe instanceof CraftingRecipe) ? Optional.of((CraftingRecipe) recipe) : Optional.empty();
}
/**
* Returns a list of matching recipes by the first N slots (crafting grid slots) of the given inventory.
*/
public static List<CraftingRecipe> get3x3CraftingRecipes(Level world, Container crafting_grid_slots) {
return CraftingGrid.instance3x3.getRecipes(world, crafting_grid_slots);
}
/**
* Returns a recipe by the first N slots (crafting grid slots).
*/
public static Optional<CraftingRecipe> get3x3CraftingRecipe(Level world, Container crafting_grid_slots) {
return get3x3CraftingRecipes(world, crafting_grid_slots).stream().findFirst();
}
/**
* Returns the result item of the recipe with the given grid layout.
*/
public static ItemStack get3x3CraftingResult(Level world, Container grid, CraftingRecipe recipe) {
return CraftingGrid.instance3x3.getCraftingResult(world, grid, recipe);
}
/**
* Returns the items remaining in the grid after crafting 3x3.
*/
public static List<ItemStack> get3x3RemainingItems(Level world, Container grid, CraftingRecipe recipe) {
return CraftingGrid.instance3x3.getRemainingItems(world, grid, recipe);
}
public static List<ItemStack> get3x3Placement(Level world, CraftingRecipe recipe, Container item_inventory, @Nullable Container crafting_grid) {
final int width = 3;
final int height = 3;
if (!recipe.canCraftInDimensions(width, height)) return Collections.emptyList();
List<ItemStack> used = new ArrayList<>(); //NonNullList.withSize(width*height);
for (int i = width * height; i > 0; --i) used.add(ItemStack.EMPTY);
Container check_inventory = Inventories.copyOf(item_inventory);
Inventories.InventoryRange source = new Inventories.InventoryRange(check_inventory);
final List<Ingredient> ingredients = recipe.getIngredients();
final List<ItemStack> preferred = new ArrayList<>(width * height);
if (crafting_grid != null) {
for (int i = 0; i < crafting_grid.getContainerSize(); ++i) {
ItemStack stack = crafting_grid.getItem(i);
if (stack.isEmpty()) continue;
stack = stack.copy();
stack.setCount(1);
if (!source.extract(stack).isEmpty()) preferred.add(stack);
}
}
for (int i = 0; i < ingredients.size(); ++i) {
final Ingredient ingredient = ingredients.get(i);
if (ingredient == Ingredient.EMPTY) continue;
ItemStack stack = preferred.stream().filter(ingredient).findFirst().orElse(ItemStack.EMPTY);
if (!stack.isEmpty()) {
preferred.remove(stack);
} else {
stack = source.stream().filter(ingredient).findFirst().orElse(ItemStack.EMPTY);
if (stack.isEmpty()) return Collections.emptyList();
stack = stack.copy();
stack.setCount(1);
if (source.extract(stack).isEmpty()) return Collections.emptyList();
}
used.set(i, stack);
}
if (recipe instanceof ShapedRecipe shaped) {
List<ItemStack> placement = NonNullList.withSize(width * height, ItemStack.EMPTY);
for (int row = 0; row < shaped.getRecipeHeight(); ++row) {
for (int col = 0; col < shaped.getRecipeWidth(); ++col) {
placement.set(width * row + col, used.get(row * shaped.getRecipeWidth() + col));
}
}
return placement;
} else {
return used;
}
}
/**
* Returns the recipe for a given input stack to smelt, null if there is no recipe
* for the given type (SMELTING,BLASTING,SMOKING, etc).
*/
public static <T extends Recipe<?>> Optional<AbstractCookingRecipe> getFurnaceRecipe(RecipeType<T> recipe_type, Level world, ItemStack input_stack) {
if (input_stack.isEmpty()) {
return Optional.empty();
} else if (recipe_type == RecipeType.SMELTING) {
SimpleContainer inventory = new SimpleContainer(3);
inventory.setItem(0, input_stack);
SmeltingRecipe recipe = world.getRecipeManager().getRecipeFor(RecipeType.SMELTING, inventory, world).orElse(null);
return (recipe == null) ? Optional.empty() : Optional.of(recipe);
} else if (recipe_type == RecipeType.BLASTING) {
SimpleContainer inventory = new SimpleContainer(3);
inventory.setItem(0, input_stack);
BlastingRecipe recipe = world.getRecipeManager().getRecipeFor(RecipeType.BLASTING, inventory, world).orElse(null);
return (recipe == null) ? Optional.empty() : Optional.of(recipe);
} else if (recipe_type == RecipeType.SMOKING) {
SimpleContainer inventory = new SimpleContainer(3);
inventory.setItem(0, input_stack);
SmokingRecipe recipe = world.getRecipeManager().getRecipeFor(RecipeType.SMOKING, inventory, world).orElse(null);
return (recipe == null) ? Optional.empty() : Optional.of(recipe);
} else {
return Optional.empty();
}
}
// -------------------------------------------------------------------------------------------------------------------
public static <T extends Recipe<?>> int getSmeltingTimeNeeded(RecipeType<T> recipe_type, Level world, ItemStack stack) {
if (stack.isEmpty()) return 0;
final int t = getFurnaceRecipe(recipe_type, world, stack).map((AbstractCookingRecipe::getCookingTime)).orElse(0);
return (t <= 0) ? 200 : t;
}
/**
* Returns the burn time of an item when used as fuel, 0 if it is no fuel.
*/
public static int getFuelBurntime(Level world, ItemStack stack) {
if (stack.isEmpty()) return 0;
int t = ForgeHooks.getBurnTime(stack, null);
return Math.max(t, 0);
}
/**
* Returns true if an item can be used as fuel.
*/
public static boolean isFuel(Level world, ItemStack stack) {
return (getFuelBurntime(world, stack) > 0) || (stack.getItem() == Items.LAVA_BUCKET);
}
/**
* Returns burntime and remaining stack then the item shall be used as fuel.
*/
public static Tuple<Integer, ItemStack> consumeFuel(Level world, ItemStack stack) {
if (stack.isEmpty()) return new Tuple<>(0, stack);
int burnime = getFuelBurntime(world, stack);
if ((stack.getItem() == Items.LAVA_BUCKET)) {
if (burnime <= 0) burnime = 1000 * 20;
return new Tuple<>(burnime, new ItemStack(Items.BUCKET));
} else if (burnime <= 0) {
return new Tuple<>(0, stack);
} else {
ItemStack left_over = stack.copy();
left_over.shrink(1);
return new Tuple<>(burnime, left_over);
}
}
/**
* Returns true if the item can be used as brewing fuel.
*/
public static boolean isBrewingFuel(Level world, ItemStack stack) {
return (stack.getItem() == Items.BLAZE_POWDER) || (stack.getItem() == Items.BLAZE_ROD);
}
// -------------------------------------------------------------------------------------------------------------------
/**
* Returns true if the item can be used as brewing ingredient.
*/
public static boolean isBrewingIngredient(Level world, ItemStack stack) {
return BrewingRecipeRegistry.isValidIngredient(stack);
}
/**
* Returns true if the item can be used as brewing bottle.
*/
public static boolean isBrewingInput(Level world, ItemStack stack) {
return BrewingRecipeRegistry.isValidInput(stack);
}
/**
* Returns the burn time for brewing of the given stack.
*/
public static int getBrewingFuelBurntime(Level world, ItemStack stack) {
if (stack.isEmpty()) return 0;
if (stack.getItem() == Items.BLAZE_POWDER) return (400 * 20);
if (stack.getItem() == Items.BLAZE_ROD) return (400 * 40);
return 0;
}
/**
* Returns brewing burn time and remaining stack if the item shall be used as fuel.
*/
public static Tuple<Integer, ItemStack> consumeBrewingFuel(Level world, ItemStack stack) {
int burntime = getBrewingFuelBurntime(world, stack);
if (burntime <= 0) return new Tuple<>(0, stack.copy());
stack = stack.copy();
stack.shrink(1);
return new Tuple<>(burntime, stack.isEmpty() ? ItemStack.EMPTY : stack);
}
public static double getCompostingChance(ItemStack stack) {
return ComposterBlock.COMPOSTABLES.getOrDefault(stack.getItem(), 0);
}
/**
* Returns the enchtments bound to the given stack.
*/
public static Map<Enchantment, Integer> getEnchantmentsOnItem(Level world, ItemStack stack) {
return (stack.isEmpty() || (stack.getTag() == null)) ? Collections.emptyMap() : EnchantmentHelper.getEnchantments(stack);
}
// -------------------------------------------------------------------------------------------------------------------
/**
* Returns an enchanted book with the given enchantment, emtpy stack if not applicable.
*/
public static ItemStack getEnchantmentBook(Level world, Enchantment enchantment, int level) {
return ((!enchantment.isAllowedOnBooks()) || (level <= 0)) ? ItemStack.EMPTY : EnchantedBookItem.createForEnchantment(new EnchantmentInstance(enchantment, level));
}
// -------------------------------------------------------------------------------------------------------------------
/**
* Returns the accumulated repair cost for the given enchantments.
*/
public static int getEnchantmentRepairCost(Level world, Map<Enchantment, Integer> enchantments) {
int repair_cost = 0;
for (Map.Entry<Enchantment, Integer> e : enchantments.entrySet())
repair_cost = repair_cost * 2 + 1; // @see: RepairContainer.getNewRepairCost()
return repair_cost;
}
/**
* Trys to add an enchtment to the given stack, returns boolean success.
*/
public static boolean addEnchantmentOnItem(Level world, ItemStack stack, Enchantment enchantment, int level) {
if (stack.isEmpty() || (level <= 0) || (!stack.isEnchantable()) || (level >= enchantment.getMaxLevel()))
return false;
final Map<Enchantment, Integer> on_item = getEnchantmentsOnItem(world, stack);
if (on_item.keySet().stream().anyMatch(ench -> ench.isCompatibleWith(enchantment))) return false;
final ItemStack book = EnchantedBookItem.createForEnchantment(new EnchantmentInstance(enchantment, level));
if ((!(stack.isBookEnchantable(book) && enchantment.isAllowedOnBooks())) && (!stack.canApplyAtEnchantingTable(enchantment)) && (!enchantment.canEnchant(stack)))
return false;
final int existing_level = on_item.getOrDefault(enchantment, 0);
if (existing_level > 0) level = Mth.clamp(level + existing_level, 1, enchantment.getMaxLevel());
on_item.put(enchantment, level);
EnchantmentHelper.setEnchantments(on_item, stack);
stack.setRepairCost(getEnchantmentRepairCost(world, on_item));
return true;
}
/**
* Removes enchantments from a stack, returns the removed enchantments.
*/
public static Map<Enchantment, Integer> removeEnchantmentsOnItem(Level world, ItemStack stack, BiPredicate<Enchantment, Integer> filter) {
if (stack.isEmpty()) return Collections.emptyMap();
final Map<Enchantment, Integer> on_item = getEnchantmentsOnItem(world, stack);
final Map<Enchantment, Integer> removed = new HashMap<>();
for (Map.Entry<Enchantment, Integer> e : on_item.entrySet()) {
if (filter.test(e.getKey(), e.getValue())) {
removed.put(e.getKey(), e.getValue());
}
}
for (Enchantment e : removed.keySet()) {
on_item.remove(e);
}
EnchantmentHelper.setEnchantments(on_item, stack);
stack.setRepairCost(getEnchantmentRepairCost(world, on_item));
return removed;
}
public static final class CraftingGrid implements CraftingContainer {
private static final CraftingGrid instance3x3 = new CraftingGrid(3, 3);
final int _width;
private CraftingGrid(int width, int height) {
_width=width;
}
private void fill(Container grid) {
for (int i = 0; i < getContainerSize(); ++i)
setItem(i, i >= grid.getContainerSize() ? ItemStack.EMPTY : grid.getItem(i));
}
public List<CraftingRecipe> getRecipes(Level world, Container grid) {
fill(grid);
return world.getRecipeManager().getRecipesFor(RecipeType.CRAFTING, this, world);
}
public List<ItemStack> getRemainingItems(Level world, Container grid, CraftingRecipe recipe) {
fill(grid);
return recipe.getRemainingItems(this);
}
public ItemStack getCraftingResult(Level world, Container grid, CraftingRecipe recipe) {
fill(grid);
return recipe.assemble(this, world.registryAccess());
}
@Override
public int getWidth() {
return _width;
}
@Override
public int getHeight() {
return 0;
}
@Override
public List<ItemStack> getItems() {
return null;
}
@Override
public int getContainerSize() {
return 0;
}
@Override
public boolean isEmpty() {
return false;
}
@Override
public ItemStack getItem(int i) {
return null;
}
@Override
public ItemStack removeItem(int i, int i1) {
return null;
}
@Override
public ItemStack removeItemNoUpdate(int i) {
return null;
}
@Override
public void setItem(int i, ItemStack itemStack) {
}
@Override
public void setChanged() {
}
@Override
public boolean stillValid(Player player) {
return false;
}
@Override
public void clearContent() {
}
@Override
public void fillStackedContents(StackedContents stackedContents) {
}
}
public static final class BrewingOutput {
public static final int DEFAULT_BREWING_TIME = 400;
public static final BrewingOutput EMPTY = new BrewingOutput(ItemStack.EMPTY, new SimpleContainer(1), new SimpleContainer(1), 0, 0, DEFAULT_BREWING_TIME);
public final ItemStack item;
public final Container potionInventory;
public final Container ingredientInventory;
public final int potionSlot;
public final int ingredientSlot;
public final int brewTime;
public BrewingOutput(ItemStack output_potion, Container potion_inventory, Container ingredient_inventory, int potion_slot, int ingredient_slot, int time_needed) {
item = output_potion;
potionInventory = potion_inventory;
ingredientInventory = ingredient_inventory;
potionSlot = potion_slot;
ingredientSlot = ingredient_slot;
brewTime = time_needed;
}
public static BrewingOutput find(Level world, Container potion_inventory, Container ingredient_inventory) {
for (int potion_slot = 0; potion_slot < potion_inventory.getContainerSize(); ++potion_slot) {
final ItemStack pstack = potion_inventory.getItem(potion_slot);
if (!isBrewingInput(world, pstack)) continue;
for (int ingredient_slot = 0; ingredient_slot < ingredient_inventory.getContainerSize(); ++ingredient_slot) {
final ItemStack istack = ingredient_inventory.getItem(ingredient_slot);
if ((!isBrewingIngredient(world, istack)) || (ingredient_slot == potion_slot) || (isBrewingFuel(world, istack)))
continue;
final ItemStack result = BrewingRecipeRegistry.getOutput(pstack, istack);
if (result.isEmpty()) continue;
return new BrewingOutput(result, potion_inventory, ingredient_inventory, potion_slot, ingredient_slot, DEFAULT_BREWING_TIME);
}
}
return BrewingOutput.EMPTY;
}
}
}

View file

@ -0,0 +1,485 @@
/*
* @file Fluidics.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* General fluid handling functionality.
*/
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.Mth;
import net.minecraft.util.Tuple;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.material.Fluid;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraft.nbt.Tag;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidActionResult;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction;
import net.minecraftforge.fluids.capability.IFluidHandlerItem;
import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.function.Predicate;
public class Fluidics {
public static class SingleTankFluidHandler implements IFluidHandler {
private final IFluidTank tank_;
public SingleTankFluidHandler(IFluidTank tank) {
tank_ = tank;
}
@Override
public int getTanks() {
return 1;
}
@Override
public FluidStack getFluidInTank(int tank) {
return tank_.getFluid();
}
@Override
public int getTankCapacity(int tank) {
return tank_.getCapacity();
}
@Override
public boolean isFluidValid(int tank, @Nonnull FluidStack stack) {
return tank_.isFluidValid(stack);
}
@Override
public int fill(FluidStack resource, FluidAction action) {
return tank_.fill(resource, action);
}
@Override
public FluidStack drain(FluidStack resource, FluidAction action) {
return tank_.drain(resource, action);
}
@Override
public FluidStack drain(int maxDrain, FluidAction action) {
return tank_.drain(maxDrain, action);
}
}
private static class SingleTankOutputFluidHandler implements IFluidHandler {
private final IFluidTank tank_;
public SingleTankOutputFluidHandler(IFluidTank tank) {
tank_ = tank;
}
@Override
public int getTanks() {
return 1;
}
@Override
public FluidStack getFluidInTank(int tank) {
return tank_.getFluid().copy();
}
@Override
public int getTankCapacity(int tank) {
return tank_.getCapacity();
}
@Override
public boolean isFluidValid(int tank, @Nonnull FluidStack stack) {
return true;
}
@Override
public int fill(FluidStack resource, FluidAction action) {
return 0;
}
@Override
public FluidStack drain(FluidStack resource, FluidAction action) {
return tank_.drain(resource, action);
}
@Override
public FluidStack drain(int maxDrain, FluidAction action) {
return tank_.drain(maxDrain, action);
}
}
public static class Tank implements IFluidTank {
private Predicate<FluidStack> validator_ = ((e) -> true);
private BiConsumer<Tank, Integer> interaction_notifier_ = ((tank, diff) -> {
});
private FluidStack fluid_ = FluidStack.EMPTY;
private int capacity_;
private int fill_rate_;
private int drain_rate_;
public Tank(int capacity) {
this(capacity, capacity, capacity);
}
public Tank(int capacity, int fill_rate, int drain_rate) {
this(capacity, fill_rate, drain_rate, e -> true);
}
public Tank(int capacity, int fill_rate, int drain_rate, Predicate<FluidStack> validator) {
capacity_ = capacity;
setMaxFillRate(fill_rate);
setMaxDrainRate(drain_rate);
setValidator(validator);
}
public Tank load(CompoundTag nbt) {
if (nbt.contains("tank", Tag.TAG_COMPOUND)) {
setFluid(FluidStack.loadFluidStackFromNBT(nbt.getCompound("tank")));
} else {
clear();
}
return this;
}
public CompoundTag save(CompoundTag nbt) {
if (!isEmpty()) {
nbt.put("tank", fluid_.writeToNBT(new CompoundTag()));
}
return nbt;
}
public void reset() {
clear();
}
public Tank clear() {
setFluid(null);
return this;
}
public int getCapacity() {
return capacity_;
}
public Tank setCapacity(int capacity) {
capacity_ = capacity;
return this;
}
public int getMaxDrainRate() {
return drain_rate_;
}
public Tank setMaxDrainRate(int rate) {
drain_rate_ = Mth.clamp(rate, 0, capacity_);
return this;
}
public int getMaxFillRate() {
return fill_rate_;
}
public Tank setMaxFillRate(int rate) {
fill_rate_ = Mth.clamp(rate, 0, capacity_);
return this;
}
public Tank setValidator(Predicate<FluidStack> validator) {
validator_ = (validator != null) ? validator : ((e) -> true);
return this;
}
public Tank setInteractionNotifier(BiConsumer<Tank, Integer> notifier) {
interaction_notifier_ = (notifier != null) ? notifier : ((tank, diff) -> {
});
return this;
}
public LazyOptional<IFluidHandler> createFluidHandler() {
return LazyOptional.of(() -> new Fluidics.SingleTankFluidHandler(this));
}
public LazyOptional<IFluidHandler> createOutputFluidHandler() {
return LazyOptional.of(() -> new Fluidics.SingleTankOutputFluidHandler(this));
}
// IFluidTank ------------------------------------------------------------------------------------
@Nonnull
public FluidStack getFluid() {
return fluid_;
}
public void setFluid(@Nullable FluidStack stack) {
fluid_ = (stack == null) ? FluidStack.EMPTY : stack;
}
public int getFluidAmount() {
return fluid_.getAmount();
}
public boolean isEmpty() {
return fluid_.isEmpty();
}
public boolean isFull() {
return getFluidAmount() >= getCapacity();
}
public boolean isFluidValid(FluidStack stack) {
return validator_.test(stack);
}
public boolean isFluidEqual(FluidStack stack) {
return (stack == null) ? (fluid_.isEmpty()) : fluid_.isFluidEqual(stack);
}
@Override
public int fill(FluidStack fs, FluidAction action) {
if ((fs == null) || fs.isEmpty() || (!isFluidValid(fs))) {
return 0;
} else if (action.simulate()) {
if (fluid_.isEmpty()) return Math.min(capacity_, fs.getAmount());
if (!fluid_.isFluidEqual(fs)) return 0;
return Math.min(capacity_ - fluid_.getAmount(), fs.getAmount());
} else if (fluid_.isEmpty()) {
fluid_ = new FluidStack(fs, Math.min(capacity_, fs.getAmount()));
return fluid_.getAmount();
} else if (!fluid_.isFluidEqual(fs)) {
return 0;
} else {
int amount = capacity_ - fluid_.getAmount();
if (fs.getAmount() < amount) {
fluid_.grow(fs.getAmount());
amount = fs.getAmount();
} else {
fluid_.setAmount(capacity_);
}
if (amount != 0) interaction_notifier_.accept(this, amount);
return amount;
}
}
@Nonnull
public FluidStack drain(int maxDrain) {
return drain(maxDrain, FluidAction.EXECUTE);
}
@Nonnull
@Override
public FluidStack drain(FluidStack fs, FluidAction action) {
return ((fs.isEmpty()) || (!fs.isFluidEqual(fluid_))) ? FluidStack.EMPTY : drain(fs.getAmount(), action);
}
@Nonnull
@Override
public FluidStack drain(int maxDrain, FluidAction action) {
final int amount = Math.min(fluid_.getAmount(), maxDrain);
final FluidStack stack = new FluidStack(fluid_, amount);
if ((amount > 0) && action.execute()) {
fluid_.shrink(amount);
if (fluid_.isEmpty()) fluid_ = FluidStack.EMPTY;
if (amount != 0) interaction_notifier_.accept(this, -amount);
}
return stack;
}
}
// -------------------------------------------------------------------------------------------------------------------
public static @Nullable IFluidHandler handler(Level world, BlockPos pos, @Nullable Direction side) {
return FluidUtil.getFluidHandler(world, pos, side).orElse(null);
}
/**
* Fills or drains items with fluid handlers from or into tile blocks with fluid handlers.
*/
public static boolean manualFluidHandlerInteraction(Level world, BlockPos pos, @Nullable Direction side, Player player, InteractionHand hand) {
return manualTrackedFluidHandlerInteraction(world, pos, side, player, hand) != null;
}
public static boolean manualFluidHandlerInteraction(Player player, InteractionHand hand, IFluidHandler handler) {
return FluidUtil.interactWithFluidHandler(player, hand, handler);
}
/**
* Fills or drains items with fluid handlers from or into tile blocks with fluid handlers.
* Returns the fluid and (possibly negative) amount that transferred from the item into the block.
*/
public static @Nullable Tuple<Fluid, Integer> manualTrackedFluidHandlerInteraction(Level world, BlockPos pos, @Nullable Direction side, Player player, InteractionHand hand) {
if (world.isClientSide()) return null;
final ItemStack held = player.getItemInHand(hand);
if (held.isEmpty()) return null;
final IFluidHandler fh = handler(world, pos, side);
if (fh == null) return null;
final IItemHandler ih = player.getCapability(ForgeCapabilities.ITEM_HANDLER).orElse(null);
if (ih == null) return null;
FluidActionResult far = FluidUtil.tryFillContainerAndStow(held, fh, ih, Integer.MAX_VALUE, player, true);
if (!far.isSuccess()) far = FluidUtil.tryEmptyContainerAndStow(held, fh, ih, Integer.MAX_VALUE, player, true);
if (!far.isSuccess()) return null;
final ItemStack rstack = far.getResult().copy();
player.setItemInHand(hand, far.getResult());
final IFluidHandler fh_before = FluidUtil.getFluidHandler(held).orElse(null);
final IFluidHandler fh_after = FluidUtil.getFluidHandler(rstack).orElse(null);
if ((fh_before == null) || (fh_after == null) || (fh_after.getTanks() != fh_before.getTanks()))
return null; // should not be, but y'never know.
for (int i = 0; i < fh_before.getTanks(); ++i) {
final int vol_before = fh_before.getFluidInTank(i).getAmount();
final int vol_after = fh_after.getFluidInTank(i).getAmount();
if (vol_before != vol_after) {
return new Tuple<>(
(vol_before > 0) ? (fh_before.getFluidInTank(i).getFluid()) : (fh_after.getFluidInTank(i).getFluid()),
(vol_before - vol_after)
);
}
}
return null;
}
public static boolean manualFluidHandlerInteraction(Player player, InteractionHand hand, Level world, BlockPos pos, @Nullable Direction side) {
return FluidUtil.interactWithFluidHandler(player, hand, world, pos, side);
}
public static int fill(Level world, BlockPos pos, Direction side, FluidStack fs, FluidAction action) {
IFluidHandler fh = FluidUtil.getFluidHandler(world, pos, side).orElse(null);
return (fh == null) ? (0) : (fh.fill(fs, action));
}
public static int fill(Level world, BlockPos pos, Direction side, FluidStack fs) {
return fill(world, pos, side, fs, FluidAction.EXECUTE);
}
/**
* Fluid tank access when itemized.
*/
public static class FluidContainerItemCapabilityWrapper implements IFluidHandlerItem, ICapabilityProvider {
private final LazyOptional<IFluidHandlerItem> handler_ = LazyOptional.of(() -> this);
private final Function<ItemStack, CompoundTag> nbt_getter_;
private final BiConsumer<ItemStack, CompoundTag> nbt_setter_;
private final Predicate<FluidStack> validator_;
private final ItemStack container_;
private final int capacity_;
private final int transfer_rate_;
public FluidContainerItemCapabilityWrapper(ItemStack container, int capacity, int transfer_rate,
Function<ItemStack, CompoundTag> nbt_getter,
BiConsumer<ItemStack, CompoundTag> nbt_setter,
Predicate<FluidStack> validator) {
container_ = container;
capacity_ = capacity;
transfer_rate_ = transfer_rate;
nbt_getter_ = nbt_getter;
nbt_setter_ = nbt_setter;
validator_ = (validator != null) ? validator : (e -> true);
}
@Override
public <T> LazyOptional<T> getCapability(Capability<T> capability, @Nullable Direction side) {
return (capability == ForgeCapabilities.FLUID_HANDLER) ? handler_.cast() : LazyOptional.empty();
}
protected FluidStack readnbt() {
final CompoundTag nbt = nbt_getter_.apply(container_);
return ((nbt == null) || (nbt.isEmpty())) ? FluidStack.EMPTY : FluidStack.loadFluidStackFromNBT(nbt);
}
protected void writenbt(FluidStack fs) {
CompoundTag nbt = new CompoundTag();
if (!fs.isEmpty()) fs.writeToNBT(nbt);
nbt_setter_.accept(container_, nbt);
}
@Override
public ItemStack getContainer() {
return container_;
}
@Override
public int getTanks() {
return 1;
}
@Override
public FluidStack getFluidInTank(int tank) {
return readnbt();
}
@Override
public int getTankCapacity(int tank) {
return capacity_;
}
@Override
public boolean isFluidValid(int tank, FluidStack fs) {
return isFluidValid(fs);
}
public boolean isFluidValid(FluidStack fs) {
return validator_.test(fs);
}
@Override
public int fill(FluidStack fs, FluidAction action) {
if ((fs.isEmpty()) || (!isFluidValid(fs) || (container_.getCount() != 1))) return 0;
FluidStack tank = readnbt();
final int amount = Math.min(Math.min(fs.getAmount(), transfer_rate_), capacity_ - tank.getAmount());
if (amount <= 0) return 0;
if (tank.isEmpty()) {
if (action.execute()) {
tank = new FluidStack(fs.getFluid(), amount, fs.getTag());
writenbt(tank);
}
} else {
if (!tank.isFluidEqual(fs)) {
return 0;
} else if (action.execute()) {
tank.grow(amount);
writenbt(tank);
}
}
return amount;
}
@Override
public FluidStack drain(FluidStack fs, FluidAction action) {
if ((fs.isEmpty()) || (container_.getCount() != 1)) return FluidStack.EMPTY;
final FluidStack tank = readnbt();
if ((!tank.isEmpty()) && (!tank.isFluidEqual(fs))) return FluidStack.EMPTY;
return drain(fs.getAmount(), action);
}
@Override
public FluidStack drain(int max, FluidAction action) {
if ((max <= 0) || (container_.getCount() != 1)) return FluidStack.EMPTY;
FluidStack tank = readnbt();
if (tank.isEmpty()) return FluidStack.EMPTY;
final int amount = Math.min(Math.min(tank.getAmount(), max), transfer_rate_);
final FluidStack fs = tank.copy();
fs.setAmount(amount);
if (action.execute()) {
tank.shrink(amount);
writenbt(tank);
}
return fs;
}
}
}

View file

@ -0,0 +1,466 @@
/*
* @file Guis.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Gui Wrappers and Widgets.
*/
package dev.zontreck.libzontreck.edlibmc;
import com.mojang.blaze3d.platform.Window;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.client.gui.narration.NarrationElementOutput;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.client.sounds.SoundManager;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import java.util.Arrays;
import java.util.function.Consumer;
import java.util.function.Function;
public class Guis {
// -------------------------------------------------------------------------------------------------------------------
// Gui base
// -------------------------------------------------------------------------------------------------------------------
@OnlyIn(Dist.CLIENT)
public static abstract class ContainerGui<T extends AbstractContainerMenu> extends AbstractContainerScreen<T> {
protected final ResourceLocation background_image_;
protected final Player player_;
protected final Guis.BackgroundImage gui_background_;
protected final TooltipDisplay tooltip_ = new TooltipDisplay();
public ContainerGui(T menu, Inventory player_inv, Component title, String background_image, int width, int height) {
super(menu, player_inv, title);
this.background_image_ = new ResourceLocation(Auxiliaries.modid(), background_image);
this.player_ = player_inv.player;
this.imageWidth = width;
this.imageHeight = height;
gui_background_ = new Guis.BackgroundImage(background_image_, width, height, Coord2d.ORIGIN);
}
public ContainerGui(T menu, Inventory player_inv, Component title, String background_image) {
super(menu, player_inv, title);
this.background_image_ = new ResourceLocation(Auxiliaries.modid(), background_image);
this.player_ = player_inv.player;
gui_background_ = new Guis.BackgroundImage(background_image_, imageWidth, imageHeight, Coord2d.ORIGIN);
}
@Override
public void init() {
super.init();
gui_background_.init(this, Coord2d.ORIGIN).show();
}
@Override
public void render(GuiGraphics mx, int mouseX, int mouseY, float partialTicks) {
renderBackground(mx);
super.render(mx, mouseX, mouseY, partialTicks);
if (!tooltip_.render(mx, this, mouseX, mouseY)) renderTooltip(mx, mouseX, mouseY);
}
@Override
protected void renderLabels(GuiGraphics mx, int x, int y) {
}
@Override
@SuppressWarnings("deprecation")
protected final void renderBg(GuiGraphics mx, float partialTicks, int mouseX, int mouseY) {
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
RenderSystem.enableDepthTest();
gui_background_.draw(mx, this);
renderBgWidgets(mx, partialTicks, mouseX, mouseY);
RenderSystem.disableBlend();
}
public final ResourceLocation getBackgroundImage() {
return background_image_;
}
protected void renderBgWidgets(GuiGraphics mx, float partialTicks, int mouseX, int mouseY) {
}
protected void renderItemTemplate(GuiGraphics mx, ItemStack stack, int x, int y) {
final int x0 = getGuiLeft();
final int y0 = getGuiTop();
mx.renderFakeItem(stack, x0 + x, y0 + y);
RenderSystem.disableColorLogicOp(); //RenderSystem.disableColorMaterial();
RenderSystem.enableDepthTest(); //RenderSystem.enableAlphaTest();
RenderSystem.defaultBlendFunc();
RenderSystem.enableBlend();
RenderSystem.colorMask(true, true, true, true);
RenderSystem.setShaderColor(0.7f, 0.7f, 0.7f, 0.8f);
RenderSystem.setShaderTexture(0, background_image_);
mx.blit(background_image_,x0 + x, y0 + y, x, y, 16, 16);
RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
}
}
// -------------------------------------------------------------------------------------------------------------------
// Gui elements
// -------------------------------------------------------------------------------------------------------------------
@OnlyIn(Dist.CLIENT)
public static class Coord2d {
public static final Coord2d ORIGIN = new Coord2d(0, 0);
public final int x, y;
public Coord2d(int x, int y) {
this.x = x;
this.y = y;
}
public static Coord2d of(int x, int y) {
return new Coord2d(x, y);
}
public String toString() {
return "[" + x + "," + y + "]";
}
}
@OnlyIn(Dist.CLIENT)
public static class UiWidget extends AbstractWidget {
protected static final Component EMPTY_TEXT = Component.literal("");
protected static final Function<UiWidget, Component> NO_TOOLTIP = (uiw) -> EMPTY_TEXT;
private final Minecraft mc_;
private Function<UiWidget, Component> tooltip_ = NO_TOOLTIP;
private Screen parent_;
public UiWidget(int x, int y, int width, int height, Component title) {
super(x, y, width, height, title);
mc_ = Minecraft.getInstance();
}
public UiWidget init(Screen parent) {
this.parent_ = parent;
this.setX(((parent instanceof AbstractContainerScreen<?>) ? ((AbstractContainerScreen<?>) parent).getGuiLeft() : 0));
this.setY(((parent instanceof AbstractContainerScreen<?>) ? ((AbstractContainerScreen<?>) parent).getGuiTop() : 0));
return this;
}
public UiWidget init(Screen parent, Coord2d position) {
this.parent_ = parent;
this.setX(position.x + ((parent instanceof AbstractContainerScreen<?>) ? ((AbstractContainerScreen<?>) parent).getGuiLeft() : 0));
this.setY(position.y + ((parent instanceof AbstractContainerScreen<?>) ? ((AbstractContainerScreen<?>) parent).getGuiTop() : 0));
return this;
}
public final UiWidget tooltip(Function<UiWidget, Component> tip) {
tooltip_ = tip;
return this;
}
public final UiWidget tooltip(Component tip) {
tooltip_ = (o) -> tip;
return this;
}
public final int getWidth() {
return this.width;
}
@Override
protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
}
public final int getHeight() {
return this.height;
}
public Coord2d getMousePosition() {
final Window win = mc_.getWindow();
return Coord2d.of(
Mth.clamp(((int) (mc_.mouseHandler.xpos() * (double) win.getGuiScaledWidth() / (double) win.getScreenWidth())) - this.getX(), -1, this.width + 1),
Mth.clamp(((int) (mc_.mouseHandler.ypos() * (double) win.getGuiScaledHeight() / (double) win.getScreenHeight())) - this.getY(), -1, this.height + 1)
);
}
protected final Coord2d screenCoordinates(Coord2d xy, boolean reverse) {
return (reverse) ? (Coord2d.of(xy.x + getX(), xy.y + getY())) : (Coord2d.of(xy.x - getX(), xy.y - getY()));
}
public UiWidget show() {
visible = true;
return this;
}
public UiWidget hide() {
visible = false;
return this;
}
@Override
public void renderWidget(GuiGraphics mxs, int mouseX, int mouseY, float partialTicks) {
//super.renderWidget(mxs, mouseX, mouseY, partialTicks);
if (isHovered) renderToolTip(mxs, mouseX, mouseY);
}
@SuppressWarnings("all")
public void renderToolTip(GuiGraphics mx, int mouseX, int mouseY) {
if (!visible || (!active) || (tooltip_ == NO_TOOLTIP)) return;
final Component tip = tooltip_.apply(this);
if (tip.getString().trim().isEmpty()) return;
mx.renderTooltip(mc_.font, Arrays.asList(tip.getVisualOrderText()), mouseX, mouseY);
}
}
@OnlyIn(Dist.CLIENT)
public static class HorizontalProgressBar extends UiWidget {
private final Coord2d texture_position_base_;
private final Coord2d texture_position_filled_;
private final ResourceLocation atlas_;
private double progress_max_ = 100;
private double progress_ = 0;
public HorizontalProgressBar(ResourceLocation atlas, int width, int height, Coord2d base_texture_xy, Coord2d filled_texture_xy) {
super(0, 0, width, height, EMPTY_TEXT);
atlas_ = atlas;
texture_position_base_ = base_texture_xy;
texture_position_filled_ = filled_texture_xy;
}
public HorizontalProgressBar setProgress(double progress) {
progress_ = Mth.clamp(progress, 0, progress_max_);
return this;
}
public double getProgress() {
return progress_;
}
public HorizontalProgressBar setMaxProgress(double progress) {
progress_max_ = Math.max(progress, 0);
return this;
}
public double getMaxProgress() {
return progress_max_;
}
public HorizontalProgressBar show() {
visible = true;
return this;
}
public HorizontalProgressBar hide() {
visible = false;
return this;
}
@Override
public void playDownSound(SoundManager handler) {
}
@Override
public void renderWidget(GuiGraphics mxs, int mouseX, int mouseY, float partialTicks) {
RenderSystem.setShaderTexture(0, atlas_);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
RenderSystem.enableDepthTest();
mxs.blit(atlas_, getX(), getY(), texture_position_base_.x, texture_position_base_.y, width, height);
if ((progress_max_ > 0) && (progress_ > 0)) {
int w = Mth.clamp((int) Math.round((progress_ * width) / progress_max_), 0, width);
mxs.blit(atlas_, getX(), getY(), texture_position_filled_.x, texture_position_filled_.y, w, height);
}
if (isHovered) renderToolTip(mxs, mouseX, mouseY);
}
}
@OnlyIn(Dist.CLIENT)
public static class BackgroundImage extends UiWidget {
private final ResourceLocation atlas_;
private final Coord2d atlas_position_;
public boolean visible;
public BackgroundImage(ResourceLocation atlas, int width, int height, Coord2d atlas_position) {
super(0, 0, width, height, EMPTY_TEXT);
atlas_ = atlas;
atlas_position_ = atlas_position;
this.width = width;
this.height = height;
visible = true;
}
public void draw(GuiGraphics mx, Screen parent) {
if (!visible) return;
RenderSystem.setShaderTexture(0, atlas_);
mx.blit(atlas_, getX(), getY(), atlas_position_.x, atlas_position_.y, width, height);
}
}
@OnlyIn(Dist.CLIENT)
public static class CheckBox extends UiWidget {
private final Coord2d texture_position_off_;
private final Coord2d texture_position_on_;
private final ResourceLocation atlas_;
private boolean checked_ = false;
private Consumer<CheckBox> on_click_ = (checkbox) -> {
};
public CheckBox(ResourceLocation atlas, int width, int height, Coord2d atlas_texture_position_off, Coord2d atlas_texture_position_on) {
super(0, 0, width, height, EMPTY_TEXT);
texture_position_off_ = atlas_texture_position_off;
texture_position_on_ = atlas_texture_position_on;
atlas_ = atlas;
}
public boolean checked() {
return checked_;
}
public CheckBox checked(boolean on) {
checked_ = on;
return this;
}
public CheckBox onclick(Consumer<CheckBox> action) {
on_click_ = action;
return this;
}
@Override
public void onClick(double mouseX, double mouseY) {
checked_ = !checked_;
on_click_.accept(this);
}
@Override
public void renderWidget(GuiGraphics mxs, int mouseX, int mouseY, float partialTicks) {
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderTexture(0, atlas_);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
RenderSystem.enableDepthTest();
Coord2d pos = checked_ ? texture_position_on_ : texture_position_off_;
mxs.blit(atlas_, getX(), getY(), pos.x, pos.y, width, height);
if (isHovered) renderToolTip(mxs, mouseX, mouseY);
}
}
@OnlyIn(Dist.CLIENT)
public static class ImageButton extends UiWidget {
private final Coord2d texture_position_;
private final ResourceLocation atlas_;
private Consumer<ImageButton> on_click_ = (bt) -> {
};
public ImageButton(ResourceLocation atlas, int width, int height, Coord2d atlas_texture_position) {
super(0, 0, width, height, Component.empty());
texture_position_ = atlas_texture_position;
atlas_ = atlas;
}
public ImageButton onclick(Consumer<ImageButton> action) {
on_click_ = action;
return this;
}
@Override
public void onClick(double mouseX, double mouseY) {
on_click_.accept(this);
}
@Override
public void renderWidget(GuiGraphics mxs, int mouseX, int mouseY, float partialTicks) {
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderTexture(0, atlas_);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
RenderSystem.enableDepthTest();
Coord2d pos = texture_position_;
mxs.blit(atlas_, getX(), getY(), pos.x, pos.y, width, height);
if (isHovered) renderToolTip(mxs, mouseX, mouseY);
}
}
@OnlyIn(Dist.CLIENT)
public static class Image extends UiWidget {
private final Coord2d texture_position_;
private final ResourceLocation atlas_;
public Image(ResourceLocation atlas, int width, int height, Coord2d atlas_texture_position) {
super(0, 0, width, height, Component.empty());
texture_position_ = atlas_texture_position;
atlas_ = atlas;
}
@Override
public void onClick(double mouseX, double mouseY) {
}
@Override
public void renderWidget(GuiGraphics mxs, int mouseX, int mouseY, float partialTicks) {
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderTexture(0, atlas_);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
RenderSystem.enableDepthTest();
Coord2d pos = texture_position_;
mxs.blit(atlas_, getX(), getY(), pos.x, pos.y, width, height);
if (isHovered) renderToolTip(mxs, mouseX, mouseY);
}
}
@OnlyIn(Dist.CLIENT)
public static class TextBox extends net.minecraft.client.gui.components.EditBox {
public TextBox(int x, int y, int width, int height, Component title, Font font) {
super(font, x, y, width, height, title);
setBordered(false);
}
public TextBox withMaxLength(int len) {
super.setMaxLength(len);
return this;
}
public TextBox withBordered(boolean b) {
super.setBordered(b);
return this;
}
public TextBox withValue(String s) {
super.setValue(s);
return this;
}
public TextBox withEditable(boolean e) {
super.setEditable(e);
return this;
}
public TextBox withResponder(Consumer<String> r) {
super.setResponder(r);
return this;
}
}
}

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,409 @@
/*
* @file Networking.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Main client/server message handling.
*/
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.network.NetworkDirection;
import net.minecraftforge.network.NetworkEvent;
import net.minecraftforge.network.NetworkRegistry;
import net.minecraftforge.network.simple.SimpleChannel;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Supplier;
public class Networking {
private static final String PROTOCOL = "1";
private static SimpleChannel DEFAULT_CHANNEL;
public static void init(String modid) {
DEFAULT_CHANNEL = NetworkRegistry.ChannelBuilder
.named(new ResourceLocation(modid, "default_ch"))
.clientAcceptedVersions(PROTOCOL::equals).serverAcceptedVersions(PROTOCOL::equals).networkProtocolVersion(() -> PROTOCOL)
.simpleChannel();
int discr = -1;
DEFAULT_CHANNEL.registerMessage(++discr, PacketTileNotifyClientToServer.class, PacketTileNotifyClientToServer::compose, PacketTileNotifyClientToServer::parse, PacketTileNotifyClientToServer.Handler::handle);
DEFAULT_CHANNEL.registerMessage(++discr, PacketTileNotifyServerToClient.class, PacketTileNotifyServerToClient::compose, PacketTileNotifyServerToClient::parse, PacketTileNotifyServerToClient.Handler::handle);
DEFAULT_CHANNEL.registerMessage(++discr, PacketContainerSyncClientToServer.class, PacketContainerSyncClientToServer::compose, PacketContainerSyncClientToServer::parse, PacketContainerSyncClientToServer.Handler::handle);
DEFAULT_CHANNEL.registerMessage(++discr, PacketContainerSyncServerToClient.class, PacketContainerSyncServerToClient::compose, PacketContainerSyncServerToClient::parse, PacketContainerSyncServerToClient.Handler::handle);
DEFAULT_CHANNEL.registerMessage(++discr, PacketNbtNotifyClientToServer.class, PacketNbtNotifyClientToServer::compose, PacketNbtNotifyClientToServer::parse, PacketNbtNotifyClientToServer.Handler::handle);
DEFAULT_CHANNEL.registerMessage(++discr, PacketNbtNotifyServerToClient.class, PacketNbtNotifyServerToClient::compose, PacketNbtNotifyServerToClient::parse, PacketNbtNotifyServerToClient.Handler::handle);
DEFAULT_CHANNEL.registerMessage(++discr, OverlayTextMessage.class, OverlayTextMessage::compose, OverlayTextMessage::parse, OverlayTextMessage.Handler::handle);
}
//--------------------------------------------------------------------------------------------------------------------
// Tile entity notifications
//--------------------------------------------------------------------------------------------------------------------
public interface IPacketTileNotifyReceiver {
default void onServerPacketReceived(CompoundTag nbt) {
}
default void onClientPacketReceived(Player player, CompoundTag nbt) {
}
}
public static class PacketTileNotifyClientToServer {
CompoundTag nbt = null;
BlockPos pos = BlockPos.ZERO;
public static void sendToServer(BlockPos pos, CompoundTag nbt) {
if ((pos != null) && (nbt != null))
DEFAULT_CHANNEL.sendToServer(new PacketTileNotifyClientToServer(pos, nbt));
}
public static void sendToServer(BlockEntity te, CompoundTag nbt) {
if ((te != null) && (nbt != null))
DEFAULT_CHANNEL.sendToServer(new PacketTileNotifyClientToServer(te, nbt));
}
public PacketTileNotifyClientToServer() {
}
public PacketTileNotifyClientToServer(BlockPos pos, CompoundTag nbt) {
this.nbt = nbt;
this.pos = pos;
}
public PacketTileNotifyClientToServer(BlockEntity te, CompoundTag nbt) {
this.nbt = nbt;
pos = te.getBlockPos();
}
public static PacketTileNotifyClientToServer parse(final FriendlyByteBuf buf) {
return new PacketTileNotifyClientToServer(buf.readBlockPos(), buf.readNbt());
}
public static void compose(final PacketTileNotifyClientToServer pkt, final FriendlyByteBuf buf) {
buf.writeBlockPos(pkt.pos);
buf.writeNbt(pkt.nbt);
}
@SuppressWarnings("all")
public static class Handler {
public static void handle(final PacketTileNotifyClientToServer pkt, final Supplier<NetworkEvent.Context> ctx) {
ctx.get().enqueueWork(() -> {
Player player = ctx.get().getSender();
if (player == null) return;
Level world = player.level();
final BlockEntity te = world.getBlockEntity(pkt.pos);
if (!(te instanceof IPacketTileNotifyReceiver)) return;
((IPacketTileNotifyReceiver) te).onClientPacketReceived(ctx.get().getSender(), pkt.nbt);
});
ctx.get().setPacketHandled(true);
}
}
}
public static class PacketTileNotifyServerToClient {
CompoundTag nbt = null;
BlockPos pos = BlockPos.ZERO;
public static void sendToPlayer(Player player, BlockEntity te, CompoundTag nbt) {
if ((!(player instanceof ServerPlayer)) || (player instanceof FakePlayer) || (te == null) || (nbt == null))
return;
DEFAULT_CHANNEL.sendTo(new PacketTileNotifyServerToClient(te, nbt), ((ServerPlayer) player).connection.connection, NetworkDirection.PLAY_TO_CLIENT);
}
public static void sendToPlayers(BlockEntity te, CompoundTag nbt) {
if (te == null || te.getLevel() == null) return;
for (Player player : te.getLevel().players()) sendToPlayer(player, te, nbt);
}
public PacketTileNotifyServerToClient() {
}
public PacketTileNotifyServerToClient(BlockPos pos, CompoundTag nbt) {
this.nbt = nbt;
this.pos = pos;
}
public PacketTileNotifyServerToClient(BlockEntity te, CompoundTag nbt) {
this.nbt = nbt;
pos = te.getBlockPos();
}
public static PacketTileNotifyServerToClient parse(final FriendlyByteBuf buf) {
return new PacketTileNotifyServerToClient(buf.readBlockPos(), buf.readNbt());
}
public static void compose(final PacketTileNotifyServerToClient pkt, final FriendlyByteBuf buf) {
buf.writeBlockPos(pkt.pos);
buf.writeNbt(pkt.nbt);
}
public static class Handler {
public static void handle(final PacketTileNotifyServerToClient pkt, final Supplier<NetworkEvent.Context> ctx) {
ctx.get().enqueueWork(() -> {
Level world = SidedProxy.getWorldClientSide();
if (world == null) return;
final BlockEntity te = world.getBlockEntity(pkt.pos);
if (!(te instanceof IPacketTileNotifyReceiver)) return;
((IPacketTileNotifyReceiver) te).onServerPacketReceived(pkt.nbt);
});
ctx.get().setPacketHandled(true);
}
}
}
//--------------------------------------------------------------------------------------------------------------------
// (GUI) Container synchronization
//--------------------------------------------------------------------------------------------------------------------
public interface INetworkSynchronisableContainer {
void onServerPacketReceived(int windowId, CompoundTag nbt);
void onClientPacketReceived(int windowId, Player player, CompoundTag nbt);
}
public static class PacketContainerSyncClientToServer {
int id = -1;
CompoundTag nbt = null;
public static void sendToServer(int windowId, CompoundTag nbt) {
if (nbt != null) DEFAULT_CHANNEL.sendToServer(new PacketContainerSyncClientToServer(windowId, nbt));
}
public static void sendToServer(AbstractContainerMenu container, CompoundTag nbt) {
if (nbt != null)
DEFAULT_CHANNEL.sendToServer(new PacketContainerSyncClientToServer(container.containerId, nbt));
}
public PacketContainerSyncClientToServer() {
}
public PacketContainerSyncClientToServer(int id, CompoundTag nbt) {
this.nbt = nbt;
this.id = id;
}
public static PacketContainerSyncClientToServer parse(final FriendlyByteBuf buf) {
return new PacketContainerSyncClientToServer(buf.readInt(), buf.readNbt());
}
public static void compose(final PacketContainerSyncClientToServer pkt, final FriendlyByteBuf buf) {
buf.writeInt(pkt.id);
buf.writeNbt(pkt.nbt);
}
public static class Handler {
public static void handle(final PacketContainerSyncClientToServer pkt, final Supplier<NetworkEvent.Context> ctx) {
ctx.get().enqueueWork(() -> {
Player player = ctx.get().getSender();
if ((player == null) || !(player.containerMenu instanceof INetworkSynchronisableContainer)) return;
if (player.containerMenu.containerId != pkt.id) return;
((INetworkSynchronisableContainer) player.containerMenu).onClientPacketReceived(pkt.id, player, pkt.nbt);
});
ctx.get().setPacketHandled(true);
}
}
}
public static class PacketContainerSyncServerToClient {
int id = -1;
CompoundTag nbt = null;
public static void sendToPlayer(Player player, int windowId, CompoundTag nbt) {
if ((!(player instanceof ServerPlayer)) || (player instanceof FakePlayer) || (nbt == null)) return;
DEFAULT_CHANNEL.sendTo(new PacketContainerSyncServerToClient(windowId, nbt), ((ServerPlayer) player).connection.connection, NetworkDirection.PLAY_TO_CLIENT);
}
public static void sendToPlayer(Player player, AbstractContainerMenu container, CompoundTag nbt) {
if ((!(player instanceof ServerPlayer)) || (player instanceof FakePlayer) || (nbt == null)) return;
DEFAULT_CHANNEL.sendTo(new PacketContainerSyncServerToClient(container.containerId, nbt), ((ServerPlayer) player).connection.connection, NetworkDirection.PLAY_TO_CLIENT);
}
public static <C extends AbstractContainerMenu & INetworkSynchronisableContainer>
void sendToListeners(Level world, C container, CompoundTag nbt) {
for (Player player : world.players()) {
if (player.containerMenu.containerId != container.containerId) continue;
sendToPlayer(player, container.containerId, nbt);
}
}
public PacketContainerSyncServerToClient() {
}
public PacketContainerSyncServerToClient(int id, CompoundTag nbt) {
this.nbt = nbt;
this.id = id;
}
public static PacketContainerSyncServerToClient parse(final FriendlyByteBuf buf) {
return new PacketContainerSyncServerToClient(buf.readInt(), buf.readNbt());
}
public static void compose(final PacketContainerSyncServerToClient pkt, final FriendlyByteBuf buf) {
buf.writeInt(pkt.id);
buf.writeNbt(pkt.nbt);
}
public static class Handler {
public static void handle(final PacketContainerSyncServerToClient pkt, final Supplier<NetworkEvent.Context> ctx) {
ctx.get().enqueueWork(() -> {
Player player = SidedProxy.getPlayerClientSide();
if ((player == null) || !(player.containerMenu instanceof INetworkSynchronisableContainer)) return;
if (player.containerMenu.containerId != pkt.id) return;
((INetworkSynchronisableContainer) player.containerMenu).onServerPacketReceived(pkt.id, pkt.nbt);
});
ctx.get().setPacketHandled(true);
}
}
}
//--------------------------------------------------------------------------------------------------------------------
// World notifications
//--------------------------------------------------------------------------------------------------------------------
public static class PacketNbtNotifyClientToServer {
public static final Map<String, BiConsumer<Player, CompoundTag>> handlers = new HashMap<>();
final CompoundTag nbt;
public static void sendToServer(CompoundTag nbt) {
if (nbt != null) DEFAULT_CHANNEL.sendToServer(new PacketNbtNotifyClientToServer(nbt));
}
public PacketNbtNotifyClientToServer(CompoundTag nbt) {
this.nbt = nbt;
}
public static PacketNbtNotifyClientToServer parse(final FriendlyByteBuf buf) {
return new PacketNbtNotifyClientToServer(buf.readNbt());
}
public static void compose(final PacketNbtNotifyClientToServer pkt, final FriendlyByteBuf buf) {
buf.writeNbt(pkt.nbt);
}
public static class Handler {
public static void handle(final PacketNbtNotifyClientToServer pkt, final Supplier<NetworkEvent.Context> ctx) {
ctx.get().enqueueWork(() -> {
final ServerPlayer player = ctx.get().getSender();
if (player == null) return;
final String hnd = pkt.nbt.getString("hnd");
if (hnd.isEmpty()) return;
if (handlers.containsKey(hnd)) handlers.get(hnd).accept(player, pkt.nbt);
});
ctx.get().setPacketHandled(true);
}
}
}
public static class PacketNbtNotifyServerToClient {
public static final Map<String, Consumer<CompoundTag>> handlers = new HashMap<>();
final CompoundTag nbt;
public static void sendToPlayer(Player player, CompoundTag nbt) {
if ((!(player instanceof ServerPlayer)) || (player instanceof FakePlayer) || (nbt == null)) return;
DEFAULT_CHANNEL.sendTo(new PacketNbtNotifyServerToClient(nbt), ((ServerPlayer) player).connection.connection, NetworkDirection.PLAY_TO_CLIENT);
}
public static void sendToPlayers(Level world, CompoundTag nbt) {
for (Player player : world.players()) sendToPlayer(player, nbt);
}
public PacketNbtNotifyServerToClient(CompoundTag nbt) {
this.nbt = nbt;
}
public static PacketNbtNotifyServerToClient parse(final FriendlyByteBuf buf) {
return new PacketNbtNotifyServerToClient(buf.readNbt());
}
public static void compose(final PacketNbtNotifyServerToClient pkt, final FriendlyByteBuf buf) {
buf.writeNbt(pkt.nbt);
}
public static class Handler {
public static void handle(final PacketNbtNotifyServerToClient pkt, final Supplier<NetworkEvent.Context> ctx) {
ctx.get().enqueueWork(() -> {
final String hnd = pkt.nbt.getString("hnd");
if (hnd.isEmpty()) return;
if (handlers.containsKey(hnd)) handlers.get(hnd).accept(pkt.nbt);
});
ctx.get().setPacketHandled(true);
}
}
}
//--------------------------------------------------------------------------------------------------------------------
// Main window GUI text message
//--------------------------------------------------------------------------------------------------------------------
public static class OverlayTextMessage {
public static final int DISPLAY_TIME_MS = 3000;
private static BiConsumer<Component, Integer> handler_ = null;
private final Component data_;
private int delay_ = DISPLAY_TIME_MS;
private Component data() {
return data_;
}
private int delay() {
return delay_;
}
public static void setHandler(BiConsumer<Component, Integer> handler) {
if (handler_ == null) handler_ = handler;
}
public static void sendToPlayer(Player player, Component message, int delay) {
if ((!(player instanceof ServerPlayer)) || (player instanceof FakePlayer) || Auxiliaries.isEmpty(message))
return;
DEFAULT_CHANNEL.sendTo(new OverlayTextMessage(message, delay), ((ServerPlayer) player).connection.connection, NetworkDirection.PLAY_TO_CLIENT);
}
public OverlayTextMessage() {
data_ = Component.translatable("[unset]");
}
public OverlayTextMessage(final Component tct, int delay) {
data_ = tct.copy();
delay_ = delay;
}
public static OverlayTextMessage parse(final FriendlyByteBuf buf) {
try {
return new OverlayTextMessage(buf.readComponent(), DISPLAY_TIME_MS);
} catch (Throwable e) {
return new OverlayTextMessage(Component.translatable("[incorrect translation]"), DISPLAY_TIME_MS);
}
}
public static void compose(final OverlayTextMessage pkt, final FriendlyByteBuf buf) {
try {
buf.writeComponent(pkt.data());
} catch (Throwable e) {
Auxiliaries.logger().error("OverlayTextMessage.toBytes() failed: " + e);
}
}
public static class Handler {
public static void handle(final OverlayTextMessage pkt, final Supplier<NetworkEvent.Context> ctx) {
if (handler_ != null) ctx.get().enqueueWork(() -> handler_.accept(pkt.data(), pkt.delay()));
ctx.get().setPacketHandled(true);
}
}
}
}

View file

@ -0,0 +1,191 @@
/*
* @file OptionalRecipeCondition.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Recipe condition to enable opt'ing out JSON based recipes.
*/
package dev.zontreck.libzontreck.edlibmc;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.GsonHelper;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.minecraftforge.common.crafting.conditions.ICondition;
import net.minecraftforge.common.crafting.conditions.IConditionSerializer;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.IForgeRegistry;
import org.slf4j.Logger;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Predicate;
public class OptionalRecipeCondition implements ICondition {
private static ResourceLocation NAME;
private final List<ResourceLocation> all_required;
private final List<ResourceLocation> any_missing;
private final List<ResourceLocation> all_required_tags;
private final List<ResourceLocation> any_missing_tags;
private final @Nullable ResourceLocation result;
private final boolean result_is_tag;
private final boolean experimental;
private static boolean with_experimental = false;
private static boolean without_recipes = false;
private static Predicate<Block> block_optouts = (block) -> false;
private static Predicate<Item> item_optouts = (item) -> false;
public static void init(String modid, Logger logger) {
NAME = new ResourceLocation(modid, "optional");
}
public static void on_config(boolean enable_experimental, boolean disable_all_recipes,
Predicate<Block> block_optout_provider,
Predicate<Item> item_optout_provider) {
with_experimental = enable_experimental;
without_recipes = disable_all_recipes;
block_optouts = block_optout_provider;
item_optouts = item_optout_provider;
}
public OptionalRecipeCondition(ResourceLocation result, List<ResourceLocation> required, List<ResourceLocation> missing, List<ResourceLocation> required_tags, List<ResourceLocation> missing_tags, boolean isexperimental, boolean result_is_tag) {
all_required = required;
any_missing = missing;
all_required_tags = required_tags;
any_missing_tags = missing_tags;
this.result = result;
this.result_is_tag = result_is_tag;
experimental = isexperimental;
}
@Override
public ResourceLocation getID() {
return NAME;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("Optional recipe, all-required: [");
for (ResourceLocation e : all_required) sb.append(e.toString()).append(",");
for (ResourceLocation e : all_required_tags) sb.append("#").append(e.toString()).append(",");
sb.delete(sb.length() - 1, sb.length()).append("], any-missing: [");
for (ResourceLocation e : any_missing) sb.append(e.toString()).append(",");
for (ResourceLocation e : any_missing_tags) sb.append("#").append(e.toString()).append(",");
sb.delete(sb.length() - 1, sb.length()).append("]");
if (experimental) sb.append(" EXPERIMENTAL");
return sb.toString();
}
@Override
public boolean test(IContext context) {
if (without_recipes) return false;
if ((experimental) && (!with_experimental)) return false;
final IForgeRegistry<Item> item_registry = ForgeRegistries.ITEMS;
//final Collection<ResourceLocation> item_tags = SerializationTags.getInstance().getOrEmpty(Registry.ITEM_REGISTRY).getAvailableTags();
if (result != null) {
boolean item_registered = item_registry.containsKey(result);
if (!item_registered) return false; // required result not registered
if (item_optouts.test(item_registry.getValue(result))) return false;
if (ForgeRegistries.BLOCKS.containsKey(result) && block_optouts.test(ForgeRegistries.BLOCKS.getValue(result)))
return false;
}
if (!all_required.isEmpty()) {
for (ResourceLocation rl : all_required) {
if (!item_registry.containsKey(rl)) return false;
}
}
if (!all_required_tags.isEmpty()) {
for (ResourceLocation rl : all_required_tags) {
if (item_registry.tags().getTagNames().noneMatch(tk -> tk.location().equals(rl)))
return false; // if(!item_tags.contains(rl)) return false;
}
}
if (!any_missing.isEmpty()) {
for (ResourceLocation rl : any_missing) {
if (!item_registry.containsKey(rl)) return true;
}
return false;
}
if (!any_missing_tags.isEmpty()) {
for (ResourceLocation rl : any_missing_tags) {
if (item_registry.tags().getTagNames().noneMatch(tk -> tk.location().equals(rl)))
return true; // if(!item_tags.contains(rl)) return true;
}
return false;
}
return true;
}
public static class Serializer implements IConditionSerializer<OptionalRecipeCondition> {
public static final Serializer INSTANCE = new Serializer();
@Override
public ResourceLocation getID() {
return OptionalRecipeCondition.NAME;
}
@Override
public void write(JsonObject json, OptionalRecipeCondition condition) {
JsonArray required = new JsonArray();
JsonArray missing = new JsonArray();
for (ResourceLocation e : condition.all_required) required.add(e.toString());
for (ResourceLocation e : condition.any_missing) missing.add(e.toString());
json.add("required", required);
json.add("missing", missing);
if (condition.result != null) {
json.addProperty("result", (condition.result_is_tag ? "#" : "") + condition.result);
}
}
@Override
public OptionalRecipeCondition read(JsonObject json) {
List<ResourceLocation> required = new ArrayList<>();
List<ResourceLocation> missing = new ArrayList<>();
List<ResourceLocation> required_tags = new ArrayList<>();
List<ResourceLocation> missing_tags = new ArrayList<>();
ResourceLocation result = null;
boolean experimental = false;
boolean result_is_tag = false;
if (json.has("result")) {
String s = json.get("result").getAsString();
if (s.startsWith("#")) {
result = new ResourceLocation(s.substring(1));
result_is_tag = true;
} else {
result = new ResourceLocation(s);
}
}
if (json.has("required")) {
for (JsonElement e : GsonHelper.getAsJsonArray(json, "required")) {
String s = e.getAsString();
if (s.startsWith("#")) {
required_tags.add(new ResourceLocation(s.substring(1)));
} else {
required.add(new ResourceLocation(s));
}
}
}
if (json.has("missing")) {
for (JsonElement e : GsonHelper.getAsJsonArray(json, "missing")) {
String s = e.getAsString();
if (s.startsWith("#")) {
missing_tags.add(new ResourceLocation(s.substring(1)));
} else {
missing.add(new ResourceLocation(s));
}
}
}
if (json.has("experimental")) experimental = json.get("experimental").getAsBoolean();
return new OptionalRecipeCondition(result, required, missing, required_tags, missing_tags, experimental, result_is_tag);
}
}
}

View file

@ -0,0 +1,165 @@
/*
* @file Overlay.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Renders status messages in one line.
*/
package dev.zontreck.libzontreck.edlibmc;
import com.mojang.blaze3d.platform.Window;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.util.Mth;
import net.minecraft.util.Tuple;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.LightLayer;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fml.DistExecutor;
import javax.annotation.Nullable;
import java.util.Optional;
public class Overlay {
public static void show(Player player, final Component message) {
Networking.OverlayTextMessage.sendToPlayer(player, message, 3000);
}
public static void show(Player player, final Component message, int delay) {
Networking.OverlayTextMessage.sendToPlayer(player, message, delay);
}
public static void show(BlockState state, BlockPos pos) {
show(state, pos, 100);
}
public static void show(BlockState state, BlockPos pos, int displayTimeoutMs) {
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> (() -> TextOverlayGui.show(state, pos, displayTimeoutMs)));
} // Only called when client side
// -----------------------------------------------------------------------------
// Client side handler
// -----------------------------------------------------------------------------
@OnlyIn(Dist.CLIENT)
public static class TextOverlayGui extends Screen {
public static final TextOverlayGui INSTANCE = new TextOverlayGui();
private static final Component EMPTY_TEXT = Component.literal("");
private static final BlockState EMPTY_STATE = null;
private static double overlay_y_ = 0.75;
private static int text_color_ = 0x00ffaa00;
private static int border_color_ = 0xaa333333;
private static int background_color1_ = 0xaa333333;
private static int background_color2_ = 0xaa444444;
private static long text_deadline_ = 0;
private static Component text_ = EMPTY_TEXT;
private static long state_deadline_ = 0;
private static @Nullable BlockState state_ = EMPTY_STATE;
private static BlockPos pos_ = BlockPos.ZERO;
public static void on_config(double overlay_y) {
on_config(overlay_y, 0x00ffaa00, 0xaa333333, 0xaa333333, 0xaa444444);
}
public static void on_config(double overlay_y, int text_color, int border_color, int background_color1, int background_color2) {
overlay_y_ = overlay_y;
text_color_ = text_color;
border_color_ = border_color;
background_color1_ = background_color1;
background_color2_ = background_color2;
}
public static synchronized Component text() {
return text_;
}
public static synchronized long deadline() {
return text_deadline_;
}
public static synchronized void hide() {
text_deadline_ = 0;
text_ = EMPTY_TEXT;
}
public static synchronized void show(Component s, int displayTimeoutMs) {
text_ = (s == null) ? (EMPTY_TEXT) : (s.copy());
text_deadline_ = System.currentTimeMillis() + displayTimeoutMs;
}
public static synchronized void show(String s, int displayTimeoutMs) {
text_ = ((s == null) || (s.isEmpty())) ? (EMPTY_TEXT) : (Component.literal(s));
text_deadline_ = System.currentTimeMillis() + displayTimeoutMs;
}
public static synchronized void show(BlockState state, BlockPos pos, int displayTimeoutMs) {
pos_ = new BlockPos(pos);
state_ = state;
state_deadline_ = System.currentTimeMillis() + displayTimeoutMs;
}
private static synchronized Optional<Tuple<BlockState, BlockPos>> state_pos() {
return ((state_deadline_ < System.currentTimeMillis()) || (state_ == EMPTY_STATE)) ? Optional.empty() : Optional.of(new Tuple<>(state_, pos_));
}
TextOverlayGui() {
super(Component.literal(""));
}
public void onRenderGui(final GuiGraphics mxs) {
if (deadline() < System.currentTimeMillis()) return;
if (text() == EMPTY_TEXT) return;
String txt = text().getString();
if (txt.isEmpty()) return;
final net.minecraft.client.Minecraft mc = net.minecraft.client.Minecraft.getInstance();
final Window win = mc.getWindow();
final Font fr = mc.font;
final boolean was_unicode = fr.isBidirectional();
final int cx = win.getGuiScaledWidth() / 2;
final int cy = (int) (win.getGuiScaledHeight() * overlay_y_);
final int w = fr.width(txt);
final int h = fr.lineHeight;
mxs.fillGradient(cx - (w / 2) - 3, cy - 2, cx + (w / 2) + 2, cy + h + 2, 0xaa333333, 0xaa444444);
mxs.hLine(cx - (w / 2) - 3, cx + (w / 2) + 2, cy - 2, 0xaa333333);
mxs.hLine(cx - (w / 2) - 3, cx + (w / 2) + 2, cy + h + 2, 0xaa333333);
mxs.vLine(cx - (w / 2) - 3, cy - 2, cy + h + 2, 0xaa333333);
mxs.vLine(cx + (w / 2) + 2, cy - 2, cy + h + 2, 0xaa333333);
mxs.drawCenteredString(fr, text(), cx, cy + 1, 0x00ffaa00);
}
@SuppressWarnings("deprecation")
public void onRenderWorldOverlay(final com.mojang.blaze3d.vertex.PoseStack mxs, final double partialTick) {
final Optional<Tuple<BlockState, BlockPos>> sp = state_pos();
if (sp.isEmpty()) return;
final ClientLevel world = Minecraft.getInstance().level;
final LocalPlayer player = Minecraft.getInstance().player;
if ((player == null) || (world == null)) return;
final BlockState state = sp.get().getA();
final BlockPos pos = sp.get().getB();
final int light = (world.hasChunkAt(pos)) ? LightTexture.pack(world.getBrightness(LightLayer.BLOCK, pos), world.getBrightness(LightLayer.SKY, pos)) : LightTexture.pack(15, 15);
final MultiBufferSource buffer = Minecraft.getInstance().renderBuffers().bufferSource();
final double px = Mth.lerp(partialTick, player.xo, player.getX());
final double py = Mth.lerp(partialTick, player.yo, player.getY());
final double pz = Mth.lerp(partialTick, player.zo, player.getZ());
mxs.pushPose();
mxs.translate((pos.getX() - px), (pos.getY() - py - player.getEyeHeight()), (pos.getZ() - pz));
Minecraft.getInstance().getBlockRenderer().renderSingleBlock(state, mxs, buffer, light, OverlayTexture.NO_OVERLAY);
mxs.popPose();
}
}
}

View file

@ -0,0 +1,4 @@
# Engineer's Decor LibMC
____________
As Engineer's Decor has been abandoned and discontinued, i've adopted the LibMC, and split the mod up among my various mods. Engineer's Decor blocks, and items, will now reside in Thresholds.

View file

@ -0,0 +1,263 @@
/*
* @file Registries.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Common game registry handling.
*/
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.flag.FeatureFlagSet;
import net.minecraft.world.flag.FeatureFlags;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.RecipeSerializer;
import net.minecraft.world.level.ItemLike;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import javax.annotation.Nonnull;
import java.util.*;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Supplier;
import java.util.stream.Collectors;
public class Registries {
private static String modid = null;
private static String creative_tab_icon = "";
private static CreativeModeTab creative_tab = null;
private static final Map<String, TagKey<Block>> registered_block_tag_keys = new HashMap<>();
private static final Map<String, TagKey<Item>> registered_item_tag_keys = new HashMap<>();
private static final Map<String, RegistryObject<Block>> registered_blocks = new HashMap<>();
private static final Map<String, RegistryObject<Item>> registered_items = new HashMap<>();
private static final Map<String, RegistryObject<BlockEntityType<?>>> registered_block_entity_types = new HashMap<>();
private static final Map<String, RegistryObject<EntityType<?>>> registered_entity_types = new HashMap<>();
private static final Map<String, RegistryObject<MenuType<?>>> registered_menu_types = new HashMap<>();
private static final Map<String, RegistryObject<RecipeSerializer<?>>> recipe_serializers = new HashMap<>();
private static final Map<String, RegistryObject<CreativeModeTab>> registered_tabs = new HashMap<>();
public static final List<Supplier<? extends ItemLike>> tabItems = new ArrayList<>();
private static DeferredRegister<Block> BLOCKS;
private static DeferredRegister<Item> ITEMS;
private static DeferredRegister<CreativeModeTab> TABS;
private static DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES;
private static DeferredRegister<MenuType<?>> MENUS;
private static DeferredRegister<EntityType<?>> ENTITIES;
private static DeferredRegister<RecipeSerializer<?>> RECIPE_SERIALIZERS;
private static List<DeferredRegister<?>> MOD_REGISTRIES;
public static void init(String mod_id, String creative_tab_icon_item_name, IEventBus bus) {
modid = mod_id;
creative_tab_icon = creative_tab_icon_item_name;
BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, modid);
ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, modid);
BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, modid);
MENUS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, modid);
ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, modid);
RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, modid);
TABS = DeferredRegister.create(net.minecraft.core.registries.Registries.CREATIVE_MODE_TAB, modid);
Consumer<DeferredRegister<?>> consumer = (X)->{
X.register(bus);
};
List.of(BLOCKS, ITEMS, BLOCK_ENTITIES, MENUS, ENTITIES, RECIPE_SERIALIZERS, TABS).forEach(consumer);
}
// -------------------------------------------------------------------------------------------------------------
public static Block getBlock(String block_name) {
return registered_blocks.get(block_name).get();
}
public static <T extends Item> RegistryObject<T> withTab(RegistryObject<T> item)
{
tabItems.add(item);
return item;
}
public static Item getItem(String name) {
return registered_items.get(name).get();
}
public static EntityType<?> getEntityType(String name) {
return registered_entity_types.get(name).get();
}
public static BlockEntityType<?> getBlockEntityType(String block_name) {
return registered_block_entity_types.get(block_name).get();
}
public static MenuType<?> getMenuType(String name) {
return registered_menu_types.get(name).get();
}
public static RecipeSerializer<?> getRecipeSerializer(String name) {
return recipe_serializers.get(name).get();
}
public static BlockEntityType<?> getBlockEntityTypeOfBlock(String block_name) {
return getBlockEntityType("tet_" + block_name);
}
public static BlockEntityType<?> getBlockEntityTypeOfBlock(Block block) {
return getBlockEntityTypeOfBlock(ForgeRegistries.BLOCKS.getKey(block).getPath());
}
public static MenuType<?> getMenuTypeOfBlock(String name) {
return getMenuType("ct_" + name);
}
public static MenuType<?> getMenuTypeOfBlock(Block block) {
return getMenuTypeOfBlock(ForgeRegistries.BLOCKS.getKey(block).getPath());
}
public static TagKey<Block> getBlockTagKey(String name) {
return registered_block_tag_keys.get(name);
}
public static TagKey<Item> getItemTagKey(String name) {
return registered_item_tag_keys.get(name);
}
// -------------------------------------------------------------------------------------------------------------
@Nonnull
public static List<Block> getRegisteredBlocks() {
return Collections.unmodifiableList(registered_blocks.values().stream().map(RegistryObject::get).toList());
}
@Nonnull
public static List<Item> getRegisteredItems() {
return Collections.unmodifiableList(registered_items.values().stream().map(RegistryObject::get).toList());
}
@Nonnull
public static List<BlockEntityType<?>> getRegisteredBlockEntityTypes() {
return Collections.unmodifiableList(registered_block_entity_types.values().stream().map(RegistryObject::get).toList());
}
@Nonnull
public static List<EntityType<?>> getRegisteredEntityTypes() {
return Collections.unmodifiableList(registered_entity_types.values().stream().map(RegistryObject::get).toList());
}
// -------------------------------------------------------------------------------------------------------------
public static <T extends Item> void addItem(String registry_name, Supplier<T> supplier) {
registered_items.put(registry_name, withTab(ITEMS.register(registry_name, supplier)));
}
public static <T extends Block> void addBlock(String registry_name, Supplier<T> block_supplier) {
registered_blocks.put(registry_name, BLOCKS.register(registry_name, block_supplier));
registered_items.put(registry_name, withTab(ITEMS.register(registry_name, () -> new BlockItem(registered_blocks.get(registry_name).get(), (new Item.Properties())))));
}
public static <T extends CreativeModeTab> void addCreativeModeTab(String id, Component title, ItemStack icon)
{
registered_tabs.put(id, TABS.register(id, ()-> CreativeModeTab
.builder()
.icon(()->icon)
.title(title)
.withSearchBar()
.displayItems((display, output) -> tabItems.forEach(it->output.accept(it.get())))
.build()
));
}
public static <TB extends Block, TI extends Item> void addBlock(String registry_name, Supplier<TB> block_supplier, Supplier<TI> item_supplier) {
registered_blocks.put(registry_name, BLOCKS.register(registry_name, block_supplier));
registered_items.put(registry_name, ITEMS.register(registry_name, item_supplier));
}
public static <T extends BlockEntity> void addBlockEntityType(String registry_name, BlockEntityType.BlockEntitySupplier<T> ctor, String... block_names) {
registered_block_entity_types.put(registry_name, BLOCK_ENTITIES.register(registry_name, () -> {
final Block[] blocks = Arrays.stream(block_names).map(s -> {
Block b = BLOCKS.getEntries().stream().filter((ro) -> ro.getId().getPath().equals(s)).findFirst().map(RegistryObject::get).orElse(null);
if (b == null) Auxiliaries.logError("registered_blocks does not encompass '" + s + "'");
return b;
}).filter(Objects::nonNull).collect(Collectors.toList()).toArray(new Block[]{});
return BlockEntityType.Builder.of(ctor, blocks).build(null);
}));
}
public static <T extends EntityType<?>> void addEntityType(String registry_name, Supplier<EntityType<?>> supplier) {
registered_entity_types.put(registry_name, ENTITIES.register(registry_name, supplier));
}
public static <T extends MenuType<?>> void addMenuType(String registry_name, MenuType.MenuSupplier<?> supplier, FeatureFlagSet flags) {
registered_menu_types.put(registry_name, MENUS.register(registry_name, () -> new MenuType<>(supplier, flags)));
}
public static void addRecipeSerializer(String registry_name, Supplier<? extends RecipeSerializer<?>> serializer_supplier) {
recipe_serializers.put(registry_name, RECIPE_SERIALIZERS.register(registry_name, serializer_supplier));
}
public static void addOptionalBlockTag(String tag_name, ResourceLocation... default_blocks) {
final Set<Supplier<Block>> default_suppliers = new HashSet<>();
for (ResourceLocation rl : default_blocks) default_suppliers.add(() -> ForgeRegistries.BLOCKS.getValue(rl));
final TagKey<Block> key = ForgeRegistries.BLOCKS.tags().createOptionalTagKey(new ResourceLocation(modid, tag_name), default_suppliers);
registered_block_tag_keys.put(tag_name, key);
}
public static void addOptionaItemTag(String tag_name, ResourceLocation... default_items) {
final Set<Supplier<Item>> default_suppliers = new HashSet<>();
for (ResourceLocation rl : default_items) default_suppliers.add(() -> ForgeRegistries.ITEMS.getValue(rl));
final TagKey<Item> key = ForgeRegistries.ITEMS.tags().createOptionalTagKey(new ResourceLocation(modid, tag_name), default_suppliers);
registered_item_tag_keys.put(tag_name, key);
}
// -------------------------------------------------------------------------------------------------------------
@Deprecated
/**
* This function is to be removed as it cannot add items to a tab anymore
*/
public static <TB extends Block, TI extends Item> void addBlock(String registry_name, Supplier<TB> block_supplier, BiFunction<Block, Item.Properties, Item> item_builder) {
addBlock(registry_name, block_supplier, () -> item_builder.apply(registered_blocks.get(registry_name).get(), (new Item.Properties())));
}
public static void addBlock(String registry_name, Supplier<? extends Block> block_supplier, BlockEntityType.BlockEntitySupplier<?> block_entity_ctor) {
addBlock(registry_name, block_supplier);
addBlockEntityType("tet_" + registry_name, block_entity_ctor, registry_name);
}
public static void addBlock(String registry_name, Supplier<? extends Block> block_supplier, BiFunction<Block, Item.Properties, Item> item_builder, BlockEntityType.BlockEntitySupplier<?> block_entity_ctor) {
addBlock(registry_name, block_supplier, item_builder);
addBlockEntityType("tet_" + registry_name, block_entity_ctor, registry_name);
}
public static void addBlock(String registry_name, Supplier<? extends Block> block_supplier, BiFunction<Block, Item.Properties, Item> item_builder, BlockEntityType.BlockEntitySupplier<?> block_entity_ctor, MenuType.MenuSupplier<?> menu_type_supplier, FeatureFlagSet menuFlags) {
addBlock(registry_name, block_supplier, item_builder);
addBlockEntityType("tet_" + registry_name, block_entity_ctor, registry_name);
addMenuType("ct_" + registry_name, menu_type_supplier, menuFlags);
}
public static void addBlock(String registry_name, Supplier<? extends Block> block_supplier, BlockEntityType.BlockEntitySupplier<?> block_entity_ctor, MenuType.MenuSupplier<?> menu_type_supplier, FeatureFlagSet menuFlags) {
addBlock(registry_name, block_supplier, block_entity_ctor);
addMenuType("ct_" + registry_name, menu_type_supplier, menuFlags);
}
}

View file

@ -0,0 +1,180 @@
/*
* @file RfEnergy.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* General RF/FE energy handling functionality.
*/
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.Mth;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.energy.IEnergyStorage;
import javax.annotation.Nullable;
public class RfEnergy {
public static int feed(Level world, BlockPos pos, @Nullable Direction side, int rf_energy) {
final BlockEntity te = world.getBlockEntity(pos);
if (te == null) return 0;
final IEnergyStorage es = te.getCapability(ForgeCapabilities.ENERGY, side).orElse(null);
if (es == null) return 0;
return es.receiveEnergy(rf_energy, false);
}
public static class Battery implements IEnergyStorage {
protected int capacity_;
protected int charge_rate_;
protected int discharge_rate_;
protected int energy_;
public Battery(int capacity) {
this(capacity, capacity);
}
public Battery(int capacity, int transfer_rate) {
this(capacity, transfer_rate, transfer_rate, 0);
}
public Battery(int capacity, int charge_rate, int discharge_rate) {
this(capacity, charge_rate, discharge_rate, 0);
}
public Battery(int capacity, int charge_rate, int discharge_rate, int energy) {
capacity_ = Math.max(capacity, 1);
charge_rate_ = Mth.clamp(charge_rate, 0, capacity_);
discharge_rate_ = Mth.clamp(discharge_rate, 0, capacity_);
energy_ = Mth.clamp(energy, 0, capacity_);
}
// ---------------------------------------------------------------------------------------------------
public Battery setMaxEnergyStored(int capacity) {
capacity_ = Math.max(capacity, 1);
return this;
}
public Battery setEnergyStored(int energy) {
energy_ = Mth.clamp(energy, 0, capacity_);
return this;
}
public Battery setChargeRate(int in_rate) {
charge_rate_ = Mth.clamp(in_rate, 0, capacity_);
return this;
}
public Battery setDischargeRate(int out_rate) {
discharge_rate_ = Mth.clamp(out_rate, 0, capacity_);
return this;
}
public int getChargeRate() {
return charge_rate_;
}
public int getDischargeRate() {
return discharge_rate_;
}
public boolean isEmpty() {
return energy_ <= 0;
}
public boolean isFull() {
return energy_ >= capacity_;
}
public int getSOC() {
return (int) Mth.clamp((100.0 * energy_ / capacity_ + .5), 0, 100);
}
public int getComparatorOutput() {
return (int) Mth.clamp((15.0 * energy_ / capacity_ + .2), 0, 15);
}
public boolean draw(int energy) {
if (energy_ < energy) return false;
energy_ -= energy;
return true;
}
public boolean feed(int energy) {
energy_ = Math.min(energy_ + energy, capacity_);
return energy_ >= capacity_;
}
public Battery clear() {
energy_ = 0;
return this;
}
public Battery load(CompoundTag nbt, String key) {
setEnergyStored(nbt.getInt(key));
return this;
}
public Battery load(CompoundTag nbt) {
return load(nbt, "Energy");
}
public CompoundTag save(CompoundTag nbt, String key) {
nbt.putInt(key, energy_);
return nbt;
}
public CompoundTag save(CompoundTag nbt) {
return save(nbt, "Energy");
}
public LazyOptional<IEnergyStorage> createEnergyHandler() {
return LazyOptional.of(() -> this);
}
// IEnergyStorage ------------------------------------------------------------------------------------
@Override
public int receiveEnergy(int feed_energy, boolean simulate) {
if (!canReceive()) return 0;
int e = Math.min(Math.min(charge_rate_, feed_energy), capacity_ - energy_);
if (!simulate) energy_ += e;
return e;
}
@Override
public int extractEnergy(int draw_energy, boolean simulate) {
if (!canExtract()) return 0;
int e = Math.min(Math.min(discharge_rate_, draw_energy), energy_);
if (!simulate) energy_ -= e;
return e;
}
@Override
public int getEnergyStored() {
return energy_;
}
@Override
public int getMaxEnergyStored() {
return capacity_;
}
@Override
public boolean canExtract() {
return discharge_rate_ > 0;
}
@Override
public boolean canReceive() {
return charge_rate_ > 0;
}
}
}

View file

@ -0,0 +1,42 @@
/*
* @file RsSignals.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* General redstone signal related functionality.
*/
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.Container;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.state.BlockState;
import javax.annotation.Nullable;
public class RsSignals {
public static boolean hasSignalConnector(BlockState state, BlockGetter world, BlockPos pos, @Nullable Direction realSide) {
return state.isSignalSource();
}
public static int fromContainer(@Nullable Container container) {
if (container == null) return 0;
final double max = container.getMaxStackSize();
if (max <= 0) return 0;
boolean nonempty = false;
double fill_level = 0;
for (int i = 0; i < container.getContainerSize(); ++i) {
ItemStack stack = container.getItem(i);
if (stack.isEmpty() || (stack.getMaxStackSize() <= 0)) continue;
fill_level += ((double) stack.getCount()) / Math.min(max, stack.getMaxStackSize());
nonempty = true;
}
fill_level /= container.getContainerSize();
return (int) (Math.floor(fill_level * 14) + (nonempty ? 1 : 0)); // vanilla compliant calculation.
}
}

View file

@ -0,0 +1,122 @@
/*
* @file SidedProxy.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* General client/server sidedness selection proxy.
*/
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.client.Minecraft;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level;
import net.minecraftforge.fml.DistExecutor;
import javax.annotation.Nullable;
import java.util.Optional;
public class SidedProxy {
@Nullable
public static Player getPlayerClientSide() {
return proxy.getPlayerClientSide();
}
@Nullable
public static Level getWorldClientSide() {
return proxy.getWorldClientSide();
}
@Nullable
public static Minecraft mc() {
return proxy.mc();
}
public static Optional<Boolean> isCtrlDown() {
return proxy.isCtrlDown();
}
public static Optional<Boolean> isShiftDown() {
return proxy.isShiftDown();
}
public static Optional<String> getClipboard() {
return proxy.getClipboard();
}
public static boolean setClipboard(String text) {
return proxy.setClipboard(text);
}
// --------------------------------------------------------------------------------------------------------
private static final ISidedProxy proxy = DistExecutor.unsafeRunForDist(() -> ClientProxy::new, () -> ServerProxy::new);
private interface ISidedProxy {
default @Nullable Player getPlayerClientSide() {
return null;
}
default @Nullable Level getWorldClientSide() {
return null;
}
default @Nullable Minecraft mc() {
return null;
}
default Optional<Boolean> isCtrlDown() {
return Optional.empty();
}
default Optional<Boolean> isShiftDown() {
return Optional.empty();
}
default Optional<String> getClipboard() {
return Optional.empty();
}
default boolean setClipboard(String text) {
return false;
}
}
private static final class ClientProxy implements ISidedProxy {
public @Nullable Player getPlayerClientSide() {
return Minecraft.getInstance().player;
}
public @Nullable Level getWorldClientSide() {
return Minecraft.getInstance().level;
}
public @Nullable Minecraft mc() {
return Minecraft.getInstance();
}
public Optional<Boolean> isCtrlDown() {
return Optional.of(Auxiliaries.isCtrlDown());
}
public Optional<Boolean> isShiftDown() {
return Optional.of(Auxiliaries.isShiftDown());
}
public Optional<String> getClipboard() {
return (mc() == null) ? Optional.empty() : Optional.of(net.minecraft.client.gui.font.TextFieldHelper.getClipboardContents(mc()));
}
public boolean setClipboard(String text) {
if (mc() == null) {
return false;
}
net.minecraft.client.gui.font.TextFieldHelper.setClipboardContents(Minecraft.getInstance(), text);
return true;
}
}
private static final class ServerProxy implements ISidedProxy {
}
}

View file

@ -0,0 +1,228 @@
/*
* @file SlabSliceBlock.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Half slab ("slab slices") characteristics class. Actually
* it's now a quarter slab, but who cares.
*/
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.SpawnPlacements;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Mirror;
import net.minecraft.world.level.block.Rotation;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.IntegerProperty;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class SlabSliceBlock extends StandardBlocks.WaterLoggable implements StandardBlocks.IStandardBlock {
public static final IntegerProperty PARTS = IntegerProperty.create("parts", 0, 14);
protected static final VoxelShape[] AABBs = {
Shapes.create(new AABB(0, 0. / 16, 0, 1, 2. / 16, 1)),
Shapes.create(new AABB(0, 0. / 16, 0, 1, 4. / 16, 1)),
Shapes.create(new AABB(0, 0. / 16, 0, 1, 6. / 16, 1)),
Shapes.create(new AABB(0, 0. / 16, 0, 1, 8. / 16, 1)),
Shapes.create(new AABB(0, 0. / 16, 0, 1, 10. / 16, 1)),
Shapes.create(new AABB(0, 0. / 16, 0, 1, 12. / 16, 1)),
Shapes.create(new AABB(0, 0. / 16, 0, 1, 14. / 16, 1)),
Shapes.create(new AABB(0, 0. / 16, 0, 1, 16. / 16, 1)),
Shapes.create(new AABB(0, 2. / 16, 0, 1, 16. / 16, 1)),
Shapes.create(new AABB(0, 4. / 16, 0, 1, 16. / 16, 1)),
Shapes.create(new AABB(0, 6. / 16, 0, 1, 16. / 16, 1)),
Shapes.create(new AABB(0, 8. / 16, 0, 1, 16. / 16, 1)),
Shapes.create(new AABB(0, 10. / 16, 0, 1, 16. / 16, 1)),
Shapes.create(new AABB(0, 12. / 16, 0, 1, 16. / 16, 1)),
Shapes.create(new AABB(0, 14. / 16, 0, 1, 16. / 16, 1)),
Shapes.create(new AABB(0, 0, 0, 1, 1, 1)) // <- with 4bit fill
};
protected static final int[] num_slabs_contained_in_parts_ = {1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1, 0x1}; // <- with 4bit fill
private static boolean with_pickup = false;
public static void on_config(boolean direct_slab_pickup) {
with_pickup = direct_slab_pickup;
}
public SlabSliceBlock(long config, BlockBehaviour.Properties builder) {
super(config, builder);
}
protected boolean is_cube(BlockState state) {
return state.getValue(PARTS) == 0x07;
}
@Override
@OnlyIn(Dist.CLIENT)
public void appendHoverText(ItemStack stack, @Nullable BlockGetter world, List<Component> tooltip, TooltipFlag flag) {
if (!Auxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true)) return;
if (with_pickup) Auxiliaries.Tooltip.addInformation("engineersdecor.tooltip.slabpickup", tooltip);
}
@Override
public RenderTypeHint getRenderTypeHint() {
return (((config & StandardBlocks.CFG_TRANSLUCENT) != 0) ? (RenderTypeHint.TRANSLUCENT) : (RenderTypeHint.CUTOUT));
}
@Override
public boolean isPossibleToRespawnInThis(BlockState p_279289_) {
return false;
}
@Override
public boolean isValidSpawn(BlockState state, BlockGetter world, BlockPos pos, SpawnPlacements.Type type, @Nullable EntityType<?> entityType) {
return false;
}
@Override
public VoxelShape getShape(BlockState state, BlockGetter source, BlockPos pos, CollisionContext selectionContext) {
return AABBs[state.getValue(PARTS) & 0xf];
}
@Override
public VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext selectionContext) {
return getShape(state, world, pos, selectionContext);
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
super.createBlockStateDefinition(builder);
builder.add(PARTS);
}
@Override
@Nullable
public BlockState getStateForPlacement(BlockPlaceContext context) {
final BlockPos pos = context.getClickedPos();
BlockState state = context.getLevel().getBlockState(pos);
if (state.getBlock() == this) {
int parts = state.getValue(PARTS);
if (parts == 7) return null; // -> is already a full block.
parts += (parts < 7) ? 1 : -1;
if (parts == 7) state = state.setValue(WATERLOGGED, false);
return state.setValue(PARTS, parts);
} else {
final Direction face = context.getClickedFace();
final BlockState placement_state = super.getStateForPlacement(context); // fluid state
if (face == Direction.UP) return placement_state.setValue(PARTS, 0);
if (face == Direction.DOWN) return placement_state.setValue(PARTS, 14);
if (!face.getAxis().isHorizontal()) return placement_state;
final boolean isupper = ((context.getClickLocation().y() - context.getClickedPos().getY()) > 0.5);
return placement_state.setValue(PARTS, isupper ? 14 : 0);
}
}
@Override
@SuppressWarnings("deprecation")
public boolean canBeReplaced(BlockState state, BlockPlaceContext context) {
if (context.getItemInHand().getItem() != this.asItem()) return false;
if (!context.replacingClickedOnBlock()) return true;
final Direction face = context.getClickedFace();
final int parts = state.getValue(PARTS);
if (parts == 7) return false;
if ((face == Direction.UP) && (parts < 7)) return true;
if ((face == Direction.DOWN) && (parts > 7)) return true;
if (!face.getAxis().isHorizontal()) return false;
final boolean isupper = ((context.getClickLocation().y() - context.getClickedPos().getY()) > 0.5);
return isupper ? (parts == 0) : (parts == 1);
}
@Override
@SuppressWarnings("deprecation")
public BlockState rotate(BlockState state, Rotation rot) {
return state;
}
@Override
@SuppressWarnings("deprecation")
public BlockState mirror(BlockState state, Mirror mirrorIn) {
return state;
}
@Override
public boolean hasDynamicDropList() {
return true;
}
@Override
public List<ItemStack> dropList(BlockState state, Level world, BlockEntity te, boolean explosion) {
return new ArrayList<>(Collections.singletonList(new ItemStack(this.asItem(), num_slabs_contained_in_parts_[state.getValue(PARTS) & 0xf])));
}
@Override
@SuppressWarnings("deprecation")
public void attack(BlockState state, Level world, BlockPos pos, Player player) {
if ((world.isClientSide) || (!with_pickup)) return;
final ItemStack stack = player.getMainHandItem();
if (stack.isEmpty() || (Block.byItem(stack.getItem()) != this)) return;
if (stack.getCount() >= stack.getMaxStackSize()) return;
Vec3 lv = player.getLookAngle();
Direction facing = Direction.getNearest((float) lv.x, (float) lv.y, (float) lv.z);
if ((facing != Direction.UP) && (facing != Direction.DOWN)) return;
if (state.getBlock() != this) return;
int parts = state.getValue(PARTS);
if ((facing == Direction.DOWN) && (parts <= 7)) {
if (parts > 0) {
world.setBlock(pos, state.setValue(PARTS, parts - 1), 3);
} else {
world.removeBlock(pos, false);
}
} else if ((facing == Direction.UP) && (parts >= 7)) {
if (parts < 14) {
world.setBlock(pos, state.setValue(PARTS, parts + 1), 3);
} else {
world.removeBlock(pos, false);
}
} else {
return;
}
if (!player.isCreative()) {
stack.grow(1);
if (player.getInventory() != null) player.getInventory().setChanged();
}
SoundType st = this.getSoundType(state, world, pos, null);
world.playSound(player, pos, st.getPlaceSound(), SoundSource.BLOCKS, (st.getVolume() + 1f) / 2.5f, 0.9f * st.getPitch());
}
@Override
public boolean placeLiquid(LevelAccessor world, BlockPos pos, BlockState state, FluidState fluidState) {
return (state.getValue(PARTS) != 14) && (super.placeLiquid(world, pos, state, fluidState));
}
@Override
public boolean canPlaceLiquid(BlockGetter world, BlockPos pos, BlockState state, Fluid fluid) {
return (state.getValue(PARTS) != 14) && (super.canPlaceLiquid(world, pos, state, fluid));
}
}

View file

@ -0,0 +1,698 @@
/*
* @file StandardBlocks.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Common functionality class for decor blocks.
*/
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.SpawnPlacements;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Mirror;
import net.minecraft.world.level.block.Rotation;
import net.minecraft.world.level.block.SimpleWaterloggedBlock;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.block.state.properties.DirectionProperty;
import net.minecraft.world.level.block.state.properties.EnumProperty;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.level.material.PushReaction;
import net.minecraft.world.level.pathfinder.PathComputationType;
import net.minecraft.world.level.storage.loot.LootContext;
import net.minecraft.world.level.storage.loot.LootParams;
import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.shapes.BooleanOp;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import javax.annotation.Nullable;
import java.util.*;
import java.util.function.Function;
import java.util.function.Supplier;
@SuppressWarnings("deprecation")
public class StandardBlocks {
public static final long CFG_DEFAULT = 0x0000000000000000L; // no special config
public static final long CFG_CUTOUT = 0x0000000000000001L; // cutout rendering
public static final long CFG_MIPPED = 0x0000000000000002L; // cutout mipped rendering
public static final long CFG_TRANSLUCENT = 0x0000000000000004L; // indicates a block/pane is glass like (transparent, etc)
public static final long CFG_WATERLOGGABLE = 0x0000000000000008L; // The derived block extends IWaterLoggable
public static final long CFG_HORIZIONTAL = 0x0000000000000010L; // horizontal block, affects bounding box calculation at construction time and placement
public static final long CFG_LOOK_PLACEMENT = 0x0000000000000020L; // placed in direction the player is looking when placing.
public static final long CFG_FACING_PLACEMENT = 0x0000000000000040L; // placed on the facing the player has clicked.
public static final long CFG_OPPOSITE_PLACEMENT = 0x0000000000000080L; // placed placed in the opposite direction of the face the player clicked.
public static final long CFG_FLIP_PLACEMENT_IF_SAME = 0x0000000000000100L; // placement direction flipped if an instance of the same class was clicked
public static final long CFG_FLIP_PLACEMENT_SHIFTCLICK = 0x0000000000000200L; // placement direction flipped if player is sneaking
public static final long CFG_STRICT_CONNECTIONS = 0x0000000000000400L; // blocks do not connect to similar blocks around (implementation details may vary a bit)
public static final long CFG_AI_PASSABLE = 0x0000000000000800L; // does not block movement path for AI, needed for non-opaque blocks with collision shapes not thin at the bottom or one side.
public interface IStandardBlock {
default long config() {
return 0;
}
default boolean hasDynamicDropList() {
return false;
}
default List<ItemStack> dropList(BlockState state, Level world, @Nullable BlockEntity te, boolean explosion) {
return Collections.singletonList((!world.isClientSide()) ? (new ItemStack(state.getBlock().asItem())) : (ItemStack.EMPTY));
}
enum RenderTypeHint {SOLID, CUTOUT, CUTOUT_MIPPED, TRANSLUCENT, TRANSLUCENT_NO_CRUMBLING}
default RenderTypeHint getRenderTypeHint() {
return getRenderTypeHint(config());
}
default RenderTypeHint getRenderTypeHint(long config) {
if ((config & CFG_CUTOUT) != 0) return RenderTypeHint.CUTOUT;
if ((config & CFG_MIPPED) != 0) return RenderTypeHint.CUTOUT_MIPPED;
if ((config & CFG_TRANSLUCENT) != 0) return RenderTypeHint.TRANSLUCENT;
return RenderTypeHint.SOLID;
}
}
public static class BaseBlock extends Block implements IStandardBlock, SimpleWaterloggedBlock {
public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
public final long config;
public BaseBlock(long conf, BlockBehaviour.Properties properties) {
super(properties);
config = conf;
BlockState state = getStateDefinition().any();
if ((conf & CFG_WATERLOGGABLE) != 0) state = state.setValue(WATERLOGGED, false);
registerDefaultState(state);
}
@Override
public long config() {
return config;
}
@Override
@OnlyIn(Dist.CLIENT)
public void appendHoverText(ItemStack stack, @Nullable BlockGetter world, List<Component> tooltip, TooltipFlag flag) {
Auxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true);
}
@Override
public RenderTypeHint getRenderTypeHint() {
return getRenderTypeHint(config);
}
@Override
@SuppressWarnings("deprecation")
public boolean isPathfindable(BlockState state, BlockGetter world, BlockPos pos, PathComputationType type) {
return ((config & CFG_AI_PASSABLE) != 0) && (super.isPathfindable(state, world, pos, type));
}
public boolean hasSignalConnector(BlockState state, BlockGetter world, BlockPos pos, @Nullable Direction side) {
return state.isSignalSource();
}
@Override
@SuppressWarnings("deprecation")
public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean isMoving) {
final boolean rsup = (state.hasBlockEntity() && (state.getBlock() != newState.getBlock()));
super.onRemove(state, world, pos, newState, isMoving);
if (rsup) world.updateNeighbourForOutputSignal(pos, this);
}
@Override
public boolean propagatesSkylightDown(BlockState state, BlockGetter reader, BlockPos pos) {
return (((config & CFG_WATERLOGGABLE) == 0) || (!state.getValue(WATERLOGGED))) && super.propagatesSkylightDown(state, reader, pos);
}
@Override
@SuppressWarnings("deprecation")
public FluidState getFluidState(BlockState state) {
return (((config & CFG_WATERLOGGABLE) != 0) && state.getValue(WATERLOGGED)) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
}
@Override
@SuppressWarnings("deprecation")
public BlockState updateShape(BlockState state, Direction facing, BlockState facingState, LevelAccessor world, BlockPos pos, BlockPos facingPos) {
if (((config & CFG_WATERLOGGABLE) != 0) && (state.getValue(WATERLOGGED)))
world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world));
return state;
}
@Override // SimpleWaterloggedBlock
public boolean canPlaceLiquid(BlockGetter world, BlockPos pos, BlockState state, Fluid fluid) {
return ((config & CFG_WATERLOGGABLE) != 0) && SimpleWaterloggedBlock.super.canPlaceLiquid(world, pos, state, fluid);
}
@Override // SimpleWaterloggedBlock
public boolean placeLiquid(LevelAccessor world, BlockPos pos, BlockState state, FluidState fluidState) {
return ((config & CFG_WATERLOGGABLE) != 0) && SimpleWaterloggedBlock.super.placeLiquid(world, pos, state, fluidState);
}
@Override // SimpleWaterloggedBlock
public ItemStack pickupBlock(LevelAccessor world, BlockPos pos, BlockState state) {
return ((config & CFG_WATERLOGGABLE) != 0) ? (SimpleWaterloggedBlock.super.pickupBlock(world, pos, state)) : (ItemStack.EMPTY);
}
@Override // SimpleWaterloggedBlock
public Optional<SoundEvent> getPickupSound() {
return ((config & CFG_WATERLOGGABLE) != 0) ? (SimpleWaterloggedBlock.super.getPickupSound()) : Optional.empty();
}
}
public static class Cutout extends BaseBlock implements IStandardBlock {
private final VoxelShape vshape;
public Cutout(long conf, BlockBehaviour.Properties properties) {
this(conf, properties, Auxiliaries.getPixeledAABB(0, 0, 0, 16, 16, 16));
}
public Cutout(long conf, BlockBehaviour.Properties properties, AABB aabb) {
this(conf, properties, Shapes.create(aabb));
}
public Cutout(long conf, BlockBehaviour.Properties properties, AABB[] aabbs) {
this(conf, properties, Arrays.stream(aabbs).map(Shapes::create).reduce(Shapes.empty(), (shape, aabb) -> Shapes.joinUnoptimized(shape, aabb, BooleanOp.OR)));
}
public Cutout(long conf, BlockBehaviour.Properties properties, VoxelShape voxel_shape) {
super(conf, properties);
vshape = voxel_shape;
}
@Override
@SuppressWarnings("deprecation")
public VoxelShape getShape(BlockState state, BlockGetter source, BlockPos pos, CollisionContext selectionContext) {
return vshape;
}
@Override
@SuppressWarnings("deprecation")
public VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext selectionContext) {
return vshape;
}
@Override
@Nullable
public BlockState getStateForPlacement(BlockPlaceContext context) {
BlockState state = super.getStateForPlacement(context);
if ((config & CFG_WATERLOGGABLE) != 0) {
FluidState fs = context.getLevel().getFluidState(context.getClickedPos());
state = state.setValue(WATERLOGGED, fs.getType() == Fluids.WATER);
}
return state;
}
@Override
public boolean isPossibleToRespawnInThis(BlockState p_279289_) {
return false;
}
@Override
@SuppressWarnings("deprecation")
public PushReaction getPistonPushReaction(BlockState state) {
return PushReaction.NORMAL;
}
@Override
public boolean propagatesSkylightDown(BlockState state, BlockGetter reader, BlockPos pos) {
if ((config & CFG_WATERLOGGABLE) != 0) {
if (state.getValue(WATERLOGGED)) return false;
}
return super.propagatesSkylightDown(state, reader, pos);
}
@Override
@SuppressWarnings("deprecation")
public FluidState getFluidState(BlockState state) {
if ((config & CFG_WATERLOGGABLE) != 0) {
return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
}
return super.getFluidState(state);
}
@Override
@SuppressWarnings("deprecation")
public BlockState updateShape(BlockState state, Direction facing, BlockState facingState, LevelAccessor world, BlockPos pos, BlockPos facingPos) {
if ((config & CFG_WATERLOGGABLE) != 0) {
if (state.getValue(WATERLOGGED))
world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world));
}
return state;
}
}
public static class WaterLoggable extends Cutout implements IStandardBlock {
public WaterLoggable(long config, BlockBehaviour.Properties properties) {
super(config | CFG_WATERLOGGABLE, properties);
}
public WaterLoggable(long config, BlockBehaviour.Properties properties, AABB aabb) {
super(config | CFG_WATERLOGGABLE, properties, aabb);
}
public WaterLoggable(long config, BlockBehaviour.Properties properties, VoxelShape voxel_shape) {
super(config | CFG_WATERLOGGABLE, properties, voxel_shape);
}
public WaterLoggable(long config, BlockBehaviour.Properties properties, AABB[] aabbs) {
super(config | CFG_WATERLOGGABLE, properties, aabbs);
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
super.createBlockStateDefinition(builder);
builder.add(WATERLOGGED);
}
}
public static class Directed extends Cutout implements IStandardBlock {
public static final DirectionProperty FACING = BlockStateProperties.FACING;
protected final Map<BlockState, VoxelShape> vshapes;
public Directed(long config, BlockBehaviour.Properties properties, final Function<List<BlockState>, Map<BlockState, VoxelShape>> shape_supplier) {
super(config, properties);
registerDefaultState(super.defaultBlockState().setValue(FACING, Direction.UP));
vshapes = shape_supplier.apply(getStateDefinition().getPossibleStates());
}
public Directed(long config, BlockBehaviour.Properties properties, final Supplier<ArrayList<VoxelShape>> shape_supplier) {
this(config, properties, (states) -> {
final Map<BlockState, VoxelShape> vshapes = new HashMap<>();
final ArrayList<VoxelShape> indexed_shapes = shape_supplier.get();
for (BlockState state : states)
vshapes.put(state, indexed_shapes.get(state.getValue(FACING).get3DDataValue()));
return vshapes;
});
}
public Directed(long config, BlockBehaviour.Properties properties, final AABB[] unrotatedAABBs) {
this(config, properties, (states) -> {
final boolean is_horizontal = ((config & CFG_HORIZIONTAL) != 0);
Map<BlockState, VoxelShape> vshapes = new HashMap<>();
for (BlockState state : states) {
vshapes.put(state, Auxiliaries.getUnionShape(Auxiliaries.getRotatedAABB(unrotatedAABBs, state.getValue(FACING), is_horizontal)));
}
return vshapes;
});
}
public Directed(long config, BlockBehaviour.Properties properties, final AABB unrotatedAABB) {
this(config, properties, new AABB[]{unrotatedAABB});
}
@Override
public boolean isPossibleToRespawnInThis(BlockState p_279289_) {
return false;
}
@Override
public boolean isValidSpawn(BlockState state, BlockGetter world, BlockPos pos, SpawnPlacements.Type type, @Nullable EntityType<?> entityType) {
return false;
}
@Override
public VoxelShape getShape(BlockState state, BlockGetter source, BlockPos pos, CollisionContext selectionContext) {
return vshapes.get(state);
}
@Override
public VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext selectionContext) {
return getShape(state, world, pos, selectionContext);
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
super.createBlockStateDefinition(builder);
builder.add(FACING);
}
@Override
@Nullable
public BlockState getStateForPlacement(BlockPlaceContext context) {
BlockState state = super.getStateForPlacement(context);
if (state == null) return null;
Direction facing = context.getClickedFace();
if ((config & (CFG_HORIZIONTAL | CFG_LOOK_PLACEMENT)) == (CFG_HORIZIONTAL | CFG_LOOK_PLACEMENT)) {
// horizontal placement in direction the player is looking
facing = context.getHorizontalDirection();
} else if ((config & (CFG_HORIZIONTAL | CFG_LOOK_PLACEMENT)) == (CFG_HORIZIONTAL)) {
// horizontal placement on a face
if (((facing == Direction.UP) || (facing == Direction.DOWN))) return null;
} else if ((config & CFG_LOOK_PLACEMENT) != 0) {
// placement in direction the player is looking, with up and down
facing = context.getNearestLookingDirection();
}
if ((config & CFG_OPPOSITE_PLACEMENT) != 0) facing = facing.getOpposite();
if (((config & CFG_FLIP_PLACEMENT_SHIFTCLICK) != 0) && (context.getPlayer() != null) && (context.getPlayer().isShiftKeyDown()))
facing = facing.getOpposite();
return state.setValue(FACING, facing);
}
}
public static class AxisAligned extends Cutout implements IStandardBlock {
public static final EnumProperty<Direction.Axis> AXIS = BlockStateProperties.AXIS;
protected final ArrayList<VoxelShape> vshapes;
public AxisAligned(long config, BlockBehaviour.Properties properties, final Supplier<ArrayList<VoxelShape>> shape_supplier) {
super(config, properties);
registerDefaultState(super.defaultBlockState().setValue(AXIS, Direction.Axis.X));
vshapes = shape_supplier.get();
}
public AxisAligned(long config, BlockBehaviour.Properties properties, final AABB[] unrotatedAABBs) {
this(config, properties, () -> new ArrayList<>(Arrays.asList(
Auxiliaries.getUnionShape(Auxiliaries.getRotatedAABB(unrotatedAABBs, Direction.EAST, false)),
Auxiliaries.getUnionShape(Auxiliaries.getRotatedAABB(unrotatedAABBs, Direction.UP, false)),
Auxiliaries.getUnionShape(Auxiliaries.getRotatedAABB(unrotatedAABBs, Direction.SOUTH, false)),
Shapes.block()
)));
}
public AxisAligned(long config, BlockBehaviour.Properties properties, final AABB unrotatedAABB) {
this(config, properties, new AABB[]{unrotatedAABB});
}
@Override
public boolean isPossibleToRespawnInThis(BlockState p_279289_) {
return false;
}
@Override
public boolean isValidSpawn(BlockState state, BlockGetter world, BlockPos pos, SpawnPlacements.Type type, @Nullable EntityType<?> entityType) {
return false;
}
@Override
public VoxelShape getShape(BlockState state, BlockGetter source, BlockPos pos, CollisionContext selectionContext) {
return vshapes.get((state.getValue(AXIS)).ordinal() & 0x3);
}
@Override
public VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext selectionContext) {
return getShape(state, world, pos, selectionContext);
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
super.createBlockStateDefinition(builder);
builder.add(AXIS);
}
@Override
@Nullable
public BlockState getStateForPlacement(BlockPlaceContext context) {
Direction facing;
if ((config & CFG_LOOK_PLACEMENT) != 0) {
facing = context.getNearestLookingDirection();
} else {
facing = context.getClickedFace();
}
return super.getStateForPlacement(context).setValue(AXIS, facing.getAxis());
}
@Override
@SuppressWarnings("deprecation")
public BlockState rotate(BlockState state, Rotation rotation) {
switch (rotation) {
case CLOCKWISE_90:
case COUNTERCLOCKWISE_90:
switch (state.getValue(AXIS)) {
case X:
return state.setValue(AXIS, Direction.Axis.Z);
case Z:
return state.setValue(AXIS, Direction.Axis.X);
}
}
return state;
}
}
public static class Horizontal extends Cutout implements IStandardBlock {
public static final DirectionProperty HORIZONTAL_FACING = BlockStateProperties.HORIZONTAL_FACING;
protected final Map<BlockState, VoxelShape> vshapes;
protected final Map<BlockState, VoxelShape> cshapes;
public Horizontal(long config, BlockBehaviour.Properties properties, final Function<List<BlockState>, Map<BlockState, VoxelShape>> shape_supplier) {
super(config | CFG_HORIZIONTAL, properties);
registerDefaultState(super.defaultBlockState().setValue(HORIZONTAL_FACING, Direction.NORTH));
vshapes = shape_supplier.apply(getStateDefinition().getPossibleStates());
cshapes = shape_supplier.apply(getStateDefinition().getPossibleStates());
}
public Horizontal(long config, BlockBehaviour.Properties properties, final Supplier<ArrayList<VoxelShape>> shape_supplier) {
this(config, properties, (states) -> {
final Map<BlockState, VoxelShape> vshapes = new HashMap<>();
final ArrayList<VoxelShape> indexed_shapes = shape_supplier.get();
for (BlockState state : states)
vshapes.put(state, indexed_shapes.get(state.getValue(HORIZONTAL_FACING).get3DDataValue()));
return vshapes;
});
}
public Horizontal(long config, BlockBehaviour.Properties properties, final AABB unrotatedAABB) {
this(config, properties, new AABB[]{unrotatedAABB});
}
public Horizontal(long config, BlockBehaviour.Properties properties, final AABB[] unrotatedAABBs) {
this(config, properties, (states) -> {
Map<BlockState, VoxelShape> vshapes = new HashMap<>();
for (BlockState state : states) {
vshapes.put(state, Auxiliaries.getUnionShape(Auxiliaries.getRotatedAABB(unrotatedAABBs, state.getValue(HORIZONTAL_FACING), true)));
}
return vshapes;
});
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
super.createBlockStateDefinition(builder);
builder.add(HORIZONTAL_FACING);
}
@Override
public VoxelShape getShape(BlockState state, BlockGetter source, BlockPos pos, CollisionContext selectionContext) {
return vshapes.get(state);
}
@Override
public VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext selectionContext) {
return cshapes.get(state);
}
@Override
@Nullable
public BlockState getStateForPlacement(BlockPlaceContext context) {
BlockState state = super.getStateForPlacement(context);
if (state == null) return null;
Direction facing = context.getClickedFace();
if ((config & CFG_LOOK_PLACEMENT) != 0) {
// horizontal placement in direction the player is looking
facing = context.getHorizontalDirection();
} else {
// horizontal placement on a face
facing = ((facing == Direction.UP) || (facing == Direction.DOWN)) ? (context.getHorizontalDirection()) : facing;
}
if ((config & CFG_OPPOSITE_PLACEMENT) != 0) facing = facing.getOpposite();
if (((config & CFG_FLIP_PLACEMENT_SHIFTCLICK) != 0) && (context.getPlayer() != null) && (context.getPlayer().isShiftKeyDown()))
facing = facing.getOpposite();
return state.setValue(HORIZONTAL_FACING, facing);
}
@Override
@SuppressWarnings("deprecation")
public BlockState rotate(BlockState state, Rotation rot) {
return state.setValue(HORIZONTAL_FACING, rot.rotate(state.getValue(HORIZONTAL_FACING)));
}
@Override
@SuppressWarnings("deprecation")
public BlockState mirror(BlockState state, Mirror mirrorIn) {
return state.rotate(mirrorIn.getRotation(state.getValue(HORIZONTAL_FACING)));
}
}
public static class DirectedWaterLoggable extends Directed implements IStandardBlock {
public DirectedWaterLoggable(long config, BlockBehaviour.Properties properties, AABB aabb) {
super(config | CFG_WATERLOGGABLE, properties, aabb);
}
public DirectedWaterLoggable(long config, BlockBehaviour.Properties properties, AABB[] aabbs) {
super(config | CFG_WATERLOGGABLE, properties, aabbs);
}
public DirectedWaterLoggable(long config, BlockBehaviour.Properties properties, final Function<List<BlockState>, Map<BlockState, VoxelShape>> shape_supplier) {
super(config | CFG_WATERLOGGABLE, properties, shape_supplier);
}
public DirectedWaterLoggable(long config, BlockBehaviour.Properties properties, final Supplier<ArrayList<VoxelShape>> shape_supplier) {
super(config | CFG_WATERLOGGABLE, properties, shape_supplier);
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
super.createBlockStateDefinition(builder);
builder.add(WATERLOGGED);
}
}
public static class AxisAlignedWaterLoggable extends AxisAligned implements IStandardBlock {
public AxisAlignedWaterLoggable(long config, BlockBehaviour.Properties properties, AABB aabb) {
super(config | CFG_WATERLOGGABLE, properties, aabb);
}
public AxisAlignedWaterLoggable(long config, BlockBehaviour.Properties properties, AABB[] aabbs) {
super(config | CFG_WATERLOGGABLE, properties, aabbs);
}
public AxisAlignedWaterLoggable(long config, BlockBehaviour.Properties properties, final Supplier<ArrayList<VoxelShape>> shape_supplier) {
super(config | CFG_WATERLOGGABLE, properties, shape_supplier);
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
super.createBlockStateDefinition(builder);
builder.add(WATERLOGGED);
}
}
public static class HorizontalWaterLoggable extends Horizontal implements IStandardBlock {
public HorizontalWaterLoggable(long config, BlockBehaviour.Properties properties, AABB aabb) {
super(config | CFG_WATERLOGGABLE | CFG_HORIZIONTAL, properties, aabb);
}
public HorizontalWaterLoggable(long config, BlockBehaviour.Properties properties, AABB[] aabbs) {
super(config | CFG_WATERLOGGABLE | CFG_HORIZIONTAL, properties, aabbs);
}
public HorizontalWaterLoggable(long config, BlockBehaviour.Properties properties, final Supplier<ArrayList<VoxelShape>> shape_supplier) {
super(config | CFG_WATERLOGGABLE | CFG_HORIZIONTAL, properties, shape_supplier);
}
public HorizontalWaterLoggable(long config, BlockBehaviour.Properties properties, final Function<List<BlockState>, Map<BlockState, VoxelShape>> shape_supplier) {
super(config | CFG_WATERLOGGABLE | CFG_HORIZIONTAL, properties, shape_supplier);
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
super.createBlockStateDefinition(builder);
builder.add(WATERLOGGED);
}
}
static public class HorizontalFourWayWaterLoggable extends WaterLoggable implements IStandardBlock {
public static final BooleanProperty NORTH = BlockStateProperties.NORTH;
public static final BooleanProperty EAST = BlockStateProperties.EAST;
public static final BooleanProperty SOUTH = BlockStateProperties.SOUTH;
public static final BooleanProperty WEST = BlockStateProperties.WEST;
protected final Map<BlockState, VoxelShape> shapes;
protected final Map<BlockState, VoxelShape> collision_shapes;
public HorizontalFourWayWaterLoggable(long config, BlockBehaviour.Properties properties, AABB base_aabb, final AABB[] side_aabb, int railing_height_extension) {
super(config, properties, base_aabb);
Map<BlockState, VoxelShape> build_shapes = new HashMap<>();
Map<BlockState, VoxelShape> build_collision_shapes = new HashMap<>();
for (BlockState state : getStateDefinition().getPossibleStates()) {
{
VoxelShape shape = ((base_aabb.getXsize() == 0) || (base_aabb.getYsize() == 0) || (base_aabb.getZsize() == 0)) ? Shapes.empty() : Shapes.create(base_aabb);
if (state.getValue(NORTH))
shape = Shapes.joinUnoptimized(shape, Auxiliaries.getUnionShape(Auxiliaries.getRotatedAABB(side_aabb, Direction.NORTH, true)), BooleanOp.OR);
if (state.getValue(EAST))
shape = Shapes.joinUnoptimized(shape, Auxiliaries.getUnionShape(Auxiliaries.getRotatedAABB(side_aabb, Direction.EAST, true)), BooleanOp.OR);
if (state.getValue(SOUTH))
shape = Shapes.joinUnoptimized(shape, Auxiliaries.getUnionShape(Auxiliaries.getRotatedAABB(side_aabb, Direction.SOUTH, true)), BooleanOp.OR);
if (state.getValue(WEST))
shape = Shapes.joinUnoptimized(shape, Auxiliaries.getUnionShape(Auxiliaries.getRotatedAABB(side_aabb, Direction.WEST, true)), BooleanOp.OR);
if (shape.isEmpty()) shape = Shapes.block();
build_shapes.put(state.setValue(WATERLOGGED, false), shape);
build_shapes.put(state.setValue(WATERLOGGED, true), shape);
}
{
// how the hack to extend a shape, these are the above with y+4px.
VoxelShape shape = ((base_aabb.getXsize() == 0) || (base_aabb.getYsize() == 0) || (base_aabb.getZsize() == 0)) ? Shapes.empty() : Shapes.create(base_aabb);
if (state.getValue(NORTH))
shape = Shapes.joinUnoptimized(shape, Auxiliaries.getUnionShape(Auxiliaries.getMappedAABB(Auxiliaries.getRotatedAABB(side_aabb,
Direction.NORTH, true), bb -> bb.expandTowards(0, railing_height_extension, 0))), BooleanOp.OR);
if (state.getValue(EAST))
shape = Shapes.joinUnoptimized(shape, Auxiliaries.getUnionShape(Auxiliaries.getMappedAABB(Auxiliaries.getRotatedAABB(side_aabb,
Direction.EAST, true), bb -> bb.expandTowards(0, railing_height_extension, 0))), BooleanOp.OR);
if (state.getValue(SOUTH))
shape = Shapes.joinUnoptimized(shape, Auxiliaries.getUnionShape(Auxiliaries.getMappedAABB(Auxiliaries.getRotatedAABB(side_aabb,
Direction.SOUTH, true), bb -> bb.expandTowards(0, railing_height_extension, 0))), BooleanOp.OR);
if (state.getValue(WEST))
shape = Shapes.joinUnoptimized(shape, Auxiliaries.getUnionShape(Auxiliaries.getMappedAABB(Auxiliaries.getRotatedAABB(side_aabb,
Direction.WEST, true), bb -> bb.expandTowards(0, railing_height_extension, 0))), BooleanOp.OR);
if (shape.isEmpty()) shape = Shapes.block();
build_collision_shapes.put(state.setValue(WATERLOGGED, false), shape);
build_collision_shapes.put(state.setValue(WATERLOGGED, true), shape);
}
}
shapes = build_shapes;
collision_shapes = build_collision_shapes;
registerDefaultState(super.defaultBlockState().setValue(NORTH, false).setValue(EAST, false).setValue(SOUTH, false).setValue(WEST, false).setValue(WATERLOGGED, false));
}
public HorizontalFourWayWaterLoggable(long config, BlockBehaviour.Properties properties, AABB base_aabb, final AABB side_aabb, int railing_height_extension) {
this(config, properties, base_aabb, new AABB[]{side_aabb}, railing_height_extension);
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
super.createBlockStateDefinition(builder);
builder.add(NORTH, EAST, SOUTH, WEST);
}
@Override
@Nullable
public BlockState getStateForPlacement(BlockPlaceContext context) {
return super.getStateForPlacement(context).setValue(NORTH, false).setValue(EAST, false).setValue(SOUTH, false).setValue(WEST, false);
}
@Override
public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
return shapes.getOrDefault(state, Shapes.block());
}
@Override
public VoxelShape getCollisionShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
return collision_shapes.getOrDefault(state, Shapes.block());
}
public static BooleanProperty getDirectionProperty(Direction face) {
return switch (face) {
case EAST -> HorizontalFourWayWaterLoggable.EAST;
case SOUTH -> HorizontalFourWayWaterLoggable.SOUTH;
case WEST -> HorizontalFourWayWaterLoggable.WEST;
default -> HorizontalFourWayWaterLoggable.NORTH;
};
}
}
}

View file

@ -0,0 +1,175 @@
/*
* @file StandardDoorBlock.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Door blocks, almost entirely based on vanilla.
*/
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.SpawnPlacements;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.DoorBlock;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockSetType;
import net.minecraft.world.level.block.state.properties.DoorHingeSide;
import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.shapes.BooleanOp;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import javax.annotation.Nullable;
import java.util.List;
public class StandardDoorBlock extends DoorBlock implements StandardBlocks.IStandardBlock {
private final long config_;
protected final VoxelShape[][][][] shapes_;
protected final SoundEvent open_sound_;
protected final SoundEvent close_sound_;
public StandardDoorBlock(long config, BlockBehaviour.Properties properties, AABB[] open_aabbs_top, AABB[] open_aabbs_bottom, AABB[] closed_aabbs_top, AABB[] closed_aabbs_bottom, SoundEvent open_sound, SoundEvent close_sound, BlockSetType blockSetType) {
super(properties, blockSetType);
VoxelShape[][][][] shapes = new VoxelShape[Direction.values().length][2][2][2];
for (Direction facing : Direction.values()) {
for (boolean open : new boolean[]{false, true}) {
for (DoubleBlockHalf half : new DoubleBlockHalf[]{DoubleBlockHalf.UPPER, DoubleBlockHalf.LOWER}) {
for (boolean hinge_right : new boolean[]{false, true}) {
VoxelShape shape = Shapes.empty();
if (facing.getAxis() == Direction.Axis.Y) {
shape = Shapes.block();
} else {
final AABB[] aabbs = (open) ? ((half == DoubleBlockHalf.UPPER) ? open_aabbs_top : open_aabbs_bottom) : ((half == DoubleBlockHalf.UPPER) ? closed_aabbs_top : closed_aabbs_bottom);
for (AABB e : aabbs) {
AABB aabb = Auxiliaries.getRotatedAABB(e, facing, true);
if (!hinge_right)
aabb = Auxiliaries.getMirroredAABB(aabb, facing.getClockWise().getAxis());
shape = Shapes.join(shape, Shapes.create(aabb), BooleanOp.OR);
}
}
shapes[facing.ordinal()][open ? 1 : 0][hinge_right ? 1 : 0][half == DoubleBlockHalf.UPPER ? 0 : 1] = shape;
}
}
}
}
config_ = config;
shapes_ = shapes;
open_sound_ = open_sound;
close_sound_ = close_sound;
}
public StandardDoorBlock(long config, BlockBehaviour.Properties properties, AABB open_aabb, AABB closed_aabb, SoundEvent open_sound, SoundEvent close_sound, BlockSetType blockSetType) {
this(config, properties, new AABB[]{open_aabb}, new AABB[]{open_aabb}, new AABB[]{closed_aabb}, new AABB[]{closed_aabb}, open_sound, close_sound, blockSetType);
}
public StandardDoorBlock(long config, BlockBehaviour.Properties properties, SoundEvent open_sound, SoundEvent close_sound, BlockSetType blockSetType) {
this(
config, properties,
Auxiliaries.getPixeledAABB(13, 0, 0, 16, 16, 16),
Auxiliaries.getPixeledAABB(0, 0, 13, 16, 16, 16),
open_sound,
close_sound,
blockSetType
);
}
public StandardDoorBlock(long config, BlockBehaviour.Properties properties) {
this(
config, properties,
Auxiliaries.getPixeledAABB(13, 0, 0, 16, 16, 16),
Auxiliaries.getPixeledAABB(0, 0, 13, 16, 16, 16),
SoundEvents.WOODEN_DOOR_OPEN,
SoundEvents.WOODEN_DOOR_CLOSE,
BlockSetType.OAK
);
}
@Override
public long config() {
return config_;
}
protected void sound(BlockGetter world, BlockPos pos, boolean open) {
if (world instanceof Level)
((Level) world).playSound(null, pos, open ? open_sound_ : close_sound_, SoundSource.BLOCKS, 0.7f, 1f);
}
protected void actuate_adjacent_wing(BlockState state, BlockGetter world_ro, BlockPos pos, boolean open) {
if (!(world_ro instanceof final Level world)) return;
final BlockPos adjecent_pos = pos.relative((state.getValue(HINGE) == DoorHingeSide.LEFT) ? (state.getValue(FACING).getClockWise()) : (state.getValue(FACING).getCounterClockWise()));
if (!world.isLoaded(adjecent_pos)) return;
BlockState adjacent_state = world.getBlockState(adjecent_pos);
if (adjacent_state.getBlock() != this) return;
if (adjacent_state.getValue(OPEN) == open) return;
world.setBlock(adjecent_pos, adjacent_state.setValue(OPEN, open), 2 | 10);
}
@Override
@OnlyIn(Dist.CLIENT)
public void appendHoverText(ItemStack stack, @Nullable BlockGetter world, List<Component> tooltip, TooltipFlag flag) {
Auxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true);
}
@Override
public boolean isPossibleToRespawnInThis(BlockState p_279289_) {
return false;
}
@Override
public boolean isValidSpawn(BlockState state, BlockGetter world, BlockPos pos, SpawnPlacements.Type type, @Nullable EntityType<?> entityType) {
return false;
}
@Override
public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
return shapes_[state.getValue(FACING).ordinal()][state.getValue(OPEN) ? 1 : 0][state.getValue(HINGE) == DoorHingeSide.RIGHT ? 1 : 0][state.getValue(HALF) == DoubleBlockHalf.UPPER ? 0 : 1];
}
@Override
public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
setOpen(player, world, state, pos, !state.getValue(OPEN));
return InteractionResult.sidedSuccess(world.isClientSide());
}
@Override
public void neighborChanged(BlockState state, Level world, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) {
boolean powered = world.hasNeighborSignal(pos) || world.hasNeighborSignal(pos.relative(state.getValue(HALF) == DoubleBlockHalf.LOWER ? Direction.UP : Direction.DOWN));
if ((block == this) || (powered == state.getValue(POWERED))) return;
world.setBlock(pos, state.setValue(POWERED, powered).setValue(OPEN, powered), 2);
actuate_adjacent_wing(state, world, pos, powered);
if (powered != state.getValue(OPEN)) sound(world, pos, powered);
}
@Override
public void setOpen(@Nullable Entity entity, Level world, BlockState state, BlockPos pos, boolean open) {
if (!state.is(this) || (state.getValue(OPEN) == open)) return;
state = state.setValue(OPEN, open);
world.setBlock(pos, state, 2 | 8);
sound(world, pos, open);
actuate_adjacent_wing(state, world, pos, open);
}
}

View file

@ -0,0 +1,72 @@
/*
* @file StandardEntityBlocks.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Common functionality class for blocks with block entities.
*/
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.MenuProvider;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.EntityBlock;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.gameevent.GameEventListener;
import net.minecraftforge.common.util.FakePlayer;
import javax.annotation.Nullable;
public class StandardEntityBlocks {
public interface IStandardEntityBlock<ET extends StandardBlockEntity> extends EntityBlock {
default boolean isBlockEntityTicking(Level world, BlockState state) {
return false;
}
default InteractionResult useOpenGui(BlockState state, Level world, BlockPos pos, Player player) {
if (world.isClientSide()) return InteractionResult.SUCCESS;
final BlockEntity te = world.getBlockEntity(pos);
if (!(te instanceof MenuProvider) || ((player instanceof FakePlayer))) return InteractionResult.FAIL;
player.openMenu((MenuProvider) te);
return InteractionResult.CONSUME;
}
@Override
@Nullable
default BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
BlockEntityType<?> tet = Registries.getBlockEntityTypeOfBlock(state.getBlock());
return (tet == null) ? null : tet.create(pos, state);
}
@Override
@Nullable
default <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level world, BlockState state, BlockEntityType<T> te_type) {
return (world.isClientSide || (!isBlockEntityTicking(world, state))) ? (null) : ((Level w, BlockPos p, BlockState s, T te) -> ((StandardBlockEntity) te).tick());
}
@Override
@Nullable
default <T extends BlockEntity> GameEventListener getListener(ServerLevel world, T te) {
return null;
}
}
public static abstract class StandardBlockEntity extends BlockEntity {
public StandardBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
}
public void tick() {
}
}
}

View file

@ -0,0 +1,203 @@
/*
* @file StandardFenceBlock.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Wall blocks.
*/
package dev.zontreck.libzontreck.edlibmc;
import com.google.common.collect.ImmutableMap;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.SpawnPlacements;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.LevelReader;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.FenceGateBlock;
import net.minecraft.world.level.block.WallBlock;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.block.state.properties.EnumProperty;
import net.minecraft.world.level.block.state.properties.WallSide;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.level.material.PushReaction;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Map;
public class StandardFenceBlock extends WallBlock implements StandardBlocks.IStandardBlock {
public static final BooleanProperty UP = BlockStateProperties.UP;
public static final EnumProperty<WallSide> WALL_EAST = BlockStateProperties.EAST_WALL;
public static final EnumProperty<WallSide> WALL_NORTH = BlockStateProperties.NORTH_WALL;
public static final EnumProperty<WallSide> WALL_SOUTH = BlockStateProperties.SOUTH_WALL;
public static final EnumProperty<WallSide> WALL_WEST = BlockStateProperties.WEST_WALL;
public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
private final Map<BlockState, VoxelShape> shape_voxels;
private final Map<BlockState, VoxelShape> collision_shape_voxels;
private final long config;
public StandardFenceBlock(long config, BlockBehaviour.Properties properties) {
this(config, properties, 1.5, 16, 1.5, 0, 14, 16);
}
public StandardFenceBlock(long config, BlockBehaviour.Properties properties, double pole_width, double pole_height, double side_width, double side_min_y, double side_max_low_y, double side_max_tall_y) {
super(properties);
shape_voxels = buildShapes(pole_width, pole_height, side_width, side_min_y, side_max_low_y, side_max_tall_y);
collision_shape_voxels = buildShapes(pole_width, 24, pole_width, 0, 24, 24);
this.config = config;
}
@Override
public long config() {
return config;
}
@Override
@OnlyIn(Dist.CLIENT)
public void appendHoverText(ItemStack stack, @Nullable BlockGetter world, List<Component> tooltip, TooltipFlag flag) {
Auxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true);
}
private static VoxelShape combinedShape(VoxelShape pole, WallSide height, VoxelShape low, VoxelShape high) {
if (height == WallSide.TALL) return Shapes.or(pole, high);
if (height == WallSide.LOW) return Shapes.or(pole, low);
return pole;
}
protected Map<BlockState, VoxelShape> buildShapes(double pole_width, double pole_height, double side_width, double side_min_y, double side_max_low_y, double side_max_tall_y) {
final double px0 = 8.0 - pole_width, px1 = 8.0 + pole_width, sx0 = 8.0 - side_width, sx1 = 8.0 + side_width;
VoxelShape vp = Block.box(px0, 0, px0, px1, pole_height, px1);
VoxelShape vs1 = Block.box(sx0, side_min_y, 0, sx1, side_max_low_y, sx1);
VoxelShape vs2 = Block.box(sx0, side_min_y, sx0, sx1, side_max_low_y, 16);
VoxelShape vs3 = Block.box(0, side_min_y, sx0, sx1, side_max_low_y, sx1);
VoxelShape vs4 = Block.box(sx0, side_min_y, sx0, 16, side_max_low_y, sx1);
VoxelShape vs5 = Block.box(sx0, side_min_y, 0, sx1, side_max_tall_y, sx1);
VoxelShape vs6 = Block.box(sx0, side_min_y, sx0, sx1, side_max_tall_y, 16);
VoxelShape vs7 = Block.box(0, side_min_y, sx0, sx1, side_max_tall_y, sx1);
VoxelShape vs8 = Block.box(sx0, side_min_y, sx0, 16, side_max_tall_y, sx1);
ImmutableMap.Builder<BlockState, VoxelShape> builder = ImmutableMap.builder();
for (Boolean up : UP.getPossibleValues()) {
for (WallSide wh_east : WALL_EAST.getPossibleValues()) {
for (WallSide wh_north : WALL_NORTH.getPossibleValues()) {
for (WallSide wh_west : WALL_WEST.getPossibleValues()) {
for (WallSide wh_south : WALL_SOUTH.getPossibleValues()) {
VoxelShape shape = Shapes.empty();
shape = combinedShape(shape, wh_east, vs4, vs8);
shape = combinedShape(shape, wh_west, vs3, vs7);
shape = combinedShape(shape, wh_north, vs1, vs5);
shape = combinedShape(shape, wh_south, vs2, vs6);
if (up) shape = Shapes.or(shape, vp);
BlockState bs = defaultBlockState().setValue(UP, up)
.setValue(WALL_EAST, wh_east)
.setValue(WALL_NORTH, wh_north)
.setValue(WALL_WEST, wh_west)
.setValue(WALL_SOUTH, wh_south);
builder.put(bs.setValue(WATERLOGGED, false), shape);
builder.put(bs.setValue(WATERLOGGED, true), shape);
}
}
}
}
}
return builder.build();
}
@Override
public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext selectionContext) {
return shape_voxels.getOrDefault(state, Shapes.block());
}
@Override
public VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext selectionContext) {
return collision_shape_voxels.getOrDefault(state, Shapes.block());
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
super.createBlockStateDefinition(builder);
}
protected boolean attachesTo(BlockState facingState, LevelReader world, BlockPos facingPos, Direction side) {
final Block block = facingState.getBlock();
if ((block instanceof FenceGateBlock) || (block instanceof StandardFenceBlock) || (block instanceof VariantWallBlock))
return true;
final BlockState oppositeState = world.getBlockState(facingPos.relative(side, 2));
if (!(oppositeState.getBlock() instanceof StandardFenceBlock)) return false;
return facingState.isRedstoneConductor(world, facingPos) && canSupportCenter(world, facingPos, side);
}
protected WallSide selectWallHeight(LevelReader world, BlockPos pos, Direction direction) {
return WallSide.LOW; // @todo: implement
}
public BlockState getStateForPlacement(BlockPlaceContext context) {
LevelReader world = context.getLevel();
BlockPos pos = context.getClickedPos();
FluidState fs = context.getLevel().getFluidState(context.getClickedPos());
boolean n = attachesTo(world.getBlockState(pos.north()), world, pos.north(), Direction.SOUTH);
boolean e = attachesTo(world.getBlockState(pos.east()), world, pos.east(), Direction.WEST);
boolean s = attachesTo(world.getBlockState(pos.south()), world, pos.south(), Direction.NORTH);
boolean w = attachesTo(world.getBlockState(pos.west()), world, pos.west(), Direction.EAST);
boolean not_straight = (!n || !s || e || w) && (n || s || !e || !w);
return defaultBlockState()
.setValue(UP, not_straight)
.setValue(WALL_NORTH, n ? selectWallHeight(world, pos, Direction.NORTH) : WallSide.NONE)
.setValue(WALL_EAST, e ? selectWallHeight(world, pos, Direction.EAST) : WallSide.NONE)
.setValue(WALL_SOUTH, s ? selectWallHeight(world, pos, Direction.SOUTH) : WallSide.NONE)
.setValue(WALL_WEST, w ? selectWallHeight(world, pos, Direction.WEST) : WallSide.NONE)
.setValue(WATERLOGGED, fs.getType() == Fluids.WATER);
}
@Override
public BlockState updateShape(BlockState state, Direction side, BlockState facingState, LevelAccessor world, BlockPos pos, BlockPos facingPos) {
if (state.getValue(BlockStateProperties.WATERLOGGED))
world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world));
if (side == Direction.DOWN) return super.updateShape(state, side, facingState, world, pos, facingPos);
boolean n = (side == Direction.NORTH) ? attachesTo(facingState, world, facingPos, side) : (state.getValue(WALL_NORTH) != WallSide.NONE);
boolean e = (side == Direction.EAST) ? attachesTo(facingState, world, facingPos, side) : (state.getValue(WALL_EAST) != WallSide.NONE);
boolean s = (side == Direction.SOUTH) ? attachesTo(facingState, world, facingPos, side) : (state.getValue(WALL_SOUTH) != WallSide.NONE);
boolean w = (side == Direction.WEST) ? attachesTo(facingState, world, facingPos, side) : (state.getValue(WALL_WEST) != WallSide.NONE);
boolean not_straight = (!n || !s || e || w) && (n || s || !e || !w);
return state.setValue(UP, not_straight)
.setValue(WALL_NORTH, n ? selectWallHeight(world, pos, Direction.NORTH) : WallSide.NONE)
.setValue(WALL_EAST, e ? selectWallHeight(world, pos, Direction.EAST) : WallSide.NONE)
.setValue(WALL_SOUTH, s ? selectWallHeight(world, pos, Direction.SOUTH) : WallSide.NONE)
.setValue(WALL_WEST, w ? selectWallHeight(world, pos, Direction.WEST) : WallSide.NONE);
}
@Override
public boolean isValidSpawn(BlockState state, BlockGetter world, BlockPos pos, SpawnPlacements.Type type, @Nullable EntityType<?> entityType) {
return false;
}
@Override
public boolean isPossibleToRespawnInThis(BlockState p_279289_) {
return false;
}
@Override
@SuppressWarnings("deprecation")
public PushReaction getPistonPushReaction(BlockState state) {
return PushReaction.NORMAL;
}
}

View file

@ -0,0 +1,59 @@
/*
* @file StandardStairsBlock.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Stairs and roof blocks, almost entirely based on vanilla stairs.
*/
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.SpawnPlacements;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.StairBlock;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.PushReaction;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import javax.annotation.Nullable;
import java.util.List;
public class StandardStairsBlock extends StairBlock implements StandardBlocks.IStandardBlock {
private final long config;
public StandardStairsBlock(long config, java.util.function.Supplier<BlockState> state, BlockBehaviour.Properties properties) {
super(state, properties);
this.config = config;
}
@Override
@OnlyIn(Dist.CLIENT)
public void appendHoverText(ItemStack stack, @Nullable BlockGetter world, List<Component> tooltip, TooltipFlag flag) {
Auxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true);
}
@Override
public boolean isPossibleToRespawnInThis(BlockState p_279289_) {
return false;
}
@Override
public boolean isValidSpawn(BlockState state, BlockGetter world, BlockPos pos, SpawnPlacements.Type type, @Nullable EntityType<?> entityType) {
return false;
}
@Override
@SuppressWarnings("deprecation")
public PushReaction getPistonPushReaction(BlockState state) {
return PushReaction.NORMAL;
}
}

View file

@ -0,0 +1,130 @@
/*
* @file Tooltip.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Delayed tooltip for a selected area. Constructed with a
* GUI, invoked in `render()`.
*/
package dev.zontreck.libzontreck.edlibmc;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.network.chat.*;
import net.minecraft.util.Mth;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.function.Supplier;
@OnlyIn(Dist.CLIENT)
public class TooltipDisplay {
private static long default_delay = 800;
private static int default_max_deviation = 1;
public static void config(long delay, int max_deviation) {
default_delay = clamp(delay, 500, 5000);
default_max_deviation = Mth.clamp(max_deviation, 1, 5);
}
private static long clamp(long p1, long a, long b) {
return p1 < a ? a : Math.min(p1, b);
}
// ---------------------------------------------------------------------------------------------------
public static class TipRange {
public final int x0, y0, x1, y1;
public final Supplier<Component> text;
public TipRange(int x, int y, int w, int h, Component text) {
this(x, y, w, h, () -> text);
}
public TipRange(int x, int y, int w, int h, Supplier<Component> text) {
this.text = text;
this.x0 = x;
this.y0 = y;
this.x1 = x0 + w - 1;
this.y1 = y0 + h - 1;
}
}
// ---------------------------------------------------------------------------------------------------
private List<TipRange> ranges = new ArrayList<>();
private long delay = default_delay;
private int max_deviation = default_max_deviation;
private int x_last, y_last;
private long t;
private static boolean had_render_exception = false;
public TooltipDisplay() {
t = System.currentTimeMillis();
}
public TooltipDisplay init(List<TipRange> ranges, long delay_ms, int max_deviation_xy) {
this.ranges = ranges;
this.delay = delay_ms;
this.max_deviation = max_deviation_xy;
t = System.currentTimeMillis();
x_last = y_last = 0;
return this;
}
public TooltipDisplay init(List<TipRange> ranges) {
return init(ranges, default_delay, default_max_deviation);
}
public TooltipDisplay init(TipRange... ranges) {
return init(Arrays.asList(ranges), default_delay, default_max_deviation);
}
public TooltipDisplay delay(int ms) {
delay = (ms <= 0) ? default_delay : ms;
return this;
}
public void resetTimer() {
t = System.currentTimeMillis();
}
public <T extends AbstractContainerMenu> boolean render(GuiGraphics mx, final AbstractContainerScreen<T> gui, int x, int y) {
if (had_render_exception) return false;
if ((Math.abs(x - x_last) > max_deviation) || (Math.abs(y - y_last) > max_deviation)) {
x_last = x;
y_last = y;
resetTimer();
return false;
} else if (Math.abs(System.currentTimeMillis() - t) < delay) {
return false;
} else if (ranges.stream().noneMatch(
(tip) -> {
if ((x < tip.x0) || (x > tip.x1) || (y < tip.y0) || (y > tip.y1)) return false;
String text = tip.text.get().toString();
if (text.isEmpty()) return false;
try {
mx.renderComponentTooltip(Minecraft.getInstance().font, tip.text.get().toFlatList(Style.EMPTY), x, y);
} catch (Exception ex) {
had_render_exception = true;
Auxiliaries.logError("Tooltip rendering disabled due to exception: '" + ex.getMessage() + "'");
return false;
}
return true;
})
) {
resetTimer();
return false;
} else {
return true;
}
}
}

View file

@ -0,0 +1,220 @@
/*
* @file VariantSlabBlock.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Standard half block horizontal slab characteristics class.
*/
package dev.zontreck.libzontreck.edlibmc;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
import net.minecraft.sounds.SoundSource;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.SpawnPlacements;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Mirror;
import net.minecraft.world.level.block.Rotation;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.EnumProperty;
import net.minecraft.world.level.block.state.properties.IntegerProperty;
import net.minecraft.world.level.block.state.properties.SlabType;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class VariantSlabBlock extends StandardBlocks.WaterLoggable implements StandardBlocks.IStandardBlock {
public static final EnumProperty<SlabType> TYPE = BlockStateProperties.SLAB_TYPE;
public static final IntegerProperty TEXTURE_VARIANT = IntegerProperty.create("tvariant", 0, 3);
protected static final VoxelShape[] AABBs = {
Shapes.create(new AABB(0, 8. / 16, 0, 1, 16. / 16, 1)), // top slab
Shapes.create(new AABB(0, 0. / 16, 0, 1, 8. / 16, 1)), // bottom slab
Shapes.create(new AABB(0, 0. / 16, 0, 1, 16. / 16, 1)), // both slabs
Shapes.create(new AABB(0, 0. / 16, 0, 1, 16. / 16, 1)) // << 2bit fill
};
protected static final int[] num_slabs_contained_in_parts_ = {1, 1, 2, 2};
private static boolean with_pickup = false;
public static void on_config(boolean direct_slab_pickup) {
with_pickup = direct_slab_pickup;
}
protected boolean is_cube(BlockState state) {
return state.getValue(TYPE) == SlabType.DOUBLE;
}
public VariantSlabBlock(long config, BlockBehaviour.Properties builder) {
super(config, builder);
registerDefaultState(defaultBlockState().setValue(TYPE, SlabType.BOTTOM));
}
@Override
public RenderTypeHint getRenderTypeHint() {
return (((config & StandardBlocks.CFG_TRANSLUCENT) != 0) ? (RenderTypeHint.TRANSLUCENT) : (RenderTypeHint.CUTOUT));
}
@Override
@OnlyIn(Dist.CLIENT)
public void appendHoverText(ItemStack stack, @Nullable BlockGetter world, List<Component> tooltip, TooltipFlag flag) {
if (!Auxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true)) return;
if (with_pickup && Auxiliaries.Tooltip.helpCondition())
Auxiliaries.Tooltip.addInformation("engineersdecor.tooltip.slabpickup", "engineersdecor.tooltip.slabpickup", tooltip, flag, true);
}
@Override
@OnlyIn(Dist.CLIENT)
@SuppressWarnings("deprecation")
public boolean skipRendering(BlockState state, BlockState adjacentBlockState, Direction side) {
return (adjacentBlockState == state) || (super.skipRendering(state, adjacentBlockState, side));
}
@Override
public boolean isPossibleToRespawnInThis(BlockState state) {
return false;
}
@Override
public boolean isValidSpawn(BlockState state, BlockGetter world, BlockPos pos, SpawnPlacements.Type type, @Nullable EntityType<?> entityType) {
return false;
}
@Override
public VoxelShape getShape(BlockState state, BlockGetter source, BlockPos pos, CollisionContext selectionContext) {
return AABBs[state.getValue(TYPE).ordinal() & 0x3];
}
@Override
public VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext selectionContext) {
return getShape(state, world, pos, selectionContext);
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
super.createBlockStateDefinition(builder);
builder.add(TYPE, TEXTURE_VARIANT);
}
@Override
@Nullable
public BlockState getStateForPlacement(BlockPlaceContext context) {
BlockPos pos = context.getClickedPos();
if (context.getLevel().getBlockState(pos).getBlock() == this)
return context.getLevel().getBlockState(pos).setValue(TYPE, SlabType.DOUBLE).setValue(WATERLOGGED, false);
final int rnd = Mth.clamp((int) (Mth.getSeed(context.getClickedPos()) & 0x3), 0, 3);
final Direction face = context.getClickedFace();
final BlockState placement_state = super.getStateForPlacement(context).setValue(TEXTURE_VARIANT, rnd); // fluid state
if (face == Direction.UP) return placement_state.setValue(TYPE, SlabType.BOTTOM);
if (face == Direction.DOWN) return placement_state.setValue(TYPE, SlabType.TOP);
if (!face.getAxis().isHorizontal()) return placement_state;
final boolean isupper = ((context.getClickLocation().y() - context.getClickedPos().getY()) > 0.5);
return placement_state.setValue(TYPE, isupper ? SlabType.TOP : SlabType.BOTTOM);
}
@Override
@SuppressWarnings("deprecation")
public boolean canBeReplaced(BlockState state, BlockPlaceContext context) {
if (context.getItemInHand().getItem() != this.asItem()) return false;
if (!context.replacingClickedOnBlock()) return true;
final Direction face = context.getClickedFace();
final SlabType type = state.getValue(TYPE);
if ((face == Direction.UP) && (type == SlabType.BOTTOM)) return true;
if ((face == Direction.DOWN) && (type == SlabType.TOP)) return true;
if (!face.getAxis().isHorizontal()) return false;
final boolean isupper = ((context.getClickLocation().y() - context.getClickedPos().getY()) > 0.5);
return isupper ? (type == SlabType.BOTTOM) : (type == SlabType.TOP);
}
@Override
@SuppressWarnings("deprecation")
public BlockState rotate(BlockState state, Rotation rot) {
return state;
}
@Override
@SuppressWarnings("deprecation")
public BlockState mirror(BlockState state, Mirror mirrorIn) {
return state;
}
@Override
public boolean hasDynamicDropList() {
return true;
}
@Override
public List<ItemStack> dropList(BlockState state, Level world, BlockEntity te, boolean explosion) {
return new ArrayList<>(Collections.singletonList(new ItemStack(this.asItem(), num_slabs_contained_in_parts_[state.getValue(TYPE).ordinal() & 0x3])));
}
@Override
@SuppressWarnings("deprecation")
public void attack(BlockState state, Level world, BlockPos pos, Player player) {
if ((world.isClientSide) || (!with_pickup)) return;
final ItemStack stack = player.getMainHandItem();
if (stack.isEmpty() || (Block.byItem(stack.getItem()) != this)) return;
if (stack.getCount() >= stack.getMaxStackSize()) return;
Vec3 lv = player.getLookAngle();
Direction facing = Direction.getNearest((float) lv.x, (float) lv.y, (float) lv.z);
if ((facing != Direction.UP) && (facing != Direction.DOWN)) return;
if (state.getBlock() != this) return;
SlabType type = state.getValue(TYPE);
if (facing == Direction.DOWN) {
if (type == SlabType.DOUBLE) {
world.setBlock(pos, state.setValue(TYPE, SlabType.BOTTOM), 3);
} else {
world.removeBlock(pos, false);
}
} else if (facing == Direction.UP) {
if (type == SlabType.DOUBLE) {
world.setBlock(pos, state.setValue(TYPE, SlabType.TOP), 3);
} else {
world.removeBlock(pos, false);
}
}
if (!player.isCreative()) {
stack.grow(1);
if (player.getInventory() != null) player.getInventory().setChanged();
}
SoundType st = this.getSoundType(state, world, pos, null);
world.playSound(player, pos, st.getPlaceSound(), SoundSource.BLOCKS, (st.getVolume() + 1f) / 2.5f, 0.9f * st.getPitch());
}
@Override
public boolean placeLiquid(LevelAccessor world, BlockPos pos, BlockState state, FluidState fluidState) {
return (state.getValue(TYPE) != SlabType.DOUBLE) && super.placeLiquid(world, pos, state, fluidState);
}
@Override
public boolean canPlaceLiquid(BlockGetter world, BlockPos pos, BlockState state, Fluid fluid) {
return (state.getValue(TYPE) != SlabType.DOUBLE) && super.canPlaceLiquid(world, pos, state, fluid);
}
}

View file

@ -0,0 +1,200 @@
/*
* @file VariantWallBlock.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2020 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Wall blocks.
*/
package dev.zontreck.libzontreck.edlibmc;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap.Builder;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.SpawnPlacements;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.LevelReader;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.FenceGateBlock;
import net.minecraft.world.level.block.WallBlock;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.*;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.level.material.PushReaction;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Map;
public class VariantWallBlock extends WallBlock implements StandardBlocks.IStandardBlock {
public static final BooleanProperty UP = BlockStateProperties.UP;
public static final EnumProperty<WallSide> WALL_EAST = BlockStateProperties.EAST_WALL;
public static final EnumProperty<WallSide> WALL_NORTH = BlockStateProperties.NORTH_WALL;
public static final EnumProperty<WallSide> WALL_SOUTH = BlockStateProperties.SOUTH_WALL;
public static final EnumProperty<WallSide> WALL_WEST = BlockStateProperties.WEST_WALL;
public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
public static final IntegerProperty TEXTURE_VARIANT = IntegerProperty.create("tvariant", 0, 7);
private final Map<BlockState, VoxelShape> shape_voxels;
private final Map<BlockState, VoxelShape> collision_shape_voxels;
private final long config;
public VariantWallBlock(long config, BlockBehaviour.Properties builder) {
super(builder);
shape_voxels = buildWallShapes(4, 16, 4, 0, 16, 16);
collision_shape_voxels = buildWallShapes(6, 16, 5, 0, 24, 24);
this.config = config;
}
@Override
public long config() {
return config;
}
@Override
@OnlyIn(Dist.CLIENT)
public void appendHoverText(ItemStack stack, @Nullable BlockGetter world, List<Component> tooltip, TooltipFlag flag) {
Auxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true);
}
private static VoxelShape combinedShape(VoxelShape pole, WallSide height, VoxelShape low, VoxelShape high) {
if (height == WallSide.TALL) return Shapes.or(pole, high);
if (height == WallSide.LOW) return Shapes.or(pole, low);
return pole;
}
protected Map<BlockState, VoxelShape> buildWallShapes(double pole_width, double pole_height, double side_width, double side_min_y, double side_max_low_y, double side_max_tall_y) {
final double px0 = 8.0 - pole_width, px1 = 8.0 + pole_width, sx0 = 8.0 - side_width, sx1 = 8.0 + side_width;
VoxelShape vp = Block.box(px0, 0, px0, px1, pole_height, px1);
VoxelShape vs1 = Block.box(sx0, side_min_y, 0, sx1, side_max_low_y, sx1);
VoxelShape vs2 = Block.box(sx0, side_min_y, sx0, sx1, side_max_low_y, 16);
VoxelShape vs3 = Block.box(0, side_min_y, sx0, sx1, side_max_low_y, sx1);
VoxelShape vs4 = Block.box(sx0, side_min_y, sx0, 16, side_max_low_y, sx1);
VoxelShape vs5 = Block.box(sx0, side_min_y, 0, sx1, side_max_tall_y, sx1);
VoxelShape vs6 = Block.box(sx0, side_min_y, sx0, sx1, side_max_tall_y, 16);
VoxelShape vs7 = Block.box(0, side_min_y, sx0, sx1, side_max_tall_y, sx1);
VoxelShape vs8 = Block.box(sx0, side_min_y, sx0, 16, side_max_tall_y, sx1);
Builder<BlockState, VoxelShape> builder = ImmutableMap.builder();
for (Boolean up : UP.getPossibleValues()) {
for (WallSide wh_east : WALL_EAST.getPossibleValues()) {
for (WallSide wh_north : WALL_NORTH.getPossibleValues()) {
for (WallSide wh_west : WALL_WEST.getPossibleValues()) {
for (WallSide wh_south : WALL_SOUTH.getPossibleValues()) {
VoxelShape shape = Shapes.empty();
shape = combinedShape(shape, wh_east, vs4, vs8);
shape = combinedShape(shape, wh_west, vs3, vs7);
shape = combinedShape(shape, wh_north, vs1, vs5);
shape = combinedShape(shape, wh_south, vs2, vs6);
if (up) shape = Shapes.or(shape, vp);
BlockState bs = defaultBlockState().setValue(UP, up)
.setValue(WALL_EAST, wh_east)
.setValue(WALL_NORTH, wh_north)
.setValue(WALL_WEST, wh_west)
.setValue(WALL_SOUTH, wh_south);
final VoxelShape tvs = shape;
TEXTURE_VARIANT.getPossibleValues().forEach((tv) -> {
builder.put(bs.setValue(TEXTURE_VARIANT, tv).setValue(WATERLOGGED, false), tvs);
builder.put(bs.setValue(TEXTURE_VARIANT, tv).setValue(WATERLOGGED, true), tvs);
});
}
}
}
}
}
return builder.build();
}
@Override
public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext selectionContext) {
return shape_voxels.getOrDefault(state, Shapes.block());
}
@Override
public VoxelShape getCollisionShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext selectionContext) {
return collision_shape_voxels.getOrDefault(state, Shapes.block());
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
super.createBlockStateDefinition(builder);
builder.add(TEXTURE_VARIANT);
}
protected boolean attachesTo(BlockState facingState, LevelReader world, BlockPos facingPos, Direction side) {
final Block block = facingState.getBlock();
if ((block instanceof FenceGateBlock) || (block instanceof WallBlock)) return true;
final BlockState oppositeState = world.getBlockState(facingPos.relative(side, 2));
if (!(oppositeState.getBlock() instanceof VariantWallBlock)) return false;
return facingState.isRedstoneConductor(world, facingPos) && Block.canSupportCenter(world, facingPos, side);
}
protected WallSide selectWallHeight(LevelReader world, BlockPos pos, Direction direction) {
return WallSide.LOW;
}
public BlockState getStateForPlacement(BlockPlaceContext context) {
LevelReader world = context.getLevel();
BlockPos pos = context.getClickedPos();
FluidState fs = context.getLevel().getFluidState(context.getClickedPos());
boolean n = attachesTo(world.getBlockState(pos.north()), world, pos.north(), Direction.SOUTH);
boolean e = attachesTo(world.getBlockState(pos.east()), world, pos.east(), Direction.WEST);
boolean s = attachesTo(world.getBlockState(pos.south()), world, pos.south(), Direction.NORTH);
boolean w = attachesTo(world.getBlockState(pos.west()), world, pos.west(), Direction.EAST);
boolean not_straight = (!n || !s || e || w) && (n || s || !e || !w);
return defaultBlockState().setValue(UP, not_straight)
.setValue(WALL_NORTH, n ? selectWallHeight(world, pos, Direction.NORTH) : WallSide.NONE)
.setValue(WALL_EAST, e ? selectWallHeight(world, pos, Direction.EAST) : WallSide.NONE)
.setValue(WALL_SOUTH, s ? selectWallHeight(world, pos, Direction.SOUTH) : WallSide.NONE)
.setValue(WALL_WEST, w ? selectWallHeight(world, pos, Direction.WEST) : WallSide.NONE)
.setValue(WATERLOGGED, fs.getType() == Fluids.WATER);
}
@Override
public BlockState updateShape(BlockState state, Direction side, BlockState facingState, LevelAccessor world, BlockPos pos, BlockPos facingPos) {
if (state.getValue(WATERLOGGED)) world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world));
if (side == Direction.DOWN) return super.updateShape(state, side, facingState, world, pos, facingPos);
boolean n = (side == Direction.NORTH) ? this.attachesTo(facingState, world, facingPos, side) : state.getValue(WALL_NORTH) != WallSide.NONE;
boolean e = (side == Direction.EAST) ? this.attachesTo(facingState, world, facingPos, side) : state.getValue(WALL_EAST) != WallSide.NONE;
boolean s = (side == Direction.SOUTH) ? this.attachesTo(facingState, world, facingPos, side) : state.getValue(WALL_SOUTH) != WallSide.NONE;
boolean w = (side == Direction.WEST) ? this.attachesTo(facingState, world, facingPos, side) : state.getValue(WALL_WEST) != WallSide.NONE;
boolean not_straight = (!n || !s || e || w) && (n || s || !e || !w);
return state.setValue(UP, not_straight)
.setValue(WALL_NORTH, n ? selectWallHeight(world, pos, Direction.NORTH) : WallSide.NONE)
.setValue(WALL_EAST, e ? selectWallHeight(world, pos, Direction.EAST) : WallSide.NONE)
.setValue(WALL_SOUTH, s ? selectWallHeight(world, pos, Direction.SOUTH) : WallSide.NONE)
.setValue(WALL_WEST, w ? selectWallHeight(world, pos, Direction.WEST) : WallSide.NONE)
.setValue(TEXTURE_VARIANT, ((int) Mth.getSeed(pos)) & 0x7);
}
@Override
public boolean isValidSpawn(BlockState state, BlockGetter world, BlockPos pos, SpawnPlacements.Type type, @Nullable EntityType<?> entityType) {
return false;
}
@Override
public boolean isPossibleToRespawnInThis(BlockState state) {
return false;
}
@Override
@SuppressWarnings("deprecation")
public PushReaction getPistonPushReaction(BlockState state) {
return PushReaction.NORMAL;
}
}

View file

@ -0,0 +1,20 @@
package dev.zontreck.libzontreck.events;
import dev.zontreck.libzontreck.memory.world.BlockRestoreQueue;
import dev.zontreck.libzontreck.memory.world.BlockRestoreQueueRegistry;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.Event;
public class BlockRestoreQueueRegistrationEvent extends Event
{
/**
* Registers the provided queue to be able to be ticked
* @param queue
*/
public void register(BlockRestoreQueue queue)
{
BlockRestoreQueueRegistry.addQueue(queue);
MinecraftForge.EVENT_BUS.register(queue);
}
}

View file

@ -1,13 +1,10 @@
package dev.zontreck.libzontreck.events;
import dev.zontreck.ariaslib.terminal.Task;
import dev.zontreck.ariaslib.util.DelayedExecutorService;
import dev.zontreck.libzontreck.LibZontreck;
import dev.zontreck.libzontreck.exceptions.InvalidSideException;
import dev.zontreck.libzontreck.memory.PlayerContainer;
import dev.zontreck.libzontreck.networking.ModMessages;
import dev.zontreck.libzontreck.memory.player.PlayerContainer;
import dev.zontreck.libzontreck.networking.packets.S2CServerAvailable;
import dev.zontreck.libzontreck.networking.packets.S2CWalletInitialSyncPacket;
import dev.zontreck.libzontreck.profiles.Profile;
import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException;
import dev.zontreck.libzontreck.util.ServerUtilities;
@ -52,7 +49,7 @@ public class ForgeEventHandlers {
MinecraftForge.EVENT_BUS.post(new ProfileLoadedEvent(prof, player, level));
DelayedExecutorService.getInstance().schedule(new Task("send-msg", true) {
Thread tx = new Thread(new Task("send-msg", true) {
@Override
public void run() {
// Check player wallet, then send wallet to client
@ -61,7 +58,8 @@ public class ForgeEventHandlers {
S2CServerAvailable avail = new S2CServerAvailable();
avail.send(player);
}
}, 10);
});
tx.start();
}
@SubscribeEvent

View file

@ -0,0 +1,22 @@
package dev.zontreck.libzontreck.events;
import dev.zontreck.libzontreck.memory.world.DatabaseMigrations;
import net.minecraftforge.eventbus.api.Event;
import java.util.ArrayList;
import java.util.List;
public class RegisterMigrationsEvent extends Event
{
private List<DatabaseMigrations.Migration> migrations = new ArrayList<>();
public void register(DatabaseMigrations.Migration migration)
{
migrations.add(migration);
}
public List<DatabaseMigrations.Migration> getMigrations()
{
return new ArrayList<>(migrations);
}
}

View file

@ -1,16 +0,0 @@
package dev.zontreck.libzontreck.events;
import java.util.ArrayList;
import java.util.List;
import dev.zontreck.libzontreck.networking.packets.IPacket;
import net.minecraftforge.eventbus.api.Event;
/**
* Used to register your packets with LibZontreck. Packets must extend IPacket and implement PacketSerializable. This is dispatched on both logical sides, and is considered a final event. It is not cancelable
* @see IPacket
*/
public class RegisterPacketsEvent extends Event
{
public final List<IPacket> packets = new ArrayList<>();
}

View file

@ -0,0 +1,32 @@
package dev.zontreck.libzontreck.events;
import dev.zontreck.libzontreck.vectors.WorldPosition;
import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.eventbus.api.Event;
/**
* This event should be cancelled if a Teleport Implementation is provided and handles the teleport
* <br/>
* The event not being cancelled should indicate that the sender should handle teleport themselves.
*/
@Cancelable
public class TeleportEvent extends Event
{
WorldPosition position;
ServerPlayer player;
public TeleportEvent(WorldPosition position, ServerPlayer player)
{
this.position=position;
this.player=player;
}
public ServerPlayer getPlayer() {
return player;
}
public WorldPosition getPosition() {
return position;
}
}

View file

@ -0,0 +1,47 @@
package dev.zontreck.libzontreck.items;
import net.minecraft.core.NonNullList;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.items.ItemStackHandler;
public class InputItemStackHandler extends ItemStackHandler {
private final ItemStackHandler internalSlot;
public InputItemStackHandler(ItemStackHandler hidden) {
super();
internalSlot = hidden;
}
@Override
public void setSize(int size) {
stacks = NonNullList.<ItemStack>withSize(size, ItemStack.EMPTY);
}
@Override
public void setStackInSlot(int slot, ItemStack stack) {
internalSlot.setStackInSlot(slot, stack);
}
@Override
public int getSlots() {
return internalSlot.getSlots();
}
@Override
public ItemStack getStackInSlot(int slot) {
return internalSlot.getStackInSlot(slot);
}
@Override
public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
setStackInSlot(slot, stack);
return ItemStack.EMPTY;
}
@Override
public ItemStack extractItem(int slot, int amount, boolean simulate) {
return ItemStack.EMPTY;
}
}

View file

@ -0,0 +1,45 @@
package dev.zontreck.libzontreck.items;
import net.minecraft.core.NonNullList;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.items.ItemStackHandler;
public class OutputItemStackHandler extends ItemStackHandler {
private final ItemStackHandler internalSlot;
public OutputItemStackHandler(ItemStackHandler hidden) {
super();
internalSlot = hidden;
}
@Override
public void setSize(int size) {
stacks = NonNullList.<ItemStack>withSize(size, ItemStack.EMPTY);
}
@Override
public void setStackInSlot(int slot, ItemStack stack) {
internalSlot.setStackInSlot(slot, stack);
}
@Override
public int getSlots() {
return internalSlot.getSlots();
}
@Override
public ItemStack getStackInSlot(int slot) {
return internalSlot.getStackInSlot(slot);
}
@Override
public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
return stack;
}
@Override
public ItemStack extractItem(int slot, int amount, boolean simulate) {
return internalSlot.extractItem(slot, amount, simulate);
}
}

View file

@ -1,12 +1,12 @@
package dev.zontreck.libzontreck.memory;
package dev.zontreck.libzontreck.memory.player;
import java.util.UUID;
import dev.zontreck.libzontreck.LibZontreck;
import dev.zontreck.libzontreck.exceptions.InvalidDeserialization;
import dev.zontreck.libzontreck.vectors.WorldPosition;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.server.ServerLifecycleHooks;
public class PlayerComponent
{
@ -34,7 +34,7 @@ public class PlayerComponent
public static PlayerComponent fromID(UUID ID)
{
return new PlayerComponent(LibZontreck.THE_SERVER.getPlayerList().getPlayer(ID));
return new PlayerComponent(ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayer(ID));
}
public CompoundTag serialize()

View file

@ -1,10 +1,10 @@
package dev.zontreck.libzontreck.memory;
package dev.zontreck.libzontreck.memory.player;
import java.util.UUID;
import dev.zontreck.libzontreck.LibZontreck;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.server.ServerLifecycleHooks;
public class PlayerContainer {
public UUID ID;
@ -13,7 +13,7 @@ public class PlayerContainer {
public PlayerContainer(UUID ID)
{
this(LibZontreck.THE_SERVER.getPlayerList().getPlayer(ID));
this(ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayer(ID));
}
public PlayerContainer(ServerPlayer player)
{

View file

@ -1,4 +1,4 @@
package dev.zontreck.libzontreck.memory;
package dev.zontreck.libzontreck.memory.player;
import java.util.ArrayList;
import java.util.Iterator;

View file

@ -0,0 +1,19 @@
package dev.zontreck.libzontreck.memory.world;
public class BlockRestore extends BlockRestoreQueue
{
@Override
public String getRestoreQueueName() {
return "BasicBlockSnapshots";
}
@Override
public void notifyDirtyQueue(boolean blockAdded) {
return; // We dont care. This is a basic queue
}
@Override
public boolean sorted() {
return false;
}
}

View file

@ -0,0 +1,333 @@
package dev.zontreck.libzontreck.memory.world;
import dev.zontreck.libzontreck.LibZontreck;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtIo;
import net.minecraft.server.level.ServerLevel;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.TickEvent;
import net.minecraftforge.event.server.ServerStoppingEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import java.io.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
public abstract class BlockRestoreQueue
{
private List<PrimitiveBlock> BLOCK_QUEUE = new ArrayList<>();
private final BlockRestoreRunner RUNNER;
private ScheduledFuture<?> RUNNING_TASK;
private ScheduledFuture<?> DATABASE_UPLOAD_RUNNER;
/**
* When in database mode, this flag will be checked by the Restore Runner so a database call is not made unnecessarily.
*/
private boolean hasBlocks = true;
public BlockRestoreQueue()
{
RUNNER = new BlockRestoreRunner(this);
MinecraftForge.EVENT_BUS.register(this);
}
/**
* When true, uses the database to store blocks. The blocks stored in the database will not be loaded into memory at runtime
* @return
*/
public boolean usesDatabase()
{
return false;
}
/**
* Returns the restore queue name
* @return Name of the restore queue
*/
public abstract String getRestoreQueueName();
/**
* @return The number of blocks remaining in this queue
*/
public int getQueuedBlocks()
{
return BLOCK_QUEUE.size();
}
/**
* Queues a block to be restored
* @param block
*/
public void enqueueBlock(SavedBlock block)
{
enqueueBlock(block.getBlockPrimitive());
}
/**
* Queues a block to be restored
* @param block
*/
public void enqueueBlock(PrimitiveBlock block)
{
/*
if(usesDatabase())
{
databaseUpdate(block);
notifyDirtyQueue(true);
hasBlocks=true;
return;
}*/
BLOCK_QUEUE.add(block);
notifyDirtyQueue(true);
}
/**
* Called when enqueuing a block, this is a special handler to insert the block to the database. Custom queues should override this to put into a different table, or add additional data
* @param block
*/
public void databaseUpdate(PrimitiveBlock block)
{
hasBlocks=true;
PreparedStatement pstmt = null;
try {
pstmt = DatabaseWrapper.get().prepareStatement("INSERT INTO `blocks` (queueName, posX, posY, posZ, snapshotID, block) VALUES (?, ?, ?, ?, ?, ?);");
pstmt.setString(1, getRestoreQueueName());
pstmt.setInt(2, block.position.getX());
pstmt.setInt(3, block.position.getY());
pstmt.setInt(4, block.position.getZ());
pstmt.setInt(5, 0);
ByteArrayOutputStream blockState = new ByteArrayOutputStream();
DataOutputStream dos0 = new DataOutputStream(blockState);
NbtIo.write(block.serialize(), dos0);
pstmt.setBytes(6, blockState.toByteArray());
DatabaseWrapper.get().executePreparedStatement(pstmt);
} catch (Exception e)
{
// Duplicate block insertion, we only cache each block one time by default. If this function is overridden to use a different table, perhaps multiple blocks for the same position could be cached.
}
}
/**
* Executed when the queue is modified.
* @param blockAdded Whether a block was added or removed from the queue
*/
public abstract void notifyDirtyQueue(boolean blockAdded);
/**
* Pops a block off the queue, and returns it
* @return A PrimitiveBlock instance of the SavedBlock
*/
public PrimitiveBlock getNextBlock()
{
if (usesDatabase()) {
// Send a query to the database to retrieve the block, and reconstruct here
try {
PreparedStatement sel;
if (sorted()) {
sel = DatabaseWrapper.get().prepareStatement("SELECT * FROM `blocks` WHERE queueName=? ORDER BY posY ASC LIMIT 1;");
} else
sel = DatabaseWrapper.get().prepareStatement("SELECT * FROM `blocks` WHERE queueName=? LIMIT 1;");
sel.setString(1, getRestoreQueueName());
ResultSet res = DatabaseWrapper.get().executePreparedStatementQuery(sel);
// Now retrieve the block from the database
if (res.next()) {
byte[] data = res.getBytes("block");
ByteArrayInputStream bais = new ByteArrayInputStream(data);
DataInputStream dis = new DataInputStream(bais);
PrimitiveBlock block = PrimitiveBlock.deserialize(NbtIo.read(dis));
if(block.level.getBlockState(block.position).is(block.blockType))
{
try {
res.deleteRow();
if (!res.rowDeleted()) {
}
} catch (SQLException e001) {
PreparedStatement pstat = DatabaseWrapper.get().prepareStatement("DELETE FROM `blocks` WHERE queueName=? AND posX=? AND posY=? AND posZ=?;");
pstat.setString(1, getRestoreQueueName());
pstat.setInt(2, block.position.getX());
pstat.setInt(3, block.position.getY());
pstat.setInt(4, block.position.getZ());
DatabaseWrapper.get().executePreparedStatement(pstat);
}
}
return block;
} else return null;
} catch (SQLException e) {
throw new RuntimeException(e);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
PrimitiveBlock blk = BLOCK_QUEUE.get(0);
BLOCK_QUEUE.remove(0);
notifyDirtyQueue(false);
return blk;
}
/**
* Sets the hasBlocks flag to false to reduce DB Spam
*/
public void setNoBlocks()
{
hasBlocks=false;
}
/**
* Override to indicate if the list should be sorted by lowest Y value
*
* @return
*/
public abstract boolean sorted();
/**
* Whether the queue has blocks or not
* @return
*/
public boolean hasBlocks()
{
if(usesDatabase()) return hasBlocks;
else return getQueuedBlocks() != 0;
}
/**
* Clears the entire queue, discarding the saved blocks permanently.
*/
public void clear()
{
BLOCK_QUEUE.clear();
notifyDirtyQueue(false);
}
/**
* Returns the raw block queue instance
* @return
*/
public List<PrimitiveBlock> getQueue() {
return BLOCK_QUEUE;
}
/**
* Sets the block queue, without notifying listeners
* @param queue
*/
public void setQueueNoNotify(List<PrimitiveBlock> queue)
{
BLOCK_QUEUE = queue;
}
/**
* Sets the block queue, and notifies any listeners that blocks were potentially added
* @param queue
*/
public void setQueue(List<PrimitiveBlock> queue)
{
BLOCK_QUEUE = queue;
notifyDirtyQueue(true);
}
/**
* Gets the restore runner instance initialized for this queue
* @return
*/
public BlockRestoreRunner getRunner()
{
return RUNNER;
}
/**
* Must be called manually to register a restore queue. This will have a 2 second fixed delay before initial execution
*/
public void schedule(long interval, TimeUnit unit)
{
RUNNING_TASK = LibZontreck.executor.scheduleAtFixedRate(RUNNER, 2000, interval, unit);
DATABASE_UPLOAD_RUNNER = LibZontreck.executor.scheduleAtFixedRate(new DatabaseUploadRunner(this), 2000, 50, TimeUnit.MILLISECONDS);
isCancelled=false;
}
/**
* Cancels the restore job
*/
public void cancel()
{
isCancelled=true;
RUNNING_TASK.cancel(false);
}
public boolean isCancelled=false;
/**
* Remove a block from the local queue. This does not impact the database and is used internally
* @param block
*/
public void dequeue(PrimitiveBlock block)
{
BLOCK_QUEUE.remove(block);
}
/**
* Cancels the repeating upload to database task. This is automatically invoked when cancel has been invoked, and no more tasks are to be uploaded.
*/
public void cancelUploader()
{
DATABASE_UPLOAD_RUNNER.cancel(true);
}
@SubscribeEvent
public void onServerStopping(ServerStoppingEvent event)
{
cancel();
}
/**
* Initialize a restore Queue for a specific level. This will load and import the blocks in the save data into this queue
* @param level The level to load for
* @throws IOException On failure to read a file
*/
public void initialize(ServerLevel level) throws IOException {
if(usesDatabase())
{
return;
}
var file = SaveDataFactory.builder().withDimension(level).withQueueID(this).withPosition(null).build();
if(!file.getSaveDataPath().toFile().exists())
{
return;
}
CompoundTag tag = NbtIo.read(file.getSaveDataPath().toFile());
SaveDataFactory.SaveDataManifest manifest = SaveDataFactory.SaveDataManifest.deserialize(tag);
List<SaveDataCoordinates> files = manifest.get();
for(SaveDataCoordinates chunk : files)
{
var saved = SaveDataFactory.builder().withDimension(level).withQueueID(this).withPosition(chunk.toBlockPos()).build();
var saveData = saved.getInstance();
for(SavedBlock sb : saveData.blocks)
{
enqueueBlock(sb);
}
}
}
}

View file

@ -0,0 +1,65 @@
package dev.zontreck.libzontreck.memory.world;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.Level;
import java.io.IOException;
import java.util.*;
/**
* DANGER: DO NOT USE THIS CLASS DIRECTLY
*/
public class BlockRestoreQueueRegistry
{
private static Map<String, BlockRestoreQueue> QUEUES = new HashMap<>();
/**
* Internal use only
*
* @see dev.zontreck.libzontreck.events.BlockRestoreQueueRegistrationEvent
* @param queue The queue to register
*/
public static void addQueue(BlockRestoreQueue queue) {
QUEUES.put(queue.getRestoreQueueName(), queue);
}
/**
* Retrieves a registered restore queue by its name
* @param restoreQueueName Queue Name
* @return
*/
public static BlockRestoreQueue getQueue(String restoreQueueName) {
return QUEUES.get(restoreQueueName);
}
/**
* Returns a iterator for a list of all the queues. This cannot remove items from the main queue.
* @return
*/
public static Iterator<BlockRestoreQueue> getReadOnlyQueue() {
List<BlockRestoreQueue> queues = new ArrayList<>();
queues.addAll(QUEUES.values());
return queues.iterator();
}
/**
* Initialize a block restore queue.
* <p></p>
* Block Restore Queues are level independent, but blocks are not. This loads the blocks saved for this queue in that particular level's hierarchy
* @param level The level to load the queue for
*/
public static void init(ServerLevel level)
{
Iterator<BlockRestoreQueue> it = BlockRestoreQueueRegistry.getReadOnlyQueue();
while(it.hasNext())
{
BlockRestoreQueue queue = it.next();
try {
queue.initialize(level);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}
}

View file

@ -0,0 +1,56 @@
package dev.zontreck.libzontreck.memory.world;
import dev.zontreck.libzontreck.vectors.Vector3d;
import net.minecraft.core.BlockPos;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntity;
import java.util.Random;
public class BlockRestoreRunner implements Runnable
{
public BlockRestoreRunner(BlockRestoreQueue queue)
{
this.queue = queue;
}
private BlockRestoreQueue queue;
public final SoundEvent pop = SoundEvents.ITEM_PICKUP;
@Override
public void run() {
if(queue.getQueuedBlocks() == 0 && !queue.usesDatabase()) return; // We'll be queued back up later
if(!queue.hasBlocks())
return;
PrimitiveBlock prim = queue.getNextBlock();
if(prim == null){
queue.setNoBlocks();
return; // No more blocks.
}
Level level = prim.level;
// Everything is restored, play sound
SoundSource ss = SoundSource.NEUTRAL;
BlockPos pos = prim.position;
Random rng = new Random();
level.playSound(null, pos, pop, ss, rng.nextFloat(0.75f,1.0f), rng.nextFloat(1));
level.setBlock(pos, prim.blockState, Block.UPDATE_CLIENTS, 0);
BlockEntity entity = level.getBlockEntity(pos);
if(entity != null)
{
entity.load(prim.blockEntity);
}
}
}

View file

@ -0,0 +1,208 @@
package dev.zontreck.libzontreck.memory.world;
import com.google.common.collect.Lists;
import dev.zontreck.libzontreck.LibZontreck;
import dev.zontreck.libzontreck.events.RegisterMigrationsEvent;
import net.minecraftforge.common.MinecraftForge;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
public class DatabaseMigrations
{
public static class Migration
{
String tableID;
int version;
List<PreparedStatement> migrationActions = new ArrayList<>();
private Migration(){
tableID = "";
version = 0;
}
/**
* Builder pattern function - Sets the table ID for the migration
* @param tableID
* @return
*/
public Migration withTableID(String tableID)
{
this.tableID = tableID;
return this;
}
/**
* Builder pattern function - Sets the table version for the migration
* @param version
* @return
*/
public Migration withVersion(int version)
{
this.version = version;
return this;
}
/**
* Builder pattern function - Adds the action to be executed. The list will operate as FILO.
* @param pstat
* @return
*/
public Migration withMigrationAction(PreparedStatement pstat)
{
migrationActions.add(pstat);
return this;
}
/**
* Executes the migration as defined by the builder pattern.
*/
public void execute()
{
for(PreparedStatement pstmt : migrationActions)
{
try {
DatabaseWrapper.get().executePreparedStatement(pstmt);
} catch (SQLException e) {
LibZontreck.LOGGER.warn("There was a problem executing a migration. The migration is " + pstmt+"\n\nThis does not necessarily mean a failure. If everything seems to work fine, this migration might not have been necessary.\n\n");
e.printStackTrace();
}
}
try {
PreparedStatement pstat = DatabaseWrapper.get().prepareStatement("REPLACE INTO `migrations` (tableID, version) VALUES (?,?);");
pstat.setString(1, tableID);
pstat.setInt(2, version);
LibZontreck.LOGGER.info("SQL QUERY: " + pstat);
pstat.execute();
} catch (SQLException ex)
{
ex.printStackTrace();
}
}
}
private static List<Migration> migrations = new ArrayList<>();
public static void initMigrations() throws SQLException {
Migration migrationsTable = builder()
.withVersion(1)
.withTableID("migrations");
PreparedStatement statement = DatabaseWrapper.get().prepareStatement("CREATE TABLE `migrations` (" +
" `tableID` varchar(255) NOT NULL," +
" `version` int(11) NOT NULL," +
" PRIMARY KEY (`tableID`)," +
" UNIQUE KEY `tableID` (`tableID`)" +
") ;");
migrations.add(migrationsTable.withMigrationAction(statement));
Migration blocksTable = builder()
.withTableID("blocks")
.withVersion(1);
PreparedStatement makeBlocksTable = DatabaseWrapper.get().prepareStatement("CREATE TABLE `blocks` (" +
" `time` timestamp NOT NULL DEFAULT current_timestamp()," +
" `queueName` varchar(255) NOT NULL," +
" `posX` int(11) NOT NULL," +
" `posY` int(11) NOT NULL," +
" `posZ` int(11) NOT NULL," +
" `snapshotID` int(11) NOT NULL DEFAULT 0 COMMENT 'Enables multiple blocks existing at the same position'," +
" `block` blob NOT NULL COMMENT 'NBT Data representing a SavedBlock'," +
" PRIMARY KEY (`time`)" +
") ;");
migrations.add(blocksTable.withMigrationAction(makeBlocksTable));
Migration blocksUpdate = builder()
.withTableID("blocks")
.withVersion(2);
PreparedStatement removePKey = DatabaseWrapper.get().prepareStatement("ALTER TABLE `blocks` DROP PRIMARY KEY;");
blocksUpdate.withMigrationAction(removePKey);
PreparedStatement addIDColumn = DatabaseWrapper.get().prepareStatement("ALTER TABLE `blocks` ADD `ID` INT NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`ID`);");
blocksUpdate.withMigrationAction(addIDColumn);
migrations.add(blocksUpdate);
migrations.add(builder()
.withTableID("blocks")
.withVersion(3)
.withMigrationAction(DatabaseWrapper.get().prepareStatement("ALTER TABLE `blocks` ADD UNIQUE (`posX`, `posY`, `posZ`); ")));
RegisterMigrationsEvent rme = new RegisterMigrationsEvent();
MinecraftForge.EVENT_BUS.post(rme);
migrations.addAll(rme.getMigrations());
executeMigrations();
}
private static void executeMigrations()
{
Migration lastTableChecked = null;
for(Migration m : migrations)
{
if(lastTableChecked == null) lastTableChecked = getCurrentTable(m.tableID);
else {
if(lastTableChecked.tableID != m.tableID) lastTableChecked = getCurrentTable(m.tableID);
}
if(lastTableChecked == null || m.version > lastTableChecked.version) {
LibZontreck.LOGGER.info("Executing migration " + m.tableID + ":" + m.version);
m.execute();
} else {
LibZontreck.LOGGER.info("Skipping migration on table " + m.tableID + "; Current table version is " + lastTableChecked.version);
}
}
}
/**
* Gets the current table's version using the Migration structure for data fields. Will be null if there is an error on any table except for migrations.
* @return
*/
private static Migration getCurrentTable(String tableID)
{
try{
PreparedStatement pst = DatabaseWrapper.get().prepareStatement("SELECT * FROM `migrations` WHERE tableID=?;");
pst.setString(1, tableID);
var result = pst.executeQuery();
if(!result.next())
{
return builder().withTableID(tableID).withVersion(0);
}else {
return builder().withTableID(tableID).withVersion(result.getInt("version"));
}
}catch (Exception ex)
{
if(tableID == "migrations")
{
return builder().withTableID(tableID)
.withVersion(0);
}
ex.printStackTrace();
return null;
}
}
public static Migration builder()
{
return new Migration();
}
}

View file

@ -0,0 +1,26 @@
package dev.zontreck.libzontreck.memory.world;
public class DatabaseUploadRunner implements Runnable {
private BlockRestoreQueue QUEUE;
public DatabaseUploadRunner(BlockRestoreQueue queue)
{
QUEUE = queue;
}
@Override
public void run() {
if(QUEUE.getQueuedBlocks() == 0)
{
if(QUEUE.isCancelled)
{
QUEUE.cancelUploader();
return;
}
} else {
PrimitiveBlock block = QUEUE.getQueue().get(0);
QUEUE.dequeue(block);
QUEUE.databaseUpdate(block);
}
}
}

View file

@ -0,0 +1,163 @@
package dev.zontreck.libzontreck.memory.world;
import dev.zontreck.libzontreck.LibZontreck;
import dev.zontreck.libzontreck.config.ServerConfig;
import java.sql.*;
public class DatabaseWrapper {
private Connection connection;
public static boolean hasDB = true;
private static DatabaseWrapper instance;
public static DatabaseWrapper get() {
if(!hasDB) {
throw new RuntimeException("Error: Database is not set up");
}
if (instance == null)
start();
try {
instance.sanityCheck();
} catch (SQLException e) {
throw new RuntimeException(e);
}
return instance;
}
/**
* This function will return true if the database drivers are available.
*
* @return
*/
public static boolean databaseIsAvailable() {
return instance.connection!=null;
}
public DatabaseWrapper() {
connection = null;
}
public static void start() {
instance = new DatabaseWrapper();
try {
LibZontreck.LOGGER.info("Connecting to database...");
LibZontreck.LOGGER.info("jdbc:db ://" + ServerConfig.database.user + "@" + ServerConfig.database.host + "/" + ServerConfig.database.database);
instance.connect(ServerConfig.database.host, ServerConfig.database.user, ServerConfig.database.password, ServerConfig.database.database);
} catch (SQLException e) {
throw new RuntimeException(e);
}
}
public static void invalidate() {
instance=null;
hasDB=false;
}
private void restart() {
LibZontreck.LOGGER.info("Reconnecting to database...");
LibZontreck.LOGGER.info("jdbc:db ://" + ServerConfig.database.user + "@" + ServerConfig.database.host + "/" + ServerConfig.database.database);
try {
instance.connect(ServerConfig.database.host, ServerConfig.database.user, ServerConfig.database.password, ServerConfig.database.database);
} catch (SQLException e) {
throw new RuntimeException(e);
}
}
public void connect(String url, String username, String password, String database) throws SQLException {
if(database.isBlank())
{
ServerConfig.init();
if(ServerConfig.database.database.isBlank())
{
throw new SQLException("Failed to connect to database");
} else {
start();
return;
}
}
try {
// Try MariaDB JDBC driver
Class.forName("org.mariadb.jdbc.Driver");
connection = DriverManager.getConnection("jdbc:mariadb://" + url + "/" + database, username, password);
} catch (ClassNotFoundException | SQLException e) {
// MariaDB not found or failed to connect, try MySQL
LibZontreck.LOGGER.warn("Failed to connect via MariaDB: " + e.getMessage() + "; Attempting to fall back to mysql");
try {
Class.forName("com.mysql.cj.jdbc.Driver");
connection = DriverManager.getConnection("jdbc:mysql://" + url + "/" + database, username, password);
} catch (ClassNotFoundException | SQLException ex) {
// MySQL not found or failed to connect, try SQLite
try {
Class.forName("com.mysql.jdbc.Driver");
connection = DriverManager.getConnection("jdbc:mysql://" + url + "/" + database, username, password);
} catch (ClassNotFoundException | SQLException ex1) {
LibZontreck.LOGGER.warn("Failed to connect via MySQL: " + e.getMessage() + "; " + ex1.getMessage() + "; Attempting to fall back to sqlite");
try {
Class.forName("org.sqlite.JDBC");
connection = DriverManager.getConnection("jdbc:sqlite:" + database + ".db");
} catch (ClassNotFoundException | SQLException exc) {
LibZontreck.LOGGER.error("Failed to connect via SQLite: " + e.getMessage() + "; If you require the use of the block queues, please check the above warnings for explanation on cause. It could be that you do not have the relevant JDBC installed in your server mods list.");
}
}
}
}
}
private void sanityCheck() throws SQLException {
if(connection.isClosed() || connection == null) {
restart();
}
}
public ResultSet executeQuery(String query) throws SQLException {
if (connection == null) {
throw new SQLException("Connection not established.");
}
Statement statement = connection.createStatement();
return statement.executeQuery(query);
}
public int executeUpdate(String statement) throws SQLException {
if (connection == null) {
throw new SQLException("Connection not established.");
}
return connection.createStatement().executeUpdate(statement);
}
public void disconnect() throws SQLException {
if (connection != null && !connection.isClosed()) {
connection.close();
}
}
public int executePreparedStatement(PreparedStatement preparedStatement) throws SQLException {
if (connection == null) {
throw new SQLException("Connection not established.");
}
return preparedStatement.executeUpdate();
}
public ResultSet executePreparedStatementQuery(PreparedStatement query) throws SQLException {
if (connection == null) {
throw new SQLException("Connection not established.");
}
return query.executeQuery();
}
public PreparedStatement prepareStatement(String query) throws SQLException {
if (connection == null) {
throw new SQLException("Connection not established.");
}
return connection.prepareStatement(query);
}
}

View file

@ -0,0 +1,80 @@
package dev.zontreck.libzontreck.memory.world;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
public class PrimitiveBlock
{
public final SavedBlock savedBlock;
public final Block blockType;
public final BlockState blockState;
public final CompoundTag blockEntity;
public final BlockPos position;
public final ServerLevel level;
public PrimitiveBlock(SavedBlock savedBlock, Block blockType, BlockState blockState, CompoundTag blockEntity, BlockPos position, ServerLevel level)
{
this.savedBlock = savedBlock;
this.blockType = blockType;
this.blockEntity = blockEntity;
this.position = position;
this.level = level;
this.blockState = blockState;
}
/**
* Alias method
* @see SavedBlock#serialize()
* @return NBT Tag
*/
public CompoundTag serialize()
{
return savedBlock.serialize();
}
/**
* Alias Method
* @see SavedBlock#deserialize(CompoundTag)
* @see SavedBlock#getBlockPrimitive()
* @param tag NBT Tag
* @return A Primitive Block
*/
public static PrimitiveBlock deserialize(CompoundTag tag)
{
return SavedBlock.deserialize(tag).getBlockPrimitive();
}
/**
* Compare a block with this primitive block
* @param state The block state to compare
* @param entity The block entity to compare
* @return True if identical
*/
public boolean is(BlockState state, BlockEntity entity)
{
if(state.getBlock() == this.blockType)
{
// Check the block state
if(this.blockState.equals(state))
{
if(blockEntity == null) return true; // Not all blocks have a block entity.
if(blockEntity.equals(entity.serializeNBT())){
return true;
}else return false;
} else return false;
}else return false;
}
/**
* Clones the PrimitiveBlock into a new instance
* @return
*/
public PrimitiveBlock copy()
{
return savedBlock.clone().getBlockPrimitive();
}
}

View file

@ -0,0 +1,47 @@
package dev.zontreck.libzontreck.memory.world;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtUtils;
import net.minecraft.tags.BlockTags;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraftforge.common.Tags;
public class SaveDataCoordinates
{
public int X;
public int Z;
private BlockPos source;
public SaveDataCoordinates(BlockPos pos)
{
int X = pos.getX() >> 4 >> 5;
int Z = pos.getZ() >> 4 >> 5;
source = pos;
}
public String getFileName()
{
return "r." + X + "." + Z + ".dat";
}
public BlockPos toBlockPos()
{
return source;
}
public static final String TAG_COORDS = "sdc";
public CompoundTag toNBT()
{
return NbtUtils.writeBlockPos(source);
}
public static SaveDataCoordinates deserialize(CompoundTag tag)
{
BlockPos pos = NbtUtils.readBlockPos(tag);
return new SaveDataCoordinates(pos);
}
}

View file

@ -0,0 +1,267 @@
package dev.zontreck.libzontreck.memory.world;
import dev.zontreck.libzontreck.LibZontreck;
import dev.zontreck.libzontreck.vectors.WorldPosition;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.*;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.Level;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class SaveDataFactory
{
static Map<String, SaveData> datas = new HashMap<>();
protected static boolean hasSaveDataInstance(SaveDataFile file)
{
return datas.containsKey(file.getSaveDataPath().toString());
}
protected static SaveData getSaveDataInstance(SaveDataFile file)
{
return datas.get(file.getSaveDataPath().toString());
}
public static Builder builder()
{
return new Builder();
}
static class Builder
{
private String modID = "minecraft";
private String levelName;
private String queueID;
private boolean DBMode;
private BlockPos position;
public Builder withDimension(Level level)
{
ResourceLocation lv = level.dimension().location();
this.modID = lv.getNamespace();
this.levelName = lv.getPath();
return this;
}
public Builder withQueueID(BlockRestoreQueue queue)
{
queueID = queue.getRestoreQueueName();
return this;
}
public Builder withDatabaseMode()
{
DBMode=true;
return this;
}
public Builder withPosition(BlockPos pos)
{
position = pos;
return this;
}
public SaveDataManifest getManifest()
{
return new SaveDataManifest();
}
public SaveDataFile build()
{
return new SaveDataFile(modID, levelName, queueID, DBMode, position);
}
}
static class SaveDataFile
{
String mod;
String dimension;
String queue;
boolean database;
BlockPos position;
boolean useManifest = false;
public SaveDataFile(String modID, String levelName, String queueID, boolean DBMode, BlockPos pos)
{
mod = modID;
dimension = levelName;
queue = queueID;
database = DBMode;
position = pos;
if(pos == null)
{
useManifest=true;
}
}
/**
* config/LibZontreck/block_snapshots/[mod]/[dimension]/[queueNickName]/r.x.z.dat
* @return
*/
public Path getSaveDataPath()
{
Path path = LibZontreck.BASE_CONFIG.resolve("block_snapshots");
if(mod != null) path = path.resolve(mod);
if(dimension != null) path = path.resolve(dimension);
if(queue != null) path = path.resolve(queue);
path.toFile().mkdirs();
if(useManifest) return path.resolve("manifest.nbt");
SaveDataCoordinates coordinates = new SaveDataCoordinates(position);
path = path.resolve(coordinates.getFileName());
return path;
}
/**
* Reads the save data, or initializes a new instance.
* <p></p>
* Additionally, this will check for a pre-existing POJO instance and return if it exists.
* @return
* @throws IOException
*/
public SaveData getInstance() throws IOException {
if(SaveDataFactory.hasSaveDataInstance(this)) return SaveDataFactory.getSaveDataInstance(this);
Path data = getSaveDataPath();
if(data.toFile().exists())
{
CompoundTag tag = NbtIo.read(data.toFile());
return SaveData.deserialize(tag, this);
} else {
return new SaveData(this);
}
}
}
static class SaveDataManifest {
private List<SaveDataCoordinates> SAVE_DATA = new ArrayList<>();
public static final String TAG_MANIFEST = "manifest";
private SaveDataManifest()
{
}
public void add(SaveDataCoordinates pos){
SAVE_DATA.add(pos);
}
public List<SaveDataCoordinates> get()
{
return new ArrayList<>(SAVE_DATA);
}
public CompoundTag save()
{
CompoundTag tag = new CompoundTag();
ListTag lst = new ListTag();
for(SaveDataCoordinates str : SAVE_DATA)
{
lst.add(str.toNBT());
}
tag.put(TAG_MANIFEST, lst);
return tag;
}
public static SaveDataManifest deserialize(CompoundTag tag)
{
SaveDataManifest ret = new SaveDataManifest();
ListTag lst = tag.getList(TAG_MANIFEST, Tag.TAG_COMPOUND);
for(Tag entry : lst)
{
if(entry instanceof CompoundTag ct)
{
ret.add(SaveDataCoordinates.deserialize(ct));
}
}
return ret;
}
}
static class SaveData {
SaveDataFile myFile;
public static final String TAG_SAVED_BLOCKS = "sb";
public List<SavedBlock> blocks = new ArrayList<>();
public SaveData(SaveDataFile file)
{
myFile = file;
}
/**
* Read a NBT Tag and reconstruct the SaveData POJO
* @param tag
* @param file
* @return
*/
public static SaveData deserialize(CompoundTag tag, SaveDataFile file) {
SaveData data = new SaveData(file);
ListTag lst = tag.getList(TAG_SAVED_BLOCKS, ListTag.TAG_COMPOUND);
for(Tag xTag : lst)
{
if(xTag instanceof CompoundTag ct)
{
SavedBlock sb = SavedBlock.deserialize(ct);
data.blocks.add(sb);
}
}
return data;
}
/**
* Write the current save data to NBT
* @return
*/
public CompoundTag serialize()
{
CompoundTag tag = new CompoundTag();
ListTag lst = new ListTag();
for(SavedBlock block : blocks)
{
lst.add(block.serialize());
}
tag.put(TAG_SAVED_BLOCKS, lst);
return tag;
}
/**
* Imports a full queue to the save data file.
* ! WARNING ! This method will overwrite the SaveDataFile's Queue ID
* * * *
* This will only import for the correct dimension. This method is invoked automatically for each level for each queue when the server is shutting down prior to level unload.
* @param queue Queue to import
* @return The current SaveData instance
*/
public SaveData importQueue(BlockRestoreQueue queue)
{
for(PrimitiveBlock blk : queue.getQueue())
{
if(WorldPosition.getDim(blk.level) == this.myFile.dimension)
blocks.add(blk.savedBlock);
else
continue; // We only want to add to a save data file, the blocks for the dimension in question.
}
myFile.queue = queue.getRestoreQueueName();
return this;
}
}
}

View file

@ -0,0 +1,112 @@
package dev.zontreck.libzontreck.memory.world;
import dev.zontreck.libzontreck.api.Vector3;
import dev.zontreck.libzontreck.exceptions.InvalidDeserialization;
import dev.zontreck.libzontreck.vectors.WorldPosition;
import net.minecraft.core.BlockPos;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtUtils;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
public class SavedBlock implements Cloneable
{
private CompoundTag blockState;
private CompoundTag blockEntity;
private boolean hasBlockEntity;
private WorldPosition position;
/**
* Take a snapshot of the block, and save as primitive type SavedBlock
* @param position The block's position
* @param level The level the position relates to
* @return A instance of the saved block
*/
public static SavedBlock takeSnapshot(Vector3 position, Level level)
{
SavedBlock savedBlock = new SavedBlock();
BlockPos pos = position.asBlockPos();
BlockState state = level.getBlockState(pos);
savedBlock.blockState = NbtUtils.writeBlockState(state);
BlockEntity entity = level.getBlockEntity(pos);
if(entity == null)
{
savedBlock.hasBlockEntity = false;
}else {
savedBlock.hasBlockEntity = true;
savedBlock.blockEntity = entity.serializeNBT();
}
savedBlock.position = new WorldPosition(position.asVector3d(), (ServerLevel) level);
return savedBlock;
}
/**
* Saves the stored block as a NBT Tag
* @return CompoundTag
*/
public CompoundTag serialize()
{
CompoundTag tag = new CompoundTag();
tag.put("state", blockState);
if(hasBlockEntity) tag.put("entity", blockEntity);
tag.put("position", position.serialize());
return tag;
}
/**
* Reads a NBT Tag that represents a stored block, and returns the StoredBlock object
* @param tag Saved NBT
* @return SavedBlock instance
*/
public static SavedBlock deserialize(CompoundTag tag)
{
SavedBlock savedBlock = new SavedBlock();
savedBlock.blockState = tag.getCompound("state");
if(tag.contains("entity")) {
savedBlock.blockEntity = tag.getCompound("entity");
savedBlock.hasBlockEntity=true;
}
try {
savedBlock.position = new WorldPosition(tag.getCompound("position"), false);
} catch (InvalidDeserialization e) {
throw new RuntimeException(e);
}
return savedBlock;
}
public PrimitiveBlock getBlockPrimitive()
{
ServerLevel level = position.getActualDimension();
BlockState state = NbtUtils.readBlockState(level.holderLookup(Registries.BLOCK), blockState);
return new PrimitiveBlock(this, state.getBlock(), state, blockEntity, position.Position.asBlockPos(), level);
}
@Override
public SavedBlock clone() {
try {
SavedBlock clone = (SavedBlock) super.clone();
if(blockEntity != null)
clone.blockEntity = blockEntity.copy();
if(blockState != null)
clone.blockState = blockState.copy();
if(position != null)
clone.position = position.clone();
return clone;
} catch (CloneNotSupportedException e) {
throw new AssertionError();
}
}
}

View file

@ -0,0 +1,41 @@
package dev.zontreck.libzontreck.memory.world;
import dev.zontreck.libzontreck.api.Vector3;
import dev.zontreck.libzontreck.util.PositionUtil;
import dev.zontreck.libzontreck.vectors.Vector3i;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
public class SortedBlockQueue extends BlockRestoreQueue
{
@Override
public String getRestoreQueueName() {
return "SortedBlockQueue";
}
@Override
public void notifyDirtyQueue(boolean blockAdded) {
if(blockAdded) {
List<PrimitiveBlock> queue = getQueue();
List<PrimitiveBlock> retQueue = new ArrayList<>(queue.size());
// Sort the queue based on block positions
queue.sort(Comparator.comparing(block -> new Vector3i(block.position)));
// Add blocks in sorted order to the new queue
for (PrimitiveBlock blk : queue) {
retQueue.add(blk.copy()); // Copy block if necessary
}
setQueueNoNotify(retQueue);
}
}
@Override
public boolean sorted() {
return true;
}
}

View file

@ -1,14 +1,11 @@
package dev.zontreck.libzontreck.networking;
import dev.zontreck.libzontreck.LibZontreck;
import dev.zontreck.libzontreck.events.RegisterPacketsEvent;
import dev.zontreck.libzontreck.networking.packets.IPacket;
import dev.zontreck.libzontreck.networking.packets.S2CCloseChestGUI;
import dev.zontreck.libzontreck.networking.packets.S2CPlaySoundPacket;
import dev.zontreck.libzontreck.networking.packets.S2CServerAvailable;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.network.NetworkDirection;
import net.minecraftforge.network.NetworkRegistry;
import net.minecraftforge.network.PacketDistributor;
@ -36,16 +33,9 @@ public class ModMessages {
.clientAcceptedVersions(s->true)
.serverAcceptedVersions(s->true)
.simpleChannel();
RegisterPacketsEvent event = new RegisterPacketsEvent();
MinecraftForge.EVENT_BUS.post(event);
INSTANCE=net;
for(IPacket packet : event.packets)
{
packet.register(net);
}
net.messageBuilder(S2CPlaySoundPacket.class, PACKET_ID.getAndIncrement(), NetworkDirection.PLAY_TO_CLIENT)
.decoder(S2CPlaySoundPacket::new)

View file

@ -1,17 +1,5 @@
package dev.zontreck.libzontreck.networking;
import dev.zontreck.libzontreck.events.RegisterPacketsEvent;
import dev.zontreck.libzontreck.networking.packets.S2CPlaySoundPacket;
import dev.zontreck.libzontreck.networking.packets.S2CWalletInitialSyncPacket;
import dev.zontreck.libzontreck.networking.packets.S2CWalletUpdatedPacket;
import net.minecraftforge.eventbus.api.SubscribeEvent;
public class NetworkEvents
{
@SubscribeEvent
public void onRegisterPackets(RegisterPacketsEvent ev)
{
ev.packets.add(new S2CWalletUpdatedPacket());
ev.packets.add(new S2CWalletInitialSyncPacket());
}
}

View file

@ -1,11 +1,12 @@
package dev.zontreck.libzontreck.networking.packets;
import dev.zontreck.eventsbus.Bus;
import dev.zontreck.libzontreck.currency.Transaction;
import dev.zontreck.libzontreck.currency.events.WalletUpdatedEvent;
import dev.zontreck.libzontreck.util.ServerUtilities;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.network.NetworkDirection;
import net.minecraftforge.network.NetworkEvent;
import net.minecraftforge.network.simple.SimpleChannel;
@ -63,7 +64,7 @@ public class S2CWalletUpdatedPacket implements IPacket
return ServerUtilities.handlePacket(supplier, new Runnable() {
@Override
public void run() {
Bus.Post(new WalletUpdatedEvent(ID, oldBal, balance, tx));
MinecraftForge.EVENT_BUS.post(new WalletUpdatedEvent(ID, oldBal, balance, tx));
}
});

View file

@ -1,6 +1,6 @@
package dev.zontreck.libzontreck.util;
import dev.zontreck.libzontreck.vectors.Vector3;
import dev.zontreck.libzontreck.vectors.Vector3d;
import net.minecraft.server.level.ServerLevel;
import java.util.ArrayList;
@ -18,9 +18,9 @@ public class BlocksUtil
* @param limit The applicable limit for vein detection
* @return List of positions for the vein
*/
public static List<Vector3> VeinOf(ServerLevel level, Vector3 start, int limit)
public static List<Vector3d> VeinOf(ServerLevel level, Vector3d start, int limit)
{
List<Vector3> ret = new ArrayList<>();
List<Vector3d> ret = new ArrayList<>();

View file

@ -0,0 +1,156 @@
package dev.zontreck.libzontreck.util;
import dev.zontreck.libzontreck.api.Vector3;
import dev.zontreck.libzontreck.vectors.Vector3d;
import dev.zontreck.libzontreck.vectors.Vector3i;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
/**
* Provides helper functions for position related things
*/
public class PositionUtil
{
public static List<Vector3> makeCube(Vector3 p1, Vector3 p2)
{
List<Vector3> vecs = new ArrayList<>();
Vector3 work = new Vector3d();
Vector3d v1 = p1.asVector3d();
Vector3d v2 = p2.asVector3d();
double xx = v1.x;
double yy = v1.y;
double zz = v1.z;
int yState = 0;
int zState = 0;
int xState = 0;
for(xx = Math.round(v1.x); (xx != Math.round(v2.x) && xState != 2);)
{
for(zz = Math.round(v1.z); (zz != Math.round(v2.z) && zState != 2);)
{
for(yy = Math.round(v1.y); (yy != Math.round(v2.y) && yState != 2);)
{
work = new Vector3d(xx, yy, zz);
if(!vecs.contains(work)) vecs.add(work);
if(yy > v2.y)
{
yy -= 1.0;
if(yy == Math.round(v2.y) && yState == 0)
{
yState++;
}else{
if(yState == 1)
{
yState ++;
}
}
} else if(yy < v2.y)
{
yy += 1.0;
if(yy == Math.round(v2.y) && yState == 0){
yState ++;
}else {
if(yState == 1)yState++;
}
}
}
yState=0;
work = new Vector3d(xx,yy,zz);
if(!vecs.contains(work)) vecs.add(work);
if(zz > v2.z)
{
zz -= 1.0;
if(zz == Math.round(v2.z) && zState == 0)zState++;
else{
if(zState == 1)zState++;
}
}else if(zz < v2.z)
{
zz += 1.0;
if(zz == Math.round(v2.z) && zState == 0)zState++;
else {
if(zState==1)zState++;
}
}
}
zState=0;
work = new Vector3d(xx,yy,zz);
if(!vecs.contains(work)) vecs.add(work);
if(xx > v2.x)
{
xx -= 1.0;
if(xx == Math.round(v2.x) && xState == 0) xState++;
else{
if(xState == 1)xState++;
}
}else if(xx < v2.x)
{
xx += 1.0;
if(xx == Math.round(v2.x) && xState==0)xState++;
else{
if(xState==1)xState++;
}
}
}
return vecs;
}
public static List<Vector3> sortAscending(List<Vector3> vecs)
{
List<Vector3> copy = new ArrayList<>(vecs);
List<Vector3> sorted = new ArrayList<>();
while(copy.size()>0)
{
Vector3 lowest = findFirstLowestPosition(copy);
copy.remove(lowest);
sorted.add(lowest);
}
return sorted;
}
public static Vector3 findFirstLowestPosition(List<Vector3> vecs)
{
Vector3i lowest = new Vector3i(0, 500, 0);
List<Vector3> copy = new ArrayList<>(vecs);
Iterator<Vector3> it = copy.iterator();
while(it.hasNext())
{
Vector3i entry = it.next().asVector3i();
if(entry.y < lowest.y)
{
lowest = entry;
it.remove();
}else it.remove();
}
return lowest;
}
}

View file

@ -1,5 +1,6 @@
package dev.zontreck.libzontreck.util;
import java.util.List;
import java.util.UUID;
import java.util.function.Function;
import java.util.function.Supplier;
@ -13,6 +14,7 @@ import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.fml.LogicalSide;
import net.minecraftforge.network.NetworkEvent;
import net.minecraftforge.network.simple.SimpleChannel;
import net.minecraftforge.server.ServerLifecycleHooks;
public class ServerUtilities
{
@ -23,7 +25,7 @@ public class ServerUtilities
*/
public static ServerPlayer getPlayerByID(String id)
{
return LibZontreck.THE_SERVER.getPlayerList().getPlayer(UUID.fromString(id));
return ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayer(UUID.fromString(id));
}
/**
@ -79,7 +81,7 @@ public class ServerUtilities
public static boolean playerIsOffline(UUID ID) throws InvalidSideException {
if(isClient())throw new InvalidSideException("This can only be called on the server");
if(LibZontreck.THE_SERVER.getPlayerList().getPlayer(ID) == null) return true;
if(ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayer(ID) == null) return true;
else return false;
}

View file

@ -0,0 +1,45 @@
package dev.zontreck.libzontreck.util;
import net.minecraft.nbt.CompoundTag;
public class TagUtils
{
/**
* Get either the entry, or supply a default value
* @param tag
* @param entry
* @param other
* @return
*/
public static int intOr(CompoundTag tag, String entry, int other)
{
if(tag.contains(entry)) return tag.getInt(entry);
else return other;
}
/**
* Get either the entry, or supply a default value
* @param tag
* @param entry
* @param other
* @return
*/
public static String strOr(CompoundTag tag, String entry, String other)
{
if(tag.contains(entry)) return tag.getString(entry);
else return other;
}
/**
* Get either the entry, or supply a default value
* @param tag
* @param entry
* @param other
* @return
*/
public static boolean boolOr(CompoundTag tag, String entry, boolean other)
{
if(tag.contains(entry)) return tag.getBoolean(entry);
else return other;
}
}

View file

@ -109,10 +109,8 @@ public class HeadCache
creds.add(
new CreditsEntry(HeadUtilities.cachedLookup("zontreck"), "Aria (zontreck)", "Developer, Designer, Artist", "Aria is the primary developer and project maintainer"));
creds.add(
new CreditsEntry(HeadUtilities.cachedLookup("PossumTheWarrior"), "PossumTheWarrior", "Tester, Adviser, Designer, Artist", "Poss has helped to test the mods from very early on. Poss has also contributed the artwork and mob model for the Possum"));
creds.add(
new CreditsEntry(HeadUtilities.cachedLookup("GemMD"), "GemMD", "Tester, Adviser, Designer", "GemMD has provided advice on marketing and development decisions for various mods"));
creds.add(new CreditsEntry(HeadUtilities.cachedLookup("firesyde424"), "firesyde424", "Tester", "Firesyde has helped to test my mods and given feedback."));
creds.add(new CreditsEntry(HeadUtilities.cachedLookup("EmberCat42"), "EmberCat42", "Tester", "EmberCat42 has helped to test and reported on a major bug in Night Vision"));
CREDITS = creds;

View file

@ -5,10 +5,10 @@ import net.minecraft.server.level.ServerLevel;
public class ChunkPos {
public Points points;
public Vector2 centerPoints;
public Vector2f centerPoints;
public String dim;
public ChunkPos(Vector3 point1, Vector3 point2, ServerLevel lvl)
public ChunkPos(Vector3d point1, Vector3d point2, ServerLevel lvl)
{
points = new Points(point1, point2, lvl);
dim = WorldPosition.getDim(lvl);
@ -17,12 +17,12 @@ public class ChunkPos {
public ChunkPos(CompoundTag tag)
{
points = new Points(tag.getCompound("points"));
centerPoints = new Vector2(tag.getCompound("center"));
centerPoints = Vector2f.deserialize(tag.getCompound("center"));
}
public boolean isWithin(Vector3 point)
public boolean isWithin(Vector3d point)
{
return point.inside(points.Min, points.Max);
return point.Inside(points.Min, points.Max);
}
public static ChunkPos getChunkPos(WorldPosition pos)

View file

@ -11,7 +11,7 @@ public class NonAbsVector3
public long y;
public long z;
public NonAbsVector3(Vector3 origin)
public NonAbsVector3(Vector3d origin)
{
x = Math.round(origin.x);
y = Math.round(origin.y);

View file

@ -7,8 +7,8 @@ import net.minecraft.server.level.ServerLevel;
* Two points within the same dimension
*/
public class Points {
public Vector3 Min = Vector3.ZERO;
public Vector3 Max = Vector3.ZERO;
public Vector3d Min = Vector3d.ZERO;
public Vector3d Max = Vector3d.ZERO;
public String dimension = "";
/**
@ -17,7 +17,7 @@ public class Points {
* @param max
* @param lvl
*/
public Points(Vector3 min, Vector3 max, ServerLevel lvl)
public Points(Vector3d min, Vector3d max, ServerLevel lvl)
{
dimension = WorldPosition.getDimSafe(lvl);
if(min.less(max))
@ -48,8 +48,8 @@ public class Points {
public void deserialize(CompoundTag tag)
{
Min = new Vector3(tag.getCompound("min"));
Max = new Vector3(tag.getCompound("max"));
Min = Vector3d.deserialize(tag.getCompound("min"));
Max = Vector3d.deserialize(tag.getCompound("max"));
dimension = tag.getString("dim");
}
}

View file

@ -1,120 +0,0 @@
package dev.zontreck.libzontreck.vectors;
import dev.zontreck.libzontreck.exceptions.InvalidDeserialization;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.phys.Vec2;
public class Vector2
{
public static final Vector2 ZERO = new Vector2(0, 0);
public float x;
public float y;
public Vec2 asMinecraftVector(){
return new Vec2(x, y);
}
public Vector2()
{
}
public Vector2(float x, float y)
{
this.x=x;
this.y=y;
}
public Vector2(Vec2 pos)
{
x=pos.x;
y=pos.y;
}
public Vector2(String pos) throws InvalidDeserialization
{
// This will be serialized most likely from the ToString method
// Parse
if(pos.startsWith("<"))
{
pos=pos.substring(1, pos.length()-1); // Rip off the ending bracket too
String[] positions = pos.split(", ");
if(positions.length!=2)
{
positions = pos.split(",");
}
if(positions.length!=2)
{
throw new InvalidDeserialization("Positions must be in the same format provided by ToString() (ex. <1,1> or <1, 1>");
}
this.x = Float.parseFloat(positions[0]);
this.y = Float.parseFloat(positions[1]);
// We are done now
}
}
public Vector2 Clone()
{
Vector2 n = new Vector2(x, y);
return n;
}
@Override
public String toString()
{
return "<"+String.valueOf(x)+", "+String.valueOf(y) + ">";
}
public CompoundTag serialize()
{
CompoundTag tag = new CompoundTag();
tag.putFloat("x", x);
tag.putFloat("y", y);
return tag;
}
public Vector2(CompoundTag tag) {
this.deserialize(tag);
}
public void deserialize(CompoundTag tag)
{
x=tag.getFloat("x");
y=tag.getFloat("y");
}
public boolean same(Vector2 other)
{
if(x == other.x && y==other.y)return true;
else return false;
}
public boolean inside(Vector2 point1, Vector2 point2)
{
if(point1.x <= x && point2.x >= x){
if(point1.y <= y && point2.y >= y)
{
return true;
}
}
return false;
}
public boolean greater(Vector2 other)
{
return ((x>other.x) && (y>other.y));
}
public boolean less(Vector2 other)
{
return ((x>other.x) && (y>other.y));
}
public boolean equal(Vector2 other)
{
return same(other);
}
}

View file

@ -0,0 +1,200 @@
package dev.zontreck.libzontreck.vectors;
import dev.zontreck.libzontreck.api.Vector2;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.phys.Vec2;
import org.jetbrains.annotations.NotNull;
public class Vector2f implements Vector2<Float>
{
public static final Vector2f ZERO = new Vector2f(0, 0);
public float x;
public float y;
@Override
public Vec2 asMinecraftVector(){
return new Vec2(x, y);
}
public Vector2f()
{
}
public Vector2f(float x, float y)
{
this.x=x;
this.y=y;
}
public Vector2f(Vec2 pos)
{
x=pos.x;
y=pos.y;
}
public static Vector2f parseString(String vector2)
{
Vector2f vec = new Vector2f();
// This will be serialized most likely from the ToString method
// Parse
if(vector2.startsWith("<"))
{
vector2=vector2.substring(1, vector2.length()-1); // Rip off the ending bracket too
String[] positions = vector2.split(", ");
if(positions.length!=2)
{
positions = vector2.split(",");
}
if(positions.length!=2)
{
return ZERO;
}
vec.x = Float.parseFloat(positions[0]);
vec.y = Float.parseFloat(positions[1]);
// We are done now
}
return vec;
}
@Override
public Vector2f Clone()
{
Vector2f n = new Vector2f(x, y);
return n;
}
@Override
public String toString()
{
return "<"+String.valueOf(x)+", "+String.valueOf(y) + ">";
}
@Override
public CompoundTag serialize()
{
CompoundTag tag = new CompoundTag();
tag.putFloat("x", x);
tag.putFloat("y", y);
return tag;
}
public static Vector2f deserialize(CompoundTag tag)
{
Vector2f vec = new Vector2f();
vec.x=tag.getFloat("x");
vec.y=tag.getFloat("y");
return vec;
}
@Override
public boolean Same(Vector2 other)
{
Vector2f ov = other.asVector2f();
if(x == ov.x && y == ov.y) return true;
return false;
}
@Override
public boolean Inside(Vector2 point1, Vector2 point2)
{
Vector2f p1 = point1.asVector2f();
Vector2f p2 = point2.asVector2f();
if(p1.x <= x && p2.x >= x){
if(p1.y <= y && p2.y >= y)
{
return true;
}
}
return false;
}
@Override
public Vector2f asVector2f()
{
return this;
}
@Override
public Vector2i asVector2i() {
return new Vector2i(Math.round(x), Math.round(y));
}
@Override
public boolean greater(Vector2 other)
{
Vector2f vec = other.asVector2f();
return ((x > vec.x) && (y > vec.y));
}
@Override
public boolean less(Vector2 other)
{
Vector2f vec = other.asVector2f();
return ((x > vec.x) && (y > vec.y));
}
public boolean equal(Vector2 other)
{
return Same(other);
}
@Override
public Vector2f add(Vector2 other) {
Vector2f vec = other.asVector2f();
return new Vector2f(x + vec.x, y + vec.y);
}
@Override
public Vector2f subtract(Vector2 other) {
Vector2f vec = other.asVector2f();
return new Vector2f(x - vec.x, y - vec.y);
}
@Override
public double distance(Vector2 other) {
Vector2f vec = subtract(other);
return Math.sqrt((vec.x * vec.x + vec.y * vec.y));
}
@Override
public Vector2f moveUp() {
return add(new Vector2f(0,1));
}
@Override
public Vector2f moveDown() {
return subtract(new Vector2f(0,1));
}
@Override
public Float getX() {
return x;
}
@Override
public Float getY() {
return y;
}
@Override
public int compareTo(@NotNull Vector2<Float> other) {
if(other instanceof Vector2f v2f){
// Compare x coordinates first
int cmp = Float.compare(this.x, v2f.x);
if (cmp != 0) {
return cmp;
}
// If x coordinates are equal, compare y coordinates
return Float.compare(this.y, v2f.y);
} else return -1;
}
}

View file

@ -1,16 +1,18 @@
package dev.zontreck.libzontreck.vectors;
import dev.zontreck.libzontreck.exceptions.InvalidDeserialization;
import dev.zontreck.libzontreck.api.Vector2;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.phys.Vec2;
import org.jetbrains.annotations.NotNull;
public class Vector2i
public class Vector2i implements Vector2<Integer>
{
public static final Vector2i ZERO = new Vector2i(0, 0);
public int x;
public int y;
@Override
public Vec2 asMinecraftVector(){
return new Vec2(x, y);
}
@ -32,30 +34,34 @@ public class Vector2i
y=(int)Math.floor(pos.y);
}
public Vector2i(String pos) throws InvalidDeserialization
public static Vector2i parseString(String vector2)
{
Vector2i vec = new Vector2i();
// This will be serialized most likely from the ToString method
// Parse
if(pos.startsWith("<"))
if(vector2.startsWith("<"))
{
pos=pos.substring(1, pos.length()-1); // Rip off the ending bracket too
String[] positions = pos.split(", ");
vector2=vector2.substring(1, vector2.length()-1); // Rip off the ending bracket too
String[] positions = vector2.split(", ");
if(positions.length!=2)
{
positions = pos.split(",");
positions = vector2.split(",");
}
if(positions.length!=2)
{
throw new InvalidDeserialization("Positions must be in the same format provided by ToString() (ex. <1,1> or <1, 1>");
return ZERO;
}
this.x = Integer.parseInt(positions[0]);
this.y = Integer.parseInt(positions[1]);
vec.x = Integer.parseInt(positions[0]);
vec.y = Integer.parseInt(positions[1]);
// We are done now
}
return vec;
}
@Override
public Vector2i Clone()
{
Vector2i n = new Vector2i(x, y);
@ -69,6 +75,7 @@ public class Vector2i
}
@Override
public CompoundTag serialize()
{
CompoundTag tag = new CompoundTag();
@ -78,25 +85,33 @@ public class Vector2i
return tag;
}
public Vector2i(CompoundTag tag) {
this.deserialize(tag);
}
public void deserialize(CompoundTag tag)
public static Vector2i deserialize(CompoundTag tag)
{
x=tag.getInt("x");
y=tag.getInt("y");
Vector2i vec = new Vector2i();
vec.x=tag.getInt("x");
vec.y=tag.getInt("y");
return vec;
}
public boolean same(Vector2i other)
@Override
public boolean Same(Vector2 other)
{
if(x == other.x && y==other.y)return true;
Vector2i v2i = other.asVector2i();
if(x == v2i.x && y==v2i.y)return true;
else return false;
}
public boolean inside(Vector2i point1, Vector2i point2)
@Override
public boolean Inside(Vector2 point1, Vector2 point2)
{
if(point1.x <= x && point2.x >= x){
if(point1.y <= y && point2.y >= y)
Vector2i v1i = point1.asVector2i();
Vector2i v2i = point2.asVector2i();
if(v1i.x <= x && v2i.x >= x){
if(v1i.y <= y && v2i.y >= y)
{
return true;
}
@ -105,16 +120,94 @@ public class Vector2i
return false;
}
public boolean greater(Vector2i other)
{
return ((x>other.x) && (y>other.y));
@Override
public Vector2f asVector2f() {
return new Vector2f(x,y);
}
public boolean less(Vector2i other)
{
return ((x>other.x) && (y>other.y));
@Override
public Vector2i asVector2i() {
return this;
}
public boolean equal(Vector2i other)
@Override
public boolean greater(Vector2 other)
{
return same(other);
Vector2i vec = other.asVector2i();
return ((x > vec.x) && (y > vec.y));
}
@Override
public boolean less(Vector2 other)
{
Vector2i vec = other.asVector2i();
return ((x > vec.x) && (y > vec.y));
}
@Override
public boolean equal(Vector2 other)
{
return Same(other);
}
@Override
public Vector2i add(Vector2 other) {
Vector2i vec = other.asVector2i();
x += vec.x;
y += vec.y;
return this;
}
@Override
public Vector2i subtract(Vector2 other) {
Vector2i vec = other.asVector2i();
x -= vec.x;
y -= vec.y;
return this;
}
@Override
public double distance(Vector2 other) {
Vector2i vec = subtract(other);
return Math.sqrt((vec.x * vec.x + vec.y * vec.y));
}
@Override
public Vector2i moveUp() {
return add(new Vector2i(0,1));
}
@Override
public Vector2i moveDown() {
return subtract(new Vector2i(0,1));
}
@Override
public Integer getX() {
return x;
}
@Override
public Integer getY() {
return y;
}
@Override
public int compareTo(@NotNull Vector2<Integer> other) {
if(other instanceof Vector2i v2i){
// Compare x coordinates first
int cmp = Integer.compare(this.x, v2i.x);
if (cmp != 0) {
return cmp;
}
// If x coordinates are equal, compare y coordinates
return Integer.compare(this.y, v2i.y);
} else return -1;
}
}

View file

@ -1,285 +0,0 @@
package dev.zontreck.libzontreck.vectors;
import java.util.ArrayList;
import java.util.List;
import dev.zontreck.libzontreck.exceptions.InvalidDeserialization;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Vec3i;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.phys.Vec3;
public class Vector3
{
public static final Vector3 ZERO = new Vector3(0, 0, 0);
public double x;
public double y;
public double z;
public Vec3 asMinecraftVector(){
return new Vec3(x, y, z);
}
public Vec3i asMinecraftVec3i()
{
return new Vec3i((int) Math.round(x), (int) Math.round(y), (int) Math.round(z));
}
public BlockPos asBlockPos()
{
return new BlockPos(asMinecraftVec3i());
}
public Vector3()
{
}
public Vector3(double x, double y, double z)
{
this.x=x;
this.y=y;
this.z=z;
}
public Vector3(Vec3 pos)
{
x=pos.x;
y=pos.y;
z=pos.z;
}
public Vector3(BlockPos pos)
{
x=pos.getX();
y=pos.getY();
z=pos.getZ();
}
public Vector3(String pos) throws InvalidDeserialization
{
// This will be serialized most likely from the ToString method
// Parse
if(pos.startsWith("<"))
{
pos=pos.substring(1, pos.length()-1); // Rip off the ending bracket too
String[] positions = pos.split(", ");
if(positions.length!=3)
{
positions = pos.split(",");
}
if(positions.length!=3)
{
throw new InvalidDeserialization("Positions must be in the same format provided by ToString() (ex. <1,1,1> or <1, 1, 1>");
}
this.x = Double.parseDouble(positions[0]);
this.y = Double.parseDouble(positions[1]);
this.z = Double.parseDouble(positions[2]);
// We are done now
}
}
public List<Vector3> makeCube(Vector3 other)
{
List<Vector3> vecs = new ArrayList<>();
Vector3 work = new Vector3();
double xx = x;
double yy = y;
double zz = z;
int yState = 0;
int zState = 0;
int xState = 0;
for(xx = Math.round(x); (xx != Math.round(other.x) && xState != 2);)
{
for(zz = Math.round(z); (zz != Math.round(other.z) && zState != 2);)
{
for(yy = Math.round(y); (yy != Math.round(other.y) && yState != 2);)
{
work = new Vector3(xx, yy, zz);
if(!vecs.contains(work)) vecs.add(work);
if(yy > other.y)
{
yy -= 1.0;
if(yy == Math.round(other.y) && yState == 0)
{
yState++;
}else{
if(yState == 1)
{
yState ++;
}
}
} else if(yy < other.y)
{
yy += 1.0;
if(yy == Math.round(other.y) && yState == 0){
yState ++;
}else {
if(yState == 1)yState++;
}
}
}
yState=0;
work = new Vector3(xx,yy,zz);
if(!vecs.contains(work)) vecs.add(work);
if(zz > other.z)
{
zz -= 1.0;
if(zz == Math.round(other.z) && zState == 0)zState++;
else{
if(zState == 1)zState++;
}
}else if(zz < other.z)
{
zz += 1.0;
if(zz == Math.round(other.z) && zState == 0)zState++;
else {
if(zState==1)zState++;
}
}
}
zState=0;
work = new Vector3(xx,yy,zz);
if(!vecs.contains(work)) vecs.add(work);
if(xx > other.x)
{
xx -= 1.0;
if(xx == Math.round(other.x) && xState == 0) xState++;
else{
if(xState == 1)xState++;
}
}else if(xx < other.x)
{
xx += 1.0;
if(xx == Math.round(other.x) && xState==0)xState++;
else{
if(xState==1)xState++;
}
}
}
return vecs;
}
public Vector3 subtract(Vector3 other)
{
return new Vector3(x-other.x, y-other.y, z-other.z);
}
public Vector3 add(Vector3 other)
{
return new Vector3(x+other.x, y+other.y, z +other.z);
}
public double distance(Vector3 other)
{
Vector3 sub = subtract(other);
return Math.sqrt((sub.x * sub.x + sub.y * sub.y + sub.z * sub.z));
}
public Vector3 moveUp()
{
Vector3 up = Clone();
up.y+=1;
return up;
}
public Vector3 moveDown()
{
Vector3 up = Clone();
up.y-=1;
return up;
}
public Vector3 Clone()
{
Vector3 n = new Vector3(x, y, z);
return n;
}
@Override
public String toString()
{
return "<"+String.valueOf(x)+", "+String.valueOf(y)+", "+String.valueOf(z)+">";
}
public NonAbsVector3 rounded()
{
NonAbsVector3 cl = new NonAbsVector3(this);
return cl;
}
public CompoundTag serialize()
{
CompoundTag tag = new CompoundTag();
tag.putDouble("x", x);
tag.putDouble("y", y);
tag.putDouble("z", z);
return tag;
}
public Vector3(CompoundTag tag) {
this.deserialize(tag);
}
public void deserialize(CompoundTag tag)
{
x=tag.getDouble("x");
y=tag.getDouble("y");
z=tag.getDouble("z");
}
public boolean same(Vector3 other)
{
if(x == other.x && y==other.y && z==other.z)return true;
else return false;
}
public boolean inside(Vector3 point1, Vector3 point2)
{
if(point1.x <= x && point2.x >= x){
if(point1.y <= y && point2.y >= y)
{
if(point1.z <= z && point2.z >= z)
{
return true;
}
}
}
return false;
}
public boolean greater(Vector3 other)
{
return ((x>other.x) && (y>other.y) && (z>other.z));
}
public boolean less(Vector3 other)
{
return ((x<other.x) && (y<other.y) && (z<other.z));
}
public boolean equal(Vector3 other)
{
return same(other);
}
}

View file

@ -0,0 +1,253 @@
package dev.zontreck.libzontreck.vectors;
import java.util.ArrayList;
import java.util.List;
import dev.zontreck.libzontreck.api.Vector3;
import dev.zontreck.libzontreck.exceptions.InvalidDeserialization;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Vec3i;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.NotNull;
public class Vector3d implements Vector3<Double>
{
public static final Vector3d ZERO = new Vector3d(0, 0, 0);
public double x;
public double y;
public double z;
@Override
public Vec3 asMinecraftVector(){
return new Vec3(x, y, z);
}
@Override
public Vec3i asVec3i()
{
return new Vec3i((int) Math.round(x), (int) Math.round(y), (int) Math.round(z));
}
@Override
public BlockPos asBlockPos()
{
return new BlockPos(asVec3i());
}
public Vector3d()
{
}
public Vector3d(double x, double y, double z)
{
this.x=x;
this.y=y;
this.z=z;
}
public Vector3d(Vec3 pos)
{
x=pos.x;
y=pos.y;
z=pos.z;
}
public Vector3d(BlockPos pos)
{
x=pos.getX();
y=pos.getY();
z=pos.getZ();
}
public static Vector3d parseString(String vector3)
{
Vector3d vec = new Vector3d();
// This will be serialized most likely from the ToString method
// Parse
if(vector3.startsWith("<"))
{
vector3=vector3.substring(1, vector3.length()-1); // Rip off the ending bracket too
String[] positions = vector3.split(", ");
if(positions.length!=3)
{
positions = vector3.split(",");
}
if(positions.length!=3)
{
return ZERO;
}
vec.x = Double.parseDouble(positions[0]);
vec.y = Double.parseDouble(positions[1]);
vec.z = Double.parseDouble(positions[2]);
// We are done now
}
return vec;
}
@Override
public Vector3d subtract(Vector3 other)
{
Vector3d vec = other.asVector3d();
return new Vector3d(x-vec.x, y-vec.y, z-vec.z);
}
@Override
public Vector3d add(Vector3 other)
{
Vector3d vec = other.asVector3d();
return new Vector3d(x+vec.x, y+vec.y, z +vec.z);
}
@Override
public double distance(Vector3 other)
{
Vector3d sub = subtract(other);
return Math.sqrt((sub.x * sub.x + sub.y * sub.y + sub.z * sub.z));
}
@Override
public Vector3d moveUp()
{
return add(new Vector3d(0,1,0));
}
public Vector3d moveDown()
{
return subtract(new Vector3d(0,1,0));
}
@Override
public Vector3d Clone()
{
return new Vector3d(x, y, z);
}
@Override
public String toString()
{
return "<"+String.valueOf(x)+", "+String.valueOf(y)+", "+String.valueOf(z)+">";
}
public NonAbsVector3 rounded()
{
NonAbsVector3 cl = new NonAbsVector3(this);
return cl;
}
@Override
public CompoundTag serialize()
{
CompoundTag tag = new CompoundTag();
tag.putDouble("x", x);
tag.putDouble("y", y);
tag.putDouble("z", z);
return tag;
}
public static Vector3d deserialize(CompoundTag tag)
{
Vector3d vec = new Vector3d();
vec.x=tag.getDouble("x");
vec.y=tag.getDouble("y");
vec.z=tag.getDouble("z");
return vec;
}
@Override
public boolean Same(Vector3 other)
{
Vector3d vec = other.asVector3d();
if(x == vec.x && y==vec.y && z==vec.z)return true;
else return false;
}
@Override
public boolean Inside(Vector3 point1, Vector3 point2)
{
Vector3d v1 = point1.asVector3d();
Vector3d v2 = point2.asVector3d();
if(v1.x <= x && v2.x >= x){
if(v1.y <= y && v2.y >= y)
{
if(v1.z <= z && v2.z >= z)
{
return true;
}
}
}
return false;
}
@Override
public Vector3d asVector3d() {
return this;
}
@Override
public Vector3i asVector3i() {
return new Vector3i((int) Math.round(x), (int) Math.round(y), (int) Math.round(z));
}
@Override
public boolean greater(Vector3 other)
{
Vector3d vec = other.asVector3d();
return ((x>vec.x) && (y>vec.y) && (z>vec.z));
}
@Override
public boolean less(Vector3 other)
{
Vector3d vec = other.asVector3d();
return ((x<vec.x) && (y<vec.y) && (z<vec.z));
}
@Override
public boolean equal(Vector3 other)
{
return Same(other);
}
@Override
public Double getX() {
return x;
}
@Override
public Double getY() {
return y;
}
@Override
public Double getZ() {
return z;
}
@Override
public int compareTo(@NotNull Vector3<Double> doubleVector3) {
if(doubleVector3 instanceof Vector3d v3d)
{
int Ycomp = Double.compare(y, v3d.y);
if(Ycomp!=0)return Ycomp;
int Zcomp = Double.compare(z, v3d.z);
if(Zcomp!=0)return Zcomp;
int Xcomp = Double.compare(x, v3d.x);
if(Xcomp!=0)return Xcomp;
return 0;
} else return -1;
}
}

View file

@ -0,0 +1,246 @@
package dev.zontreck.libzontreck.vectors;
import dev.zontreck.libzontreck.api.Vector3;
import dev.zontreck.libzontreck.exceptions.InvalidDeserialization;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Vec3i;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
public class Vector3i implements Vector3<Integer>
{
public static final Vector3i ZERO = new Vector3i(0, 0, 0);
public int x;
public int y;
public int z;
@Override
public Vec3 asMinecraftVector(){
return new Vec3(x, y, z);
}
@Override
public Vec3i asVec3i()
{
return new Vec3i((int) Math.round(x), (int) Math.round(y), (int) Math.round(z));
}
@Override
public BlockPos asBlockPos()
{
return new BlockPos(asVec3i());
}
public Vector3i()
{
}
public Vector3i(int x, int y, int z)
{
this.x=x;
this.y=y;
this.z=z;
}
public Vector3i(Vec3i pos)
{
x=pos.getX();
y=pos.getY();
z=pos.getZ();
}
public Vector3i(BlockPos pos)
{
x=pos.getX();
y=pos.getY();
z=pos.getZ();
}
public static Vector3i parseString(String vector3) throws InvalidDeserialization
{
Vector3i vec = new Vector3i();
// This will be serialized most likely from the ToString method
// Parse
if(vector3.startsWith("<"))
{
vector3=vector3.substring(1, vector3.length()-1); // Rip off the ending bracket too
String[] positions = vector3.split(", ");
if(positions.length!=3)
{
positions = vector3.split(",");
}
if(positions.length!=3)
{
throw new InvalidDeserialization("Positions must be in the same format provided by ToString() (ex. <1,1,1> or <1, 1, 1>");
}
vec.x = Integer.parseInt(positions[0]);
vec.y = Integer.parseInt(positions[1]);
vec.z = Integer.parseInt(positions[2]);
// We are done now
}
return vec;
}
@Override
public Vector3i subtract(Vector3 other)
{
Vector3i vec = other.asVector3i();
return new Vector3i(x-vec.x, y-vec.y, z-vec.z);
}
@Override
public Vector3i add(Vector3 other)
{
Vector3i vec = other.asVector3i();
return new Vector3i(x+vec.x, y+vec.y, z +vec.z);
}
@Override
public Vector3i asVector3i() {
return this;
}
@Override
public Vector3d asVector3d() {
return new Vector3d(x, y, z);
}
@Override
public double distance(Vector3 other)
{
Vector3i sub = subtract(other);
return Math.sqrt((sub.x * sub.x + sub.y * sub.y + sub.z * sub.z));
}
@Override
public Vector3i moveUp()
{
return add(new Vector3i(0,1,0));
}
public Vector3i moveDown()
{
return subtract(new Vector3i(0,1,0));
}
@Override
public Vector3i Clone()
{
Vector3i n = new Vector3i(x, y, z);
return n;
}
@Override
public String toString()
{
return "<"+String.valueOf(x)+", "+String.valueOf(y)+", "+String.valueOf(z)+">";
}
@Override
public CompoundTag serialize()
{
CompoundTag tag = new CompoundTag();
tag.putInt("x", x);
tag.putInt("y", y);
tag.putInt("z", z);
return tag;
}
public static Vector3i deserialize(CompoundTag tag)
{
Vector3i vec = new Vector3i();
vec.x=tag.getInt("x");
vec.y=tag.getInt("y");
vec.z=tag.getInt("z");
return vec;
}
@Override
public boolean Same(Vector3 other)
{
Vector3i vec = other.asVector3i();
if(x == vec.x && y==vec.y && z==vec.z)return true;
else return false;
}
@Override
public boolean Inside(Vector3 point1, Vector3 point2)
{
Vector3i v1 = point1.asVector3i();
Vector3i v2 = point2.asVector3i();
if(v1.x <= x && v2.x >= x){
if(v1.y <= y && v2.y >= y)
{
if(v1.z <= z && v2.z >= z)
{
return true;
}
}
}
return false;
}
@Override
public boolean greater(Vector3 other)
{
Vector3i v3 = other.asVector3i();
return ((x>v3.x) && (y>v3.y) && (z>v3.z));
}
@Override
public boolean less(Vector3 other)
{
Vector3i vec = other.asVector3i();
return ((x<vec.x) && (y<vec.y) && (z<vec.z));
}
@Override
public boolean equal(Vector3 other)
{
return Same(other);
}
@Override
public Integer getX() {
return x;
}
@Override
public Integer getY() {
return y;
}
@Override
public Integer getZ() {
return z;
}
@Override
public int compareTo(@NotNull Vector3<Integer> integerVector3) {
if(integerVector3 instanceof Vector3i v3i)
{
int Ycomp = Integer.compare(y, v3i.y);
if(Ycomp!=0)return Ycomp;
int Zcomp = Integer.compare(z, v3i.z);
if(Zcomp!=0)return Zcomp;
int Xcomp = Integer.compare(x, v3i.x);
if(Xcomp!=0)return Xcomp;
return 0;
} else return -1;
}
}

View file

@ -4,23 +4,26 @@ import dev.zontreck.libzontreck.LibZontreck;
import dev.zontreck.libzontreck.exceptions.InvalidDeserialization;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtUtils;
import net.minecraft.network.protocol.game.ClientboundMoveEntityPacket;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.server.ServerLifecycleHooks;
public class WorldPosition {
public class WorldPosition implements Cloneable
{
public Vector3 Position;
public Vector3d Position;
public String Dimension;
public String DimSafe;
public WorldPosition(CompoundTag tag, boolean pretty) throws InvalidDeserialization {
if (pretty) {
Position = new Vector3(tag.getString("Position"));
Position = Vector3d.parseString(tag.getString("Position"));
Dimension = tag.getString("Dimension");
} else {
Position = new Vector3(tag.getCompound("pos"));
Position = Vector3d.deserialize(tag.getCompound("pos"));
Dimension = tag.getString("Dimension");
}
@ -28,17 +31,17 @@ public class WorldPosition {
}
public WorldPosition(Vector3 pos, String dim) {
public WorldPosition(Vector3d pos, String dim) {
Position = pos;
Dimension = dim;
calcDimSafe();
}
public WorldPosition(ServerPlayer player) {
this(new Vector3(player.position()), player.serverLevel());
this(new Vector3d(player.position()), player.serverLevel());
}
public WorldPosition(Vector3 pos, ServerLevel lvl) {
public WorldPosition(Vector3d pos, ServerLevel lvl) {
Position = pos;
Dimension = lvl.dimension().location().getNamespace() + ":" + lvl.dimension().location().getPath();
calcDimSafe();
@ -94,7 +97,7 @@ public class WorldPosition {
ResourceLocation rl = new ResourceLocation(dims[0], dims[1]);
ServerLevel dimL = null;
for (ServerLevel lServerLevel : LibZontreck.THE_SERVER.getAllLevels()) {
for (ServerLevel lServerLevel : ServerLifecycleHooks.getCurrentServer().getAllLevels()) {
ResourceLocation XL = lServerLevel.dimension().location();
if (XL.getNamespace().equals(rl.getNamespace())) {
@ -114,14 +117,26 @@ public class WorldPosition {
public boolean same(WorldPosition other) {
return Position.same(other.Position) && Dimension == other.Dimension;
return Position.Same(other.Position) && Dimension == other.Dimension;
}
public ChunkPos getChunkPos() {
net.minecraft.world.level.ChunkPos mcChunk = getActualDimension().getChunkAt(Position.asBlockPos()).getPos();
ChunkPos pos = new ChunkPos(new Vector3(mcChunk.getMinBlockX(), -70, mcChunk.getMinBlockZ()), new Vector3(mcChunk.getMaxBlockX(), 400, mcChunk.getMaxBlockZ()), getActualDimension());
pos.centerPoints = new Vector2(mcChunk.getMiddleBlockX(), mcChunk.getMiddleBlockZ());
ChunkPos pos = new ChunkPos(new Vector3d(mcChunk.getMinBlockX(), -70, mcChunk.getMinBlockZ()), new Vector3d(mcChunk.getMaxBlockX(), 400, mcChunk.getMaxBlockZ()), getActualDimension());
pos.centerPoints = new Vector2f(mcChunk.getMiddleBlockX(), mcChunk.getMiddleBlockZ());
return pos;
}
@Override
public WorldPosition clone() {
try {
WorldPosition clone = (WorldPosition) super.clone();
if(Position != null)
clone.Position = Position.Clone();
return clone;
} catch (CloneNotSupportedException e) {
throw new AssertionError();
}
}
}

View file

@ -5,13 +5,13 @@
# Find more information on toml format here: https://github.com/toml-lang/toml
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
modLoader="javafml" #mandatory
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
# A version range to match for said mod loader - for regular FML @Mod it will be the the FML version. This is currently 47.
loaderVersion="${loader_version_range}" #mandatory
# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
license="${mod_license}"
# A URL to refer people to when problems occur with this mod
issueTrackerURL="https://github.com/zontreck/LibZontreckMod/issues" #optional
#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
# A list of mods - how many allowed here is determined by the individual mod loader
[[mods]] #mandatory
# The modid of the mod
@ -20,7 +20,7 @@ modId="${mod_id}" #mandatory
version="${mod_version}" #mandatory
# A display name for the mod
displayName="${mod_name}" #mandatory
# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/
# A URL to query for updates for this mod. See the JSON update specification https://docs.neoforged.net/docs/misc/updatechecker/
#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
# A URL for the "homepage" for this mod, displayed in the mod UI
#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
@ -36,35 +36,35 @@ authors="${mod_authors}" #optional
# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)
displayTest="IGNORE_ALL_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)
# The description text for the mod (multi line!) (#mandatory)
description='''${mod_description}'''
# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
[[dependencies.${mod_id}]] #optional
# the modid of the dependency
modId="forge" #mandatory
# Does this dependency have to exist - if not, ordering below must be specified
mandatory=true #mandatory
# The version range of the dependency
versionRange="${forge_version_range}" #mandatory
# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory
# BEFORE - This mod is loaded BEFORE the dependency
# AFTER - This mod is loaded AFTER the dependency
ordering="NONE"
# Side this dependency is applied on - BOTH, CLIENT, or SERVER
side="BOTH"
# the modid of the dependency
modId="forge" #mandatory
# Does this dependency have to exist - if not, ordering below must be specified
mandatory=true #mandatory
# The version range of the dependency
versionRange="${neo_version_range}" #mandatory
# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory
# BEFORE - This mod is loaded BEFORE the dependency
# AFTER - This mod is loaded AFTER the dependency
ordering="NONE"
# Side this dependency is applied on - BOTH, CLIENT, or SERVER
side="BOTH"
# Here's another dependency
[[dependencies.${mod_id}]]
modId="minecraft"
mandatory=true
# This version range declares a minimum of the current minecraft version up to but not including the next major version
versionRange="${minecraft_version_range}"
ordering="NONE"
side="BOTH"
modId="minecraft"
mandatory=true
# This version range declares a minimum of the current minecraft version up to but not including the next major version
versionRange="${minecraft_version_range}"
ordering="NONE"
side="BOTH"
# Features are specific properties of the game environment, that you may want to declare you require. This example declares
# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
# stop your mod loading on the server for example.
#[features.${mod_id}]
#openGLVersion="[3.2,)"
#openGLVersion="[3.2,)"

View file

@ -3,6 +3,6 @@
"description": {
"text": "${mod_id} resources"
},
"pack_format": 15
"pack_format": ${pack_format_number}
}
}