diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..18bb160
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,20 @@
+---
+name: Bug Report
+about: Template for reporting a bug.
+title: "Bug Report: CHANGEME"
+assignees: zontreck
+---
+Bug Report
+====
+
+1) What I was doing when this happened:
+
+2) Steps to reproduce the bug
+
+```
+CHANGEME
+```
+
+3) What I was expecting to happen:
+
+4) What actually happened:
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 61d0af9..48740ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,11 @@ run
# Files from Forge MDK
forge*changelog.txt
-.private
\ No newline at end of file
+.private
+.vscode
+
+
+run
+run-data
+/src/generated/resources/.cache/
+/wile/
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index 0f4d53c..0000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "version": "0.2.0",
- "configurations": [
- {
- "type": "java",
- "name": "runClient",
- "request": "launch",
- "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher",
- "projectName": "OTEMod",
- "cwd": "${workspaceFolder}\\run",
- "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dSCAN,REGISTRIES,REGISTRYDUMP -DlegacyClassPath.file\u003dH:\\repos\\OTEMod\\build\\classpath\\runClient_minecraftClasspath.txt -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Dforge.enableGameTest\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.4\\f47e3b9dd860a7b82154b8f90a650ffd0aaa5582\\securejarhandler-2.1.4.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.3\\1f2a432d1212f5c352ae607d7b61dcae20c20af5\\asm-commons-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.3\\9595bc05510d0bd4b610188b77333fe4851a1975\\asm-util-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.3\\4b071f211b37c38e0e9f5998550197c8593f6ad8\\asm-analysis-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.3\\78d2ecd61318b5a58cd04fb237636c0e86b77d97\\asm-tree-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.3\\8e6300ef51c1d801a7ed62d07cd221aca3a90640\\asm-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.16\\e52afbb2599dc7c6f779efea0496d32fc01152e3\\JarJarFileSystems-0.3.16.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming -XX:HeapDumpPath\u003dMojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump \"-Dos.name\u003dWindows 10\" -Dos.version\u003d10.0",
- "args": "--launchTarget forgeclientuserdev --version MOD_DEV --assetIndex 1.19 --assetsDir C:\\Users\\tyler\\.gradle\\caches\\forge_gradle\\assets --gameDir . --fml.forgeVersion 43.1.32 --fml.mcVersion 1.19.2 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20220805.130853",
- "env": {
- "MOD_CLASSES": "otemod%%${workspaceFolder}\\bin\\main;otemod%%${workspaceFolder}\\bin\\main",
- "MCP_MAPPINGS": "official_1.19.2"
- }
- },
- {
- "type": "java",
- "name": "runData",
- "request": "launch",
- "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher",
- "projectName": "OTEMod",
- "cwd": "${workspaceFolder}\\run",
- "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES -DlegacyClassPath.file\u003dH:\\repos\\OTEMod\\build\\classpath\\runData_minecraftClasspath.txt -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.4\\f47e3b9dd860a7b82154b8f90a650ffd0aaa5582\\securejarhandler-2.1.4.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.3\\1f2a432d1212f5c352ae607d7b61dcae20c20af5\\asm-commons-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.3\\9595bc05510d0bd4b610188b77333fe4851a1975\\asm-util-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.3\\4b071f211b37c38e0e9f5998550197c8593f6ad8\\asm-analysis-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.3\\78d2ecd61318b5a58cd04fb237636c0e86b77d97\\asm-tree-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.3\\8e6300ef51c1d801a7ed62d07cd221aca3a90640\\asm-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.16\\e52afbb2599dc7c6f779efea0496d32fc01152e3\\JarJarFileSystems-0.3.16.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming",
- "args": "--launchTarget forgedatauserdev --assetIndex 1.19 --assetsDir C:\\Users\\tyler\\.gradle\\caches\\forge_gradle\\assets --gameDir . --fml.forgeVersion 43.1.32 --fml.mcVersion 1.19.2 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20220805.130853 --mod otemod --all --output H:\\repos\\OTEMod\\src\\generated\\resources",
- "env": {
- "MOD_CLASSES": "otemod%%${workspaceFolder}\\bin\\main;otemod%%${workspaceFolder}\\bin\\main",
- "MCP_MAPPINGS": "official_1.19.2"
- }
- },
- {
- "type": "java",
- "name": "runServer",
- "request": "launch",
- "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher",
- "projectName": "OTEMod",
- "cwd": "${workspaceFolder}\\run",
- "vmArgs": "-Dforge.logging.console.level\u003ddebug -Dforge.logging.markers\u003dREGISTRIES -DlegacyClassPath.file\u003dH:\\repos\\OTEMod\\build\\classpath\\runServer_minecraftClasspath.txt -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Dforge.enableGameTest\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.4\\f47e3b9dd860a7b82154b8f90a650ffd0aaa5582\\securejarhandler-2.1.4.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.3\\1f2a432d1212f5c352ae607d7b61dcae20c20af5\\asm-commons-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.3\\9595bc05510d0bd4b610188b77333fe4851a1975\\asm-util-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.3\\4b071f211b37c38e0e9f5998550197c8593f6ad8\\asm-analysis-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.3\\78d2ecd61318b5a58cd04fb237636c0e86b77d97\\asm-tree-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.3\\8e6300ef51c1d801a7ed62d07cd221aca3a90640\\asm-9.3.jar;C:\\Users\\tyler\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.16\\e52afbb2599dc7c6f779efea0496d32fc01152e3\\JarJarFileSystems-0.3.16.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming",
- "args": "--launchTarget forgeserveruserdev --gameDir . --fml.forgeVersion 43.1.32 --fml.mcVersion 1.19.2 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20220805.130853",
- "env": {
- "MOD_CLASSES": "otemod%%${workspaceFolder}\\bin\\main;otemod%%${workspaceFolder}\\bin\\main",
- "MCP_MAPPINGS": "official_1.19.2"
- }
- }
- ]
-}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index a11691a..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "java.configuration.updateBuildConfiguration": "automatic",
- "java.project.referencedLibraries": [
- ".private/lib/**/*.jar"
- ]
-}
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..791c037
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,28 @@
+How to Contribute
+=====
+
+First of all, thank you for considering, or for contributing to any of the following mods
+```
+LibZontreck
+Arias-Essentials
+OTEMod
+ClaimsMod
+WatchMyDurability
+```
+
+It's people like you who make the contrinuted existence of these mods possible.
+
+Contributing to any of the mods under my development is simple.
+
+Code Contributions
+---
+1) To contribute code, fork the repository, then make a new branch. Name it something like `bugfix_somefeature`, or `feature_newfeature`. When done coding, submit a pull request to have your changes be integrated upstream.
+
+Asset contribution
+----
+2) Contributions are also accepted in the form of artwork or music, or sound, or block models from blockbench. Just simply follow the above steps to create your working base. Then send it to us in a pull request. No coding knowledge is necessary for adding these resources. Someone else can tackle that if you do not know how to code. An example of this is the Possum animal model in OTEMod. This was contributed by PossumTheWarrior via discord.
+
+Bug reporting or feature requests
+----
+3) Bug reports. Please be as detailed as possible when reporting a bug. Include steps on how to reproduce the bug if possible.
+4) Feature requests. Please be sure to name your issue ticket accordingly to indicate you are requesting a new feature, and not reporting a bug. Then be as detailed as possible in how you want the feature to work. If the feature is requested for LibZontreck. Please be detailed in how the API would work. You can do this simply by providing a basic interface example.
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..9cecc1d
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ {one line to give the program's name and a brief idea of what it does.}
+ Copyright (C) {year} {name of author}
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ {project} Copyright (C) {year} {fullname}
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
diff --git a/LICENSE.txt b/LICENSE.forge
similarity index 100%
rename from LICENSE.txt
rename to LICENSE.forge
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..01481d3
--- /dev/null
+++ b/README.md
@@ -0,0 +1,15 @@
+Thresholds Mod
+=====
+
+Hello! We're still in alpha. Ignore the dust.
+
+Compiling
+-----
+
+In a terminal simply run the command `gradlew jar` to compile.
+
+
+About
+======
+
+Thresholds is a mod about machines, and the spaces in between spaces.
\ No newline at end of file
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 344bca7..0000000
--- a/README.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-
-Source installation information for modders
--------------------------------------------
-This code follows the Minecraft Forge installation methodology. It will apply
-some small patches to the vanilla MCP source code, giving you and it access
-to some of the data and functions you need to build a successful mod.
-
-Note also that the patches are built against "un-renamed" MCP source code (aka
-SRG Names) - this means that you will not be able to read them directly against
-normal code.
-
-Setup Process:
-==============================
-
-Step 1: Open your command-line and browse to the folder where you extracted the zip file.
-
-Step 2: You're left with a choice.
-If you prefer to use Eclipse:
-1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux)
-2. Open Eclipse, Import > Existing Gradle Project > Select Folder
- or run `gradlew eclipse` to generate the project.
-
-If you prefer to use IntelliJ:
-1. Open IDEA, and import project.
-2. Select your build.gradle file and have it import.
-3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux)
-4. Refresh the Gradle Project in IDEA if required.
-
-If at any point you are missing libraries in your IDE, or you've run into problems you can
-run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything
-{this does not affect your code} and then start the process again.
-
-Mapping Names:
-=============================
-By default, the MDK is configured to use the official mapping names from Mojang for methods and fields
-in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this
-license, if you do not agree with it you can change your mapping names to other crowdsourced names in your
-build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here:
-https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
-
-Additional Resources:
-=========================
-Community Documentation: http://mcforge.readthedocs.io/en/latest/gettingstarted/
-LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0
-Forge Forum: https://forums.minecraftforge.net/
-Forge Discord: https://discord.gg/UvedJ9m
\ No newline at end of file
diff --git a/Roadmap.txt b/Roadmap.txt
index 747ae36..d8fc677 100644
--- a/Roadmap.txt
+++ b/Roadmap.txt
@@ -1,21 +1,7 @@
-Eternium Ore [done]
-Eternium Fragment [done]
-Eternium Dust [partial] [ smelt fragment into dust. 1x. crush/grind = 4x ]
-Ihan Crystal [partially] [XP is stored or retrieved. But is used by the mod as a charge. Eternium Dust will be used in the center]
-Aurora Block [done/partial] [blasting > 4x dust]
-Aurora Door [not done]
-Aurora Pressure Plate [not done]
-Reinforced Auroran Compound [not done]
-Aurora Portal Frame [not done] [stonecutting -> portal frame] [2 slots. 1 for eyes of ender, other reverse side for charged ihan crystals. portal verical. portal uses nether portal logic.]
+Liquids
+ * Liquified Soul Energy
+ * Liquified Experience
-* Dimension contents up in air
-* Dimension will be timelocked, changes do not persist, and the world reverts itself after a period of time.
-* Natural structures within the fractured dimension can be a refinery which can refine materials you mine in the realm
-* Minerals not refined in the eternium dimension have a property where they will be destroyed from inventory if removed from dimension, and cannot be used in a normal crafting recipe.
-* Dimension water acts like a fountain of youth
-* As everything happening in the dimension canonically is happening all at once, the dimension will have a unique feature where server chat will not function
-The player may also encounter other explorers, but they will be very glitched, their actions will make little sense, if they are mining, they may vanish into the ground like a ghost
-The player cannot stay there too long as the ihan crystal charges will eventually run out
-* Mekanism plugin machine: Skulk Extractor
- This machine will rip skulk blocks apart atom by atom to get every last drop of XP stored within and can charge a crystal, or convert it into a single use ihan crystal with a lesser charge.
-* Adventure system with unique villager NPC that gives quests. This could be within the Eternium Dimension, or it could be from village to village. Rewards not yet determined.
\ No newline at end of file
+
+Super Furnace
+ * Melts materials into liquids. This is how to obtain the OTEMod liquids.
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index e9790c6..8c00921 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,24 @@
plugins {
id 'eclipse'
+ id 'idea'
id 'maven-publish'
- id 'net.minecraftforge.gradle' version '5.1.+'
- id 'java-library'
+ id 'net.neoforged.gradle' version '[6.0.18,6.2)'
+ id 'org.spongepowered.mixin' version '0.7.+'
+
+}
+
+version = mod_version
+group = mod_group_id
+
+base {
+ archivesName = mod_id
}
-
-version = "${my_version}"
-group = 'dev.zontreck.otemod' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = 'otemod'
+java {
+ withSourcesJar()
+ withJavadocJar()
+}
// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
@@ -25,26 +34,48 @@ minecraft {
// See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
//
// Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
- // Additional setup is needed to use their mappings: https://github.com/ParchmentMC/Parchment/wiki/Getting-Started
+ // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started
//
// Use non-default mappings at your own risk. They may not always work.
// Simply re-run your setup task after changing the mappings to update your workspace.
- mappings channel: 'official', version: "${mc_version}"
+ mappings channel: mapping_channel, version: mapping_version
- // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
+ // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
+ // In most cases, it is not necessary to enable.
+ // enableEclipsePrepareRuns = true
+ // enableIdeaPrepareRuns = true
+
+ // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game.
+ // It is REQUIRED to be set to true for this template to function.
+ // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
+ copyIdeResources = true
+
+ // 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
+
+ // This property enables access transformers for use in development.
+ // They will be applied to the Minecraft artifact.
+ // The access transformer file can be anywhere in the project.
+ // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge.
+ // This default location is a best practice to automatically put the file in the right place in the final jar.
+ // See https://docs.neoforged.net/docs/1.20.x/advanced/accesstransformers/ for more information.
+ accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
// Default run configurations.
// These can be tweaked, removed, or duplicated as needed.
runs {
- client {
- workingDirectory project.file('run')
+ // applies to all the run configs below
+ configureEach {
+ workingDirectory project.file("run/${it.name}")
// Recommended logging data for a userdev environment
// The markers can be added/remove as needed separated by commas.
// "SCAN": For mods scan.
// "REGISTRIES": For firing of registry events.
// "REGISTRYDUMP": For getting the contents of all registries.
- property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+ property 'forge.logging.markers', 'REGISTRIES'
// Recommended logging level for the console
// You can set various levels here.
@@ -52,41 +83,35 @@ minecraft {
property 'forge.logging.console.level', 'debug'
mods {
- otemod {
+ "${mod_id}" {
source sourceSets.main
}
}
}
+ client {
+ // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+ property 'forge.enabledGameTestNamespaces', mod_id
+ }
+
server {
- workingDirectory project.file('run')
+ property 'forge.enabledGameTestNamespaces', mod_id
- property 'forge.logging.markers', 'REGISTRIES'
+ }
- property 'forge.logging.console.level', 'debug'
-
- mods {
- otemod {
- source sourceSets.main
- }
- }
+ // This run config launches GameTestServer and runs all registered gametests, then exits.
+ // By default, the server will crash when no gametests are provided.
+ // The gametest system is also enabled by default for other run configs under the /test command.
+ gameTestServer {
+ property 'forge.enabledGameTestNamespaces', mod_id
}
data {
- workingDirectory project.file('run')
-
- property 'forge.logging.markers', 'REGISTRIES'
-
- property 'forge.logging.console.level', 'debug'
+ // example of overriding the workingDirectory set in configureEach above
+ 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', 'otemod', '--all', '--output', file('src/generated/resources/')
-
- mods {
- otemod {
- source sourceSets.main
- }
- }
+ args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
}
}
}
@@ -98,92 +123,140 @@ repositories {
// Put repositories for dependencies here
// ForgeGradle automatically adds the Forge maven and Maven Central for you
- // If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
- // flatDir {
- // dir 'libs'
- // }
- mavenCentral()
+ // If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
+ // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver
maven {
- // location of the maven that hosts JEI files
- name = "Progwml6 maven"
- url = "https://dvs1.progwml6.com/files/maven/"
+ name = "Aria's Creations Caches"
+ url = "https://maven.zontreck.com/repository/internal"
}
- maven {
- // location of a maven mirror for JEI files, as a fallback
- name = "ModMaven"
- url = "https://modmaven.dev"
+ // Put repositories for dependencies here
+ // ForgeGradle automatically adds the Forge maven and Maven Central for you
+
+ // If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
+ flatDir {
+ dir 'libs'
}
+
+ //maven {
+ // name = "CurseMaven"
+ // url = "https://cursemaven.com"
+ //}
+
maven {
- name = "CurseMaven"
- url = "https://cursemaven.com"
+ name = "zontreck Maven"
+ url = "https://maven.zontreck.com/repository/zontreck"
}
}
dependencies {
- // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
- // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
- // The userdev artifact is a special name and will get all sorts of transformations applied to it.
- minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
+ // Specify the version of Minecraft to use.
+ // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact.
+ // 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.neoforged:forge:${minecraft_version}-${neo_version}"
- compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
- compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
- runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
- // compile against the JEI API but do not include it at runtime
- //compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
- // at runtime, use the full JEI jar
- //runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
- // Real mod deobf dependency examples - these get remapped to your current mappings
- // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
- // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
- // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
- // Examples using mod jars from ./libs
+ implementation fg.deobf("dev.zontreck:LibZontreckMod:${libzontreck}")
+
+ //implementation fg.deobf('software.bernie.geckolib:geckolib-forge-1.20:3.0.57')
+
+ //compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei}")
+ //runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei}")
+
+ runtimeOnly fg.deobf("curse.maven:mekanism-268560:5125665")
+ runtimeOnly fg.deobf("curse.maven:worldedit-225608:4586218")
+ runtimeOnly fg.deobf("curse.maven:jei-238222:5101366")
+ runtimeOnly fg.deobf("curse.maven:nbtedit-reborn-678133:5082493")
+
+ runtimeOnly fg.deobf("curse.maven:spawn-structures-964113:5113737")
+
+ // 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
+ // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
+ // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
+ // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
+
+ // Example mod dependency using a mod jar from ./libs with a flat dir repository
+ // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
+ // The group id is ignored when searching -- in this case, it is "blank"
// implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
- api 'org.apache.commons:commons-math3:3.6.1'
- implementation 'com.google.guava:guava:22.0'
- implementation 'org.mariadb.jdbc:mariadb-java-client:3.0.8'
- compileOnly 'org.mariadb.jdbc:mariadb-java-client'
- // For more info...
+
+ // For more info:
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html
- api 'curse.maven:mariadb-jdbc-561883:3586357'
+
}
-// Example for how to get properties into the manifest for reading at runtime.
-jar {
- manifest {
- attributes([
- "Specification-Title" : "otemod",
- "Specification-Vendor" : "Zontreck",
- "Specification-Version" : "${my_version}", // We are version 1 of ourselves
- "Implementation-Title" : project.name,
- "Implementation-Version" : project.jar.archiveVersion,
- "Implementation-Vendor" : "Zontreck",
- "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
- ])
+// This block of code expands all declared replace properties in the specified resource targets.
+// 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.withType(ProcessResources).configureEach {
+ var replaceProperties = [
+ 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, pack_format_number: pack_format_number,
+ ]
+ inputs.properties replaceProperties
+
+ filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
+ expand replaceProperties + [project: project]
}
}
-// Example configuration to allow publishing using the maven-publish plugin
-// This is the preferred method to reobfuscate your jar file
-jar.finalizedBy('reobfJar')
-// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
-// publish.dependsOn('reobfJar')
+// Example for how to get properties into the manifest for reading at runtime.
+tasks.named('jar', Jar).configure {
+ manifest {
+ attributes([
+ 'Specification-Title' : mod_id,
+ 'Specification-Vendor' : mod_authors,
+ 'Specification-Version' : '1', // We are version 1 of ourselves
+ 'Implementation-Title' : project.name,
+ 'Implementation-Version' : project.jar.archiveVersion,
+ 'Implementation-Vendor' : mod_authors,
+ 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+ ])
+ }
+ // This is the preferred method to reobfuscate your jar file
+ finalizedBy 'reobfJar'
+}
+
+
+// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing:
+// tasks.named('publish').configure {
+// dependsOn 'reobfJar'
+// }
+
+
+def MAVEN_PASSWORD_PROPERTY = "AriasCreationsMavenPassword"
publishing {
publications {
mavenJava(MavenPublication) {
artifact jar
+ artifact sourcesJar
+ artifact javadocJar
}
}
repositories {
maven {
- url "file://${project.projectDir}/mcmodsrepo"
+ url = "https://maven.zontreck.com/repository/zontreck"
+ name = "ariascreations"
+ if (project.findProperty(MAVEN_PASSWORD_PROPERTY) != null) {
+ credentials {
+ username = "admin"
+ password = project.findProperty(MAVEN_PASSWORD_PROPERTY)
+ }
+ }
}
}
}
+
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
}
diff --git a/gradle.properties b/gradle.properties
index ae2f2fd..0b7979c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,61 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx8G
+org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
+libzontreck=1201.13.043024.0404
-my_version=1.3.3.4
+## Environment Properties
-mc_version=1.19.2
-forge_version=43.1.32
-jei_version=11.3.0.262
\ No newline at end of file
+# The Minecraft version must agree with the Forge version to get a valid artifact
+minecraft_version=1.20.1
+
+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"].
+# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
+#
+# | Channel | Version | |
+# |-----------|----------------------|--------------------------------------------------------------------------------|
+# | official | MCVersion | Official field/method names from Mojang mapping files |
+# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official |
+#
+# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
+# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
+#
+# 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=official
+# The mapping version to query from the mapping channel.
+# This must match the format required by the mapping channel.
+mapping_version=1.20.1
+
+
+
+## Mod Properties
+
+# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
+# Must match the String constant located in the main mod class annotated with @Mod.
+mod_id=otemod
+# The human-readable display name for the mod.
+mod_name=Thresholds
+# 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=1201.4.050724.1934
+# 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
+mod_group_id=dev.zontreck
+# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
+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=Thresholds
+
+# Pack version - this changes each minecraft release, in general.
+pack_format_number=15
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180..943f0cb 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8049c68..37aef8d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
index c53aefa..65dcd68
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
-# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-# * compound commands having a testable exit status, especially «case»;
-# * various built-in commands including «command», «set», and «ulimit».
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
esac
done
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -205,6 +209,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f..6689b85 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
diff --git a/settings.gradle b/settings.gradle
index fb61b26..4e8d059 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,10 @@
pluginManagement {
repositories {
gradlePluginPortal()
- maven { url = 'https://maven.minecraftforge.net/' }
+ maven { url = "https://maven.zontreck.com/repository/internal" }
}
+}
+
+plugins {
+ id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/blue_pool_light.json b/src/generated/resources/assets/otemod/blockstates/blue_pool_light.json
new file mode 100644
index 0000000..f148f34
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/blue_pool_light.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/blue_pool_light"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/blue_pool_tile.json b/src/generated/resources/assets/otemod/blockstates/blue_pool_tile.json
new file mode 100644
index 0000000..a257e85
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/blue_pool_tile.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/blue_pool_tile"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/blue_pool_tile_slab.json b/src/generated/resources/assets/otemod/blockstates/blue_pool_tile_slab.json
new file mode 100644
index 0000000..06721ca
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/blue_pool_tile_slab.json
@@ -0,0 +1,13 @@
+{
+ "variants": {
+ "type=bottom": {
+ "model": "otemod:block/blue_pool_tile_slab"
+ },
+ "type=double": {
+ "model": "otemod:block/blue_pool_tile"
+ },
+ "type=top": {
+ "model": "otemod:block/blue_pool_tile_slab_top"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/blue_pool_tile_stairs.json b/src/generated/resources/assets/otemod/blockstates/blue_pool_tile_stairs.json
new file mode 100644
index 0000000..987e7a7
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/blue_pool_tile_stairs.json
@@ -0,0 +1,209 @@
+{
+ "variants": {
+ "facing=east,half=bottom,shape=inner_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=inner_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner"
+ },
+ "facing=east,half=bottom,shape=outer_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=outer_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer"
+ },
+ "facing=east,half=bottom,shape=straight": {
+ "model": "otemod:block/blue_pool_tile_stairs"
+ },
+ "facing=east,half=top,shape=inner_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=inner_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=outer_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=outer_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=straight": {
+ "model": "otemod:block/blue_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=bottom,shape=inner_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=inner_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=outer_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=outer_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=straight": {
+ "model": "otemod:block/blue_pool_tile_stairs",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=outer_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=outer_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=straight": {
+ "model": "otemod:block/blue_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=south,half=bottom,shape=inner_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner"
+ },
+ "facing=south,half=bottom,shape=inner_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=outer_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer"
+ },
+ "facing=south,half=bottom,shape=outer_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=straight": {
+ "model": "otemod:block/blue_pool_tile_stairs",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=outer_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=outer_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=straight": {
+ "model": "otemod:block/blue_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=outer_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=outer_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=straight": {
+ "model": "otemod:block/blue_pool_tile_stairs",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=outer_left": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=outer_right": {
+ "model": "otemod:block/blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=straight": {
+ "model": "otemod:block/blue_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/compressed_obsidian_block.json b/src/generated/resources/assets/otemod/blockstates/compressed_obsidian_block.json
new file mode 100644
index 0000000..9ddc5e1
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/compressed_obsidian_block.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/compressed_obsidian_block"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dark_pool_light.json b/src/generated/resources/assets/otemod/blockstates/dark_pool_light.json
new file mode 100644
index 0000000..c7dd7fd
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dark_pool_light.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/dark_pool_light"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dark_pool_tile.json b/src/generated/resources/assets/otemod/blockstates/dark_pool_tile.json
new file mode 100644
index 0000000..9548dfe
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dark_pool_tile.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/dark_pool_tile"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dark_pool_tile_slab.json b/src/generated/resources/assets/otemod/blockstates/dark_pool_tile_slab.json
new file mode 100644
index 0000000..121b8ca
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dark_pool_tile_slab.json
@@ -0,0 +1,13 @@
+{
+ "variants": {
+ "type=bottom": {
+ "model": "otemod:block/dark_pool_tile_slab"
+ },
+ "type=double": {
+ "model": "otemod:block/dark_pool_tile"
+ },
+ "type=top": {
+ "model": "otemod:block/dark_pool_tile_slab_top"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dark_pool_tile_stairs.json b/src/generated/resources/assets/otemod/blockstates/dark_pool_tile_stairs.json
new file mode 100644
index 0000000..9b344a2
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dark_pool_tile_stairs.json
@@ -0,0 +1,209 @@
+{
+ "variants": {
+ "facing=east,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner"
+ },
+ "facing=east,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer"
+ },
+ "facing=east,half=bottom,shape=straight": {
+ "model": "otemod:block/dark_pool_tile_stairs"
+ },
+ "facing=east,half=top,shape=inner_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=inner_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=outer_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=outer_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=straight": {
+ "model": "otemod:block/dark_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=straight": {
+ "model": "otemod:block/dark_pool_tile_stairs",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=outer_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=outer_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=straight": {
+ "model": "otemod:block/dark_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=south,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner"
+ },
+ "facing=south,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer"
+ },
+ "facing=south,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=straight": {
+ "model": "otemod:block/dark_pool_tile_stairs",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=outer_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=outer_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=straight": {
+ "model": "otemod:block/dark_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=straight": {
+ "model": "otemod:block/dark_pool_tile_stairs",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=outer_left": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=outer_right": {
+ "model": "otemod:block/dark_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=straight": {
+ "model": "otemod:block/dark_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dark_red_carpet.json b/src/generated/resources/assets/otemod/blockstates/dark_red_carpet.json
new file mode 100644
index 0000000..74ab708
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dark_red_carpet.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/dark_red_carpet"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dark_red_wool.json b/src/generated/resources/assets/otemod/blockstates/dark_red_wool.json
new file mode 100644
index 0000000..3a1e0d7
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dark_red_wool.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/dark_red_wool"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/otemod/blockstates/deepslate_eternium_ore_block.json b/src/generated/resources/assets/otemod/blockstates/deepslate_eternium_ore_block.json
similarity index 100%
rename from src/main/resources/assets/otemod/blockstates/deepslate_eternium_ore_block.json
rename to src/generated/resources/assets/otemod/blockstates/deepslate_eternium_ore_block.json
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_blue_pool_light.json b/src/generated/resources/assets/otemod/blockstates/dirty_blue_pool_light.json
new file mode 100644
index 0000000..e2980f1
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_blue_pool_light.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/dirty_blue_pool_light"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_blue_pool_tile.json b/src/generated/resources/assets/otemod/blockstates/dirty_blue_pool_tile.json
new file mode 100644
index 0000000..f579de6
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_blue_pool_tile.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/dirty_blue_pool_tile"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_blue_pool_tile_slab.json b/src/generated/resources/assets/otemod/blockstates/dirty_blue_pool_tile_slab.json
new file mode 100644
index 0000000..86de493
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_blue_pool_tile_slab.json
@@ -0,0 +1,13 @@
+{
+ "variants": {
+ "type=bottom": {
+ "model": "otemod:block/dirty_blue_pool_tile_slab"
+ },
+ "type=double": {
+ "model": "otemod:block/dirty_blue_pool_tile"
+ },
+ "type=top": {
+ "model": "otemod:block/dirty_blue_pool_tile_slab_top"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_blue_pool_tile_stairs.json b/src/generated/resources/assets/otemod/blockstates/dirty_blue_pool_tile_stairs.json
new file mode 100644
index 0000000..133a323
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_blue_pool_tile_stairs.json
@@ -0,0 +1,209 @@
+{
+ "variants": {
+ "facing=east,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner"
+ },
+ "facing=east,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer"
+ },
+ "facing=east,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs"
+ },
+ "facing=east,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=straight": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=straight": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=south,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner"
+ },
+ "facing=south,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer"
+ },
+ "facing=south,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=straight": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=straight": {
+ "model": "otemod:block/dirty_blue_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_green_pool_light.json b/src/generated/resources/assets/otemod/blockstates/dirty_green_pool_light.json
new file mode 100644
index 0000000..cb547f1
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_green_pool_light.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/dirty_green_pool_light"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_green_pool_tile.json b/src/generated/resources/assets/otemod/blockstates/dirty_green_pool_tile.json
new file mode 100644
index 0000000..70a6c7a
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_green_pool_tile.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/dirty_green_pool_tile"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_green_pool_tile_slab.json b/src/generated/resources/assets/otemod/blockstates/dirty_green_pool_tile_slab.json
new file mode 100644
index 0000000..c720f2c
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_green_pool_tile_slab.json
@@ -0,0 +1,13 @@
+{
+ "variants": {
+ "type=bottom": {
+ "model": "otemod:block/dirty_green_pool_tile_slab"
+ },
+ "type=double": {
+ "model": "otemod:block/dirty_green_pool_tile"
+ },
+ "type=top": {
+ "model": "otemod:block/dirty_green_pool_tile_slab_top"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_green_pool_tile_stairs.json b/src/generated/resources/assets/otemod/blockstates/dirty_green_pool_tile_stairs.json
new file mode 100644
index 0000000..225caf2
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_green_pool_tile_stairs.json
@@ -0,0 +1,209 @@
+{
+ "variants": {
+ "facing=east,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner"
+ },
+ "facing=east,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer"
+ },
+ "facing=east,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs"
+ },
+ "facing=east,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=straight": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=straight": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=south,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner"
+ },
+ "facing=south,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer"
+ },
+ "facing=south,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=straight": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=straight": {
+ "model": "otemod:block/dirty_green_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_pool_light.json b/src/generated/resources/assets/otemod/blockstates/dirty_pool_light.json
new file mode 100644
index 0000000..5453ab5
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_pool_light.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/dirty_pool_light"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_pool_tile.json b/src/generated/resources/assets/otemod/blockstates/dirty_pool_tile.json
new file mode 100644
index 0000000..dcbb07e
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_pool_tile.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/dirty_pool_tile"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_pool_tile_slab.json b/src/generated/resources/assets/otemod/blockstates/dirty_pool_tile_slab.json
new file mode 100644
index 0000000..0a40c0f
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_pool_tile_slab.json
@@ -0,0 +1,13 @@
+{
+ "variants": {
+ "type=bottom": {
+ "model": "otemod:block/dirty_pool_tile_slab"
+ },
+ "type=double": {
+ "model": "otemod:block/dirty_pool_tile"
+ },
+ "type=top": {
+ "model": "otemod:block/dirty_pool_tile_slab_top"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_pool_tile_stairs.json b/src/generated/resources/assets/otemod/blockstates/dirty_pool_tile_stairs.json
new file mode 100644
index 0000000..38aaf29
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_pool_tile_stairs.json
@@ -0,0 +1,209 @@
+{
+ "variants": {
+ "facing=east,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner"
+ },
+ "facing=east,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer"
+ },
+ "facing=east,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_pool_tile_stairs"
+ },
+ "facing=east,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=straight": {
+ "model": "otemod:block/dirty_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_pool_tile_stairs",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=straight": {
+ "model": "otemod:block/dirty_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=south,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner"
+ },
+ "facing=south,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer"
+ },
+ "facing=south,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_pool_tile_stairs",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=straight": {
+ "model": "otemod:block/dirty_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_pool_tile_stairs",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=straight": {
+ "model": "otemod:block/dirty_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_red_pool_light.json b/src/generated/resources/assets/otemod/blockstates/dirty_red_pool_light.json
new file mode 100644
index 0000000..059e1be
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_red_pool_light.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/dirty_red_pool_light"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_red_pool_tile.json b/src/generated/resources/assets/otemod/blockstates/dirty_red_pool_tile.json
new file mode 100644
index 0000000..ce82c8a
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_red_pool_tile.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/dirty_red_pool_tile"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_red_pool_tile_slab.json b/src/generated/resources/assets/otemod/blockstates/dirty_red_pool_tile_slab.json
new file mode 100644
index 0000000..e60e37e
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_red_pool_tile_slab.json
@@ -0,0 +1,13 @@
+{
+ "variants": {
+ "type=bottom": {
+ "model": "otemod:block/dirty_red_pool_tile_slab"
+ },
+ "type=double": {
+ "model": "otemod:block/dirty_red_pool_tile"
+ },
+ "type=top": {
+ "model": "otemod:block/dirty_red_pool_tile_slab_top"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/dirty_red_pool_tile_stairs.json b/src/generated/resources/assets/otemod/blockstates/dirty_red_pool_tile_stairs.json
new file mode 100644
index 0000000..b934dd5
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/dirty_red_pool_tile_stairs.json
@@ -0,0 +1,209 @@
+{
+ "variants": {
+ "facing=east,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner"
+ },
+ "facing=east,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer"
+ },
+ "facing=east,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs"
+ },
+ "facing=east,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=straight": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=straight": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=south,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner"
+ },
+ "facing=south,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer"
+ },
+ "facing=south,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=straight": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=outer_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=outer_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=straight": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=outer_left": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=outer_right": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=straight": {
+ "model": "otemod:block/dirty_red_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/eternium_block.json b/src/generated/resources/assets/otemod/blockstates/eternium_block.json
new file mode 100644
index 0000000..0702cd4
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/eternium_block.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/eternium_block"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/otemod/blockstates/eternium_ore_block.json b/src/generated/resources/assets/otemod/blockstates/eternium_ore_block.json
similarity index 100%
rename from src/main/resources/assets/otemod/blockstates/eternium_ore_block.json
rename to src/generated/resources/assets/otemod/blockstates/eternium_ore_block.json
diff --git a/src/generated/resources/assets/otemod/blockstates/filthy_blue_pool_light.json b/src/generated/resources/assets/otemod/blockstates/filthy_blue_pool_light.json
new file mode 100644
index 0000000..163eccc
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/filthy_blue_pool_light.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/filthy_blue_pool_light"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/filthy_green_pool_light.json b/src/generated/resources/assets/otemod/blockstates/filthy_green_pool_light.json
new file mode 100644
index 0000000..c949d1a
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/filthy_green_pool_light.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/filthy_green_pool_light"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/filthy_pool_light.json b/src/generated/resources/assets/otemod/blockstates/filthy_pool_light.json
new file mode 100644
index 0000000..921fb3b
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/filthy_pool_light.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/filthy_pool_light"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/filthy_red_pool_light.json b/src/generated/resources/assets/otemod/blockstates/filthy_red_pool_light.json
new file mode 100644
index 0000000..2e98f74
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/filthy_red_pool_light.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/filthy_red_pool_light"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/green_pool_light.json b/src/generated/resources/assets/otemod/blockstates/green_pool_light.json
new file mode 100644
index 0000000..d0049e8
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/green_pool_light.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/green_pool_light"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/green_pool_tile.json b/src/generated/resources/assets/otemod/blockstates/green_pool_tile.json
new file mode 100644
index 0000000..2eec3e6
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/green_pool_tile.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/green_pool_tile"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/green_pool_tile_slab.json b/src/generated/resources/assets/otemod/blockstates/green_pool_tile_slab.json
new file mode 100644
index 0000000..b71fe9d
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/green_pool_tile_slab.json
@@ -0,0 +1,13 @@
+{
+ "variants": {
+ "type=bottom": {
+ "model": "otemod:block/green_pool_tile_slab"
+ },
+ "type=double": {
+ "model": "otemod:block/green_pool_tile"
+ },
+ "type=top": {
+ "model": "otemod:block/green_pool_tile_slab_top"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/green_pool_tile_stairs.json b/src/generated/resources/assets/otemod/blockstates/green_pool_tile_stairs.json
new file mode 100644
index 0000000..3aaabe4
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/green_pool_tile_stairs.json
@@ -0,0 +1,209 @@
+{
+ "variants": {
+ "facing=east,half=bottom,shape=inner_left": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=inner_right": {
+ "model": "otemod:block/green_pool_tile_stairs_inner"
+ },
+ "facing=east,half=bottom,shape=outer_left": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=outer_right": {
+ "model": "otemod:block/green_pool_tile_stairs_outer"
+ },
+ "facing=east,half=bottom,shape=straight": {
+ "model": "otemod:block/green_pool_tile_stairs"
+ },
+ "facing=east,half=top,shape=inner_left": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=inner_right": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=outer_left": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=outer_right": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=straight": {
+ "model": "otemod:block/green_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=bottom,shape=inner_left": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=inner_right": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=outer_left": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=outer_right": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=straight": {
+ "model": "otemod:block/green_pool_tile_stairs",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_left": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_right": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=outer_left": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=outer_right": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=straight": {
+ "model": "otemod:block/green_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=south,half=bottom,shape=inner_left": {
+ "model": "otemod:block/green_pool_tile_stairs_inner"
+ },
+ "facing=south,half=bottom,shape=inner_right": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=outer_left": {
+ "model": "otemod:block/green_pool_tile_stairs_outer"
+ },
+ "facing=south,half=bottom,shape=outer_right": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=straight": {
+ "model": "otemod:block/green_pool_tile_stairs",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_left": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_right": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=outer_left": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=outer_right": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=straight": {
+ "model": "otemod:block/green_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_left": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_right": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=outer_left": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=outer_right": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=straight": {
+ "model": "otemod:block/green_pool_tile_stairs",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_left": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_right": {
+ "model": "otemod:block/green_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=outer_left": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=outer_right": {
+ "model": "otemod:block/green_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=straight": {
+ "model": "otemod:block/green_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/layered_compressed_obsidian_block.json b/src/generated/resources/assets/otemod/blockstates/layered_compressed_obsidian_block.json
new file mode 100644
index 0000000..f6a7840
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/layered_compressed_obsidian_block.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/layered_compressed_obsidian_block"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/nether_vault_steel_ore_block.json b/src/generated/resources/assets/otemod/blockstates/nether_vault_steel_ore_block.json
new file mode 100644
index 0000000..e5e1122
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/nether_vault_steel_ore_block.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/nether_vault_steel_ore_block"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/pool_light.json b/src/generated/resources/assets/otemod/blockstates/pool_light.json
new file mode 100644
index 0000000..09ea30c
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/pool_light.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/pool_light"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/pool_tile.json b/src/generated/resources/assets/otemod/blockstates/pool_tile.json
new file mode 100644
index 0000000..da5e920
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/pool_tile.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/pool_tile"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/pool_tile_slab.json b/src/generated/resources/assets/otemod/blockstates/pool_tile_slab.json
new file mode 100644
index 0000000..02ed4b8
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/pool_tile_slab.json
@@ -0,0 +1,13 @@
+{
+ "variants": {
+ "type=bottom": {
+ "model": "otemod:block/pool_tile_slab"
+ },
+ "type=double": {
+ "model": "otemod:block/pool_tile"
+ },
+ "type=top": {
+ "model": "otemod:block/pool_tile_slab_top"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/pool_tile_stairs.json b/src/generated/resources/assets/otemod/blockstates/pool_tile_stairs.json
new file mode 100644
index 0000000..1c3233f
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/pool_tile_stairs.json
@@ -0,0 +1,209 @@
+{
+ "variants": {
+ "facing=east,half=bottom,shape=inner_left": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=inner_right": {
+ "model": "otemod:block/pool_tile_stairs_inner"
+ },
+ "facing=east,half=bottom,shape=outer_left": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=outer_right": {
+ "model": "otemod:block/pool_tile_stairs_outer"
+ },
+ "facing=east,half=bottom,shape=straight": {
+ "model": "otemod:block/pool_tile_stairs"
+ },
+ "facing=east,half=top,shape=inner_left": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=inner_right": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=outer_left": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=outer_right": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=straight": {
+ "model": "otemod:block/pool_tile_stairs",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=bottom,shape=inner_left": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=inner_right": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=outer_left": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=outer_right": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=straight": {
+ "model": "otemod:block/pool_tile_stairs",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_left": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_right": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=outer_left": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=outer_right": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=straight": {
+ "model": "otemod:block/pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=south,half=bottom,shape=inner_left": {
+ "model": "otemod:block/pool_tile_stairs_inner"
+ },
+ "facing=south,half=bottom,shape=inner_right": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=outer_left": {
+ "model": "otemod:block/pool_tile_stairs_outer"
+ },
+ "facing=south,half=bottom,shape=outer_right": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=straight": {
+ "model": "otemod:block/pool_tile_stairs",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_left": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_right": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=outer_left": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=outer_right": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=straight": {
+ "model": "otemod:block/pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_left": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_right": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=outer_left": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=outer_right": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=straight": {
+ "model": "otemod:block/pool_tile_stairs",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_left": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_right": {
+ "model": "otemod:block/pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=outer_left": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=outer_right": {
+ "model": "otemod:block/pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=straight": {
+ "model": "otemod:block/pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/red_pool_light.json b/src/generated/resources/assets/otemod/blockstates/red_pool_light.json
new file mode 100644
index 0000000..9ddb15e
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/red_pool_light.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/red_pool_light"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/red_pool_tile.json b/src/generated/resources/assets/otemod/blockstates/red_pool_tile.json
new file mode 100644
index 0000000..c1c6504
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/red_pool_tile.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/red_pool_tile"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/red_pool_tile_slab.json b/src/generated/resources/assets/otemod/blockstates/red_pool_tile_slab.json
new file mode 100644
index 0000000..b532f17
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/red_pool_tile_slab.json
@@ -0,0 +1,13 @@
+{
+ "variants": {
+ "type=bottom": {
+ "model": "otemod:block/red_pool_tile_slab"
+ },
+ "type=double": {
+ "model": "otemod:block/red_pool_tile"
+ },
+ "type=top": {
+ "model": "otemod:block/red_pool_tile_slab_top"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/red_pool_tile_stairs.json b/src/generated/resources/assets/otemod/blockstates/red_pool_tile_stairs.json
new file mode 100644
index 0000000..07f55ea
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/red_pool_tile_stairs.json
@@ -0,0 +1,209 @@
+{
+ "variants": {
+ "facing=east,half=bottom,shape=inner_left": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=inner_right": {
+ "model": "otemod:block/red_pool_tile_stairs_inner"
+ },
+ "facing=east,half=bottom,shape=outer_left": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=east,half=bottom,shape=outer_right": {
+ "model": "otemod:block/red_pool_tile_stairs_outer"
+ },
+ "facing=east,half=bottom,shape=straight": {
+ "model": "otemod:block/red_pool_tile_stairs"
+ },
+ "facing=east,half=top,shape=inner_left": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=inner_right": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=outer_left": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=east,half=top,shape=outer_right": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=east,half=top,shape=straight": {
+ "model": "otemod:block/red_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=bottom,shape=inner_left": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=inner_right": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=outer_left": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=north,half=bottom,shape=outer_right": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=bottom,shape=straight": {
+ "model": "otemod:block/red_pool_tile_stairs",
+ "uvlock": true,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_left": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=inner_right": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=outer_left": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=north,half=top,shape=outer_right": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180
+ },
+ "facing=north,half=top,shape=straight": {
+ "model": "otemod:block/red_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=south,half=bottom,shape=inner_left": {
+ "model": "otemod:block/red_pool_tile_stairs_inner"
+ },
+ "facing=south,half=bottom,shape=inner_right": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=outer_left": {
+ "model": "otemod:block/red_pool_tile_stairs_outer"
+ },
+ "facing=south,half=bottom,shape=outer_right": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=bottom,shape=straight": {
+ "model": "otemod:block/red_pool_tile_stairs",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_left": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=inner_right": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=outer_left": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=south,half=top,shape=outer_right": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=south,half=top,shape=straight": {
+ "model": "otemod:block/red_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_left": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=inner_right": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=outer_left": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 90
+ },
+ "facing=west,half=bottom,shape=outer_right": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=bottom,shape=straight": {
+ "model": "otemod:block/red_pool_tile_stairs",
+ "uvlock": true,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_left": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=inner_right": {
+ "model": "otemod:block/red_pool_tile_stairs_inner",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=outer_left": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ },
+ "facing=west,half=top,shape=outer_right": {
+ "model": "otemod:block/red_pool_tile_stairs_outer",
+ "uvlock": true,
+ "x": 180,
+ "y": 270
+ },
+ "facing=west,half=top,shape=straight": {
+ "model": "otemod:block/red_pool_tile_stairs",
+ "uvlock": true,
+ "x": 180,
+ "y": 180
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/uncrafter.json b/src/generated/resources/assets/otemod/blockstates/uncrafter.json
new file mode 100644
index 0000000..adb8dcf
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/uncrafter.json
@@ -0,0 +1,19 @@
+{
+ "variants": {
+ "facing=east": {
+ "model": "otemod:block/uncrafter",
+ "y": 90
+ },
+ "facing=north": {
+ "model": "otemod:block/uncrafter"
+ },
+ "facing=south": {
+ "model": "otemod:block/uncrafter",
+ "y": 180
+ },
+ "facing=west": {
+ "model": "otemod:block/uncrafter",
+ "y": 270
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/blockstates/vault_steel_ore_block.json b/src/generated/resources/assets/otemod/blockstates/vault_steel_ore_block.json
new file mode 100644
index 0000000..0af1085
--- /dev/null
+++ b/src/generated/resources/assets/otemod/blockstates/vault_steel_ore_block.json
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "otemod:block/vault_steel_ore_block"
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/blue_pool_light.json b/src/generated/resources/assets/otemod/models/block/blue_pool_light.json
new file mode 100644
index 0000000..0d3203f
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/blue_pool_light.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/blue_pool_light"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/blue_pool_tile.json b/src/generated/resources/assets/otemod/models/block/blue_pool_tile.json
new file mode 100644
index 0000000..5fc8645
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/blue_pool_tile.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/blue_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/blue_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/block/blue_pool_tile_slab.json
new file mode 100644
index 0000000..16f61c0
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/blue_pool_tile_slab.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab",
+ "textures": {
+ "bottom": "otemod:block/blue_pool_tile",
+ "side": "otemod:block/blue_pool_tile",
+ "top": "otemod:block/blue_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/blue_pool_tile_slab_top.json b/src/generated/resources/assets/otemod/models/block/blue_pool_tile_slab_top.json
new file mode 100644
index 0000000..2bcc6e1
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/blue_pool_tile_slab_top.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab_top",
+ "textures": {
+ "bottom": "otemod:block/blue_pool_tile",
+ "side": "otemod:block/blue_pool_tile",
+ "top": "otemod:block/blue_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/blue_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/block/blue_pool_tile_stairs.json
new file mode 100644
index 0000000..7f053c7
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/blue_pool_tile_stairs.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/stairs",
+ "textures": {
+ "bottom": "otemod:block/blue_pool_tile",
+ "side": "otemod:block/blue_pool_tile",
+ "top": "otemod:block/blue_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/blue_pool_tile_stairs_inner.json b/src/generated/resources/assets/otemod/models/block/blue_pool_tile_stairs_inner.json
new file mode 100644
index 0000000..c809b25
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/blue_pool_tile_stairs_inner.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/inner_stairs",
+ "textures": {
+ "bottom": "otemod:block/blue_pool_tile",
+ "side": "otemod:block/blue_pool_tile",
+ "top": "otemod:block/blue_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/blue_pool_tile_stairs_outer.json b/src/generated/resources/assets/otemod/models/block/blue_pool_tile_stairs_outer.json
new file mode 100644
index 0000000..77e625b
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/blue_pool_tile_stairs_outer.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/outer_stairs",
+ "textures": {
+ "bottom": "otemod:block/blue_pool_tile",
+ "side": "otemod:block/blue_pool_tile",
+ "top": "otemod:block/blue_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/compressed_obsidian_block.json b/src/generated/resources/assets/otemod/models/block/compressed_obsidian_block.json
new file mode 100644
index 0000000..2cf19c9
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/compressed_obsidian_block.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/compressed_obsidian_block"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dark_pool_light.json b/src/generated/resources/assets/otemod/models/block/dark_pool_light.json
new file mode 100644
index 0000000..522efee
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dark_pool_light.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/dark_pool_light"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dark_pool_tile.json b/src/generated/resources/assets/otemod/models/block/dark_pool_tile.json
new file mode 100644
index 0000000..7b04852
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dark_pool_tile.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/dark_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dark_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/block/dark_pool_tile_slab.json
new file mode 100644
index 0000000..6dc99a4
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dark_pool_tile_slab.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab",
+ "textures": {
+ "bottom": "otemod:block/dark_pool_tile",
+ "side": "otemod:block/dark_pool_tile",
+ "top": "otemod:block/dark_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dark_pool_tile_slab_top.json b/src/generated/resources/assets/otemod/models/block/dark_pool_tile_slab_top.json
new file mode 100644
index 0000000..8bb856c
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dark_pool_tile_slab_top.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab_top",
+ "textures": {
+ "bottom": "otemod:block/dark_pool_tile",
+ "side": "otemod:block/dark_pool_tile",
+ "top": "otemod:block/dark_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dark_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/block/dark_pool_tile_stairs.json
new file mode 100644
index 0000000..4975331
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dark_pool_tile_stairs.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/stairs",
+ "textures": {
+ "bottom": "otemod:block/dark_pool_tile",
+ "side": "otemod:block/dark_pool_tile",
+ "top": "otemod:block/dark_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dark_pool_tile_stairs_inner.json b/src/generated/resources/assets/otemod/models/block/dark_pool_tile_stairs_inner.json
new file mode 100644
index 0000000..a967c30
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dark_pool_tile_stairs_inner.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/inner_stairs",
+ "textures": {
+ "bottom": "otemod:block/dark_pool_tile",
+ "side": "otemod:block/dark_pool_tile",
+ "top": "otemod:block/dark_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dark_pool_tile_stairs_outer.json b/src/generated/resources/assets/otemod/models/block/dark_pool_tile_stairs_outer.json
new file mode 100644
index 0000000..3e3d28f
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dark_pool_tile_stairs_outer.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/outer_stairs",
+ "textures": {
+ "bottom": "otemod:block/dark_pool_tile",
+ "side": "otemod:block/dark_pool_tile",
+ "top": "otemod:block/dark_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dark_red_carpet.json b/src/generated/resources/assets/otemod/models/block/dark_red_carpet.json
new file mode 100644
index 0000000..d16b3d9
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dark_red_carpet.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/carpet",
+ "textures": {
+ "wool": "otemod:block/dark_red_wool"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dark_red_wool.json b/src/generated/resources/assets/otemod/models/block/dark_red_wool.json
new file mode 100644
index 0000000..68e72aa
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dark_red_wool.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/dark_red_wool"
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/otemod/models/block/deepslate_eternium_ore_block.json b/src/generated/resources/assets/otemod/models/block/deepslate_eternium_ore_block.json
similarity index 65%
rename from src/main/resources/assets/otemod/models/block/deepslate_eternium_ore_block.json
rename to src/generated/resources/assets/otemod/models/block/deepslate_eternium_ore_block.json
index 60fd21c..2fc713b 100644
--- a/src/main/resources/assets/otemod/models/block/deepslate_eternium_ore_block.json
+++ b/src/generated/resources/assets/otemod/models/block/deepslate_eternium_ore_block.json
@@ -1,6 +1,6 @@
{
- "parent": "block/cube_all",
+ "parent": "minecraft:block/cube_all",
"textures": {
"all": "otemod:block/deepslate_eternium_ore_block"
}
-}
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_light.json b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_light.json
new file mode 100644
index 0000000..baac6a5
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_light.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/dirty_blue_pool_light"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile.json b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile.json
new file mode 100644
index 0000000..6460b17
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/dirty_blue_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_slab.json
new file mode 100644
index 0000000..570d22f
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_slab.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab",
+ "textures": {
+ "bottom": "otemod:block/dirty_blue_pool_tile",
+ "side": "otemod:block/dirty_blue_pool_tile",
+ "top": "otemod:block/dirty_blue_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_slab_top.json b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_slab_top.json
new file mode 100644
index 0000000..9d95a5e
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_slab_top.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab_top",
+ "textures": {
+ "bottom": "otemod:block/dirty_blue_pool_tile",
+ "side": "otemod:block/dirty_blue_pool_tile",
+ "top": "otemod:block/dirty_blue_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_stairs.json
new file mode 100644
index 0000000..1cd1b8f
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_stairs.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/stairs",
+ "textures": {
+ "bottom": "otemod:block/dirty_blue_pool_tile",
+ "side": "otemod:block/dirty_blue_pool_tile",
+ "top": "otemod:block/dirty_blue_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_stairs_inner.json b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_stairs_inner.json
new file mode 100644
index 0000000..55f0a4e
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_stairs_inner.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/inner_stairs",
+ "textures": {
+ "bottom": "otemod:block/dirty_blue_pool_tile",
+ "side": "otemod:block/dirty_blue_pool_tile",
+ "top": "otemod:block/dirty_blue_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_stairs_outer.json b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_stairs_outer.json
new file mode 100644
index 0000000..3f4b2d7
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_blue_pool_tile_stairs_outer.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/outer_stairs",
+ "textures": {
+ "bottom": "otemod:block/dirty_blue_pool_tile",
+ "side": "otemod:block/dirty_blue_pool_tile",
+ "top": "otemod:block/dirty_blue_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_green_pool_light.json b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_light.json
new file mode 100644
index 0000000..fc0f9df
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_light.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/dirty_green_pool_light"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile.json b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile.json
new file mode 100644
index 0000000..4c151c2
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/dirty_green_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_slab.json
new file mode 100644
index 0000000..f6dad9f
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_slab.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab",
+ "textures": {
+ "bottom": "otemod:block/dirty_green_pool_tile",
+ "side": "otemod:block/dirty_green_pool_tile",
+ "top": "otemod:block/dirty_green_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_slab_top.json b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_slab_top.json
new file mode 100644
index 0000000..69dbf70
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_slab_top.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab_top",
+ "textures": {
+ "bottom": "otemod:block/dirty_green_pool_tile",
+ "side": "otemod:block/dirty_green_pool_tile",
+ "top": "otemod:block/dirty_green_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_stairs.json
new file mode 100644
index 0000000..f99cfd2
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_stairs.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/stairs",
+ "textures": {
+ "bottom": "otemod:block/dirty_green_pool_tile",
+ "side": "otemod:block/dirty_green_pool_tile",
+ "top": "otemod:block/dirty_green_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_stairs_inner.json b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_stairs_inner.json
new file mode 100644
index 0000000..10ee6d8
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_stairs_inner.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/inner_stairs",
+ "textures": {
+ "bottom": "otemod:block/dirty_green_pool_tile",
+ "side": "otemod:block/dirty_green_pool_tile",
+ "top": "otemod:block/dirty_green_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_stairs_outer.json b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_stairs_outer.json
new file mode 100644
index 0000000..19f648d
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_green_pool_tile_stairs_outer.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/outer_stairs",
+ "textures": {
+ "bottom": "otemod:block/dirty_green_pool_tile",
+ "side": "otemod:block/dirty_green_pool_tile",
+ "top": "otemod:block/dirty_green_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_pool_light.json b/src/generated/resources/assets/otemod/models/block/dirty_pool_light.json
new file mode 100644
index 0000000..d1df817
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_pool_light.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/dirty_pool_light"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_pool_tile.json b/src/generated/resources/assets/otemod/models/block/dirty_pool_tile.json
new file mode 100644
index 0000000..769c026
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_pool_tile.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/dirty_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_slab.json
new file mode 100644
index 0000000..0273ab7
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_slab.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab",
+ "textures": {
+ "bottom": "otemod:block/dirty_pool_tile",
+ "side": "otemod:block/dirty_pool_tile",
+ "top": "otemod:block/dirty_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_slab_top.json b/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_slab_top.json
new file mode 100644
index 0000000..7785114
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_slab_top.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab_top",
+ "textures": {
+ "bottom": "otemod:block/dirty_pool_tile",
+ "side": "otemod:block/dirty_pool_tile",
+ "top": "otemod:block/dirty_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_stairs.json
new file mode 100644
index 0000000..69715ce
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_stairs.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/stairs",
+ "textures": {
+ "bottom": "otemod:block/dirty_pool_tile",
+ "side": "otemod:block/dirty_pool_tile",
+ "top": "otemod:block/dirty_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_stairs_inner.json b/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_stairs_inner.json
new file mode 100644
index 0000000..681c5e9
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_stairs_inner.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/inner_stairs",
+ "textures": {
+ "bottom": "otemod:block/dirty_pool_tile",
+ "side": "otemod:block/dirty_pool_tile",
+ "top": "otemod:block/dirty_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_stairs_outer.json b/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_stairs_outer.json
new file mode 100644
index 0000000..dc16585
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_pool_tile_stairs_outer.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/outer_stairs",
+ "textures": {
+ "bottom": "otemod:block/dirty_pool_tile",
+ "side": "otemod:block/dirty_pool_tile",
+ "top": "otemod:block/dirty_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_red_pool_light.json b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_light.json
new file mode 100644
index 0000000..449b730
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_light.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/dirty_red_pool_light"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile.json b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile.json
new file mode 100644
index 0000000..faeb123
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/dirty_red_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_slab.json
new file mode 100644
index 0000000..dcefb67
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_slab.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab",
+ "textures": {
+ "bottom": "otemod:block/dirty_red_pool_tile",
+ "side": "otemod:block/dirty_red_pool_tile",
+ "top": "otemod:block/dirty_red_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_slab_top.json b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_slab_top.json
new file mode 100644
index 0000000..9414481
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_slab_top.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab_top",
+ "textures": {
+ "bottom": "otemod:block/dirty_red_pool_tile",
+ "side": "otemod:block/dirty_red_pool_tile",
+ "top": "otemod:block/dirty_red_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_stairs.json
new file mode 100644
index 0000000..7a0cb82
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_stairs.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/stairs",
+ "textures": {
+ "bottom": "otemod:block/dirty_red_pool_tile",
+ "side": "otemod:block/dirty_red_pool_tile",
+ "top": "otemod:block/dirty_red_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_stairs_inner.json b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_stairs_inner.json
new file mode 100644
index 0000000..6bf220f
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_stairs_inner.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/inner_stairs",
+ "textures": {
+ "bottom": "otemod:block/dirty_red_pool_tile",
+ "side": "otemod:block/dirty_red_pool_tile",
+ "top": "otemod:block/dirty_red_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_stairs_outer.json b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_stairs_outer.json
new file mode 100644
index 0000000..b8d02bf
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/dirty_red_pool_tile_stairs_outer.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/outer_stairs",
+ "textures": {
+ "bottom": "otemod:block/dirty_red_pool_tile",
+ "side": "otemod:block/dirty_red_pool_tile",
+ "top": "otemod:block/dirty_red_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/eternium_block.json b/src/generated/resources/assets/otemod/models/block/eternium_block.json
new file mode 100644
index 0000000..8b6a3f0
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/eternium_block.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/eternium_block"
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/otemod/models/block/eternium_ore_block.json b/src/generated/resources/assets/otemod/models/block/eternium_ore_block.json
similarity index 62%
rename from src/main/resources/assets/otemod/models/block/eternium_ore_block.json
rename to src/generated/resources/assets/otemod/models/block/eternium_ore_block.json
index ac2cf9b..71ceb72 100644
--- a/src/main/resources/assets/otemod/models/block/eternium_ore_block.json
+++ b/src/generated/resources/assets/otemod/models/block/eternium_ore_block.json
@@ -1,6 +1,6 @@
{
- "parent": "block/cube_all",
+ "parent": "minecraft:block/cube_all",
"textures": {
"all": "otemod:block/eternium_ore_block"
}
-}
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/filthy_blue_pool_light.json b/src/generated/resources/assets/otemod/models/block/filthy_blue_pool_light.json
new file mode 100644
index 0000000..e7353f9
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/filthy_blue_pool_light.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/filthy_blue_pool_light"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/filthy_green_pool_light.json b/src/generated/resources/assets/otemod/models/block/filthy_green_pool_light.json
new file mode 100644
index 0000000..6fd8e2f
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/filthy_green_pool_light.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/filthy_green_pool_light"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/filthy_pool_light.json b/src/generated/resources/assets/otemod/models/block/filthy_pool_light.json
new file mode 100644
index 0000000..4e88189
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/filthy_pool_light.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/filthy_pool_light"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/filthy_red_pool_light.json b/src/generated/resources/assets/otemod/models/block/filthy_red_pool_light.json
new file mode 100644
index 0000000..1e44e8a
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/filthy_red_pool_light.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/filthy_red_pool_light"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/green_pool_light.json b/src/generated/resources/assets/otemod/models/block/green_pool_light.json
new file mode 100644
index 0000000..18bff4d
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/green_pool_light.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/green_pool_light"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/green_pool_tile.json b/src/generated/resources/assets/otemod/models/block/green_pool_tile.json
new file mode 100644
index 0000000..cef5b93
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/green_pool_tile.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/green_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/green_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/block/green_pool_tile_slab.json
new file mode 100644
index 0000000..c126c67
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/green_pool_tile_slab.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab",
+ "textures": {
+ "bottom": "otemod:block/green_pool_tile",
+ "side": "otemod:block/green_pool_tile",
+ "top": "otemod:block/green_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/green_pool_tile_slab_top.json b/src/generated/resources/assets/otemod/models/block/green_pool_tile_slab_top.json
new file mode 100644
index 0000000..8fa11d1
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/green_pool_tile_slab_top.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab_top",
+ "textures": {
+ "bottom": "otemod:block/green_pool_tile",
+ "side": "otemod:block/green_pool_tile",
+ "top": "otemod:block/green_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/green_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/block/green_pool_tile_stairs.json
new file mode 100644
index 0000000..389d97f
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/green_pool_tile_stairs.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/stairs",
+ "textures": {
+ "bottom": "otemod:block/green_pool_tile",
+ "side": "otemod:block/green_pool_tile",
+ "top": "otemod:block/green_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/green_pool_tile_stairs_inner.json b/src/generated/resources/assets/otemod/models/block/green_pool_tile_stairs_inner.json
new file mode 100644
index 0000000..8c25c14
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/green_pool_tile_stairs_inner.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/inner_stairs",
+ "textures": {
+ "bottom": "otemod:block/green_pool_tile",
+ "side": "otemod:block/green_pool_tile",
+ "top": "otemod:block/green_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/green_pool_tile_stairs_outer.json b/src/generated/resources/assets/otemod/models/block/green_pool_tile_stairs_outer.json
new file mode 100644
index 0000000..a171a27
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/green_pool_tile_stairs_outer.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/outer_stairs",
+ "textures": {
+ "bottom": "otemod:block/green_pool_tile",
+ "side": "otemod:block/green_pool_tile",
+ "top": "otemod:block/green_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/layered_compressed_obsidian_block.json b/src/generated/resources/assets/otemod/models/block/layered_compressed_obsidian_block.json
new file mode 100644
index 0000000..301c4b9
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/layered_compressed_obsidian_block.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/layered_compressed_obsidian_block"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/nether_vault_steel_ore_block.json b/src/generated/resources/assets/otemod/models/block/nether_vault_steel_ore_block.json
new file mode 100644
index 0000000..d7a7250
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/nether_vault_steel_ore_block.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/nether_vault_steel_ore_block"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/pool_light.json b/src/generated/resources/assets/otemod/models/block/pool_light.json
new file mode 100644
index 0000000..23e999f
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/pool_light.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/pool_light"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/pool_tile.json b/src/generated/resources/assets/otemod/models/block/pool_tile.json
new file mode 100644
index 0000000..bd07edc
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/pool_tile.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/pool_tile_slab.json b/src/generated/resources/assets/otemod/models/block/pool_tile_slab.json
new file mode 100644
index 0000000..69a073b
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/pool_tile_slab.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab",
+ "textures": {
+ "bottom": "otemod:block/pool_tile",
+ "side": "otemod:block/pool_tile",
+ "top": "otemod:block/pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/pool_tile_slab_top.json b/src/generated/resources/assets/otemod/models/block/pool_tile_slab_top.json
new file mode 100644
index 0000000..fc6a3c2
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/pool_tile_slab_top.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab_top",
+ "textures": {
+ "bottom": "otemod:block/pool_tile",
+ "side": "otemod:block/pool_tile",
+ "top": "otemod:block/pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/block/pool_tile_stairs.json
new file mode 100644
index 0000000..7c09d07
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/pool_tile_stairs.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/stairs",
+ "textures": {
+ "bottom": "otemod:block/pool_tile",
+ "side": "otemod:block/pool_tile",
+ "top": "otemod:block/pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/pool_tile_stairs_inner.json b/src/generated/resources/assets/otemod/models/block/pool_tile_stairs_inner.json
new file mode 100644
index 0000000..11e341b
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/pool_tile_stairs_inner.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/inner_stairs",
+ "textures": {
+ "bottom": "otemod:block/pool_tile",
+ "side": "otemod:block/pool_tile",
+ "top": "otemod:block/pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/pool_tile_stairs_outer.json b/src/generated/resources/assets/otemod/models/block/pool_tile_stairs_outer.json
new file mode 100644
index 0000000..c450868
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/pool_tile_stairs_outer.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/outer_stairs",
+ "textures": {
+ "bottom": "otemod:block/pool_tile",
+ "side": "otemod:block/pool_tile",
+ "top": "otemod:block/pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/red_pool_light.json b/src/generated/resources/assets/otemod/models/block/red_pool_light.json
new file mode 100644
index 0000000..18e6c30
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/red_pool_light.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/red_pool_light"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/red_pool_tile.json b/src/generated/resources/assets/otemod/models/block/red_pool_tile.json
new file mode 100644
index 0000000..e09bffc
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/red_pool_tile.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/red_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/red_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/block/red_pool_tile_slab.json
new file mode 100644
index 0000000..7099f7a
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/red_pool_tile_slab.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab",
+ "textures": {
+ "bottom": "otemod:block/red_pool_tile",
+ "side": "otemod:block/red_pool_tile",
+ "top": "otemod:block/red_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/red_pool_tile_slab_top.json b/src/generated/resources/assets/otemod/models/block/red_pool_tile_slab_top.json
new file mode 100644
index 0000000..eb91d38
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/red_pool_tile_slab_top.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/slab_top",
+ "textures": {
+ "bottom": "otemod:block/red_pool_tile",
+ "side": "otemod:block/red_pool_tile",
+ "top": "otemod:block/red_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/red_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/block/red_pool_tile_stairs.json
new file mode 100644
index 0000000..94aa233
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/red_pool_tile_stairs.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/stairs",
+ "textures": {
+ "bottom": "otemod:block/red_pool_tile",
+ "side": "otemod:block/red_pool_tile",
+ "top": "otemod:block/red_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/red_pool_tile_stairs_inner.json b/src/generated/resources/assets/otemod/models/block/red_pool_tile_stairs_inner.json
new file mode 100644
index 0000000..c83f2dd
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/red_pool_tile_stairs_inner.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/inner_stairs",
+ "textures": {
+ "bottom": "otemod:block/red_pool_tile",
+ "side": "otemod:block/red_pool_tile",
+ "top": "otemod:block/red_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/red_pool_tile_stairs_outer.json b/src/generated/resources/assets/otemod/models/block/red_pool_tile_stairs_outer.json
new file mode 100644
index 0000000..38e50c2
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/red_pool_tile_stairs_outer.json
@@ -0,0 +1,8 @@
+{
+ "parent": "minecraft:block/outer_stairs",
+ "textures": {
+ "bottom": "otemod:block/red_pool_tile",
+ "side": "otemod:block/red_pool_tile",
+ "top": "otemod:block/red_pool_tile"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/uncrafter.json b/src/generated/resources/assets/otemod/models/block/uncrafter.json
new file mode 100644
index 0000000..2cc6cce
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/uncrafter.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/custommodel/uncrafter"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/block/vault_steel_ore_block.json b/src/generated/resources/assets/otemod/models/block/vault_steel_ore_block.json
new file mode 100644
index 0000000..f1dbf81
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/block/vault_steel_ore_block.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "otemod:block/vault_steel_ore_block"
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/otemod/models/item/aurora_door.json b/src/generated/resources/assets/otemod/models/item/aurora_compound.json
similarity index 59%
rename from src/main/resources/assets/otemod/models/item/aurora_door.json
rename to src/generated/resources/assets/otemod/models/item/aurora_compound.json
index 7c36c37..a42be90 100644
--- a/src/main/resources/assets/otemod/models/item/aurora_door.json
+++ b/src/generated/resources/assets/otemod/models/item/aurora_compound.json
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
- "layer0": "otemod:item/aurora_door"
+ "layer0": "otemod:item/deprecated"
}
-}
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/blue_brick.json b/src/generated/resources/assets/otemod/models/item/blue_brick.json
new file mode 100644
index 0000000..e1ce0fb
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/blue_brick.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/blue_brick"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/blue_pool_light.json b/src/generated/resources/assets/otemod/models/item/blue_pool_light.json
new file mode 100644
index 0000000..4272c1e
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/blue_pool_light.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/blue_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/blue_pool_tile.json b/src/generated/resources/assets/otemod/models/item/blue_pool_tile.json
new file mode 100644
index 0000000..cb0dcec
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/blue_pool_tile.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/blue_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/blue_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/item/blue_pool_tile_slab.json
new file mode 100644
index 0000000..39d5eea
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/blue_pool_tile_slab.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/blue_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/blue_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/item/blue_pool_tile_stairs.json
new file mode 100644
index 0000000..9223baa
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/blue_pool_tile_stairs.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/blue_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/compressed_obsidian_block.json b/src/generated/resources/assets/otemod/models/item/compressed_obsidian_block.json
new file mode 100644
index 0000000..e393283
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/compressed_obsidian_block.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/compressed_obsidian_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/compressed_obsidian_sheet.json b/src/generated/resources/assets/otemod/models/item/compressed_obsidian_sheet.json
new file mode 100644
index 0000000..5ddc7eb
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/compressed_obsidian_sheet.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/compressed_obsidian_sheet"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/cyan_brick.json b/src/generated/resources/assets/otemod/models/item/cyan_brick.json
new file mode 100644
index 0000000..9ffc29a
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/cyan_brick.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/cyan_brick"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dark_pool_light.json b/src/generated/resources/assets/otemod/models/item/dark_pool_light.json
new file mode 100644
index 0000000..3ea2c12
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dark_pool_light.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dark_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dark_pool_tile.json b/src/generated/resources/assets/otemod/models/item/dark_pool_tile.json
new file mode 100644
index 0000000..65f1f63
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dark_pool_tile.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dark_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dark_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/item/dark_pool_tile_slab.json
new file mode 100644
index 0000000..64ee037
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dark_pool_tile_slab.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dark_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dark_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/item/dark_pool_tile_stairs.json
new file mode 100644
index 0000000..b0f6a9d
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dark_pool_tile_stairs.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dark_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dark_red_brick.json b/src/generated/resources/assets/otemod/models/item/dark_red_brick.json
new file mode 100644
index 0000000..4d4b342
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dark_red_brick.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/dark_red_brick"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dark_red_carpet.json b/src/generated/resources/assets/otemod/models/item/dark_red_carpet.json
new file mode 100644
index 0000000..df83b24
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dark_red_carpet.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dark_red_carpet"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dark_red_dye.json b/src/generated/resources/assets/otemod/models/item/dark_red_dye.json
new file mode 100644
index 0000000..c23d9da
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dark_red_dye.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/dark_red_dye"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dark_red_wool.json b/src/generated/resources/assets/otemod/models/item/dark_red_wool.json
new file mode 100644
index 0000000..8404438
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dark_red_wool.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dark_red_wool"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/otemod/models/item/deepslate_eternium_ore_block.json b/src/generated/resources/assets/otemod/models/item/deepslate_eternium_ore_block.json
similarity index 100%
rename from src/main/resources/assets/otemod/models/item/deepslate_eternium_ore_block.json
rename to src/generated/resources/assets/otemod/models/item/deepslate_eternium_ore_block.json
diff --git a/src/generated/resources/assets/otemod/models/item/deprecated.json b/src/generated/resources/assets/otemod/models/item/deprecated.json
new file mode 100644
index 0000000..a42be90
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/deprecated.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/deprecated"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_blue_pool_light.json b/src/generated/resources/assets/otemod/models/item/dirty_blue_pool_light.json
new file mode 100644
index 0000000..48e06c5
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_blue_pool_light.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_blue_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_blue_pool_tile.json b/src/generated/resources/assets/otemod/models/item/dirty_blue_pool_tile.json
new file mode 100644
index 0000000..036bbc7
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_blue_pool_tile.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_blue_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_blue_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/item/dirty_blue_pool_tile_slab.json
new file mode 100644
index 0000000..f9e42c2
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_blue_pool_tile_slab.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_blue_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_blue_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/item/dirty_blue_pool_tile_stairs.json
new file mode 100644
index 0000000..744bcc4
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_blue_pool_tile_stairs.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_blue_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_green_pool_light.json b/src/generated/resources/assets/otemod/models/item/dirty_green_pool_light.json
new file mode 100644
index 0000000..992b5e9
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_green_pool_light.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_green_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_green_pool_tile.json b/src/generated/resources/assets/otemod/models/item/dirty_green_pool_tile.json
new file mode 100644
index 0000000..bbe9e89
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_green_pool_tile.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_green_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_green_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/item/dirty_green_pool_tile_slab.json
new file mode 100644
index 0000000..e7a0665
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_green_pool_tile_slab.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_green_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_green_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/item/dirty_green_pool_tile_stairs.json
new file mode 100644
index 0000000..53fce39
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_green_pool_tile_stairs.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_green_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_pool_light.json b/src/generated/resources/assets/otemod/models/item/dirty_pool_light.json
new file mode 100644
index 0000000..02789d7
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_pool_light.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_pool_tile.json b/src/generated/resources/assets/otemod/models/item/dirty_pool_tile.json
new file mode 100644
index 0000000..b97c599
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_pool_tile.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/item/dirty_pool_tile_slab.json
new file mode 100644
index 0000000..4fb33aa
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_pool_tile_slab.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/item/dirty_pool_tile_stairs.json
new file mode 100644
index 0000000..0e1babc
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_pool_tile_stairs.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_red_pool_light.json b/src/generated/resources/assets/otemod/models/item/dirty_red_pool_light.json
new file mode 100644
index 0000000..7af0bfb
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_red_pool_light.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_red_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_red_pool_tile.json b/src/generated/resources/assets/otemod/models/item/dirty_red_pool_tile.json
new file mode 100644
index 0000000..31ac54e
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_red_pool_tile.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_red_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_red_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/item/dirty_red_pool_tile_slab.json
new file mode 100644
index 0000000..53f72ad
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_red_pool_tile_slab.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_red_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/dirty_red_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/item/dirty_red_pool_tile_stairs.json
new file mode 100644
index 0000000..b9cc523
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/dirty_red_pool_tile_stairs.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/dirty_red_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/empty_spawn_egg.json b/src/generated/resources/assets/otemod/models/item/empty_spawn_egg.json
new file mode 100644
index 0000000..595836c
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/empty_spawn_egg.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/empty_spawn_egg"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/encased_singularity.json b/src/generated/resources/assets/otemod/models/item/encased_singularity.json
new file mode 100644
index 0000000..0b13c55
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/encased_singularity.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/encased_singularity"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/eternium_block.json b/src/generated/resources/assets/otemod/models/item/eternium_block.json
new file mode 100644
index 0000000..a6a40b5
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/eternium_block.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/eternium_block"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/otemod/models/item/eternium_fragment.json b/src/generated/resources/assets/otemod/models/item/eternium_fragment.json
similarity index 62%
rename from src/main/resources/assets/otemod/models/item/eternium_fragment.json
rename to src/generated/resources/assets/otemod/models/item/eternium_fragment.json
index 38bc7d2..c1ecdd2 100644
--- a/src/main/resources/assets/otemod/models/item/eternium_fragment.json
+++ b/src/generated/resources/assets/otemod/models/item/eternium_fragment.json
@@ -1,6 +1,6 @@
{
- "parent": "item/generated",
+ "parent": "minecraft:item/generated",
"textures": {
"layer0": "otemod:item/eternium_fragment"
}
-}
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/eternium_ingot.json b/src/generated/resources/assets/otemod/models/item/eternium_ingot.json
new file mode 100644
index 0000000..6e574bb
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/eternium_ingot.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/eternium_ingot"
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/otemod/models/item/eternium_ore.json b/src/generated/resources/assets/otemod/models/item/eternium_ore.json
similarity index 60%
rename from src/main/resources/assets/otemod/models/item/eternium_ore.json
rename to src/generated/resources/assets/otemod/models/item/eternium_ore.json
index 09a92be..5b611e7 100644
--- a/src/main/resources/assets/otemod/models/item/eternium_ore.json
+++ b/src/generated/resources/assets/otemod/models/item/eternium_ore.json
@@ -1,6 +1,6 @@
{
- "parent": "item/generated",
+ "parent": "minecraft:item/generated",
"textures": {
"layer0": "otemod:item/eternium_ore"
}
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/otemod/models/item/eternium_ore_block.json b/src/generated/resources/assets/otemod/models/item/eternium_ore_block.json
similarity index 100%
rename from src/main/resources/assets/otemod/models/item/eternium_ore_block.json
rename to src/generated/resources/assets/otemod/models/item/eternium_ore_block.json
diff --git a/src/generated/resources/assets/otemod/models/item/eternium_rod.json b/src/generated/resources/assets/otemod/models/item/eternium_rod.json
new file mode 100644
index 0000000..d0e47a3
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/eternium_rod.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/eternium_rod"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/filthy_blue_pool_light.json b/src/generated/resources/assets/otemod/models/item/filthy_blue_pool_light.json
new file mode 100644
index 0000000..df23514
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/filthy_blue_pool_light.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/filthy_blue_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/filthy_green_pool_light.json b/src/generated/resources/assets/otemod/models/item/filthy_green_pool_light.json
new file mode 100644
index 0000000..07e9f82
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/filthy_green_pool_light.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/filthy_green_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/filthy_pool_light.json b/src/generated/resources/assets/otemod/models/item/filthy_pool_light.json
new file mode 100644
index 0000000..1a8ed2a
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/filthy_pool_light.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/filthy_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/filthy_red_pool_light.json b/src/generated/resources/assets/otemod/models/item/filthy_red_pool_light.json
new file mode 100644
index 0000000..e6e9b7e
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/filthy_red_pool_light.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/filthy_red_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/green_brick.json b/src/generated/resources/assets/otemod/models/item/green_brick.json
new file mode 100644
index 0000000..9f518cf
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/green_brick.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/green_brick"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/green_pool_light.json b/src/generated/resources/assets/otemod/models/item/green_pool_light.json
new file mode 100644
index 0000000..ab00714
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/green_pool_light.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/green_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/green_pool_tile.json b/src/generated/resources/assets/otemod/models/item/green_pool_tile.json
new file mode 100644
index 0000000..6d01da7
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/green_pool_tile.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/green_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/green_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/item/green_pool_tile_slab.json
new file mode 100644
index 0000000..6950e37
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/green_pool_tile_slab.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/green_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/green_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/item/green_pool_tile_stairs.json
new file mode 100644
index 0000000..506609c
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/green_pool_tile_stairs.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/green_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/otemod/models/item/ihan_crystal.json b/src/generated/resources/assets/otemod/models/item/ihan_crystal.json
similarity index 60%
rename from src/main/resources/assets/otemod/models/item/ihan_crystal.json
rename to src/generated/resources/assets/otemod/models/item/ihan_crystal.json
index 7072ee4..2671058 100644
--- a/src/main/resources/assets/otemod/models/item/ihan_crystal.json
+++ b/src/generated/resources/assets/otemod/models/item/ihan_crystal.json
@@ -1,6 +1,6 @@
{
- "parent": "item/generated",
+ "parent": "minecraft:item/generated",
"textures": {
"layer0": "otemod:item/ihan_crystal"
}
-}
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/ilusium_ingot.json b/src/generated/resources/assets/otemod/models/item/ilusium_ingot.json
new file mode 100644
index 0000000..a42be90
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/ilusium_ingot.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/deprecated"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/ilusium_ore.json b/src/generated/resources/assets/otemod/models/item/ilusium_ore.json
new file mode 100644
index 0000000..a42be90
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/ilusium_ore.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/deprecated"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/ilusium_rod.json b/src/generated/resources/assets/otemod/models/item/ilusium_rod.json
new file mode 100644
index 0000000..a42be90
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/ilusium_rod.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/deprecated"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/layered_compressed_obsidian_block.json b/src/generated/resources/assets/otemod/models/item/layered_compressed_obsidian_block.json
new file mode 100644
index 0000000..52dec24
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/layered_compressed_obsidian_block.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/layered_compressed_obsidian_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/layered_compressed_obsidian_sheet.json b/src/generated/resources/assets/otemod/models/item/layered_compressed_obsidian_sheet.json
new file mode 100644
index 0000000..6f6e738
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/layered_compressed_obsidian_sheet.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/layered_compressed_obsidian_sheet"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/light_blue_brick.json b/src/generated/resources/assets/otemod/models/item/light_blue_brick.json
new file mode 100644
index 0000000..6b4cd1a
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/light_blue_brick.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/light_blue_brick"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/lime_brick.json b/src/generated/resources/assets/otemod/models/item/lime_brick.json
new file mode 100644
index 0000000..31d5e98
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/lime_brick.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/lime_brick"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/melted_ender_pearl.json b/src/generated/resources/assets/otemod/models/item/melted_ender_pearl.json
new file mode 100644
index 0000000..95e85df
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/melted_ender_pearl.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/melted_ender_pearl"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/mob_capture_ball.json b/src/generated/resources/assets/otemod/models/item/mob_capture_ball.json
new file mode 100644
index 0000000..7b0103c
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/mob_capture_ball.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/mob_capture_ball"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/nether_vault_steel_ore_block.json b/src/generated/resources/assets/otemod/models/item/nether_vault_steel_ore_block.json
new file mode 100644
index 0000000..0793a20
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/nether_vault_steel_ore_block.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/nether_vault_steel_ore_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/partial_item.json b/src/generated/resources/assets/otemod/models/item/partial_item.json
new file mode 100644
index 0000000..f889bf3
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/partial_item.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/partial_item"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/pool_light.json b/src/generated/resources/assets/otemod/models/item/pool_light.json
new file mode 100644
index 0000000..50e76aa
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/pool_light.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/pool_tile.json b/src/generated/resources/assets/otemod/models/item/pool_tile.json
new file mode 100644
index 0000000..c9ed58b
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/pool_tile.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/pool_tile_slab.json b/src/generated/resources/assets/otemod/models/item/pool_tile_slab.json
new file mode 100644
index 0000000..907feb6
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/pool_tile_slab.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/item/pool_tile_stairs.json
new file mode 100644
index 0000000..b64d1c5
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/pool_tile_stairs.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/poss_ball.json b/src/generated/resources/assets/otemod/models/item/poss_ball.json
new file mode 100644
index 0000000..a42be90
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/poss_ball.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/deprecated"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/raw_vault_steel_ore.json b/src/generated/resources/assets/otemod/models/item/raw_vault_steel_ore.json
new file mode 100644
index 0000000..d99901a
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/raw_vault_steel_ore.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/raw_vault_steel_ore"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/red_brick.json b/src/generated/resources/assets/otemod/models/item/red_brick.json
new file mode 100644
index 0000000..84a81cf
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/red_brick.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/red_brick"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/red_pool_light.json b/src/generated/resources/assets/otemod/models/item/red_pool_light.json
new file mode 100644
index 0000000..0d546d8
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/red_pool_light.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/red_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/red_pool_tile.json b/src/generated/resources/assets/otemod/models/item/red_pool_tile.json
new file mode 100644
index 0000000..4c48ba8
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/red_pool_tile.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/red_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/red_pool_tile_slab.json b/src/generated/resources/assets/otemod/models/item/red_pool_tile_slab.json
new file mode 100644
index 0000000..1d81e6e
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/red_pool_tile_slab.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/red_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/red_pool_tile_stairs.json b/src/generated/resources/assets/otemod/models/item/red_pool_tile_stairs.json
new file mode 100644
index 0000000..f141c6c
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/red_pool_tile_stairs.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/red_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/scrubber_frame.json b/src/generated/resources/assets/otemod/models/item/scrubber_frame.json
new file mode 100644
index 0000000..0cc0455
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/scrubber_frame.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/scrubber_frame"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/scrubber_frame_piece.json b/src/generated/resources/assets/otemod/models/item/scrubber_frame_piece.json
new file mode 100644
index 0000000..79d2276
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/scrubber_frame_piece.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/scrubber_frame_piece"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/singularity.json b/src/generated/resources/assets/otemod/models/item/singularity.json
new file mode 100644
index 0000000..f063ba7
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/singularity.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/singularity"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/uncrafter.json b/src/generated/resources/assets/otemod/models/item/uncrafter.json
new file mode 100644
index 0000000..cba0602
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/uncrafter.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/uncrafter"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/vault.json b/src/generated/resources/assets/otemod/models/item/vault.json
new file mode 100644
index 0000000..776ec22
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/vault.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/vault"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/vault_fragment_center.json b/src/generated/resources/assets/otemod/models/item/vault_fragment_center.json
new file mode 100644
index 0000000..402b164
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/vault_fragment_center.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/vault_fragment_center"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/vault_fragment_left.json b/src/generated/resources/assets/otemod/models/item/vault_fragment_left.json
new file mode 100644
index 0000000..e5df909
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/vault_fragment_left.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/vault_fragment_left"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/vault_fragment_lower.json b/src/generated/resources/assets/otemod/models/item/vault_fragment_lower.json
new file mode 100644
index 0000000..2d0a28d
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/vault_fragment_lower.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/vault_fragment_lower"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/vault_fragment_lower_left.json b/src/generated/resources/assets/otemod/models/item/vault_fragment_lower_left.json
new file mode 100644
index 0000000..c663529
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/vault_fragment_lower_left.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/vault_fragment_lower_left"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/vault_fragment_lower_right.json b/src/generated/resources/assets/otemod/models/item/vault_fragment_lower_right.json
new file mode 100644
index 0000000..b2de2af
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/vault_fragment_lower_right.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/vault_fragment_lower_right"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/vault_fragment_right.json b/src/generated/resources/assets/otemod/models/item/vault_fragment_right.json
new file mode 100644
index 0000000..f9bfb12
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/vault_fragment_right.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/vault_fragment_right"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/vault_fragment_upper.json b/src/generated/resources/assets/otemod/models/item/vault_fragment_upper.json
new file mode 100644
index 0000000..b6e95ad
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/vault_fragment_upper.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/vault_fragment_upper"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/vault_fragment_upper_left.json b/src/generated/resources/assets/otemod/models/item/vault_fragment_upper_left.json
new file mode 100644
index 0000000..86c6931
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/vault_fragment_upper_left.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/vault_fragment_upper_left"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/vault_fragment_upper_right.json b/src/generated/resources/assets/otemod/models/item/vault_fragment_upper_right.json
new file mode 100644
index 0000000..69ae7b6
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/vault_fragment_upper_right.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/vault_fragment_upper_right"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/vault_steel_ingot.json b/src/generated/resources/assets/otemod/models/item/vault_steel_ingot.json
new file mode 100644
index 0000000..d39c07b
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/vault_steel_ingot.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/vault_steel_ingot"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/vault_steel_ore_block.json b/src/generated/resources/assets/otemod/models/item/vault_steel_ore_block.json
new file mode 100644
index 0000000..c56aba2
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/vault_steel_ore_block.json
@@ -0,0 +1,3 @@
+{
+ "parent": "otemod:block/vault_steel_ore_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/otemod/models/item/white_brick.json b/src/generated/resources/assets/otemod/models/item/white_brick.json
new file mode 100644
index 0000000..dae239f
--- /dev/null
+++ b/src/generated/resources/assets/otemod/models/item/white_brick.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "otemod:item/white_brick"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/blood_red.json b/src/generated/resources/data/otemod/loot_tables/blocks/blood_red.json
new file mode 100644
index 0000000..859ea24
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/blood_red.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:blood_red"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/blood_red"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/blue_pool_light.json b/src/generated/resources/data/otemod/loot_tables/blocks/blue_pool_light.json
new file mode 100644
index 0000000..8674500
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/blue_pool_light.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:blue_pool_light"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/blue_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/blue_pool_tile.json b/src/generated/resources/data/otemod/loot_tables/blocks/blue_pool_tile.json
new file mode 100644
index 0000000..2e2e5dc
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/blue_pool_tile.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:blue_pool_tile"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/blue_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/blue_pool_tile_slab.json b/src/generated/resources/data/otemod/loot_tables/blocks/blue_pool_tile_slab.json
new file mode 100644
index 0000000..e0f63df
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/blue_pool_tile_slab.json
@@ -0,0 +1,35 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "add": false,
+ "conditions": [
+ {
+ "block": "otemod:blue_pool_tile_slab",
+ "condition": "minecraft:block_state_property",
+ "properties": {
+ "type": "double"
+ }
+ }
+ ],
+ "count": 2.0,
+ "function": "minecraft:set_count"
+ },
+ {
+ "function": "minecraft:explosion_decay"
+ }
+ ],
+ "name": "otemod:blue_pool_tile_slab"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/blue_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/blue_pool_tile_stairs.json b/src/generated/resources/data/otemod/loot_tables/blocks/blue_pool_tile_stairs.json
new file mode 100644
index 0000000..368dd61
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/blue_pool_tile_stairs.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:blue_pool_tile_stairs"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/blue_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/clear_glass_block.json b/src/generated/resources/data/otemod/loot_tables/blocks/clear_glass_block.json
new file mode 100644
index 0000000..5d187c0
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/clear_glass_block.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:clear_glass_block"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/clear_glass_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/compressed_obsidian_block.json b/src/generated/resources/data/otemod/loot_tables/blocks/compressed_obsidian_block.json
new file mode 100644
index 0000000..c4a99f7
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/compressed_obsidian_block.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:compressed_obsidian_block"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/compressed_obsidian_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/compression_chamber.json b/src/generated/resources/data/otemod/loot_tables/blocks/compression_chamber.json
new file mode 100644
index 0000000..4f5fb10
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/compression_chamber.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:compression_chamber"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/compression_chamber"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/cyan.json b/src/generated/resources/data/otemod/loot_tables/blocks/cyan.json
new file mode 100644
index 0000000..61618a6
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/cyan.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:cyan"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/cyan"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/cyan_stairs.json b/src/generated/resources/data/otemod/loot_tables/blocks/cyan_stairs.json
new file mode 100644
index 0000000..c96f402
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/cyan_stairs.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:cyan_stairs"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/cyan_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/cyan_tile.json b/src/generated/resources/data/otemod/loot_tables/blocks/cyan_tile.json
new file mode 100644
index 0000000..414b7f8
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/cyan_tile.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:cyan_tile"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/cyan_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/cyan_tile_br.json b/src/generated/resources/data/otemod/loot_tables/blocks/cyan_tile_br.json
new file mode 100644
index 0000000..08aa1aa
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/cyan_tile_br.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:cyan_tile_br"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/cyan_tile_br"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/cyan_tile_to_wall.json b/src/generated/resources/data/otemod/loot_tables/blocks/cyan_tile_to_wall.json
new file mode 100644
index 0000000..ccbf466
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/cyan_tile_to_wall.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:cyan_tile_to_wall"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/cyan_tile_to_wall"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_1.json b/src/generated/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_1.json
new file mode 100644
index 0000000..3bf62fc
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_1.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:cyan_wall_variant_1"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/cyan_wall_variant_1"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_2.json b/src/generated/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_2.json
new file mode 100644
index 0000000..1024eb2
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_2.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:cyan_wall_variant_2"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/cyan_wall_variant_2"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dark_pool_light.json b/src/generated/resources/data/otemod/loot_tables/blocks/dark_pool_light.json
new file mode 100644
index 0000000..e4333d8
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dark_pool_light.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dark_pool_light"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dark_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dark_pool_tile.json b/src/generated/resources/data/otemod/loot_tables/blocks/dark_pool_tile.json
new file mode 100644
index 0000000..6ebbeb5
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dark_pool_tile.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dark_pool_tile"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dark_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dark_pool_tile_slab.json b/src/generated/resources/data/otemod/loot_tables/blocks/dark_pool_tile_slab.json
new file mode 100644
index 0000000..9251b2a
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dark_pool_tile_slab.json
@@ -0,0 +1,35 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "add": false,
+ "conditions": [
+ {
+ "block": "otemod:dark_pool_tile_slab",
+ "condition": "minecraft:block_state_property",
+ "properties": {
+ "type": "double"
+ }
+ }
+ ],
+ "count": 2.0,
+ "function": "minecraft:set_count"
+ },
+ {
+ "function": "minecraft:explosion_decay"
+ }
+ ],
+ "name": "otemod:dark_pool_tile_slab"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dark_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dark_pool_tile_stairs.json b/src/generated/resources/data/otemod/loot_tables/blocks/dark_pool_tile_stairs.json
new file mode 100644
index 0000000..c7160fc
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dark_pool_tile_stairs.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dark_pool_tile_stairs"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dark_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dark_red_carpet.json b/src/generated/resources/data/otemod/loot_tables/blocks/dark_red_carpet.json
new file mode 100644
index 0000000..92b7d7b
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dark_red_carpet.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dark_red_carpet"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dark_red_carpet"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dark_red_wool.json b/src/generated/resources/data/otemod/loot_tables/blocks/dark_red_wool.json
new file mode 100644
index 0000000..adccfd9
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dark_red_wool.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dark_red_wool"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dark_red_wool"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/deepslate_eternium_ore_block.json b/src/generated/resources/data/otemod/loot_tables/blocks/deepslate_eternium_ore_block.json
new file mode 100644
index 0000000..615b51e
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/deepslate_eternium_ore_block.json
@@ -0,0 +1,50 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:alternatives",
+ "children": [
+ {
+ "type": "minecraft:item",
+ "conditions": [
+ {
+ "condition": "minecraft:match_tool",
+ "predicate": {
+ "enchantments": [
+ {
+ "enchantment": "minecraft:silk_touch",
+ "levels": {
+ "min": 1
+ }
+ }
+ ]
+ }
+ }
+ ],
+ "name": "otemod:deepslate_eternium_ore_block"
+ },
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "enchantment": "minecraft:fortune",
+ "formula": "minecraft:ore_drops",
+ "function": "minecraft:apply_bonus"
+ },
+ {
+ "function": "minecraft:explosion_decay"
+ }
+ ],
+ "name": "otemod:eternium_ore"
+ }
+ ]
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/deepslate_eternium_ore_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/deepslate_ilusium_ore_block.json b/src/generated/resources/data/otemod/loot_tables/blocks/deepslate_ilusium_ore_block.json
new file mode 100644
index 0000000..038f8cc
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/deepslate_ilusium_ore_block.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:deepslate_ilusium_ore_block"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/deepslate_ilusium_ore_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_blue_pool_light.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_blue_pool_light.json
new file mode 100644
index 0000000..ded063f
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_blue_pool_light.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dirty_blue_pool_light"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_blue_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_blue_pool_tile.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_blue_pool_tile.json
new file mode 100644
index 0000000..f08f26d
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_blue_pool_tile.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dirty_blue_pool_tile"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_blue_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_blue_pool_tile_slab.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_blue_pool_tile_slab.json
new file mode 100644
index 0000000..38dbd07
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_blue_pool_tile_slab.json
@@ -0,0 +1,35 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "add": false,
+ "conditions": [
+ {
+ "block": "otemod:dirty_blue_pool_tile_slab",
+ "condition": "minecraft:block_state_property",
+ "properties": {
+ "type": "double"
+ }
+ }
+ ],
+ "count": 2.0,
+ "function": "minecraft:set_count"
+ },
+ {
+ "function": "minecraft:explosion_decay"
+ }
+ ],
+ "name": "otemod:dirty_blue_pool_tile_slab"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_blue_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_blue_pool_tile_stairs.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_blue_pool_tile_stairs.json
new file mode 100644
index 0000000..55e2e07
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_blue_pool_tile_stairs.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dirty_blue_pool_tile_stairs"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_blue_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_green_pool_light.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_green_pool_light.json
new file mode 100644
index 0000000..41e9ca4
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_green_pool_light.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dirty_green_pool_light"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_green_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_green_pool_tile.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_green_pool_tile.json
new file mode 100644
index 0000000..469ca49
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_green_pool_tile.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dirty_green_pool_tile"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_green_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_green_pool_tile_slab.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_green_pool_tile_slab.json
new file mode 100644
index 0000000..07a320a
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_green_pool_tile_slab.json
@@ -0,0 +1,35 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "add": false,
+ "conditions": [
+ {
+ "block": "otemod:dirty_green_pool_tile_slab",
+ "condition": "minecraft:block_state_property",
+ "properties": {
+ "type": "double"
+ }
+ }
+ ],
+ "count": 2.0,
+ "function": "minecraft:set_count"
+ },
+ {
+ "function": "minecraft:explosion_decay"
+ }
+ ],
+ "name": "otemod:dirty_green_pool_tile_slab"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_green_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_green_pool_tile_stairs.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_green_pool_tile_stairs.json
new file mode 100644
index 0000000..e300879
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_green_pool_tile_stairs.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dirty_green_pool_tile_stairs"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_green_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_pool_light.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_pool_light.json
new file mode 100644
index 0000000..6ae0866
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_pool_light.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dirty_pool_light"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_pool_tile.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_pool_tile.json
new file mode 100644
index 0000000..d79ae83
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_pool_tile.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dirty_pool_tile"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_pool_tile_slab.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_pool_tile_slab.json
new file mode 100644
index 0000000..ae8670d
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_pool_tile_slab.json
@@ -0,0 +1,35 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "add": false,
+ "conditions": [
+ {
+ "block": "otemod:dirty_pool_tile_slab",
+ "condition": "minecraft:block_state_property",
+ "properties": {
+ "type": "double"
+ }
+ }
+ ],
+ "count": 2.0,
+ "function": "minecraft:set_count"
+ },
+ {
+ "function": "minecraft:explosion_decay"
+ }
+ ],
+ "name": "otemod:dirty_pool_tile_slab"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_pool_tile_stairs.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_pool_tile_stairs.json
new file mode 100644
index 0000000..8af15ed
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_pool_tile_stairs.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dirty_pool_tile_stairs"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_red_pool_light.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_red_pool_light.json
new file mode 100644
index 0000000..ac36896
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_red_pool_light.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dirty_red_pool_light"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_red_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_red_pool_tile.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_red_pool_tile.json
new file mode 100644
index 0000000..84043aa
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_red_pool_tile.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dirty_red_pool_tile"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_red_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_red_pool_tile_slab.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_red_pool_tile_slab.json
new file mode 100644
index 0000000..560ff79
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_red_pool_tile_slab.json
@@ -0,0 +1,35 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "add": false,
+ "conditions": [
+ {
+ "block": "otemod:dirty_red_pool_tile_slab",
+ "condition": "minecraft:block_state_property",
+ "properties": {
+ "type": "double"
+ }
+ }
+ ],
+ "count": 2.0,
+ "function": "minecraft:set_count"
+ },
+ {
+ "function": "minecraft:explosion_decay"
+ }
+ ],
+ "name": "otemod:dirty_red_pool_tile_slab"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_red_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/dirty_red_pool_tile_stairs.json b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_red_pool_tile_stairs.json
new file mode 100644
index 0000000..427a4b9
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/dirty_red_pool_tile_stairs.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:dirty_red_pool_tile_stairs"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/dirty_red_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/eternium_block.json b/src/generated/resources/data/otemod/loot_tables/blocks/eternium_block.json
new file mode 100644
index 0000000..dcd08ef
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/eternium_block.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:eternium_block"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/eternium_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/eternium_ore_block.json b/src/generated/resources/data/otemod/loot_tables/blocks/eternium_ore_block.json
new file mode 100644
index 0000000..40f61f1
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/eternium_ore_block.json
@@ -0,0 +1,50 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:alternatives",
+ "children": [
+ {
+ "type": "minecraft:item",
+ "conditions": [
+ {
+ "condition": "minecraft:match_tool",
+ "predicate": {
+ "enchantments": [
+ {
+ "enchantment": "minecraft:silk_touch",
+ "levels": {
+ "min": 1
+ }
+ }
+ ]
+ }
+ }
+ ],
+ "name": "otemod:eternium_ore_block"
+ },
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "enchantment": "minecraft:fortune",
+ "formula": "minecraft:ore_drops",
+ "function": "minecraft:apply_bonus"
+ },
+ {
+ "function": "minecraft:explosion_decay"
+ }
+ ],
+ "name": "otemod:eternium_ore"
+ }
+ ]
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/eternium_ore_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/filthy_blue_pool_light.json b/src/generated/resources/data/otemod/loot_tables/blocks/filthy_blue_pool_light.json
new file mode 100644
index 0000000..a7157c2
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/filthy_blue_pool_light.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:filthy_blue_pool_light"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/filthy_blue_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/filthy_green_pool_light.json b/src/generated/resources/data/otemod/loot_tables/blocks/filthy_green_pool_light.json
new file mode 100644
index 0000000..a94c840
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/filthy_green_pool_light.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:filthy_green_pool_light"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/filthy_green_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/filthy_pool_light.json b/src/generated/resources/data/otemod/loot_tables/blocks/filthy_pool_light.json
new file mode 100644
index 0000000..a9c2175
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/filthy_pool_light.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:filthy_pool_light"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/filthy_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/filthy_red_pool_light.json b/src/generated/resources/data/otemod/loot_tables/blocks/filthy_red_pool_light.json
new file mode 100644
index 0000000..e4280cc
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/filthy_red_pool_light.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:filthy_red_pool_light"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/filthy_red_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/green_pool_light.json b/src/generated/resources/data/otemod/loot_tables/blocks/green_pool_light.json
new file mode 100644
index 0000000..2616040
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/green_pool_light.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:green_pool_light"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/green_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/green_pool_tile.json b/src/generated/resources/data/otemod/loot_tables/blocks/green_pool_tile.json
new file mode 100644
index 0000000..4d90137
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/green_pool_tile.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:green_pool_tile"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/green_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/green_pool_tile_slab.json b/src/generated/resources/data/otemod/loot_tables/blocks/green_pool_tile_slab.json
new file mode 100644
index 0000000..890e828
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/green_pool_tile_slab.json
@@ -0,0 +1,35 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "add": false,
+ "conditions": [
+ {
+ "block": "otemod:green_pool_tile_slab",
+ "condition": "minecraft:block_state_property",
+ "properties": {
+ "type": "double"
+ }
+ }
+ ],
+ "count": 2.0,
+ "function": "minecraft:set_count"
+ },
+ {
+ "function": "minecraft:explosion_decay"
+ }
+ ],
+ "name": "otemod:green_pool_tile_slab"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/green_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/green_pool_tile_stairs.json b/src/generated/resources/data/otemod/loot_tables/blocks/green_pool_tile_stairs.json
new file mode 100644
index 0000000..4357d09
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/green_pool_tile_stairs.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:green_pool_tile_stairs"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/green_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/ilusium_block.json b/src/generated/resources/data/otemod/loot_tables/blocks/ilusium_block.json
new file mode 100644
index 0000000..6462836
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/ilusium_block.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:ilusium_block"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/ilusium_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/ilusium_ore_block.json b/src/generated/resources/data/otemod/loot_tables/blocks/ilusium_ore_block.json
new file mode 100644
index 0000000..0df78e2
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/ilusium_ore_block.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:ilusium_ore_block"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/ilusium_ore_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/item_scrubber.json b/src/generated/resources/data/otemod/loot_tables/blocks/item_scrubber.json
new file mode 100644
index 0000000..950af9c
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/item_scrubber.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:item_scrubber"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/item_scrubber"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/layered_compressed_obsidian_block.json b/src/generated/resources/data/otemod/loot_tables/blocks/layered_compressed_obsidian_block.json
new file mode 100644
index 0000000..6c892de
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/layered_compressed_obsidian_block.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:layered_compressed_obsidian_block"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/layered_compressed_obsidian_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/lime.json b/src/generated/resources/data/otemod/loot_tables/blocks/lime.json
new file mode 100644
index 0000000..c7add37
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/lime.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:lime"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/lime"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/lime_stairs.json b/src/generated/resources/data/otemod/loot_tables/blocks/lime_stairs.json
new file mode 100644
index 0000000..a6e2189
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/lime_stairs.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:lime_stairs"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/lime_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/lime_tile.json b/src/generated/resources/data/otemod/loot_tables/blocks/lime_tile.json
new file mode 100644
index 0000000..fa854ff
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/lime_tile.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:lime_tile"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/lime_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/lime_tile_br.json b/src/generated/resources/data/otemod/loot_tables/blocks/lime_tile_br.json
new file mode 100644
index 0000000..b8156af
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/lime_tile_br.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:lime_tile_br"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/lime_tile_br"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/lime_tile_to_wall.json b/src/generated/resources/data/otemod/loot_tables/blocks/lime_tile_to_wall.json
new file mode 100644
index 0000000..5b655dd
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/lime_tile_to_wall.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:lime_tile_to_wall"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/lime_tile_to_wall"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/lime_wall_variant_1.json b/src/generated/resources/data/otemod/loot_tables/blocks/lime_wall_variant_1.json
new file mode 100644
index 0000000..b246d0b
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/lime_wall_variant_1.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:lime_wall_variant_1"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/lime_wall_variant_1"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/lime_wall_variant_2.json b/src/generated/resources/data/otemod/loot_tables/blocks/lime_wall_variant_2.json
new file mode 100644
index 0000000..206dbeb
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/lime_wall_variant_2.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:lime_wall_variant_2"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/lime_wall_variant_2"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/liminal_tile_slab.json b/src/generated/resources/data/otemod/loot_tables/blocks/liminal_tile_slab.json
new file mode 100644
index 0000000..fa94040
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/liminal_tile_slab.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:liminal_tile_slab"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/liminal_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/liminal_tile_stairs.json b/src/generated/resources/data/otemod/loot_tables/blocks/liminal_tile_stairs.json
new file mode 100644
index 0000000..d686cd7
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/liminal_tile_stairs.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:liminal_tile_stairs"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/liminal_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/liminal_tiles.json b/src/generated/resources/data/otemod/loot_tables/blocks/liminal_tiles.json
new file mode 100644
index 0000000..9b0a5c5
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/liminal_tiles.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:liminal_tiles"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/liminal_tiles"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/liminal_window.json b/src/generated/resources/data/otemod/loot_tables/blocks/liminal_window.json
new file mode 100644
index 0000000..c82a985
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/liminal_window.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:liminal_window"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/liminal_window"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/magical_scrubber.json b/src/generated/resources/data/otemod/loot_tables/blocks/magical_scrubber.json
new file mode 100644
index 0000000..e5bf3be
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/magical_scrubber.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:magical_scrubber"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/magical_scrubber"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/nether_vault_steel_ore_block.json b/src/generated/resources/data/otemod/loot_tables/blocks/nether_vault_steel_ore_block.json
new file mode 100644
index 0000000..61308b6
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/nether_vault_steel_ore_block.json
@@ -0,0 +1,50 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:alternatives",
+ "children": [
+ {
+ "type": "minecraft:item",
+ "conditions": [
+ {
+ "condition": "minecraft:match_tool",
+ "predicate": {
+ "enchantments": [
+ {
+ "enchantment": "minecraft:silk_touch",
+ "levels": {
+ "min": 1
+ }
+ }
+ ]
+ }
+ }
+ ],
+ "name": "otemod:nether_vault_steel_ore_block"
+ },
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "enchantment": "minecraft:fortune",
+ "formula": "minecraft:ore_drops",
+ "function": "minecraft:apply_bonus"
+ },
+ {
+ "function": "minecraft:explosion_decay"
+ }
+ ],
+ "name": "otemod:raw_vault_steel_ore"
+ }
+ ]
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/nether_vault_steel_ore_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/pool_light.json b/src/generated/resources/data/otemod/loot_tables/blocks/pool_light.json
new file mode 100644
index 0000000..89aa751
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/pool_light.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:pool_light"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/pool_tile.json b/src/generated/resources/data/otemod/loot_tables/blocks/pool_tile.json
new file mode 100644
index 0000000..ca71535
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/pool_tile.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:pool_tile"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/pool_tile_slab.json b/src/generated/resources/data/otemod/loot_tables/blocks/pool_tile_slab.json
new file mode 100644
index 0000000..f31be1b
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/pool_tile_slab.json
@@ -0,0 +1,35 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "add": false,
+ "conditions": [
+ {
+ "block": "otemod:pool_tile_slab",
+ "condition": "minecraft:block_state_property",
+ "properties": {
+ "type": "double"
+ }
+ }
+ ],
+ "count": 2.0,
+ "function": "minecraft:set_count"
+ },
+ {
+ "function": "minecraft:explosion_decay"
+ }
+ ],
+ "name": "otemod:pool_tile_slab"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/pool_tile_stairs.json b/src/generated/resources/data/otemod/loot_tables/blocks/pool_tile_stairs.json
new file mode 100644
index 0000000..6a937d5
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/pool_tile_stairs.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:pool_tile_stairs"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/red_pool_light.json b/src/generated/resources/data/otemod/loot_tables/blocks/red_pool_light.json
new file mode 100644
index 0000000..cc0cbce
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/red_pool_light.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:red_pool_light"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/red_pool_light"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/red_pool_tile.json b/src/generated/resources/data/otemod/loot_tables/blocks/red_pool_tile.json
new file mode 100644
index 0000000..8d3ebde
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/red_pool_tile.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:red_pool_tile"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/red_pool_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/red_pool_tile_slab.json b/src/generated/resources/data/otemod/loot_tables/blocks/red_pool_tile_slab.json
new file mode 100644
index 0000000..18a85e0
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/red_pool_tile_slab.json
@@ -0,0 +1,35 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "add": false,
+ "conditions": [
+ {
+ "block": "otemod:red_pool_tile_slab",
+ "condition": "minecraft:block_state_property",
+ "properties": {
+ "type": "double"
+ }
+ }
+ ],
+ "count": 2.0,
+ "function": "minecraft:set_count"
+ },
+ {
+ "function": "minecraft:explosion_decay"
+ }
+ ],
+ "name": "otemod:red_pool_tile_slab"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/red_pool_tile_slab"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/red_pool_tile_stairs.json b/src/generated/resources/data/otemod/loot_tables/blocks/red_pool_tile_stairs.json
new file mode 100644
index 0000000..8d1cdd2
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/red_pool_tile_stairs.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:red_pool_tile_stairs"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/red_pool_tile_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/red_stairs.json b/src/generated/resources/data/otemod/loot_tables/blocks/red_stairs.json
new file mode 100644
index 0000000..6e4748a
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/red_stairs.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:red_stairs"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/red_stairs"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/red_tile.json b/src/generated/resources/data/otemod/loot_tables/blocks/red_tile.json
new file mode 100644
index 0000000..9bc45dc
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/red_tile.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:red_tile"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/red_tile"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/red_tile_br.json b/src/generated/resources/data/otemod/loot_tables/blocks/red_tile_br.json
new file mode 100644
index 0000000..f7340d0
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/red_tile_br.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:red_tile_br"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/red_tile_br"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/red_tile_to_wall.json b/src/generated/resources/data/otemod/loot_tables/blocks/red_tile_to_wall.json
new file mode 100644
index 0000000..5446479
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/red_tile_to_wall.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:red_tile_to_wall"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/red_tile_to_wall"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/red_wall_variant_1.json b/src/generated/resources/data/otemod/loot_tables/blocks/red_wall_variant_1.json
new file mode 100644
index 0000000..014849c
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/red_wall_variant_1.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:red_wall_variant_1"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/red_wall_variant_1"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/red_wall_variant_2.json b/src/generated/resources/data/otemod/loot_tables/blocks/red_wall_variant_2.json
new file mode 100644
index 0000000..456949c
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/red_wall_variant_2.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:red_wall_variant_2"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/red_wall_variant_2"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/stable_singularity.json b/src/generated/resources/data/otemod/loot_tables/blocks/stable_singularity.json
new file mode 100644
index 0000000..0730790
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/stable_singularity.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:stable_singularity"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/stable_singularity"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/uncrafter.json b/src/generated/resources/data/otemod/loot_tables/blocks/uncrafter.json
new file mode 100644
index 0000000..1207e11
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/uncrafter.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:uncrafter"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/uncrafter"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/vault_steel_ore_block.json b/src/generated/resources/data/otemod/loot_tables/blocks/vault_steel_ore_block.json
new file mode 100644
index 0000000..5c6d3c3
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/vault_steel_ore_block.json
@@ -0,0 +1,50 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "entries": [
+ {
+ "type": "minecraft:alternatives",
+ "children": [
+ {
+ "type": "minecraft:item",
+ "conditions": [
+ {
+ "condition": "minecraft:match_tool",
+ "predicate": {
+ "enchantments": [
+ {
+ "enchantment": "minecraft:silk_touch",
+ "levels": {
+ "min": 1
+ }
+ }
+ ]
+ }
+ }
+ ],
+ "name": "otemod:vault_steel_ore_block"
+ },
+ {
+ "type": "minecraft:item",
+ "functions": [
+ {
+ "enchantment": "minecraft:fortune",
+ "formula": "minecraft:ore_drops",
+ "function": "minecraft:apply_bonus"
+ },
+ {
+ "function": "minecraft:explosion_decay"
+ }
+ ],
+ "name": "otemod:raw_vault_steel_ore"
+ }
+ ]
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/vault_steel_ore_block"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/void.json b/src/generated/resources/data/otemod/loot_tables/blocks/void.json
new file mode 100644
index 0000000..686adb1
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/void.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:void"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/void"
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/otemod/loot_tables/blocks/whiteout.json b/src/generated/resources/data/otemod/loot_tables/blocks/whiteout.json
new file mode 100644
index 0000000..9243a56
--- /dev/null
+++ b/src/generated/resources/data/otemod/loot_tables/blocks/whiteout.json
@@ -0,0 +1,21 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "otemod:whiteout"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ],
+ "random_sequence": "otemod:blocks/whiteout"
+}
\ No newline at end of file
diff --git a/src/main/java/dev/zontreck/otemod/ExampleMod.java.disabled b/src/main/java/dev/zontreck/otemod/ExampleMod.java.disabled
deleted file mode 100644
index 239cd36..0000000
--- a/src/main/java/dev/zontreck/otemod/ExampleMod.java.disabled
+++ /dev/null
@@ -1,89 +0,0 @@
-package dev.zontreck.otemod;
-
-import com.mojang.logging.LogUtils;
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.material.Material;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.InterModComms;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
-import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
-import net.minecraftforge.event.server.ServerStartingEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegistryObject;
-import org.slf4j.Logger;
-
-// The value here should match an entry in the META-INF/mods.toml file
-@Mod(ExampleMod.MODID)
-public class ExampleMod
-{
- // Define mod id in a common place for everything to reference
- public static final String MODID = "examplemod";
- // Directly reference a slf4j logger
- private static final Logger LOGGER = LogUtils.getLogger();
- // Create a Deferred Register to hold Blocks which will all be registered under the "examplemod" namespace
- public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
- // Create a Deferred Register to hold Items which will all be registered under the "examplemod" namespace
- public static final DeferredRegister- ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
-
- // Creates a new Block with the id "examplemod:example_block", combining the namespace and path
- public static final RegistryObject EXAMPLE_BLOCK = BLOCKS.register("example_block", () -> new Block(BlockBehaviour.Properties.of(Material.STONE)));
- // Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path
- public static final RegistryObject
- EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS)));
-
- public ExampleMod()
- {
- IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
-
- // Register the commonSetup method for modloading
- modEventBus.addListener(this::commonSetup);
-
- // Register the Deferred Register to the mod event bus so blocks get registered
- BLOCKS.register(modEventBus);
- // Register the Deferred Register to the mod event bus so items get registered
- ITEMS.register(modEventBus);
-
- // Register ourselves for server and other game events we are interested in
- MinecraftForge.EVENT_BUS.register(this);
- }
-
- private void commonSetup(final FMLCommonSetupEvent event)
- {
- // Some common setup code
- LOGGER.info("HELLO FROM COMMON SETUP");
- LOGGER.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT));
- }
-
- // You can use SubscribeEvent and let the Event Bus discover methods to call
- @SubscribeEvent
- public void onServerStarting(ServerStartingEvent event)
- {
- // Do something when the server starts
- LOGGER.info("HELLO from server starting");
- }
-
- // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent
- @Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
- public static class ClientModEvents
- {
- @SubscribeEvent
- public static void onClientSetup(FMLClientSetupEvent event)
- {
- // Some client setup code
- LOGGER.info("HELLO FROM CLIENT SETUP");
- LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName());
- }
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/OTEMod.java b/src/main/java/dev/zontreck/otemod/OTEMod.java
index 62ca946..e0311d2 100644
--- a/src/main/java/dev/zontreck/otemod/OTEMod.java
+++ b/src/main/java/dev/zontreck/otemod/OTEMod.java
@@ -1,69 +1,71 @@
package dev.zontreck.otemod;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import com.mojang.logging.LogUtils;
-import com.mojang.serialization.Codec;
-
+import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.libzontreck.edlibmc.Auxiliaries;
+import dev.zontreck.libzontreck.edlibmc.Registries;
+import dev.zontreck.libzontreck.profiles.Profile;
+import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.otemod.blocks.DeprecatedModBlocks;
+import dev.zontreck.otemod.configs.snbt.ServerConfig;
+import dev.zontreck.otemod.effects.ModEffects;
+import dev.zontreck.otemod.effects.ModPotions;
+import dev.zontreck.otemod.enchantments.FlightEnchantment;
+import dev.zontreck.otemod.enchantments.NightVisionEnchantment;
+import dev.zontreck.otemod.events.EventHandler;
+import dev.zontreck.otemod.implementation.*;
+import dev.zontreck.otemod.implementation.compressor.CompressionChamberScreen;
+import dev.zontreck.otemod.implementation.energy.IThresholdsEnergyContainer;
+import dev.zontreck.otemod.implementation.uncrafting.UncrafterScreen;
+import dev.zontreck.otemod.implementation.vault.*;
+import dev.zontreck.otemod.integrations.KeyBindings;
+import dev.zontreck.otemod.items.DeprecatedModItems;
+import dev.zontreck.otemod.networking.packets.EnergyRequestC2SPacket;
+import dev.zontreck.otemod.recipe.ModRecipes;
+import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.MenuScreens;
-import net.minecraft.client.renderer.ItemBlockRenderTypes;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.chat.Component;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Entity.RemovalReason;
import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.world.BiomeModifier;
+import net.minecraftforge.event.TickEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.event.RegisterCommandsEvent;
import net.minecraftforge.event.entity.item.ItemExpireEvent;
-import net.minecraftforge.event.entity.player.PlayerEvent.ItemPickupEvent;
import net.minecraftforge.event.server.ServerStartedEvent;
-import net.minecraftforge.event.server.ServerStartingEvent;
import net.minecraftforge.event.server.ServerStoppingEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.items.ItemStackHandler;
import org.slf4j.Logger;
-
import dev.zontreck.otemod.blocks.ModBlocks;
-import dev.zontreck.otemod.chat.ChatColor;
+import dev.zontreck.otemod.blocks.entity.ModEntities;
import dev.zontreck.otemod.chat.ChatServerOverride;
import dev.zontreck.otemod.commands.CommandRegistry;
-import dev.zontreck.otemod.commands.teleport.TeleportContainer;
-import dev.zontreck.otemod.configs.OTEServerConfig;
-import dev.zontreck.otemod.configs.Profile;
-import dev.zontreck.otemod.database.Database;
-import dev.zontreck.otemod.database.Database.DatabaseConnectionException;
-import dev.zontreck.otemod.events.EventHandler;
-import dev.zontreck.otemod.implementation.VaultScreen;
-import dev.zontreck.otemod.implementation.VaultWatcher;
-import dev.zontreck.otemod.implementation.inits.MenuInitializer;
+import dev.zontreck.otemod.enchantments.ModEnchantments;
+import dev.zontreck.otemod.entities.ModEntityTypes;
+import dev.zontreck.otemod.events.LoreHandlers;
+import dev.zontreck.otemod.implementation.inits.ModMenuTypes;
+import dev.zontreck.otemod.implementation.scrubber.ItemScrubberScreen;
+import dev.zontreck.otemod.implementation.scrubber.MagicalScrubberScreen;
import dev.zontreck.otemod.items.ModItems;
-import dev.zontreck.otemod.ore.Modifier.ModifierOfBiomes;
+//import dev.zontreck.otemod.ore.Modifier.ModifierOfBiomes;
+import dev.zontreck.otemod.networking.ModMessages;
// The value here should match an entry in the META-INF/mods.toml file
@Mod(OTEMod.MOD_ID)
@@ -71,71 +73,126 @@ public class OTEMod
{
// Directly reference a slf4j logger
public static final Logger LOGGER = LogUtils.getLogger();
- public static final String FIRST_JOIN_TAG = "dev.zontreck.otemod.firstjoin";
public static final String MOD_ID = "otemod";
- public static final String MODIFY_BIOMES = "modify_biomes";
- public static final ResourceLocation MODIFY_BIOMES_RL = new ResourceLocation(OTEMod.MOD_ID, MODIFY_BIOMES);
- public static Database DB=null;
- public static Map PROFILES = new HashMap();
- public static List TeleportRegistry = new ArrayList<>();
- public static MinecraftServer THE_SERVER;
- private static boolean ALIVE;
+
+ //public static List TeleportRegistry = new ArrayList<>();
+ public static boolean ALIVE=false;
public static boolean DEVELOPER=false;
- private static Thread MasterThread;
+
+ public static String OTEPrefix = "";
+ public static String ONLY_PLAYER = "";
+ public static IEventBus bus;
+
+
public OTEMod()
{
- IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
+
+
+ OTEMod.OTEPrefix = ChatColor.doColors("!dark_gray![!dark_green!!bold!Thresholds!reset!!dark_gray!]!reset!");
+ OTEMod.ONLY_PLAYER = ChatColor.doColors("!dark_red!Only a player can execute this command");
+
+ bus = FMLJavaModLoadingContext.get().getModEventBus();
// Register the setup method for modloading
bus.addListener(this::setup);
+ ServerConfig.load();
- ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, OTEServerConfig.SPEC, "otemod-rss-server.toml");
-
-
+ Auxiliaries.init(MOD_ID, LOGGER, null);
+ Registries.init(MOD_ID, null, bus);
// Register ourselves for server and other game events we are interested in
- final DeferredRegister> serializers = DeferredRegister.create(ForgeRegistries.Keys.BIOME_MODIFIER_SERIALIZERS, OTEMod.MOD_ID);
- serializers.register(bus);
- serializers.register(MODIFY_BIOMES, ModifierOfBiomes::makeCodec);
+ //final DeferredRegister> serializers = DeferredRegister.create(ForgeRegistries.Keys.BIOME_MODIFIER_SERIALIZERS, OTEMod.MOD_ID);
+ //serializers.register(bus);
+ //serializers.register(MODIFY_BIOMES, ModifierOfBiomes::makeCodec);
MinecraftForge.EVENT_BUS.register(this);
- MinecraftForge.EVENT_BUS.register(new EventHandler());
+ MinecraftForge.EVENT_BUS.register(new LoreHandlers());
MinecraftForge.EVENT_BUS.register(new ChatServerOverride());
MinecraftForge.EVENT_BUS.register(new CommandRegistry());
MinecraftForge.EVENT_BUS.register(new VaultWatcher());
- MenuInitializer.CONTAINERS.register(bus);
+ ModMenuTypes.CONTAINERS.register(bus);
+ MinecraftForge.EVENT_BUS.register(FlightEnchantment.class);
+ MinecraftForge.EVENT_BUS.register(NightVisionEnchantment.class);
+ MinecraftForge.EVENT_BUS.register(new EventHandler());
+
+ DeprecatedModBlocks.register(bus);
ModBlocks.register(bus);
+ CreativeModeTabs.REGISTER.register(bus);
ModItems.register(bus);
+ DeprecatedModItems.register(bus);
+ ModEntities.register(bus);
+ ModEnchantments.register(bus);
+ ModEntityTypes.register(bus);
+ ModRecipes.register(bus);
+ ModEffects.register(bus);
+ ModPotions.register(bus);
+
+
+ //MenuInitializer.register(bus);
}
private void setup(final FMLCommonSetupEvent event)
{
+ ModMessages.register();
}
- public boolean firstJoin(Player p){
-
- Set tags = p.getTags();
+ public static void checkFirstJoin(ServerPlayer p){
+ try {
+ Profile prof = Profile.get_profile_of(p.getStringUUID());
+ ItemStackHandler startKit = StarterProvider.getStarter().getItems();
+ boolean isEmpty=true;
+ for(int i = 0;i tag.LastGiven && ServerConfig.general.givesStarterKitOnChanged)
+ {
+ tag = PlayerFirstJoinTag.now();
+ tag.save(prof.NBT);
+ }else return;
+ }
+
+ prof.commit();
+
+ //p.addTag(OTEMod.FIRST_JOIN_TAG);
+
+ ChatHelpers.broadcastTo(p, ChatHelpers.macro(Messages.STARTER_KIT_GIVEN), p.server);
+
+ for(int i = 0;i=p.getInventory().getContainerSize())
+ {
+ break;
+ } else {
+ p.getInventory().add(startKit.getStackInSlot(i));
+ }
+ }
+ } catch (UserProfileNotYetExistsException e) {
+ throw new RuntimeException(e);
+ } catch (NoMoreVaultException e) {
+ throw new RuntimeException(e);
}
- //p.addTag(ShapedAionResources.FIRST_JOIN_TAG);
-
-
- return true;
- }
-
- private void commonSetup(final FMLCommonSetupEvent event)
- {
- // Some common setup code
- //LOGGER.info("HELLO FROM COMMON SETUP");
- //LOGGER.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT));
}
// You can use SubscribeEvent and let the Event Bus discover methods to call
@@ -152,94 +209,21 @@ public class OTEMod
// Do something when the server starts
//LOGGER.info("HELLO from server starting");
- try {
- OTEMod.DB = new Database(this);
- OTEMod.ALIVE=true;
- // Validate that the database has been established and that tables exist
- Connection con = OTEMod.DB.getConnection();
- con.setAutoCommit(true);
-
-
- con.beginRequest();
-
- Statement lookup = con.createStatement();
- lookup.execute("CREATE TABLE IF NOT EXISTS `homes` (" +
-" `number` int(11) NOT NULL," +
-" `user` varchar(255) NOT NULL," +
-" `home_name` varchar(255) NOT NULL," +
-" `teleporter` text not null)"); // 10/04/2022 - fix dimension column size due to a bug where mods might have long names!
-
- lookup.execute("CREATE TABLE IF NOT EXISTS `profiles` ("+
- "`username` varchar (255) not null,"+
- "`uuid` varchar (255) not null,"+
- "`prefix` varchar (255) not null,"+
- "`nickname` varchar (255) not null,"+
- "`name_color` varchar (255) not null,"+
- "`prefix_color` varchar(255) not null,"+
- "`chat_color` varchar(255) not null)");
-
- lookup.execute("CREATE TABLE IF NOT EXISTS `vaults` (" +
- "`uuid` varchar (128) NOT NULL, " +
- "`number` int (11) not null," +
- "`data` text not null);");
-
- lookup.execute("CREATE TABLE IF NOT EXISTS `warps` (" +
- "`warpname` varchar (128) not null, " +
- "`owner` varchar(128) not null, " +
- "`warptype` int (2) not null, "+
- "`teleporter` text not null)");
-
- con.endRequest();
-
- // Set up the repeating task to expire a TeleportContainer
- OTEMod.THE_SERVER = event.getServer();
- OTEMod.MasterThread = new Thread(new Runnable(){
- public void run()
- {
- while(OTEMod.ALIVE){
- // Check if the teleports have expired
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
- //e.printStackTrace();
- }
-
- for(TeleportContainer cont : OTEMod.TeleportRegistry){
- if(cont.has_expired())
- {
- try{
- Component expire = Component.literal(ChatColor.DARK_PURPLE+"Teleport request has expired");
- ChatServerOverride.broadcastTo(cont.FromPlayer, expire, OTEMod.THE_SERVER);
- ChatServerOverride.broadcastTo(cont.ToPlayer, expire, OTEMod.THE_SERVER);
- OTEMod.TeleportRegistry.remove(cont);
- }catch(Exception e){
- break;
- }
- }
- }
- }
-
- OTEMod.LOGGER.info("Tearing down OTEMod teleport queue - The server is going down");
- }
- });
- OTEMod.MasterThread.start();
- } catch (DatabaseConnectionException | SQLException e) {
- e.printStackTrace();
-
- LOGGER.error("FATAL ERROR\n \n* DATABASE COULD NOT CONNECT *\n* SEE ABOVE STACK TRACE *");
-
- }
+ OTEMod.ALIVE=true;
+ //HealerQueue.Initialize(); // Set up the queue
+
}
- @OnlyIn(Dist.DEDICATED_SERVER)
@SubscribeEvent
public void onItemExpire(final ItemExpireEvent ev)
{
- if(OTEServerConfig.ITEM_DESPAWN_TIMER.get()<=0)return;
+ if(ev.getEntity().level().isClientSide)return;
+ if(ServerConfig.general.itemDespawnTimer<=0)return;
- if(ev.getEntity().getAge() != (1200 * 5)) {
+ ItemEntity ite = (ItemEntity)ev.getEntity();
+ if(ite.getAge() != (1200 * 5)) {
//OTEMod.LOGGER.info("Extra life has already been given to item : "+ev.getEntity().getName().getString());
return; // We already gave it extra life, the default is 6000, or 5 minutes
@@ -248,19 +232,18 @@ public class OTEMod
//OTEMod.LOGGER.info("Giving extra life to item : "+ev.getEntity().getName().getString() + "; item age [ "+ev.getEntity().getAge()+ " ]");
// 1200 ticks per minute
// OTEMod item despawn amplifier is set in 5 minute intervals
- ev.setExtraLife((1200 * 5)+ ((1200 * 5) * OTEServerConfig.ITEM_DESPAWN_TIMER.get())); // reset the life count
+ ev.setExtraLife((1200 * 5)+ ((1200 * 5) * ServerConfig.general.itemDespawnTimer)); // reset the life count
//OTEMod.LOGGER.info("Item ["+ev.getEntity().getItem().getDisplayName().getString()+"] was given extra life");
// Hopefully this works?
ev.setCanceled(true);
}
- @OnlyIn(Dist.DEDICATED_SERVER)
+
@SubscribeEvent
public void onStop(final ServerStoppingEvent ev)
{
OTEMod.ALIVE=false; // Tear down all looping threads that will watch this
- OTEMod.MasterThread.interrupt();
}
@@ -275,11 +258,25 @@ public class OTEMod
// Some client setup code
//LOGGER.info("HELLO FROM CLIENT SETUP");
//LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName());
+ MinecraftForge.EVENT_BUS.register(new KeyBindings());
- MenuScreens.register(MenuInitializer.VAULT.get(), VaultScreen::new);
+ MenuScreens.register(ModMenuTypes.VAULT.get(), VaultScreen::new);
+ MenuScreens.register(ModMenuTypes.SCRUBBER.get(), ItemScrubberScreen::new);
+ MenuScreens.register(ModMenuTypes.MAGIC_SCRUBBER.get(), MagicalScrubberScreen::new);
+ MenuScreens.register(ModMenuTypes.COMPRESSION_CHAMBER.get(), CompressionChamberScreen::new);
+ MenuScreens.register(ModMenuTypes.UNCRAFTER.get(), UncrafterScreen::new);
- //ItemBlockRenderTypes.setRenderLayer(ModBlocks.AURORA_DOOR.get(), RenderType.translucent());
}
+
+
+ @OnlyIn(Dist.CLIENT)
+ @SubscribeEvent
+ public static void onRegisterKeybinds(RegisterKeyMappingsEvent ev)
+ {
+ ev.register(KeyBindings.OPEN_VAULT);
+ }
+
+
}
}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/AuroraDoorBlock.java b/src/main/java/dev/zontreck/otemod/blocks/AuroraDoorBlock.java
index 4b84170..cc2acee 100644
--- a/src/main/java/dev/zontreck/otemod/blocks/AuroraDoorBlock.java
+++ b/src/main/java/dev/zontreck/otemod/blocks/AuroraDoorBlock.java
@@ -1,13 +1,23 @@
package dev.zontreck.otemod.blocks;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.DoorBlock;
+import net.minecraft.world.level.block.SoundType;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.properties.BlockSetType;
public class AuroraDoorBlock extends DoorBlock
{
+ public static final BlockBehaviour.Properties DOOR_PROPS;
+ static
+ {
+ DOOR_PROPS = BlockBehaviour.Properties.copy(Blocks.IRON_DOOR).requiresCorrectToolForDrops().strength(10, 100000f).sound(SoundType.NETHERITE_BLOCK);
+ }
- public AuroraDoorBlock(Properties p_52737_, String name) {
- super(p_52737_);
+ public AuroraDoorBlock() {
+ super(DOOR_PROPS, BlockSetType.IRON);
+
}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/BlockCustomVoxels.java b/src/main/java/dev/zontreck/otemod/blocks/BlockCustomVoxels.java
new file mode 100644
index 0000000..b62ab86
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/BlockCustomVoxels.java
@@ -0,0 +1,22 @@
+package dev.zontreck.otemod.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;
+ protected 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;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/CompressionChamberBlock.java b/src/main/java/dev/zontreck/otemod/blocks/CompressionChamberBlock.java
new file mode 100644
index 0000000..04083bd
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/CompressionChamberBlock.java
@@ -0,0 +1,100 @@
+package dev.zontreck.otemod.blocks;
+
+import dev.zontreck.otemod.blocks.entity.CompressionChamberBlockEntity;
+import dev.zontreck.otemod.blocks.entity.ModEntities;
+import dev.zontreck.otemod.networking.ModMessages;
+import dev.zontreck.otemod.networking.packets.EnergySyncS2CPacket;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.*;
+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.block.state.StateDefinition;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraftforge.network.NetworkHooks;
+import org.jetbrains.annotations.Nullable;
+
+public class CompressionChamberBlock extends HorizontalDirectionalBlock implements EntityBlock
+{
+
+ public CompressionChamberBlock(Properties pProperties) {
+ super(pProperties);
+ }
+
+ @Override
+ protected void createBlockStateDefinition(StateDefinition.Builder pBuilder) {
+ super.createBlockStateDefinition(pBuilder);
+ pBuilder.add(FACING);
+ }
+
+ @Nullable
+ @Override
+ public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
+ return new CompressionChamberBlockEntity(blockPos, blockState);
+ }
+
+ @Override
+ public RenderShape getRenderShape(BlockState pState) {
+ return RenderShape.MODEL;
+ }
+
+ @Override
+ public InteractionResult use(BlockState state, Level lvl, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit)
+ {
+ if(!lvl.isClientSide())
+ {
+ BlockEntity be = lvl.getBlockEntity(pos);
+ if(be instanceof CompressionChamberBlockEntity)
+ {
+ CompressionChamberBlockEntity entity = (CompressionChamberBlockEntity) be;
+ NetworkHooks.openScreen(((ServerPlayer)player), entity, pos);
+
+ ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player);
+
+ }else{
+ throw new IllegalStateException("Our container is missing!");
+ }
+ }
+
+ return InteractionResult.sidedSuccess(lvl.isClientSide);
+ }
+
+ @Override
+ public void onRemove(BlockState pState, Level pLevel, BlockPos pPos, BlockState pNewState, boolean pMovedByPiston) {
+ if(pState.getBlock() != pNewState.getBlock())
+ {
+ BlockEntity be = pLevel.getBlockEntity(pPos);
+ if(be instanceof CompressionChamberBlockEntity)
+ {
+ ((CompressionChamberBlockEntity)be).doDrop();
+ }
+ }
+
+ super.onRemove(pState, pLevel, pPos, pNewState, pMovedByPiston);
+ }
+
+ @Nullable
+ @Override
+ public BlockEntityTicker getTicker(Level pLevel, BlockState pState, BlockEntityType pBlockEntityType) {
+
+ return createTickerHelper(pBlockEntityType, ModEntities.COMPRESSION_CHAMBER.get(), CompressionChamberBlockEntity::tick);
+ }
+
+
+ protected static BlockEntityTicker createTickerHelper(BlockEntityType pServerType, BlockEntityType pClientType, BlockEntityTicker super E> pTicker) {
+ return pClientType == pServerType ? (BlockEntityTicker) pTicker : null;
+ }
+
+
+ @Override
+ public BlockState getStateForPlacement(BlockPlaceContext pContext) {
+ return defaultBlockState().setValue(FACING, pContext.getHorizontalDirection());
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/DeprecatedBlock.java b/src/main/java/dev/zontreck/otemod/blocks/DeprecatedBlock.java
new file mode 100644
index 0000000..d56cff9
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/DeprecatedBlock.java
@@ -0,0 +1,12 @@
+package dev.zontreck.otemod.blocks;
+
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+
+@Deprecated
+public class DeprecatedBlock extends Block
+{
+ public DeprecatedBlock(){
+ super(BlockBehaviour.Properties.of().instabreak());
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/DeprecatedBlockItem.java b/src/main/java/dev/zontreck/otemod/blocks/DeprecatedBlockItem.java
new file mode 100644
index 0000000..1d5fc93
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/DeprecatedBlockItem.java
@@ -0,0 +1,48 @@
+package dev.zontreck.otemod.blocks;
+
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+
+import java.util.List;
+
+@Deprecated
+public class DeprecatedBlockItem extends BlockItem
+{
+ public DeprecatedBlockItem(Block a)
+ {
+ super(a, new Item.Properties().fireResistant());
+ }
+
+ @Override
+ public boolean isEdible() {
+ return true;
+ }
+
+ @Override
+ public boolean isFoil(ItemStack p_41453_) {
+ return true;
+ }
+
+ /**
+ * This is to give a use to an otherwise useless item. The piglins will exchange the item and it gets removed in that way.
+ * @param stack
+ * @return
+ */
+ @Override
+ public boolean isPiglinCurrency(ItemStack stack) {
+ return true;
+ }
+
+ @Override
+ public void appendHoverText(ItemStack p_41421_, Level p_41422_, List p_41423_, TooltipFlag p_41424_) {
+ p_41423_.add(ChatHelpers.macro("!Dark_Red!This block is deprecated"));
+ p_41423_.add(ChatHelpers.macro("!Dark_Green!It would appear this block smells faintly of gold. Maybe piglins will accept it?"));
+ p_41423_.add(ChatHelpers.macro("!Dark_Red!This block is scheduled for removal in a future version. You should use it before it is too late."));
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/DeprecatedModBlocks.java b/src/main/java/dev/zontreck/otemod/blocks/DeprecatedModBlocks.java
new file mode 100644
index 0000000..24e35a6
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/DeprecatedModBlocks.java
@@ -0,0 +1,107 @@
+package dev.zontreck.otemod.blocks;
+
+import dev.zontreck.otemod.OTEMod;
+import dev.zontreck.otemod.implementation.CreativeModeTabs;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+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.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Supplier;
+
+@Deprecated
+public class DeprecatedModBlocks
+{
+
+ public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, OTEMod.MOD_ID);
+ public static final DeferredRegister
- ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, OTEMod.MOD_ID);
+
+
+ public static void register(IEventBus bus){
+ BLOCKS.register(bus);
+ ITEMS.register(bus);
+ OTEMod.LOGGER.info("Registering all deprecated blocks...");
+ }
+
+ private static boolean never(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos) {
+ return false;
+ }
+ private static boolean always(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos) {
+ return true;
+ }
+
+ private static BlockBehaviour.Properties standardBehavior()
+ {
+ return BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(7F).destroyTime(6);
+ }
+ private static BlockBehaviour.Properties stoneLikeBehavior()
+ {
+ return BlockBehaviour.Properties.copy(Blocks.COBBLESTONE);
+ }
+
+ private static BlockBehaviour.Properties explosionResistance()
+ {
+ return standardBehavior().explosionResistance(1200);
+ }
+
+ private static BlockBehaviour.Properties noViewBlocking()
+ {
+ return standardBehavior().noOcclusion().isViewBlocking(DeprecatedModBlocks::never);
+ }
+
+ private static BlockBehaviour.Properties fullBright()
+ {
+ return standardBehavior().lightLevel((X)->{
+ return 15;
+ }).noOcclusion();
+ }
+
+ private static BlockBehaviour.Properties standard = standardBehavior();
+
+ private static BlockBehaviour.Properties explosionResistance = explosionResistance();
+
+ private static BlockBehaviour.Properties noViewBlocking = noViewBlocking();
+
+ private static BlockBehaviour.Properties stone = stoneLikeBehavior();
+
+ private static BlockBehaviour.Properties poolLightClean = BlockBehaviour.Properties.copy(Blocks.GLASS).lightLevel((X) -> 15);
+ private static BlockBehaviour.Properties poolLightDirty = BlockBehaviour.Properties.copy(Blocks.GLASS).lightLevel((X) -> 12);
+ private static BlockBehaviour.Properties poolLightFilthy = BlockBehaviour.Properties.copy(Blocks.GLASS).lightLevel((X) -> 4);
+
+ public static RegistryObject registerDeprecated(RegistryObject blk)
+ {
+ CreativeModeTabs.addToOTEModTab(ITEMS.register(blk.getId().getPath(), ()->new DeprecatedBlockItem(blk.get())));
+
+ return blk;
+ }
+
+
+ public static final RegistryObject ILUSIUM_ORE_BLOCK = registerDeprecated(BLOCKS.register("ilusium_ore_block", ()-> new DeprecatedBlock()));
+
+ public static final RegistryObject DEEPSLATE_ILUSIUM_ORE_BLOCK = registerDeprecated(BLOCKS.register("deepslate_ilusium_ore_block", ()->new DeprecatedBlock()));
+ public static final RegistryObject ILUSIUM_BLOCK = registerDeprecated(BLOCKS.register("ilusium_block", ()->new DeprecatedBlock()));
+ public static final RegistryObject CLEAR_GLASS_BLOCK = registerDeprecated(BLOCKS.register("clear_glass_block", ()-> new DeprecatedBlock()));
+ public static final RegistryObject LIMINAL_TILES = registerDeprecated(BLOCKS.register("liminal_tiles", ()->new DeprecatedBlock()));
+ public static final RegistryObject LIMINAL_TILE_STAIRS = registerDeprecated(BLOCKS.register("liminal_tile_stairs", ()-> new DeprecatedBlock()));
+ public static final RegistryObject LIMINAL_TILE_SLAB = registerDeprecated(BLOCKS.register("liminal_tile_slab", ()-> new DeprecatedBlock()));
+ public static final RegistryObject LIMINAL_WINDOW = registerDeprecated(BLOCKS.register("liminal_window", ()->new DeprecatedBlock()));
+ public static final RegistryObject LIME = registerDeprecated(BLOCKS.register("lime", ()-> new DeprecatedBlock()));
+ public static final RegistryObject LIME_TILE = registerDeprecated(BLOCKS.register("lime_tile", ()-> new DeprecatedBlock()));
+ public static final RegistryObject LIME_STAIRS = registerDeprecated(BLOCKS.register("lime_stairs", ()-> new DeprecatedBlock()));
+ public static final RegistryObject LIME_TILE_BR = registerDeprecated(BLOCKS.register("lime_tile_br", ()->new DeprecatedBlock()));
+ public static final RegistryObject LIME_TILE_TO_WALL = registerDeprecated(BLOCKS.register("lime_tile_to_wall", ()-> new DeprecatedBlock()));
+ public static final RegistryObject LIME_WALL_V1 = registerDeprecated(BLOCKS.register("lime_wall_variant_1", ()->new DeprecatedBlock()));
+ public static final RegistryObject LIME_WALL_V2 = registerDeprecated(BLOCKS.register("lime_wall_variant_2", ()->new DeprecatedBlock()));
+
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/FoiledBlockItem.java b/src/main/java/dev/zontreck/otemod/blocks/FoiledBlockItem.java
new file mode 100644
index 0000000..de968e6
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/FoiledBlockItem.java
@@ -0,0 +1,19 @@
+package dev.zontreck.otemod.blocks;
+
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
+
+public class FoiledBlockItem extends BlockItem {
+
+ public FoiledBlockItem(Block pBlock, Properties pProperties) {
+ super(pBlock, pProperties);
+ // TODO Auto-generated constructor stub
+ }
+
+ @Override
+ public boolean isFoil(ItemStack pStack) {
+ return true;
+ }
+
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/ItemScrubberBlock.java b/src/main/java/dev/zontreck/otemod/blocks/ItemScrubberBlock.java
new file mode 100644
index 0000000..9be2ac5
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/ItemScrubberBlock.java
@@ -0,0 +1,102 @@
+package dev.zontreck.otemod.blocks;
+
+import dev.zontreck.otemod.blocks.entity.ItemScrubberBlockEntity;
+import dev.zontreck.otemod.blocks.entity.ModEntities;
+import dev.zontreck.otemod.networking.ModMessages;
+import dev.zontreck.otemod.networking.packets.EnergySyncS2CPacket;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.*;
+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.block.state.StateDefinition;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraftforge.network.NetworkHooks;
+
+import javax.annotation.Nullable;
+
+public class ItemScrubberBlock extends HorizontalDirectionalBlock implements EntityBlock
+{
+
+ public ItemScrubberBlock(Properties p_54120_) {
+ super(p_54120_);
+ //registerDefaultState(defaultBlockState().setValue(FACING, Direction.NORTH));
+ }
+
+ @Override
+ protected void createBlockStateDefinition(StateDefinition.Builder pBuilder) {
+ super.createBlockStateDefinition(pBuilder);
+ pBuilder.add(FACING);
+ }
+
+ @Override
+ public RenderShape getRenderShape(BlockState state)
+ {
+ return RenderShape.MODEL;
+ }
+
+ @Override
+ public void onRemove(BlockState state, Level lvl, BlockPos pos, BlockState newState, boolean isMoving)
+ {
+ if(state.getBlock()!=newState.getBlock())
+ {
+ BlockEntity bE = lvl.getBlockEntity(pos);
+ if(bE instanceof ItemScrubberBlockEntity)
+ {
+ ((ItemScrubberBlockEntity)bE).doDrop();
+ }
+ }
+
+ super.onRemove(state, lvl, pos, newState, isMoving);
+ }
+
+ @Override
+ public InteractionResult use(BlockState state, Level lvl, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit)
+ {
+ if(!lvl.isClientSide())
+ {
+ BlockEntity be = lvl.getBlockEntity(pos);
+ if(be instanceof ItemScrubberBlockEntity)
+ {
+ ItemScrubberBlockEntity entity = (ItemScrubberBlockEntity)be;
+ NetworkHooks.openScreen(((ServerPlayer)player), entity, pos);
+
+ ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player);
+
+ }else{
+ throw new IllegalStateException("Our container is missing!");
+ }
+ }
+
+ return InteractionResult.sidedSuccess(lvl.isClientSide);
+ }
+
+ @Override
+ @Nullable
+ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
+ return new ItemScrubberBlockEntity(pos, state);
+ }
+
+ @Override
+ public BlockEntityTicker getTicker(Level lvl, BlockState state, BlockEntityType type)
+ {
+ return createTickerHelper(type, ModEntities.ITEM_SCRUBBER.get(), ItemScrubberBlockEntity::tick);
+ }
+
+ protected static BlockEntityTicker createTickerHelper(BlockEntityType pServerType, BlockEntityType pClientType, BlockEntityTicker super E> pTicker) {
+ return pClientType == pServerType ? (BlockEntityTicker) pTicker : null;
+ }
+
+ @Override
+ public BlockState getStateForPlacement(BlockPlaceContext pContext) {
+ return defaultBlockState().setValue(FACING, pContext.getHorizontalDirection().getOpposite());
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/MagicalScrubberBlock.java b/src/main/java/dev/zontreck/otemod/blocks/MagicalScrubberBlock.java
new file mode 100644
index 0000000..ae0ce19
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/MagicalScrubberBlock.java
@@ -0,0 +1,102 @@
+package dev.zontreck.otemod.blocks;
+
+import dev.zontreck.otemod.blocks.entity.MagicalScrubberBlockEntity;
+import dev.zontreck.otemod.blocks.entity.ModEntities;
+import dev.zontreck.otemod.networking.ModMessages;
+import dev.zontreck.otemod.networking.packets.EnergySyncS2CPacket;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.*;
+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.block.state.StateDefinition;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraftforge.network.NetworkHooks;
+
+import javax.annotation.Nullable;
+
+public class MagicalScrubberBlock extends HorizontalDirectionalBlock implements EntityBlock
+{
+
+ public MagicalScrubberBlock(Properties p_54120_) {
+ super(p_54120_);
+ }
+
+ @Override
+ protected void createBlockStateDefinition(StateDefinition.Builder pBuilder) {
+ super.createBlockStateDefinition(pBuilder);
+ pBuilder.add(FACING);
+ }
+
+ @Override
+ public RenderShape getRenderShape(BlockState state)
+ {
+ return RenderShape.MODEL;
+ }
+
+ @Override
+ public void onRemove(BlockState state, Level lvl, BlockPos pos, BlockState newState, boolean isMoving)
+ {
+ if(state.getBlock()!=newState.getBlock())
+ {
+ BlockEntity bE = lvl.getBlockEntity(pos);
+ if(bE instanceof MagicalScrubberBlockEntity)
+ {
+ ((MagicalScrubberBlockEntity)bE).doDrop();
+ }
+ }
+
+ super.onRemove(state, lvl, pos, newState, isMoving);
+ }
+
+ @Override
+ public InteractionResult use(BlockState state, Level lvl, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit)
+ {
+ if(!lvl.isClientSide())
+ {
+ BlockEntity be = lvl.getBlockEntity(pos);
+ if(be instanceof MagicalScrubberBlockEntity)
+ {
+ MagicalScrubberBlockEntity entity = (MagicalScrubberBlockEntity)be;
+ NetworkHooks.openScreen(((ServerPlayer)player), entity, pos);
+
+ ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player);
+ }else{
+ throw new IllegalStateException("Our container is missing!");
+ }
+ }
+
+ return InteractionResult.sidedSuccess(lvl.isClientSide);
+ }
+
+ @Override
+ @Nullable
+ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
+ return new MagicalScrubberBlockEntity(pos, state);
+ }
+
+ @Override
+ public BlockEntityTicker getTicker(Level lvl, BlockState state, BlockEntityType type)
+ {
+ return createTickerHelper(type, ModEntities.MAGICAL_SCRUBBER.get(), MagicalScrubberBlockEntity::tick);
+ }
+
+
+ protected static BlockEntityTicker createTickerHelper(BlockEntityType pServerType, BlockEntityType pClientType, BlockEntityTicker super E> pTicker) {
+ return pClientType == pServerType ? (BlockEntityTicker) pTicker : null;
+ }
+
+
+ @Override
+ public BlockState getStateForPlacement(BlockPlaceContext pContext) {
+ return defaultBlockState().setValue(FACING, pContext.getHorizontalDirection().getOpposite());
+ }
+
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java
index 16909c1..5018f40 100644
--- a/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java
+++ b/src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java
@@ -1,49 +1,260 @@
package dev.zontreck.otemod.blocks;
-import java.util.function.Supplier;
-
+import dev.zontreck.libzontreck.edlibmc.Auxiliaries;
+import dev.zontreck.libzontreck.edlibmc.StandardBlocks;
import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.items.ModItems;
+import dev.zontreck.otemod.implementation.CreativeModeTabs;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.EntityType;
import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
-import net.minecraft.world.item.Item.Properties;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.DoorBlock;
-import net.minecraft.world.level.block.SoundType;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.*;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.BlockSetType;
+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.eventbus.api.IEventBus;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
+import java.util.stream.Stream;
+
public class ModBlocks {
+
+ private static BlockBehaviour.StatePredicate shulkerState = (p_152653_, p_152654_, p_152655_) -> {
+ BlockEntity blockentity = p_152654_.getBlockEntity(p_152655_);
+ if (!(blockentity instanceof ShulkerBoxBlockEntity)) {
+ return true;
+ } else {
+ ShulkerBoxBlockEntity shulkerboxblockentity = (ShulkerBoxBlockEntity)blockentity;
+ return shulkerboxblockentity.isClosed();
+ }
+ };
+
+
public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, OTEMod.MOD_ID);
public static final DeferredRegister
- ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, OTEMod.MOD_ID);
+ private static boolean never(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos) {
+ return false;
+ }
+ private static boolean always(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos) {
+ return true;
+ }
+
+
+ private static boolean neverSpawn(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, EntityType> entityType) {
+ return false;
+ }
+
public static void register(IEventBus bus){
BLOCKS.register(bus);
ITEMS.register(bus);
OTEMod.LOGGER.info("Registering all blocks...");
}
- public static final RegistryObject ETERNIUM_ORE_BLOCK = BLOCKS.register("eternium_ore_block", () -> new Block(BlockBehaviour.Properties.of(Material.METAL).requiresCorrectToolForDrops().strength(4f).explosionResistance(1200).destroyTime(6)));
+ private static BlockBehaviour.Properties standardBehavior()
+ {
+ return BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(7F).destroyTime(6).isValidSpawn(ModBlocks::neverSpawn);
+ }
+ private static BlockBehaviour.Properties gratingBlock()
+ {
+ return standardBehavior()
+ .noOcclusion()
+ .strength(0.5f, 2000f)
+ .isViewBlocking(ModBlocks::never);
+ }
- public static final RegistryObject
- ETERNIUM_ORE_BLOCK_I = ITEMS.register("eternium_ore_block", () -> new BlockItem(ETERNIUM_ORE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
+ private static BlockBehaviour.Properties stoneLikeBehavior()
+ {
+ return BlockBehaviour.Properties.copy(Blocks.COBBLESTONE).isValidSpawn(ModBlocks::neverSpawn);
+ }
- public static final RegistryObject DEEPSLATE_ETERNIUM_ORE_BLOCK = BLOCKS.register("deepslate_eternium_ore_block", () -> new Block(BlockBehaviour.Properties.of(Material.METAL).requiresCorrectToolForDrops().strength(5f).explosionResistance(1200).destroyTime(7)));
+ private static BlockBehaviour.Properties explosionResistance()
+ {
+ return standardBehavior().explosionResistance(1200);
+ }
- public static final RegistryObject
- DEEPSLATE_ETERNIUM_ORE_BLOCK_I = ITEMS.register("deepslate_eternium_ore_block", () -> new BlockItem(DEEPSLATE_ETERNIUM_ORE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
+ private static BlockBehaviour.Properties noViewBlocking()
+ {
+ return standardBehavior().noOcclusion().isViewBlocking(ModBlocks::never);
+ }
- public static final RegistryObject AURORA_BLOCK = BLOCKS.register("aurora_block", () -> new Block(BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(9f).explosionResistance(100000f).destroyTime(10).sound(SoundType.NETHERITE_BLOCK)));
+ private static BlockBehaviour.Properties fullBright()
+ {
+ return standardBehavior().lightLevel((X)->{
+ return 15;
+ }).noOcclusion();
+ }
- public static final RegistryObject
- AURORA_BLOCK_I = ITEMS.register("aurora_block", () -> new BlockItem(AURORA_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
+ private static BlockBehaviour.Properties standard = standardBehavior();
+
+ private static BlockBehaviour.Properties explosionResistance = explosionResistance();
+
+ private static BlockBehaviour.Properties noViewBlocking = noViewBlocking();
+
+ private static BlockBehaviour.Properties stone = stoneLikeBehavior();
+
+ private static BlockBehaviour.Properties gratingBlock = gratingBlock();
+
+ private static BlockBehaviour.Properties poolLightClean = BlockBehaviour.Properties.copy(Blocks.GLASS).lightLevel((X) -> 15);
+ private static BlockBehaviour.Properties poolLightDirty = BlockBehaviour.Properties.copy(Blocks.GLASS).lightLevel((X) -> 12);
+ private static BlockBehaviour.Properties poolLightFilthy = BlockBehaviour.Properties.copy(Blocks.GLASS).lightLevel((X) -> 4);
- public static final RegistryObject AURORA_DOOR = BLOCKS.register("aurora_door", () -> new DoorBlock(BlockBehaviour.Properties.copy(Blocks.IRON_DOOR).requiresCorrectToolForDrops().strength(9f).explosionResistance(100000f).destroyTime(10).sound(SoundType.NETHERITE_BLOCK)));
+ public static RegistryObject registerWithItem(RegistryObject blk, Item.Properties props)
+ {
+ CreativeModeTabs.addToOTEModTab(ITEMS.register(blk.getId().getPath(), ()->new BlockItem(blk.get(), props)));
- public static final RegistryObject
- AURORA_DOOR_I = ITEMS.register("aurora_door", () -> new BlockItem(AURORA_DOOR.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
+ return blk;
+ }
+
+
+ public static final RegistryObject ETERNIUM_ORE_BLOCK = registerWithItem(BLOCKS.register("eternium_ore_block", ()->new DropExperienceBlock(explosionResistance)), new Item.Properties());
+
+ public static final RegistryObject VAULT_STEEL_ORE_BLOCK = registerWithItem(BLOCKS.register("vault_steel_ore_block", ()->new DropExperienceBlock(explosionResistance)), new Item.Properties());
+
+ public static final RegistryObject NETHER_VAULT_STEEL_ORE_BLOCK = registerWithItem(BLOCKS.register("nether_vault_steel_ore_block", ()->new DropExperienceBlock(explosionResistance)), new Item.Properties());
+
+ public static final RegistryObject ETERNIUM_BLOCK = registerWithItem(BLOCKS.register("eternium_block", ()->new Block(explosionResistance)), new Item.Properties());
+
+ public static final RegistryObject DEEPSLATE_ETERNIUM_ORE_BLOCK = registerWithItem(BLOCKS.register("deepslate_eternium_ore_block", ()->new DropExperienceBlock(explosionResistance)), new Item.Properties());
+
+ public static final RegistryObject ITEM_SCRUBBER = registerWithItem(BLOCKS.register("item_scrubber", ()->new ItemScrubberBlock(noViewBlocking)), new Item.Properties());
+
+ public static final RegistryObject MAGICAL_SCRUBBER = registerWithItem(BLOCKS.register("magical_scrubber", ()->new MagicalScrubberBlock(noViewBlocking)), new Item.Properties());
+
+ public static final RegistryObject STABLE_SINGULARITY = registerWithItem(BLOCKS.register("stable_singularity", ()->new Block(noViewBlocking)), new Item.Properties());
+
+ public static final RegistryObject COMPRESSION_CHAMBER = registerWithItem(BLOCKS.register("compression_chamber", ()->new CompressionChamberBlock(noViewBlocking)), new Item.Properties());
+
+ public static final RegistryObject COMPRESSED_OBSIDIAN_BLOCK = registerWithItem(BLOCKS.register("compressed_obsidian_block", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN))), new Item.Properties());
+
+ public static final RegistryObject LAYERED_COMPRESSED_OBSIDIAN_BLOCK = registerWithItem(BLOCKS.register("layered_compressed_obsidian_block", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN))), new Item.Properties());
+
+ public static final RegistryObject VOID = registerWithItem(BLOCKS.register("void", ()->new Block(fullBright().noCollission())), new Item.Properties());
+
+ public static final RegistryObject WHITEOUT = registerWithItem(BLOCKS.register("whiteout", ()->new Block(fullBright().noCollission())), new Item.Properties());
+
+ public static final RegistryObject BLOOD_RED = registerWithItem(BLOCKS.register("blood_red", ()->new Block(fullBright())), new Item.Properties());
+
+ public static final RegistryObject RED_TILE = registerWithItem(BLOCKS.register("red_tile", ()-> new Block(fullBright())), new Item.Properties());
+
+ public static final RegistryObject RED_STAIRS = registerWithItem(BLOCKS.register("red_stairs", ()-> new StairBlock(BLOOD_RED.get()::defaultBlockState, fullBright())), new Item.Properties());
+
+ public static final RegistryObject RED_TILE_BR = registerWithItem(BLOCKS.register("red_tile_br", ()->new RotatableBlock(fullBright())), new Item.Properties());
+
+ public static final RegistryObject RED_TILE_TO_WALL = registerWithItem(BLOCKS.register("red_tile_to_wall", ()->new Block(fullBright())), new Item.Properties());
+
+ public static final RegistryObject RED_WALL_V1 = registerWithItem(BLOCKS.register("red_wall_variant_1", ()->new Block(fullBright())), new Item.Properties());
+
+ public static final RegistryObject RED_WALL_V2 = registerWithItem(BLOCKS.register("red_wall_variant_2", ()->new Block(fullBright())), new Item.Properties());
+
+ public static final RegistryObject CYAN = registerWithItem(BLOCKS.register("cyan", ()->new Block(fullBright())), new Item.Properties());
+
+ public static final RegistryObject CYAN_TILE = registerWithItem(BLOCKS.register("cyan_tile", ()->new Block(fullBright())), new Item.Properties());
+
+ public static final RegistryObject CYAN_STAIRS = registerWithItem(BLOCKS.register("cyan_stairs", ()->new StairBlock(CYAN.get()::defaultBlockState, fullBright())), new Item.Properties());
+
+ public static final RegistryObject CYAN_TILE_BR = registerWithItem(BLOCKS.register("cyan_tile_br", ()->new RotatableBlock(fullBright())), new Item.Properties());
+
+ public static final RegistryObject CYAN_TILE_TO_WALL = registerWithItem(BLOCKS.register("cyan_tile_to_wall", ()->new Block(fullBright())), new Item.Properties());
+
+ public static final RegistryObject CYAN_WALL_V1 = registerWithItem(BLOCKS.register("cyan_wall_variant_1", ()->new Block(fullBright())), new Item.Properties());
+
+ public static final RegistryObject CYAN_WALL_V2 = registerWithItem(BLOCKS.register("cyan_wall_variant_2", ()->new Block(fullBright())), new Item.Properties());
+
+ public static final RegistryObject POOL_TILE = registerWithItem(BLOCKS.register("pool_tile", ()->new Block(stone)), new Item.Properties());
+
+ public static final RegistryObject POOL_TILE_STAIRS = registerWithItem(BLOCKS.register("pool_tile_stairs", ()->new StairBlock(POOL_TILE.get()::defaultBlockState, stone)), new Item.Properties());
+
+ public static final RegistryObject POOL_TILE_SLAB = registerWithItem(BLOCKS.register("pool_tile_slab", ()->new SlabBlock(stone)), new Item.Properties());
+
+ public static final RegistryObject POOL_LIGHT = registerWithItem(BLOCKS.register("pool_light", ()->new Block(poolLightClean)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_POOL_TILE = registerWithItem(BLOCKS.register("dirty_pool_tile", ()->new Block(stone)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_POOL_TILE_STAIRS = registerWithItem(BLOCKS.register("dirty_pool_tile_stairs", ()->new StairBlock(DIRTY_POOL_TILE.get()::defaultBlockState, stone)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_POOL_TILE_SLAB = registerWithItem(BLOCKS.register("dirty_pool_tile_slab", ()-> new SlabBlock(stone)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_POOL_LIGHT = registerWithItem(BLOCKS.register("dirty_pool_light", ()->new Block(poolLightDirty)), new Item.Properties());
+
+ public static final RegistryObject FILTHY_POOL_LIGHT = registerWithItem(BLOCKS.register("filthy_pool_light", ()->new Block(poolLightFilthy)), new Item.Properties());
+
+ public static final RegistryObject DARK_POOL_TILE = registerWithItem(BLOCKS.register("dark_pool_tile", ()->new Block(stone)), new Item.Properties());
+
+ public static final RegistryObject DARK_POOL_LIGHT = registerWithItem(BLOCKS.register("dark_pool_light", ()->new Block(poolLightClean)), new Item.Properties());
+
+ public static final RegistryObject DARK_POOL_TILE_STAIRS = registerWithItem(BLOCKS.register("dark_pool_tile_stairs", ()->new StairBlock(DARK_POOL_TILE.get()::defaultBlockState, stone)), new Item.Properties());
+
+ public static final RegistryObject DARK_POOL_TILE_SLAB = registerWithItem(BLOCKS.register("dark_pool_tile_slab",()-> new SlabBlock(stone)), new Item.Properties());
+
+ public static final RegistryObject BLUE_POOL_TILE = registerWithItem(BLOCKS.register("blue_pool_tile",()-> new Block(stone)), new Item.Properties());
+
+ public static final RegistryObject BLUE_POOL_TILE_STAIRS = registerWithItem(BLOCKS.register("blue_pool_tile_stairs", ()->new StairBlock(BLUE_POOL_TILE.get()::defaultBlockState, stone)), new Item.Properties());
+
+ public static final RegistryObject BLUE_POOL_TILE_SLAB = registerWithItem(BLOCKS.register("blue_pool_tile_slab",()-> new SlabBlock(stone)), new Item.Properties());
+
+ public static final RegistryObject BLUE_POOL_LIGHT = registerWithItem(BLOCKS.register("blue_pool_light", ()->new Block(poolLightClean)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_BLUE_POOL_TILE = registerWithItem(BLOCKS.register("dirty_blue_pool_tile", ()->new Block(stone)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_BLUE_POOL_TILE_STAIRS = registerWithItem(BLOCKS.register("dirty_blue_pool_tile_stairs", ()->new StairBlock(DIRTY_BLUE_POOL_TILE.get()::defaultBlockState, stone)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_BLUE_POOL_TILE_SLAB = registerWithItem(BLOCKS.register("dirty_blue_pool_tile_slab", ()->new SlabBlock(stone)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_BLUE_POOL_LIGHT = registerWithItem(BLOCKS.register("dirty_blue_pool_light", ()->new Block(poolLightDirty)), new Item.Properties());
+
+ public static final RegistryObject FILTHY_BLUE_POOL_LIGHT = registerWithItem(BLOCKS.register("filthy_blue_pool_light", ()->new Block(poolLightFilthy)), new Item.Properties());
+
+ public static final RegistryObject RED_POOL_TILE = registerWithItem(BLOCKS.register("red_pool_tile", ()->new Block(stone)), new Item.Properties());
+
+ public static final RegistryObject RED_POOL_TILE_STAIRS = registerWithItem(BLOCKS.register("red_pool_tile_stairs", ()->new StairBlock(RED_POOL_TILE.get()::defaultBlockState, stone)), new Item.Properties());
+
+ public static final RegistryObject RED_POOL_TILE_SLAB = registerWithItem(BLOCKS.register("red_pool_tile_slab", ()->new SlabBlock(stone)), new Item.Properties());
+
+ public static final RegistryObject RED_POOL_LIGHT = registerWithItem(BLOCKS.register("red_pool_light", ()->new Block(poolLightClean)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_RED_POOL_TILE = registerWithItem(BLOCKS.register("dirty_red_pool_tile", ()->new Block(stone)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_RED_POOL_LIGHT = registerWithItem(BLOCKS.register("dirty_red_pool_light", ()->new Block(poolLightDirty)), new Item.Properties());
+
+ public static final RegistryObject FILTHY_RED_POOL_LIGHT = registerWithItem(BLOCKS.register("filthy_red_pool_light", ()->new Block(poolLightFilthy)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_RED_POOL_TILE_STAIRS = registerWithItem(BLOCKS.register("dirty_red_pool_tile_stairs", ()->new StairBlock(DIRTY_RED_POOL_TILE.get()::defaultBlockState, stone)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_RED_POOL_TILE_SLAB = registerWithItem(BLOCKS.register("dirty_red_pool_tile_slab", ()->new SlabBlock(stone)), new Item.Properties());
+
+ public static final RegistryObject DARK_RED_WOOL = registerWithItem(BLOCKS.register("dark_red_wool", ()->new Block(BlockBehaviour.Properties.copy(Blocks.RED_WOOL))), new Item.Properties());
+
+ public static final RegistryObject DARK_RED_CARPET = registerWithItem(BLOCKS.register("dark_red_carpet", ()->new CarpetBlock(BlockBehaviour.Properties.copy(Blocks.RED_CARPET))), new Item.Properties());
+
+ public static final RegistryObject GREEN_POOL_TILE = registerWithItem(BLOCKS.register("green_pool_tile", ()->new Block(stone)), new Item.Properties());
+
+ public static final RegistryObject GREEN_POOL_TILE_STAIRS = registerWithItem(BLOCKS.register("green_pool_tile_stairs", ()->new StairBlock(GREEN_POOL_TILE.get()::defaultBlockState, stone)), new Item.Properties());
+
+ public static final RegistryObject GREEN_POOL_TILE_SLAB = registerWithItem(BLOCKS.register("green_pool_tile_slab", ()->new SlabBlock(stone)), new Item.Properties());
+
+ public static final RegistryObject GREEN_POOL_LIGHT = registerWithItem(BLOCKS.register("green_pool_light", ()->new Block(poolLightClean)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_GREEN_POOL_TILE = registerWithItem(BLOCKS.register("dirty_green_pool_tile", ()->new Block(stone)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_GREEN_POOL_LIGHT = registerWithItem(BLOCKS.register("dirty_green_pool_light", ()->new Block(poolLightDirty)), new Item.Properties());
+
+ public static final RegistryObject FILTHY_GREEN_POOL_LIGHT = registerWithItem(BLOCKS.register("filthy_green_pool_light", ()->new Block(poolLightFilthy)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_GREEN_POOL_TILE_STAIRS = registerWithItem(BLOCKS.register("dirty_green_pool_tile_stairs", ()->new StairBlock(DIRTY_GREEN_POOL_TILE.get()::defaultBlockState, stone)), new Item.Properties());
+
+ public static final RegistryObject DIRTY_GREEN_POOL_TILE_SLAB = registerWithItem(BLOCKS.register("dirty_green_pool_tile_slab", ()->new SlabBlock(stone)), new Item.Properties());
+
+ public static final RegistryObject UNCRAFTER = registerWithItem(BLOCKS.register("uncrafter", ()->new UncrafterBlock(BlockBehaviour.Properties.of().noOcclusion().requiresCorrectToolForDrops().strength(6))), new Item.Properties());
}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/ParallaxWindow.java b/src/main/java/dev/zontreck/otemod/blocks/ParallaxWindow.java
new file mode 100644
index 0000000..7a05350
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/ParallaxWindow.java
@@ -0,0 +1,30 @@
+package dev.zontreck.otemod.blocks;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.*;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.DirectionProperty;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
+
+public class ParallaxWindow extends BaseEntityBlock
+{
+ protected static final double OFFSET = 0.0625;
+
+ public ParallaxWindow(int light) {
+ super(Properties.copy(Blocks.BEDROCK).lightLevel(x->light).sound(SoundType.GLASS));
+ }
+
+ @Override
+ public boolean propagatesSkylightDown(BlockState pState, BlockGetter pReader, BlockPos pPos) {
+ return true;
+ }
+
+ @Nullable
+ @Override
+ public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
+ return null;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/PartialTransparentBlock.java b/src/main/java/dev/zontreck/otemod/blocks/PartialTransparentBlock.java
new file mode 100644
index 0000000..484422f
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/PartialTransparentBlock.java
@@ -0,0 +1,18 @@
+package dev.zontreck.otemod.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
+{
+ protected PartialTransparentBlock(Properties p_48729_) {
+ super(p_48729_);
+ }
+
+ @Override
+ public boolean propagatesSkylightDown(BlockState p_48740_, BlockGetter p_48741_, BlockPos p_48742_) {
+ return true;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/PartialTransparentSlabBlock.java b/src/main/java/dev/zontreck/otemod/blocks/PartialTransparentSlabBlock.java
new file mode 100644
index 0000000..2f840b1
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/PartialTransparentSlabBlock.java
@@ -0,0 +1,19 @@
+package dev.zontreck.otemod.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
+{
+ protected PartialTransparentSlabBlock(Properties p_48729_) {
+ super(p_48729_);
+ }
+
+ @Override
+ public boolean propagatesSkylightDown(BlockState p_48740_, BlockGetter p_48741_, BlockPos p_48742_) {
+ return true;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/RegistryObj.java b/src/main/java/dev/zontreck/otemod/blocks/RegistryObj.java
new file mode 100644
index 0000000..284fd0b
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/RegistryObj.java
@@ -0,0 +1,18 @@
+package dev.zontreck.otemod.blocks;
+
+
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+import net.minecraftforge.registries.RegistryObject;
+
+public class RegistryObj
+{
+ public RegistryObject block;
+ public RegistryObject extends Item> item;
+
+ public RegistryObj(RegistryObject blk, RegistryObject extends Item> item)
+ {
+ this.block=blk;
+ this.item=item;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/RotatableBlock.java b/src/main/java/dev/zontreck/otemod/blocks/RotatableBlock.java
new file mode 100644
index 0000000..c8cbdaf
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/RotatableBlock.java
@@ -0,0 +1,26 @@
+package dev.zontreck.otemod.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.state.BlockState;
+import net.minecraft.world.level.block.state.StateDefinition;
+
+public class RotatableBlock extends HorizontalDirectionalBlock
+{
+ protected RotatableBlock(Properties pProperties) {
+ super(pProperties);
+ }
+
+ @Override
+ protected void createBlockStateDefinition(StateDefinition.Builder pBuilder) {
+ super.createBlockStateDefinition(pBuilder);
+ pBuilder.add(FACING);
+ }
+
+
+ @Override
+ public BlockState getStateForPlacement(BlockPlaceContext pContext) {
+ return defaultBlockState().setValue(FACING, pContext.getHorizontalDirection());
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/dev/zontreck/otemod/blocks/RotatableBlockCustomVoxels.java b/src/main/java/dev/zontreck/otemod/blocks/RotatableBlockCustomVoxels.java
new file mode 100644
index 0000000..2ca6d84
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/RotatableBlockCustomVoxels.java
@@ -0,0 +1,35 @@
+package dev.zontreck.otemod.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 rotatedShapes = new HashMap<>();
+
+ protected 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;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/UncrafterBlock.java b/src/main/java/dev/zontreck/otemod/blocks/UncrafterBlock.java
new file mode 100644
index 0000000..b1b0954
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/UncrafterBlock.java
@@ -0,0 +1,105 @@
+package dev.zontreck.otemod.blocks;
+
+import dev.zontreck.otemod.blocks.entity.CompressionChamberBlockEntity;
+import dev.zontreck.otemod.blocks.entity.ModEntities;
+import dev.zontreck.otemod.blocks.entity.UncrafterBlockEntity;
+import dev.zontreck.otemod.networking.ModMessages;
+import dev.zontreck.otemod.networking.packets.EnergySyncS2CPacket;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.EntityBlock;
+import net.minecraft.world.level.block.HorizontalDirectionalBlock;
+import net.minecraft.world.level.block.RenderShape;
+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.block.state.StateDefinition;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraftforge.network.NetworkHooks;
+import org.jetbrains.annotations.Nullable;
+
+public class UncrafterBlock extends HorizontalDirectionalBlock implements EntityBlock
+{
+
+ public UncrafterBlock(Properties pProperties) {
+ super(pProperties);
+ }
+
+ @Override
+ protected void createBlockStateDefinition(StateDefinition.Builder pBuilder) {
+ super.createBlockStateDefinition(pBuilder);
+ pBuilder.add(FACING);
+ }
+
+ @Nullable
+ @Override
+ public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
+ return new UncrafterBlockEntity(blockPos, blockState);
+ }
+
+ @Override
+ public RenderShape getRenderShape(BlockState pState) {
+ return RenderShape.MODEL;
+ }
+
+ @Override
+ public InteractionResult use(BlockState state, Level lvl, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit)
+ {
+ if(!lvl.isClientSide())
+ {
+ BlockEntity be = lvl.getBlockEntity(pos);
+ if(be instanceof UncrafterBlockEntity entity)
+ {
+ NetworkHooks.openScreen(((ServerPlayer)player), entity, pos);
+
+ ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player);
+
+ }else{
+ throw new IllegalStateException("Our container is missing!");
+ }
+ }
+
+ return InteractionResult.sidedSuccess(lvl.isClientSide);
+ }
+
+ @Override
+ public void onRemove(BlockState pState, Level pLevel, BlockPos pPos, BlockState pNewState, boolean pMovedByPiston) {
+ if(pState.getBlock() != pNewState.getBlock())
+ {
+ BlockEntity be = pLevel.getBlockEntity(pPos);
+ if(be instanceof UncrafterBlockEntity)
+ {
+ ((UncrafterBlockEntity)be).doDrop();
+ }
+ }
+
+ super.onRemove(pState, pLevel, pPos, pNewState, pMovedByPiston);
+ }
+
+ @Nullable
+ @Override
+ public BlockEntityTicker getTicker(Level pLevel, BlockState pState, BlockEntityType pBlockEntityType) {
+
+ return createTickerHelper(pBlockEntityType, ModEntities.UNCRAFTER.get(), UncrafterBlockEntity::tick);
+ }
+
+
+ protected static BlockEntityTicker createTickerHelper(BlockEntityType pServerType, BlockEntityType pClientType, BlockEntityTicker super E> pTicker) {
+ return pClientType == pServerType ? (BlockEntityTicker) pTicker : null;
+ }
+
+
+ @Override
+ public BlockState getStateForPlacement(BlockPlaceContext pContext) {
+ return defaultBlockState().setValue(FACING, pContext.getHorizontalDirection());
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/VoidBlock.java b/src/main/java/dev/zontreck/otemod/blocks/VoidBlock.java
new file mode 100644
index 0000000..83df4b1
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/VoidBlock.java
@@ -0,0 +1,12 @@
+package dev.zontreck.otemod.blocks;
+
+import net.minecraft.world.level.block.Block;
+
+public class VoidBlock extends Block
+{
+ public VoidBlock(Properties pProperties) {
+ super(pProperties);
+ }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/dev/zontreck/otemod/blocks/entity/CompressionChamberBlockEntity.java b/src/main/java/dev/zontreck/otemod/blocks/entity/CompressionChamberBlockEntity.java
new file mode 100644
index 0000000..049f03f
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/entity/CompressionChamberBlockEntity.java
@@ -0,0 +1,331 @@
+package dev.zontreck.otemod.blocks.entity;
+
+import dev.zontreck.libzontreck.items.InputItemStackHandler;
+import dev.zontreck.libzontreck.items.OutputItemStackHandler;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.otemod.implementation.compressor.CompressionChamberMenu;
+import dev.zontreck.otemod.implementation.energy.IThresholdsEnergy;
+import dev.zontreck.otemod.implementation.energy.OTEEnergy;
+import dev.zontreck.otemod.networking.ModMessages;
+import dev.zontreck.otemod.networking.packets.EnergySyncS2CPacket;
+import dev.zontreck.otemod.recipe.CompressionChamberRecipe;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.Containers;
+import net.minecraft.world.MenuProvider;
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.ContainerData;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
+import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.energy.IEnergyStorage;
+import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.ItemStackHandler;
+
+import javax.annotation.Nullable;
+import java.util.Optional;
+
+public class CompressionChamberBlockEntity extends BlockEntity implements MenuProvider, IThresholdsEnergy
+{
+
+ private boolean EnergyDirty=true;
+ private int TickCount=0;
+
+ public CompressionChamberBlockEntity(BlockPos pPos, BlockState pBlockState) {
+ super(ModEntities.COMPRESSION_CHAMBER.get(), pPos, pBlockState);
+
+ outputSlot = new OutputItemStackHandler(outputItems);
+
+ data = new ContainerData() {
+ @Override
+ public int get(int i) {
+ return switch (i){
+ case 0 -> CompressionChamberBlockEntity.this.progress;
+ default -> 0;
+ };
+ }
+
+ @Override
+ public void set(int i, int i1) {
+ switch(i)
+ {
+ case 0->CompressionChamberBlockEntity.this.progress = i1;
+ }
+ }
+
+ @Override
+ public int getCount() {
+ return 1;
+ }
+ };
+ }
+
+ protected final ContainerData data;
+ protected int progress=0;
+
+ public static int PROCESSING_TICKS = 80;
+
+ protected final ItemStackHandler itemsHandler = new ItemStackHandler(1){
+ @Override
+ protected void onContentsChanged(int slot)
+ {
+ setChanged();
+ }
+ };
+ protected final ItemStackHandler outputItems = new ItemStackHandler(1){
+ @Override
+ protected void onContentsChanged(int slot)
+ {
+ setChanged();
+ }
+ };
+ private ItemStackHandler outputSlot;
+
+ private final OTEEnergy ENERGY_STORAGE = new OTEEnergy(ENERGY_REQUIREMENT*3, ENERGY_REQUIREMENT*512) {
+
+ @Override
+ public void onChanged() {
+ setChanged();
+ EnergyDirty=true;
+
+ }
+ };
+
+
+ private static int ENERGY_REQUIREMENT = 750;
+
+ private LazyOptional lazyEnergyHandler = LazyOptional.empty();
+
+ private LazyOptional lazyItemHandler = LazyOptional.empty();
+ private LazyOptional lazyOutputItems = LazyOptional.empty();
+
+
+ @Override
+ public Component getDisplayName() {
+ return ChatHelpers.macro("Compression Chamber");
+ }
+
+ @Override
+ @Nullable
+ public AbstractContainerMenu createMenu(int id, Inventory inv, Player player) {
+ return new CompressionChamberMenu(id, inv, this, this.data);
+ }
+
+
+ @Override
+ public LazyOptional getCapability(Capability cap, Direction side)
+ {
+ if(cap == ForgeCapabilities.ENERGY)
+ {
+ return lazyEnergyHandler.cast();
+ }
+ if(side == Direction.DOWN && cap == ForgeCapabilities.ITEM_HANDLER)
+ {
+ // Return the output slot only
+ return lazyOutputItems.cast();
+ }
+ if(cap == ForgeCapabilities.ITEM_HANDLER)
+ {
+ return lazyItemHandler.cast();
+ }
+
+ return super.getCapability(cap,side);
+ }
+
+
+ @Override
+ public void onLoad()
+ {
+ super.onLoad();
+ lazyItemHandler = LazyOptional.of(()->itemsHandler);
+ lazyOutputItems = LazyOptional.of(()->outputSlot);
+ lazyEnergyHandler = LazyOptional.of(()->ENERGY_STORAGE);
+ }
+
+
+ @Override
+ public void invalidateCaps()
+ {
+ super.invalidateCaps();
+ lazyItemHandler.invalidate();
+ lazyOutputItems.invalidate();
+ lazyEnergyHandler.invalidate();
+ }
+
+ @Override
+ protected void saveAdditional(CompoundTag nbt)
+ {
+ nbt.put("inventory", itemsHandler.serializeNBT());
+ nbt.put("output", outputItems.serializeNBT());
+ nbt.putInt("prog", progress);
+ nbt.putInt("energy", ENERGY_STORAGE.getEnergyStored());
+
+ super.saveAdditional(nbt);
+ }
+
+ @Override
+ public void load(CompoundTag nbt){
+ super.load(nbt);
+
+ itemsHandler.deserializeNBT(nbt.getCompound("inventory"));
+ outputItems.deserializeNBT(nbt.getCompound("output"));
+ progress = nbt.getInt("prog");
+ ENERGY_STORAGE.setEnergy(nbt.getInt("energy"));
+ }
+
+ public void doDrop()
+ {
+ SimpleContainer cont = new SimpleContainer(itemsHandler.getSlots());
+ for (int i = 0; i < itemsHandler.getSlots(); i++) {
+ cont.setItem(i, itemsHandler.getStackInSlot(i));
+ }
+ cont = new SimpleContainer(outputItems.getSlots());
+ for (int i = 0; i < outputItems.getSlots(); i++) {
+ cont.setItem(i, outputItems.getStackInSlot(i));
+ }
+
+ Containers.dropContents(this.level, this.worldPosition, cont);
+ }
+
+
+ public static void tick(Level lvl, BlockPos pos, BlockState state, CompressionChamberBlockEntity entity)
+ {
+ if(lvl.isClientSide())return;
+
+
+
+ if(entity.EnergyDirty)
+ {
+ if(entity.TickCount >= (2 * 20))
+ {
+ ModMessages.sendToAll(new EnergySyncS2CPacket(entity.getEnergy(), pos));
+ entity.EnergyDirty=false;
+ } else entity.TickCount++;
+ }
+
+
+ if(hasRecipe(entity))
+ {
+ if(!hasEnergy(entity))return; // Halt until sufficient energy has been received
+ entity.progress++;
+ setChanged(lvl, pos, state);
+ drain(entity);
+
+ if(entity.progress >= CompressionChamberBlockEntity.PROCESSING_TICKS)
+ {
+ craftItem(entity);
+ }
+ }else {
+ if(entity.progress>0){
+ entity.resetProgress();
+ setChanged(lvl, pos, state);
+ }
+ }
+ }
+
+
+ private static void drain(CompressionChamberBlockEntity entity) {
+ entity.ENERGY_STORAGE.extractEnergy(ENERGY_REQUIREMENT, false);
+ }
+
+ private static boolean hasEnergy(CompressionChamberBlockEntity entity) {
+ return (entity.ENERGY_STORAGE.getEnergyStored() >= ENERGY_REQUIREMENT);
+ }
+
+
+ private static void craftItem(CompressionChamberBlockEntity entity) {
+ if(hasRecipe(entity))
+ {
+ SimpleContainer inventory = new SimpleContainer(entity.itemsHandler.getSlots());
+ for(int i=0;i recipe = entity.level.getRecipeManager().getRecipeFor(CompressionChamberRecipe.Type.INSTANCE, inventory, entity.level);
+
+ ItemStack existing = entity.outputItems.getStackInSlot(0);
+
+ if(existing.is(Items.AIR))
+ {
+ existing = recipe.get().getResultItem(entity.level.registryAccess());
+ }else
+ existing.setCount(recipe.get().getResultItem(entity.level.registryAccess()).getCount() + existing.getCount());
+
+ entity.outputItems.setStackInSlot(0, existing);
+ entity.itemsHandler.extractItem(0,1,false);
+
+
+ entity.resetProgress();
+ }
+ }
+
+ private static boolean hasRecipe(CompressionChamberBlockEntity entity) {
+ SimpleContainer inventory = new SimpleContainer(entity.itemsHandler.getSlots());
+ for(int i=0;i recipe = entity.level.getRecipeManager().getRecipeFor(CompressionChamberRecipe.Type.INSTANCE, inventory, entity.level);
+
+ boolean ret = recipe.isPresent() && canInsertIntoOutput(output, recipe.get().getResultItem(entity.level.registryAccess()));
+
+ if(ret)
+ {
+ PROCESSING_TICKS = recipe.get().getTime();
+ }
+
+ return ret;
+ }
+
+ private static boolean canInsertIntoOutput(SimpleContainer inventory, ItemStack result) {
+ ItemStack existing = inventory.getItem(0);
+ boolean stackCompat = (existing.getMaxStackSize() > existing.getCount());
+ boolean sameType = (existing.getItem() == result.getItem());
+ boolean outputEmpty = existing.isEmpty();
+
+ if(outputEmpty)return true;
+ return (stackCompat && sameType);
+ }
+
+ private void resetProgress() {
+ progress=0;
+
+ }
+
+ public IEnergyStorage getEnergyStorage() {
+ return ENERGY_STORAGE;
+ }
+
+ @Override
+ public void setEnergy(int energy) {
+ ENERGY_STORAGE.setEnergy(energy);
+ }
+
+
+ @Override
+ public int getEnergy() {
+ return ENERGY_STORAGE.getEnergy();
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/entity/ItemScrubberBlockEntity.java b/src/main/java/dev/zontreck/otemod/blocks/entity/ItemScrubberBlockEntity.java
new file mode 100644
index 0000000..53f00c3
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/entity/ItemScrubberBlockEntity.java
@@ -0,0 +1,314 @@
+package dev.zontreck.otemod.blocks.entity;
+
+import dev.zontreck.libzontreck.items.InputItemStackHandler;
+import dev.zontreck.libzontreck.items.OutputItemStackHandler;
+import dev.zontreck.otemod.implementation.energy.IThresholdsEnergy;
+import dev.zontreck.otemod.implementation.energy.OTEEnergy;
+import dev.zontreck.otemod.implementation.scrubber.ItemScrubberMenu;
+import dev.zontreck.otemod.networking.ModMessages;
+import dev.zontreck.otemod.networking.packets.EnergySyncS2CPacket;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.Containers;
+import net.minecraft.world.MenuProvider;
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.ContainerData;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
+import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.energy.IEnergyStorage;
+import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.ItemStackHandler;
+
+import javax.annotation.Nullable;
+
+public class ItemScrubberBlockEntity extends BlockEntity implements MenuProvider, IThresholdsEnergy
+{
+
+ private boolean EnergyDirty=true;
+ private int TickCount=0;
+
+
+ @Override
+ public int getEnergy() {
+ return ENERGY_STORAGE.getEnergy();
+ }
+
+ protected final ItemStackHandler itemsHandler = new ItemStackHandler(1){
+ @Override
+ protected void onContentsChanged(int slot)
+ {
+ setChanged();
+ }
+ };
+ protected final ItemStackHandler outputItems = new ItemStackHandler(1){
+ @Override
+ protected void onContentsChanged(int slot)
+ {
+ setChanged();
+ }
+ };
+ private ItemStackHandler outputSlot;
+
+
+ private final OTEEnergy ENERGY_STORAGE = new OTEEnergy(ENERGY_REQ*3, ENERGY_REQ+512) {
+
+ @Override
+ public void onChanged() {
+ setChanged();
+ EnergyDirty=true;
+ }
+
+ };
+
+ private static final int ENERGY_REQ = 512;
+ private LazyOptional lazyEnergyHandler = LazyOptional.empty();
+
+ private LazyOptional lazyItemHandler = LazyOptional.empty();
+ private LazyOptional lazyOutputItems = LazyOptional.empty();
+
+ public ItemScrubberBlockEntity(BlockPos pos, BlockState state) {
+ super(ModEntities.ITEM_SCRUBBER.get(), pos, state);
+ outputSlot = new OutputItemStackHandler(outputItems);
+
+ this.data = new ContainerData() {
+
+ @Override
+ public int get(int p_39284_) {
+ return switch(p_39284_){
+ case 0 -> ItemScrubberBlockEntity.this.progress;
+ default -> 0;
+ };
+ }
+
+ @Override
+ public void set(int p_39285_, int p_39286_) {
+ switch(p_39285_)
+ {
+ case 0 -> ItemScrubberBlockEntity.this.progress = p_39286_;
+ }
+
+ }
+
+ @Override
+ public int getCount() {
+ return 1;
+ }
+
+ };
+ }
+
+ protected final ContainerData data;
+ private int progress = 0;
+
+ public static final int MAXIMUM_PROCESSING_TICKS = 250;
+
+
+ @Override
+ @Nullable
+ public AbstractContainerMenu createMenu(int id, Inventory inv, Player player) {
+ return new ItemScrubberMenu(id, inv, this, this.data);
+ }
+
+ @Override
+ public Component getDisplayName() {
+ return Component.translatable("block.otemod.item_scrubber");
+ }
+
+ @Override
+ public LazyOptional getCapability(Capability cap, Direction side)
+ {
+ if(cap == ForgeCapabilities.ENERGY)
+ {
+ return lazyEnergyHandler.cast();
+ }
+ if(side == Direction.DOWN && cap == ForgeCapabilities.ITEM_HANDLER)
+ {
+ // Return the output slot only
+ return lazyOutputItems.cast();
+ }
+ if(cap == ForgeCapabilities.ITEM_HANDLER)
+ {
+ return lazyItemHandler.cast();
+ }
+
+ return super.getCapability(cap,side);
+ }
+
+
+ @Override
+ public void onLoad()
+ {
+ super.onLoad();
+ lazyItemHandler = LazyOptional.of(()->itemsHandler);
+ lazyOutputItems = LazyOptional.of(()->outputSlot);
+ lazyEnergyHandler = LazyOptional.of(()->ENERGY_STORAGE);
+ }
+
+
+ @Override
+ public void invalidateCaps()
+ {
+ super.invalidateCaps();
+ lazyItemHandler.invalidate();
+ lazyOutputItems.invalidate();
+ lazyEnergyHandler.invalidate();
+ }
+
+ @Override
+ protected void saveAdditional(CompoundTag nbt)
+ {
+ nbt.put("inventory", itemsHandler.serializeNBT());
+ nbt.put("output", outputItems.serializeNBT());
+ nbt.putInt("prog", progress);
+ nbt.putInt("energy", ENERGY_STORAGE.getEnergyStored());
+
+ super.saveAdditional(nbt);
+ }
+
+ @Override
+ public void load(CompoundTag nbt){
+ super.load(nbt);
+
+ itemsHandler.deserializeNBT(nbt.getCompound("inventory"));
+ outputItems.deserializeNBT(nbt.getCompound("output"));
+ progress = nbt.getInt("prog");
+ ENERGY_STORAGE.setEnergy(nbt.getInt("energy"));
+ }
+
+ public void doDrop()
+ {
+ SimpleContainer cont = new SimpleContainer(itemsHandler.getSlots());
+ for (int i = 0; i < itemsHandler.getSlots(); i++) {
+ cont.setItem(i, itemsHandler.getStackInSlot(i));
+ }
+ cont = new SimpleContainer(outputItems.getSlots());
+ for (int i = 0; i < outputItems.getSlots(); i++) {
+ cont.setItem(i, outputItems.getStackInSlot(i));
+ }
+
+ Containers.dropContents(this.level, this.worldPosition, cont);
+ }
+
+ public static void tick(Level lvl, BlockPos pos, BlockState state, ItemScrubberBlockEntity entity)
+ {
+ if(lvl.isClientSide())return;
+
+
+
+ if(entity.EnergyDirty)
+ {
+ if(entity.TickCount >= (2 * 20))
+ {
+ ModMessages.sendToAll(new EnergySyncS2CPacket(entity.getEnergy(), pos));
+ entity.EnergyDirty=false;
+ } else entity.TickCount++;
+ }
+
+ if(hasRecipe(entity))
+ {
+ if(!hasEnergy(entity))return; // Halt until sufficient energy has been received
+ entity.progress++;
+ setChanged(lvl, pos, state);
+ drain(entity);
+
+ if(entity.progress >= ItemScrubberBlockEntity.MAXIMUM_PROCESSING_TICKS)
+ {
+ craftItem(entity);
+ }
+ }else {
+ if(entity.progress>0){
+ entity.resetProgress();
+ setChanged(lvl, pos, state);
+ }
+ }
+ }
+
+ private static void drain(ItemScrubberBlockEntity entity) {
+ entity.ENERGY_STORAGE.extractEnergy(ENERGY_REQ, false);
+ }
+
+ private static boolean hasEnergy(ItemScrubberBlockEntity entity) {
+ return (entity.ENERGY_STORAGE.getEnergyStored() >= ENERGY_REQ);
+ }
+
+ private static void craftItem(ItemScrubberBlockEntity entity) {
+ if(hasRecipe(entity))
+ {
+ ItemStack existing = entity.outputItems.getStackInSlot(0);
+ existing.setCount(existing.getCount()+1);
+ if(existing.is(Items.AIR))
+ {
+ existing = makeOutputItem(entity.itemsHandler.getStackInSlot(0));
+ }
+ entity.itemsHandler.extractItem(0, 1, false);
+ entity.outputItems.setStackInSlot(0, existing);
+
+ entity.resetProgress();
+ }
+ }
+
+ private static boolean hasRecipe(ItemScrubberBlockEntity entity) {
+ SimpleContainer inventory = new SimpleContainer(entity.itemsHandler.getSlots());
+ for(int i=0;i existing.getCount());
+ boolean sameType = (existing.getItem() == result.getItem());
+ boolean outputEmpty = existing.isEmpty();
+
+ if(outputEmpty)return true;
+ return (stackCompat && sameType);
+ }
+
+ private void resetProgress() {
+ progress=0;
+
+ }
+
+ protected static ItemStack makeOutputItem(ItemStack original)
+ {
+ ItemStack newItem = new ItemStack(original.getItem(),1);
+ return newItem;
+ }
+
+ public IEnergyStorage getEnergyStorage() {
+ return ENERGY_STORAGE;
+ }
+
+ @Override
+ public void setEnergy(int energy) {
+ ENERGY_STORAGE.setEnergy(energy);
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/entity/MagicalScrubberBlockEntity.java b/src/main/java/dev/zontreck/otemod/blocks/entity/MagicalScrubberBlockEntity.java
new file mode 100644
index 0000000..32e055e
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/entity/MagicalScrubberBlockEntity.java
@@ -0,0 +1,363 @@
+package dev.zontreck.otemod.blocks.entity;
+
+import dev.zontreck.libzontreck.items.InputItemStackHandler;
+import dev.zontreck.libzontreck.items.OutputItemStackHandler;
+import dev.zontreck.libzontreck.util.ItemUtils;
+import dev.zontreck.otemod.implementation.energy.IThresholdsEnergy;
+import dev.zontreck.otemod.implementation.energy.OTEEnergy;
+import dev.zontreck.otemod.implementation.scrubber.MagicalScrubberMenu;
+import dev.zontreck.otemod.items.ModItems;
+import dev.zontreck.otemod.items.PartialItem;
+import dev.zontreck.otemod.networking.ModMessages;
+import dev.zontreck.otemod.networking.packets.EnergySyncS2CPacket;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.Containers;
+import net.minecraft.world.MenuProvider;
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.ContainerData;
+import net.minecraft.world.item.EnchantedBookItem;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+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.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
+import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.energy.IEnergyStorage;
+import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.ItemStackHandler;
+
+import javax.annotation.Nullable;
+import java.util.Iterator;
+import java.util.Map;
+
+public class MagicalScrubberBlockEntity extends BlockEntity implements MenuProvider, IThresholdsEnergy
+{
+
+
+ private boolean EnergyDirty=true;
+ private int TickCount=0;
+ @Override
+ public int getEnergy() {
+ return ENERGY_STORAGE.getEnergy();
+ }
+
+ protected final ItemStackHandler itemsHandler = new ItemStackHandler(1){
+ @Override
+ protected void onContentsChanged(int slot)
+ {
+ setChanged();
+ }
+ };
+ protected final ItemStackHandler outputItems = new ItemStackHandler(1){
+ @Override
+ protected void onContentsChanged(int slot)
+ {
+ setChanged();
+ }
+ };
+ private ItemStackHandler outputSlot;
+
+ private final OTEEnergy ENERGY_STORAGE = new OTEEnergy(ENERGY_REQ*3, ENERGY_REQ+512) {
+
+ @Override
+ public void onChanged() {
+ setChanged();
+ EnergyDirty=true;
+ }
+
+ };
+
+ private static final int ENERGY_REQ = 1000;
+ private LazyOptional lazyEnergyHandler = LazyOptional.empty();
+
+ private LazyOptional lazyItemHandler = LazyOptional.empty();
+ private LazyOptional lazyOutputItems = LazyOptional.empty();
+
+ public MagicalScrubberBlockEntity(BlockPos pos, BlockState state) {
+ super(ModEntities.MAGICAL_SCRUBBER.get(), pos, state);
+ outputSlot = new OutputItemStackHandler(outputItems);
+
+ this.data = new ContainerData() {
+
+ @Override
+ public int get(int p_39284_) {
+ return switch(p_39284_){
+ case 0 -> MagicalScrubberBlockEntity.this.progress;
+ default -> 0;
+ };
+ }
+
+ @Override
+ public void set(int p_39285_, int p_39286_) {
+ switch(p_39285_)
+ {
+ case 0 -> MagicalScrubberBlockEntity.this.progress = p_39286_;
+ }
+
+ }
+
+ @Override
+ public int getCount() {
+ return 1;
+ }
+
+ };
+ }
+
+ protected final ContainerData data;
+ private int progress = 0;
+
+ public static final int MAXIMUM_PROCESSING_TICKS = 175;
+
+
+ @Override
+ @Nullable
+ public AbstractContainerMenu createMenu(int id, Inventory inv, Player player) {
+ return new MagicalScrubberMenu(id, inv, this, this.data);
+ }
+
+ @Override
+ public Component getDisplayName() {
+ return Component.translatable("block.otemod.magical_scrubber");
+ }
+
+ @Override
+ public LazyOptional getCapability(Capability cap, Direction side)
+ {
+ if(cap == ForgeCapabilities.ENERGY)
+ {
+ return lazyEnergyHandler.cast();
+ }
+ if(side == Direction.DOWN && cap == ForgeCapabilities.ITEM_HANDLER)
+ {
+ // Return the output slot only
+ return lazyOutputItems.cast();
+ }
+ if(cap == ForgeCapabilities.ITEM_HANDLER)
+ {
+ return lazyItemHandler.cast();
+ }
+
+ return super.getCapability(cap,side);
+ }
+
+
+ @Override
+ public void onLoad()
+ {
+ super.onLoad();
+ lazyItemHandler = LazyOptional.of(()->itemsHandler);
+ lazyOutputItems = LazyOptional.of(()->outputSlot);
+ lazyEnergyHandler = LazyOptional.of(()->ENERGY_STORAGE);
+ }
+
+
+ @Override
+ public void invalidateCaps()
+ {
+ super.invalidateCaps();
+ lazyItemHandler.invalidate();
+ lazyOutputItems.invalidate();
+ lazyEnergyHandler.invalidate();
+ }
+
+ @Override
+ protected void saveAdditional(CompoundTag nbt)
+ {
+ nbt.put("inventory", itemsHandler.serializeNBT());
+ nbt.put("output", outputItems.serializeNBT());
+ nbt.putInt("prog", progress);
+ nbt.putInt("energy", ENERGY_STORAGE.getEnergyStored());
+
+ super.saveAdditional(nbt);
+ }
+
+ @Override
+ public void load(CompoundTag nbt){
+ super.load(nbt);
+
+ itemsHandler.deserializeNBT(nbt.getCompound("inventory"));
+ outputItems.deserializeNBT(nbt.getCompound("output"));
+ progress = nbt.getInt("prog");
+ ENERGY_STORAGE.setEnergy(nbt.getInt("energy"));
+ }
+
+ public void doDrop()
+ {
+ SimpleContainer cont = new SimpleContainer(itemsHandler.getSlots());
+ for (int i = 0; i < itemsHandler.getSlots(); i++) {
+ cont.setItem(i, itemsHandler.getStackInSlot(i));
+ }
+ cont = new SimpleContainer(outputItems.getSlots());
+ for (int i = 0; i < outputItems.getSlots(); i++) {
+ cont.setItem(i, outputItems.getStackInSlot(i));
+ }
+
+ Containers.dropContents(this.level, this.worldPosition, cont);
+ }
+
+ public static void tick(Level lvl, BlockPos pos, BlockState state, MagicalScrubberBlockEntity entity)
+ {
+ if(lvl.isClientSide())return;
+
+
+ if(entity.EnergyDirty)
+ {
+ if(entity.TickCount >= (2 * 20))
+ {
+ ModMessages.sendToAll(new EnergySyncS2CPacket(entity.getEnergy(), pos));
+ entity.EnergyDirty=false;
+ } else entity.TickCount++;
+ }
+
+ if(hasRecipe(entity))
+ {
+ if(!hasEnergy(entity))return; // Halt until sufficient energy has been received
+ entity.progress++;
+ setChanged(lvl, pos, state);
+ drain(entity);
+
+ if(entity.progress >= MagicalScrubberBlockEntity.MAXIMUM_PROCESSING_TICKS)
+ {
+ craftItem(entity);
+ }
+ }else {
+ if(entity.progress>0){
+ entity.resetProgress();
+ setChanged(lvl, pos, state);
+ }
+ }
+ }
+
+ private static void drain(MagicalScrubberBlockEntity entity) {
+ entity.ENERGY_STORAGE.extractEnergy(ENERGY_REQ, false);
+ }
+
+ private static boolean hasEnergy(MagicalScrubberBlockEntity entity) {
+ return (entity.ENERGY_STORAGE.getEnergyStored() >= ENERGY_REQ);
+ }
+
+ private static void craftItem(MagicalScrubberBlockEntity entity) {
+ if(hasRecipe(entity))
+ {
+ ItemStack existing = entity.outputItems.getStackInSlot(0);
+ ItemStack main = entity.itemsHandler.getStackInSlot(0);
+
+ //Map enchants = main.getAllEnchantments();
+
+ Map enchantments = EnchantmentHelper.getEnchantments(main.copy());
+
+ if(!main.is(ModItems.PARTIAL_ITEM.get()))
+ {
+ entity.itemsHandler.setStackInSlot(0, PartialItem.makePartialItem(main, true, false));
+ entity.resetProgress();
+ return;
+ }
+
+ if(enchantments.size()>0)
+ {
+ Iterator> iEntries = enchantments.entrySet().iterator();
+ try{
+ Map.Entry entry = iEntries.next();
+ EnchantmentInstance eInst = new EnchantmentInstance(entry.getKey(), entry.getValue());
+ existing = EnchantedBookItem.createForEnchantment(eInst);
+ iEntries.remove();
+ main = makeOutputItem(main.copy());
+ while(iEntries.hasNext())
+ {
+ entry = iEntries.next();
+ main.enchant(entry.getKey(), entry.getValue());
+ }
+ }catch(Exception E)
+ {
+ entity.outputItems.setStackInSlot(0, main);
+ entity.itemsHandler.extractItem(0, 1, false);
+ entity.resetProgress();
+ return;
+ }
+
+ if(enchantments.size()==0){
+ entity.itemsHandler.extractItem(0, 1, false);
+ }else entity.itemsHandler.setStackInSlot(0, main);
+
+
+ }else{
+
+ existing.setCount(existing.getCount()+1);
+ if(existing.is(Items.AIR))
+ {
+ existing = makeOutputItem(entity.itemsHandler.getStackInSlot(0));
+ }
+ entity.itemsHandler.extractItem(0, 1, false);
+ }
+
+ entity.outputItems.setStackInSlot(0, existing);
+ entity.resetProgress();
+ }
+ }
+
+ private static boolean hasRecipe(MagicalScrubberBlockEntity entity) {
+ SimpleContainer inventory = new SimpleContainer(entity.itemsHandler.getSlots());
+ for(int i=0;i existing.getCount());
+ boolean sameType = (existing.getItem() == result.getItem());
+ boolean outputEmpty = existing.isEmpty();
+
+ if(outputEmpty)return true;
+ return (stackCompat && sameType);
+ }
+
+ private void resetProgress() {
+ progress=0;
+
+ }
+
+ protected static ItemStack makeOutputItem(ItemStack original)
+ {
+ ItemStack newItem = new ItemStack(original.getItem(),1);
+ return newItem;
+ }
+
+ public IEnergyStorage getEnergyStorage() {
+ return ENERGY_STORAGE;
+ }
+
+ @Override
+ public void setEnergy(int energy) {
+ ENERGY_STORAGE.setEnergy(energy);
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/entity/ModEntities.java b/src/main/java/dev/zontreck/otemod/blocks/entity/ModEntities.java
new file mode 100644
index 0000000..97be2dc
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/entity/ModEntities.java
@@ -0,0 +1,34 @@
+package dev.zontreck.otemod.blocks.entity;
+
+import dev.zontreck.otemod.OTEMod;
+import dev.zontreck.otemod.blocks.CompressionChamberBlock;
+import dev.zontreck.otemod.blocks.ModBlocks;
+import net.minecraft.resources.ResourceLocation;
+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;
+
+public class ModEntities {
+
+ public static final DeferredRegister> ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, OTEMod.MOD_ID);
+
+ public static final RegistryObject > ITEM_SCRUBBER = ENTITIES.register("item_scrubber", ()-> BlockEntityType.Builder.of(ItemScrubberBlockEntity::new, ModBlocks.ITEM_SCRUBBER.get()).build(null));
+
+ public static final RegistryObject > MAGICAL_SCRUBBER = ENTITIES.register("magical_scrubber", ()-> BlockEntityType.Builder.of(MagicalScrubberBlockEntity::new, ModBlocks.MAGICAL_SCRUBBER.get()).build(null));
+
+ //public static final ResourceLocation PARALLAX_BLOCK = new ResourceLocation(OTEMod.MOD_ID, "parallax_block");
+
+ public static final RegistryObject> COMPRESSION_CHAMBER = ENTITIES.register("compression_chamber", ()->BlockEntityType.Builder.of(CompressionChamberBlockEntity::new, ModBlocks.COMPRESSION_CHAMBER.get()).build(null));
+
+ public static final RegistryObject> UNCRAFTER = ENTITIES.register("uncrafter", ()-> BlockEntityType.Builder.of(UncrafterBlockEntity::new, ModBlocks.UNCRAFTER.get()).build(null));
+
+ //public static final RegistryObject > PARALLAX_WINDOW_ENTITY = ENTITIES.register("parallax_window", ()->BlockEntityType.Builder.of(ParallaxWindowEntity::new, ModBlocks.LIMINAL_WINDOW.get()).build(null));
+
+
+ public static void register(IEventBus eventBus)
+ {
+ ENTITIES.register(eventBus);
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/entity/UncrafterBlockEntity.java b/src/main/java/dev/zontreck/otemod/blocks/entity/UncrafterBlockEntity.java
new file mode 100644
index 0000000..16bbfac
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/entity/UncrafterBlockEntity.java
@@ -0,0 +1,303 @@
+package dev.zontreck.otemod.blocks.entity;
+
+import dev.zontreck.libzontreck.items.InputItemStackHandler;
+import dev.zontreck.libzontreck.items.OutputItemStackHandler;
+import dev.zontreck.otemod.implementation.energy.IThresholdsEnergy;
+import dev.zontreck.otemod.implementation.energy.OTEEnergy;
+import dev.zontreck.otemod.implementation.uncrafting.UncrafterMenu;
+import dev.zontreck.otemod.networking.ModMessages;
+import dev.zontreck.otemod.networking.packets.EnergySyncS2CPacket;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.Containers;
+import net.minecraft.world.MenuProvider;
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.ContainerData;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
+import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.energy.IEnergyStorage;
+import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.ItemStackHandler;
+
+import javax.annotation.Nullable;
+import java.util.*;
+
+public class UncrafterBlockEntity extends BlockEntity implements MenuProvider, IThresholdsEnergy
+{
+
+ private boolean EnergyDirty=true;
+ private int TickCount=0;
+
+ @Override
+ public int getEnergy() {
+ return ENERGY_STORAGE.getEnergy();
+ }
+
+ protected final ItemStackHandler itemsHandler = new ItemStackHandler(1){
+ @Override
+ protected void onContentsChanged(int slot)
+ {
+ setChanged();
+ }
+ };
+ protected final ItemStackHandler outputItems = new ItemStackHandler(1){
+ @Override
+ protected void onContentsChanged(int slot)
+ {
+ setChanged();
+ }
+ };
+ private ItemStackHandler outputSlot;
+
+ private final OTEEnergy ENERGY_STORAGE = new OTEEnergy(ENERGY_REQ*3, ENERGY_REQ+512) {
+
+ @Override
+ public void onChanged() {
+ setChanged();
+ EnergyDirty=true;
+ }
+
+ };
+
+ private static final int ENERGY_REQ = 250;
+ private LazyOptional lazyEnergyHandler = LazyOptional.empty();
+
+ private LazyOptional lazyItemHandler = LazyOptional.empty();
+ private LazyOptional lazyOutputItems = LazyOptional.empty();
+
+ public UncrafterBlockEntity(BlockPos pos, BlockState state) {
+ super(ModEntities.UNCRAFTER.get(), pos, state);
+ outputSlot = new OutputItemStackHandler(outputItems);
+
+ this.data = new ContainerData() {
+
+ @Override
+ public int get(int p_39284_) {
+ return switch(p_39284_){
+ case 0 -> UncrafterBlockEntity.this.progress;
+ default -> 0;
+ };
+ }
+
+ @Override
+ public void set(int p_39285_, int p_39286_) {
+ switch(p_39285_)
+ {
+ case 0 -> UncrafterBlockEntity.this.progress = p_39286_;
+ }
+
+ }
+
+ @Override
+ public int getCount() {
+ return 1;
+ }
+
+ };
+ }
+
+ protected final ContainerData data;
+ private int progress = 0;
+
+ public static final int MAXIMUM_PROCESSING_TICKS = (3*20); // 3 seconds
+
+
+ @Override
+ @Nullable
+ public AbstractContainerMenu createMenu(int id, Inventory inv, Player player) {
+ return new UncrafterMenu(id, inv, this, this.data);
+ }
+
+ @Override
+ public Component getDisplayName() {
+ return Component.translatable("block.otemod.uncrafter");
+ }
+
+ @Override
+ public LazyOptional getCapability(Capability cap, Direction side)
+ {
+ if(cap == ForgeCapabilities.ENERGY)
+ {
+ return lazyEnergyHandler.cast();
+ }
+ if(side == Direction.DOWN && cap == ForgeCapabilities.ITEM_HANDLER)
+ {
+ // Return the output slot only
+ return lazyOutputItems.cast();
+ }
+ if(cap == ForgeCapabilities.ITEM_HANDLER)
+ {
+ return lazyItemHandler.cast();
+ }
+
+ return super.getCapability(cap,side);
+ }
+
+
+ @Override
+ public void onLoad()
+ {
+ super.onLoad();
+ lazyItemHandler = LazyOptional.of(()->itemsHandler);
+ lazyOutputItems = LazyOptional.of(()->outputSlot);
+ lazyEnergyHandler = LazyOptional.of(()->ENERGY_STORAGE);
+ }
+
+
+ @Override
+ public void invalidateCaps()
+ {
+ super.invalidateCaps();
+ lazyItemHandler.invalidate();
+ lazyOutputItems.invalidate();
+ lazyEnergyHandler.invalidate();
+ }
+
+ @Override
+ protected void saveAdditional(CompoundTag nbt)
+ {
+ nbt.put("inventory", itemsHandler.serializeNBT());
+ nbt.put("output", outputItems.serializeNBT());
+ nbt.putInt("prog", progress);
+ nbt.putInt("energy", ENERGY_STORAGE.getEnergyStored());
+
+ super.saveAdditional(nbt);
+ }
+
+ @Override
+ public void load(CompoundTag nbt){
+ super.load(nbt);
+
+ itemsHandler.deserializeNBT(nbt.getCompound("inventory"));
+ outputItems.deserializeNBT(nbt.getCompound("output"));
+ progress = nbt.getInt("prog");
+ ENERGY_STORAGE.setEnergy(nbt.getInt("energy"));
+ }
+
+ public void doDrop()
+ {
+ SimpleContainer cont = new SimpleContainer(itemsHandler.getSlots());
+ for (int i = 0; i < itemsHandler.getSlots(); i++) {
+ cont.setItem(i, itemsHandler.getStackInSlot(i));
+ }
+ cont = new SimpleContainer(outputItems.getSlots());
+ for (int i = 0; i < outputItems.getSlots(); i++) {
+ cont.setItem(i, outputItems.getStackInSlot(i));
+ }
+
+ Containers.dropContents(this.level, this.worldPosition, cont);
+ }
+
+ public static void tick(Level lvl, BlockPos pos, BlockState state, UncrafterBlockEntity entity)
+ {
+ if(lvl.isClientSide())return;
+
+ if(entity.EnergyDirty)
+ {
+ if(entity.TickCount >= (2 * 20))
+ {
+ ModMessages.sendToAll(new EnergySyncS2CPacket(entity.getEnergy(), pos));
+ entity.EnergyDirty=false;
+ } else entity.TickCount++;
+ }
+
+ if(hasRecipe(entity))
+ {
+ if(!hasEnergy(entity))return; // Halt until sufficient energy has been received
+ entity.progress++;
+ setChanged(lvl, pos, state);
+ drain(entity);
+
+ if(entity.progress >= UncrafterBlockEntity.MAXIMUM_PROCESSING_TICKS)
+ {
+ craftItem(entity);
+ }
+ }else {
+ if(entity.progress>0){
+ entity.resetProgress();
+ setChanged(lvl, pos, state);
+ }
+ }
+ }
+
+ private static void drain(UncrafterBlockEntity entity) {
+ entity.ENERGY_STORAGE.extractEnergy(ENERGY_REQ, false);
+ }
+
+ private static boolean hasEnergy(UncrafterBlockEntity entity) {
+ return (entity.ENERGY_STORAGE.getEnergyStored() >= ENERGY_REQ);
+ }
+
+ private static void craftItem(UncrafterBlockEntity entity) {
+
+ if(hasRecipe(entity))
+ {
+ entity.outputItems.setStackInSlot(0, entity.itemsHandler.extractItem(0, 1, false));
+ entity.resetProgress();
+ }
+ }
+
+ private static boolean hasRecipe(UncrafterBlockEntity entity) {
+ SimpleContainer inventory = new SimpleContainer(entity.itemsHandler.getSlots());
+ for(int i=0;i existing.getCount());
+ boolean sameType = (existing.getItem() == result.getItem());
+ boolean outputEmpty = existing.isEmpty();
+
+ if(outputEmpty)return true;
+ return (stackCompat && sameType);
+ }
+
+ private void resetProgress() {
+ progress=0;
+
+ }
+
+ protected static ItemStack makeOutputItem(ItemStack original)
+ {
+ ItemStack newItem = new ItemStack(original.getItem(),1);
+ return newItem;
+ }
+
+ public IEnergyStorage getEnergyStorage() {
+ return ENERGY_STORAGE;
+ }
+
+ @Override
+ public void setEnergy(int energy) {
+ ENERGY_STORAGE.setEnergy(energy);
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/blocks/types/AlternatePaneBlock.java b/src/main/java/dev/zontreck/otemod/blocks/types/AlternatePaneBlock.java
new file mode 100644
index 0000000..17c8a97
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/blocks/types/AlternatePaneBlock.java
@@ -0,0 +1,41 @@
+package dev.zontreck.otemod.blocks.types;
+
+import net.minecraft.core.Direction;
+import net.minecraft.core.Direction.Plane;
+import net.minecraft.world.level.block.IronBarsBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.BooleanProperty;
+
+import java.util.EnumMap;
+
+/** Pane block with sensible culling */
+public class AlternatePaneBlock extends IronBarsBlock {
+ public static final EnumMap DIRECTIONS;
+ static {
+ DIRECTIONS = new EnumMap<>(Direction.class);
+ DIRECTIONS.put(Direction.NORTH, NORTH);
+ DIRECTIONS.put(Direction.EAST, EAST);
+ DIRECTIONS.put(Direction.SOUTH, SOUTH);
+ DIRECTIONS.put(Direction.WEST, WEST);
+ }
+
+ public AlternatePaneBlock(Properties builder) {
+ super(builder);
+ }
+
+ @Override
+ public boolean skipRendering(BlockState state, BlockState adjacentBlockState, Direction side) {
+ // cull top and bottom if all props that we have are contained in the above or below
+ if (adjacentBlockState.getBlock() == this && side.getAxis().isVertical()) {
+ for (Direction dir : Plane.HORIZONTAL) {
+ BooleanProperty prop = DIRECTIONS.get(dir);
+ if (state.getValue(prop) && !adjacentBlockState.getValue(prop)) {
+ return false;
+ }
+ }
+ return true;
+ }
+ return super.skipRendering(state, adjacentBlockState, side);
+ }
+ }
+
\ No newline at end of file
diff --git a/src/main/java/dev/zontreck/otemod/chat/ChatColor.java b/src/main/java/dev/zontreck/otemod/chat/ChatColor.java
deleted file mode 100644
index b9ea4e2..0000000
--- a/src/main/java/dev/zontreck/otemod/chat/ChatColor.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package dev.zontreck.otemod.chat;
-
-public class ChatColor {
- public enum ColorOptions{
- Black,
- Dark_Blue,
- Dark_Green,
- Dark_Aqua,
- Dark_Red,
- Dark_Purple,
- Gold,
- Gray,
- Dark_Gray,
- Blue,
- Green,
- Aqua,
- Red,
- Light_Purple,
- Yellow,
- White,
- MinecoinGold,
- Underline,
- Bold,
- Italic,
- Strikethrough,
- Crazy
- }
- public static char CODE = '§';
- public static String BLACK = build("0");
- public static String DARK_BLUE = build("1");
- public static String DARK_GREEN = build("2");
- public static String DARK_AQUA = build("3");
- public static String DARK_RED = build("4");
- public static String DARK_PURPLE = build("5");
- public static String GOLD = build("6");
- public static String GRAY = build("7");
- public static String DARK_GRAY = build("8");
- public static String BLUE = build("9");
- public static String GREEN = build("a");
- public static String AQUA = build("b");
- public static String RED = build("c");
- public static String LIGHT_PURPLE = build("d");
- public static String YELLOW = build("e");
- public static String WHITE = build("f");
- public static String MINECOIN_GOLD = build("g");
-
- public static String UNDERLINE = build("u");
- public static String BOLD = build("l");
- public static String ITALIC = build("o");
- public static String STRIKETHROUGH = build("m");
- public static String CRAZY = build("k");
- public static String RESET = build("r");
-
-
- public static String build(String c)
- {
- return CODE+c;
- }
-
- public static String resetChat()
- {
- return RESET+WHITE;
- }
-
- public static String from(ColorOptions nick){
- switch(nick){
- case Black:
- {
- return BLACK;
- }
- case Dark_Blue:
- {
- return DARK_BLUE;
- }
- case Dark_Green:
- {
- return DARK_GREEN;
- }
- case Dark_Aqua:
- {
- return DARK_AQUA;
- }
- case Dark_Red:
- {
- return DARK_RED;
- }
- case Dark_Purple:
- {
- return DARK_PURPLE;
- }
- case Gold:
- {
- return GOLD;
- }
- case Gray:
- {
- return GRAY;
- }
- case Dark_Gray:
- {
- return DARK_GRAY;
- }
- case Blue:
- {
- return BLUE;
- }
- case Green:
- {
- return GREEN;
- }
- case Aqua:
- {
- return AQUA;
- }
- case Red:
- {
- return RED;
- }
- case Light_Purple:
- {
- return LIGHT_PURPLE;
- }
- case Yellow:
- {
- return YELLOW;
- }
- case White:
- {
- return WHITE;
- }
- case MinecoinGold:
- {
- return MINECOIN_GOLD;
- }
- case Underline:
- {
- return UNDERLINE;
- }
- case Bold:
- {
- return BOLD;
- }
- case Italic:
- {
- return ITALIC;
- }
- case Strikethrough:
- {
- return STRIKETHROUGH;
- }
- case Crazy:
- {
- return CRAZY;
- }
- default:
- {
- return RESET+CRAZY;
- }
- }
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/chat/ChatServerOverride.java b/src/main/java/dev/zontreck/otemod/chat/ChatServerOverride.java
index d800bbe..ecc5bde 100644
--- a/src/main/java/dev/zontreck/otemod/chat/ChatServerOverride.java
+++ b/src/main/java/dev/zontreck/otemod/chat/ChatServerOverride.java
@@ -1,27 +1,25 @@
package dev.zontreck.otemod.chat;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.UUID;
-
+import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.libzontreck.chat.HoverTip;
+import dev.zontreck.libzontreck.events.ProfileLoadedEvent;
+import dev.zontreck.libzontreck.events.ProfileUnloadingEvent;
+import dev.zontreck.libzontreck.profiles.Profile;
+import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.libzontreck.util.ItemUtils;
import dev.zontreck.otemod.OTEMod;
import dev.zontreck.otemod.configs.PlayerFlyCache;
-import dev.zontreck.otemod.configs.Profile;
-import dev.zontreck.otemod.database.Database;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.chat.Component;
+import dev.zontreck.otemod.configs.snbt.ServerConfig;
+import dev.zontreck.otemod.enchantments.ModEnchantments;
+import dev.zontreck.otemod.implementation.vault.StarterProvider;
import net.minecraft.network.chat.Style;
-import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.ServerPlayerConnection;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.player.Abilities;
import net.minecraft.world.entity.player.Player;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.event.ForgeEventFactory;
+import net.minecraft.world.item.ItemStack;
import net.minecraftforge.event.ServerChatEvent;
-import net.minecraftforge.event.entity.EntityJoinLevelEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -30,71 +28,75 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
@EventBusSubscriber(modid=OTEMod.MOD_ID, bus=Mod.EventBusSubscriber.Bus.FORGE)
public class ChatServerOverride {
- @OnlyIn(Dist.DEDICATED_SERVER)
@SubscribeEvent
- public void onJoin(final PlayerEvent.PlayerLoggedInEvent ev)
+ public void onJoin(final ProfileLoadedEvent ev)
{
//Player joined, send custom alert
+ ServerPlayer play = ev.player;
+ Profile prof = ev.profile;
- // Download user data from database
- try{
- Connection c = OTEMod.DB.getConnection();
- String SQL = "SELECT * FROM `profiles` WHERE `uuid`=?;";
- PreparedStatement pst = c.prepareStatement(SQL);
- pst.setString(1,ev.getEntity().getStringUUID());
- ResultSet rs = pst.executeQuery();
- boolean has_profile=false;
- while(rs.next())
- {
- has_profile=true;
-
-
- OTEMod.PROFILES.put(ev.getEntity().getStringUUID(), new Profile(rs.getString("username"), rs.getString("prefix"), rs.getString("nickname"), rs.getString("name_color"), ev.getEntity().getStringUUID(), rs.getString("prefix_color"), rs.getString("chat_color")));
- }
-
- if(!has_profile)
- {
- // Create profile!
- ServerPlayer play = (ServerPlayer)ev.getEntity();
- Profile p = Profile.factory(play);
- OTEMod.PROFILES.put(play.getStringUUID(), p);
- p.commit(); // Commits the profile to the server
-
- ev.getEntity().displayClientMessage(Component.literal(ChatColor.BOLD+ ChatColor.DARK_GRAY + "["+ChatColor.DARK_GREEN + "OTEMOD" + ChatColor.DARK_GRAY + "] "+ChatColor.DARK_GREEN + "First join! Your server profile has been created"), false);
- }
- }catch (SQLException e){
- e.printStackTrace();
+ if(prof.flying)
+ {
+ play.getAbilities().flying=true;
+ play.onUpdateAbilities();
}
- Profile prof = Profile.get_profile_of(ev.getEntity().getStringUUID());
- if(prof == null){
- OTEMod.LOGGER.error("FATAL: Profile was null for "+ev.getEntity().getName().getString());
- return;
+
+ Abilities playerAbilities = play.getAbilities();
+ boolean mayFly = false;
+ ItemStack feet = play.getItemBySlot(EquipmentSlot.FEET);
+ if(ItemUtils.getEnchantmentLevel(ModEnchantments.FLIGHT_ENCHANTMENT.get(), feet)>0)mayFly = true;
+
+ if(play.gameMode.isCreative())
+ {
+ // Skip all this!
+ playerAbilities.mayfly=true;
+ playerAbilities.flying=true;
+
+ play.onUpdateAbilities();
+ }else{
+
+ playerAbilities.mayfly=mayFly;
+ PlayerFlyCache c = PlayerFlyCache.cachePlayer(play);
+ c.Flying=prof.flying;
+ c.FlyEnabled = mayFly;
+ c.Assert(play);
}
+
+
+
+ if(StarterProvider.exists())
+ OTEMod.checkFirstJoin(ev.player);
+
+ if(!ServerConfig.chatOverrides.enableJoinLeave) return;
+
+ ChatHelpers.broadcast(ChatHelpers.macro("!Dark_Gray![!Dark_Green!+!Dark_Gray!] !Bold!!Dark_Aqua![0]",prof.nickname), ev.level.getServer());
- ChatServerOverride.broadcast(Component.literal(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_GREEN + "+" + ChatColor.DARK_GRAY + "] "+ ChatColor.BOLD + ChatColor.DARK_AQUA + prof.nickname), ev.getEntity().getServer());
}
- @OnlyIn(Dist.DEDICATED_SERVER)
@SubscribeEvent
- public void onLeave(final PlayerEvent.PlayerLoggedOutEvent ev)
+ public void onLeave(ProfileUnloadingEvent ev)
{
// Get player profile, send disconnect alert, then commit profile and remove it from memory
- Profile px = Profile.get_profile_of(ev.getEntity().getStringUUID());
+ Profile px=ev.profile;
+
if(px==null)return;
- // Send the alert
- ChatServerOverride.broadcast(Component.literal(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_RED + "-" + ChatColor.DARK_GRAY + "] "+ChatColor.BOLD + ChatColor.DARK_AQUA + px.nickname), ev.getEntity().getServer());
+ if(!ServerConfig.chatOverrides.enableJoinLeave) return;
- px.commit();
- OTEMod.PROFILES.remove(ev.getEntity().getStringUUID());
+ // Send the alert
+ ChatHelpers.broadcast(ChatHelpers.macro("!Dark_Gray![!Dark_Red!-!Dark_Gray!] !Bold!!Dark_Aqua![0]", px.nickname), px.player.server);
+
+
+ px.flying=px.player.getAbilities().flying;
+ ev.setCanceled(true);
}
- @OnlyIn(Dist.DEDICATED_SERVER)
@SubscribeEvent
public void onClone(final PlayerEvent.Clone ev)
{
+ if(ev.getEntity().level().isClientSide)return;
// Fix for fly ability not copying to new instance on death or other circumstances
Player old = ev.getOriginal();
Player n = ev.getEntity();
@@ -103,13 +105,22 @@ public class ChatServerOverride {
c.Assert((ServerPlayer)n);
}
- @OnlyIn(Dist.DEDICATED_SERVER)
@SubscribeEvent
public void onChat(final ServerChatEvent ev){
+ if(ev.getPlayer().level().isClientSide)return;
// Player has chatted, apply override
+ if(!ServerConfig.chatOverrides.enablePrettifier) return;
+
+
ServerPlayer sp = ev.getPlayer();
// Get profile
- Profile XD = Profile.get_profile_of(sp.getStringUUID());
+ Profile XD=null;
+ try {
+ XD = Profile.get_profile_of(sp.getStringUUID());
+ } catch (UserProfileNotYetExistsException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
// Override the chat!
String prefixStr = "";
@@ -117,8 +128,8 @@ public class ChatServerOverride {
prefixStr = ChatColor.DARK_GRAY + "[" + ChatColor.BOLD + XD.prefix_color + XD.prefix + ChatColor.resetChat() + ChatColor.DARK_GRAY + "] ";
}
- String msg = ev.getMessage().getString();
- msg=doColors(msg);
+ String msg = ev.getRawText();
+ msg= ChatColor.doColors(msg);
String nameStr = ChatColor.resetChat() + "< "+ XD.name_color + XD.nickname + ChatColor.resetChat() + " >";
String message = ": "+XD.chat_color + msg;
@@ -126,71 +137,8 @@ public class ChatServerOverride {
hover=hover.withFont(Style.DEFAULT_FONT).withHoverEvent(HoverTip.get(ChatColor.MINECOIN_GOLD+"User Name: "+XD.username));
ev.setCanceled(true);
- ChatServerOverride.broadcast(Component.literal(prefixStr+nameStr+message).setStyle(hover), ev.getPlayer().server);
+ ChatHelpers.broadcast(ChatHelpers.macro(prefixStr + nameStr + message).setStyle(hover), ev.getPlayer().server);
}
- public static String doColors(String msg)
- {
- for(ChatColor.ColorOptions color : ChatColor.ColorOptions.values()){
- msg = msg.replace("!"+color.toString()+"!", ChatColor.from(color));
- }
- return msg;
- }
- public static void broadcastAbove(Component message, MinecraftServer s)
- {
- s.execute(new Runnable() {
- public void run(){
-
- // This will broadcast to all players
- for(ServerPlayer play : s.getPlayerList().getPlayers())
- {
- play.displayClientMessage(message, true); // Send the message!
- }
- LogToConsole(Component.literal("[all] ").append(message));
- }
- });
- }
- public static void LogToConsole(Component Message)
- {
- OTEMod.LOGGER.info(Message.getString());
- }
- public static void broadcast(Component message, MinecraftServer s)
- {
- s.execute(new Runnable() {
- public void run(){
-
- // This will broadcast to all players
- for(ServerPlayer play : s.getPlayerList().getPlayers())
- {
- play.displayClientMessage(message, false); // Send the message!
- }
- LogToConsole(Component.literal("[all] ").append(message));
- }
- });
- }
- public static void broadcastTo(UUID ID, Component message, MinecraftServer s)
- {
- s.execute(new Runnable() {
- public void run(){
-
- ServerPlayer play = s.getPlayerList().getPlayer(ID);
- play.displayClientMessage(message, false); // Send the message!
-
- LogToConsole(Component.literal("[server] -> ["+play.getName().toString()+"] ").append(message));
- }
- });
- }
- public static void broadcastToAbove(UUID ID, Component message, MinecraftServer s)
- {
- s.execute(new Runnable() {
- public void run(){
-
- ServerPlayer play = s.getPlayerList().getPlayer(ID);
- play.displayClientMessage(message, true); // Send the message!
-
- LogToConsole(Component.literal("[server] -> ["+play.getName().toString()+"] ").append(message));
- }
- });
- }
}
diff --git a/src/main/java/dev/zontreck/otemod/chat/Clickable.java b/src/main/java/dev/zontreck/otemod/chat/Clickable.java
deleted file mode 100644
index cdf0efd..0000000
--- a/src/main/java/dev/zontreck/otemod/chat/Clickable.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package dev.zontreck.otemod.chat;
-
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.ClickEvent.Action;
-
-/*
- * Because of some weird behavior with java not liking that both HoverEvent and ClickEvent have an Action implementation, these must both be in a custom factory here where Action can be imported by itself in both files
- */
-public class Clickable {
-
- public static ClickEvent command(String text)
- {
- return new ClickEvent(Action.RUN_COMMAND, text);
- }
-
-}
diff --git a/src/main/java/dev/zontreck/otemod/chat/HoverTip.java b/src/main/java/dev/zontreck/otemod/chat/HoverTip.java
deleted file mode 100644
index 31a6dae..0000000
--- a/src/main/java/dev/zontreck/otemod/chat/HoverTip.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package dev.zontreck.otemod.chat;
-
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.HoverEvent;
-import net.minecraft.network.chat.HoverEvent.Action;
-
-/*
- * Because of some weird behavior with java not liking that both HoverEvent and ClickEvent have an Action implementation, these must both be in a custom factory here where Action can be imported by itself in both files
- */
-public class HoverTip {
-
- public static HoverEvent get(String text)
- {
- return new HoverEvent(Action.SHOW_TEXT, Component.literal(text));
- }
-
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/CommandRegistry.java b/src/main/java/dev/zontreck/otemod/commands/CommandRegistry.java
index 0895b4a..0d28a1c 100644
--- a/src/main/java/dev/zontreck/otemod/commands/CommandRegistry.java
+++ b/src/main/java/dev/zontreck/otemod/commands/CommandRegistry.java
@@ -5,29 +5,22 @@ import java.util.HashMap;
import java.util.Map;
import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.commands.homes.DelHomeCommand;
-import dev.zontreck.otemod.commands.homes.HomeCommand;
-import dev.zontreck.otemod.commands.homes.HomesCommand;
-import dev.zontreck.otemod.commands.homes.SetHomeCommand;
+import dev.zontreck.otemod.commands.dims.BuildCommand;
+import dev.zontreck.otemod.commands.items.ShareItemInChatCommand;
import dev.zontreck.otemod.commands.profilecmds.ChatColorCommand;
import dev.zontreck.otemod.commands.profilecmds.NameColorCommand;
import dev.zontreck.otemod.commands.profilecmds.NickCommand;
import dev.zontreck.otemod.commands.profilecmds.PrefixColorCommand;
import dev.zontreck.otemod.commands.profilecmds.PrefixCommand;
-import dev.zontreck.otemod.commands.teleport.RTPCommand;
-import dev.zontreck.otemod.commands.teleport.TPACommand;
-import dev.zontreck.otemod.commands.teleport.TPAHereCommand;
-import dev.zontreck.otemod.commands.teleport.TPAcceptCommand;
-import dev.zontreck.otemod.commands.teleport.TPCancelCommand;
-import dev.zontreck.otemod.commands.teleport.TPDenyCommand;
+import dev.zontreck.otemod.commands.vaults.StarterCommand;
import dev.zontreck.otemod.commands.vaults.TrashCommand;
import dev.zontreck.otemod.commands.vaults.VaultCommand;
-import dev.zontreck.otemod.commands.warps.DelWarpCommand;
-import dev.zontreck.otemod.commands.warps.RTPWarpCommand;
-import dev.zontreck.otemod.commands.warps.SetWarpCommand;
-import dev.zontreck.otemod.commands.warps.WarpCommand;
-import dev.zontreck.otemod.commands.warps.WarpsCommand;
-import dev.zontreck.otemod.configs.OTEServerConfig;
+import dev.zontreck.otemod.commands.zschem.LoadSchem;
+import dev.zontreck.otemod.commands.zschem.Place;
+import dev.zontreck.otemod.commands.zschem.PlaceAsAir;
+import dev.zontreck.otemod.commands.zschem.SaveSchem;
+import dev.zontreck.otemod.commands.zschem.SetPos1;
+import dev.zontreck.otemod.commands.zschem.SetPos2;
import net.minecraftforge.event.RegisterCommandsEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -42,86 +35,25 @@ public class CommandRegistry {
// Command was used, mark the current time
CommandCooldownRegistry.put(cmd, Instant.now().getEpochSecond());
}
-
- public static boolean canUse(String cmd)
- {
- if(!CommandCooldownRegistry.containsKey(cmd)) return true;
- long lastUse = CommandCooldownRegistry.get(cmd);
- switch(cmd)
- {
- case "rtp":
- {
- if(Instant.now().getEpochSecond() > lastUse+Long.parseLong(String.valueOf(OTEServerConfig.RTP_COOLDOWN))){
- CommandCooldownRegistry.remove(cmd);
- return true;
- }else return false;
- }
- default:
- {
- CommandCooldownRegistry.remove(cmd);
- return true; // cooldown not yet made
- }
- }
-
- }
- public static String getRemaining(String string) {
- long now = Instant.now().getEpochSecond();
- if(!CommandCooldownRegistry.containsKey(string))return "0";
- long used = CommandCooldownRegistry.get(string);
- long cmd_time = 0L;
- switch(string)
- {
- case "rtp":
- {
- cmd_time = Long.parseLong(String.valueOf(OTEServerConfig.RTP_COOLDOWN));
- break;
- }
- default:
- {
- cmd_time = 0L;
- break;
- }
- }
-
- used+=cmd_time;
- long diff = used-now;
- if(diff<0)diff=0L;
- return String.valueOf(diff);
- }
@SubscribeEvent
public void onRegisterCommands(final RegisterCommandsEvent ev)
{
- HomesCommand.register(ev.getDispatcher());
- SetHomeCommand.register(ev.getDispatcher());
- HomeCommand.register(ev.getDispatcher());
- DelHomeCommand.register(ev.getDispatcher());
-
- FlyCommand.register(ev.getDispatcher());
ChatColorCommand.register(ev.getDispatcher());
NameColorCommand.register(ev.getDispatcher());
PrefixColorCommand.register(ev.getDispatcher());
PrefixCommand.register(ev.getDispatcher());
NickCommand.register(ev.getDispatcher());
-
- TPACommand.register(ev.getDispatcher());
- TPCancelCommand.register(ev.getDispatcher());
- TPDenyCommand.register(ev.getDispatcher());
- TPAcceptCommand.register(ev.getDispatcher());
- TPAHereCommand.register(ev.getDispatcher());
- RTPCommand.register(ev.getDispatcher());
+
VaultCommand.register(ev.getDispatcher());
TrashCommand.register(ev.getDispatcher());
- SetWarpCommand.register(ev.getDispatcher());
- DelWarpCommand.register(ev.getDispatcher());
- RTPWarpCommand.register(ev.getDispatcher());
- WarpsCommand.register(ev.getDispatcher());
- WarpCommand.register(ev.getDispatcher());
- }
+ ShareItemInChatCommand.register(ev.getDispatcher());
+ StarterCommand.register(ev.getDispatcher());
-
+ BuildCommand.register(ev.getDispatcher());
+ }
}
diff --git a/src/main/java/dev/zontreck/otemod/commands/FlyCommand.java b/src/main/java/dev/zontreck/otemod/commands/FlyCommand.java
index 7d18896..0309c12 100644
--- a/src/main/java/dev/zontreck/otemod/commands/FlyCommand.java
+++ b/src/main/java/dev/zontreck/otemod/commands/FlyCommand.java
@@ -2,14 +2,12 @@ package dev.zontreck.otemod.commands;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.context.CommandContext;
-
-import dev.zontreck.otemod.chat.ChatColor;
+import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.otemod.OTEMod;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.contents.TranslatableContents;
-import net.minecraft.server.level.ServerPlayer;
import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.server.level.ServerPlayer;
public class FlyCommand {
public static void register(CommandDispatcher dispatcher)
@@ -30,25 +28,22 @@ public class FlyCommand {
// homeName = StringArgumentType.getString(ctx2, "nickname");
// if(homeName==null)return 0;
CommandSourceStack ctx = ctx2.getSource();
- if(! ctx.isPlayer())
- {
-
- ctx.sendFailure(MutableComponent.create( new TranslatableContents("dev.zontreck.otemod.msgs.only_player")));
- return 1;
- }
- ServerPlayer p = ctx.getPlayer();
+
+ ServerPlayer p = (ServerPlayer)ctx.getEntity();
+ if(p==null)return 1;
if(p.getAbilities().mayfly){
p.getAbilities().mayfly=false;
p.getAbilities().flying=false;
p.onUpdateAbilities();
-
- ctx.sendSuccess(Component.literal(ChatColor.BOLD + "[" + ChatColor.DARK_GREEN + "OTEMOD" + ChatColor.WHITE + "] "+ChatColor.resetChat() + ChatColor.DARK_PURPLE + "Your ability to fly has been disabled"), false);
+
+
+ ctx.sendSystemMessage(Component.literal(OTEMod.OTEPrefix + ChatColor.DARK_PURPLE + " Your ability to fly has been disabled"));
}else {
p.getAbilities().mayfly=true;
p.onUpdateAbilities();
- ctx.sendSuccess(Component.literal(ChatColor.BOLD + "[" + ChatColor.DARK_GREEN + "OTEMOD" + ChatColor.WHITE + "] "+ChatColor.resetChat() + ChatColor.DARK_PURPLE + "You can now fly"), false);
+ ctx.sendSystemMessage(Component.literal(OTEMod.OTEPrefix + ChatColor.DARK_PURPLE + " You can now fly"));
}
return 0;
diff --git a/src/main/java/dev/zontreck/otemod/commands/dims/BuildCommand.java b/src/main/java/dev/zontreck/otemod/commands/dims/BuildCommand.java
new file mode 100644
index 0000000..ecbbf0f
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/commands/dims/BuildCommand.java
@@ -0,0 +1,83 @@
+package dev.zontreck.otemod.commands.dims;
+
+import com.mojang.brigadier.CommandDispatcher;
+import dev.zontreck.libzontreck.events.TeleportEvent;
+import dev.zontreck.libzontreck.exceptions.InvalidDeserialization;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.libzontreck.vectors.Vector3d;
+import dev.zontreck.libzontreck.vectors.WorldPosition;
+import dev.zontreck.otemod.configs.snbt.ServerConfig;
+import dev.zontreck.otemod.implementation.Messages;
+import dev.zontreck.otemod.registry.ModDimensions;
+import dev.zontreck.otemod.registry.PerPlayerDataRegistry;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraftforge.common.MinecraftForge;
+
+public class BuildCommand
+{
+ private enum Options {
+ enter,
+ leave
+ }
+ public static void register(CommandDispatcher dispatcher)
+ {
+ var cmd = Commands.literal("builder");
+ cmd.then(Commands.literal("enter").executes(c->run(c.getSource(), Options.enter)));
+ cmd.then(Commands.literal("leave").executes(c->run(c.getSource(), Options.leave)));
+ dispatcher.register(cmd);
+ }
+
+ public static int run(CommandSourceStack stack, Options direction)
+ {
+ if(stack.isPlayer())
+ {
+ ServerPlayer sp = stack.getPlayer();
+ boolean playerIsOp = sp.hasPermissions(stack.getServer().getOperatorUserPermissionLevel());
+
+ if(playerIsOp || ServerConfig.general.allowBuilder)
+ {
+
+ if(direction == Options.enter)
+ {
+ WorldPosition save = new WorldPosition(sp);
+ PerPlayerDataRegistry.put(sp.getUUID(), "builder_entered_from", save.serialize());
+
+ WorldPosition pos = new WorldPosition(new Vector3d(0, -55, 0), ModDimensions.BUILDER_DIM());
+
+ if(!MinecraftForge.EVENT_BUS.post(new TeleportEvent(pos, sp)))
+ stack.getPlayer().teleportTo(pos.getActualDimension(), pos.Position.x, pos.Position.y, pos.Position.z, 0, 0);
+
+ return 0;
+ } else if(direction == Options.leave) {
+
+ CompoundTag tag = (CompoundTag) PerPlayerDataRegistry.get(sp.getUUID(), "builder_entered_from");
+ if(tag != null)
+ {
+ try {
+ WorldPosition pos = new WorldPosition(tag, false);
+
+ if(!MinecraftForge.EVENT_BUS.post(new TeleportEvent(pos, sp)))
+ sp.teleportTo(pos.getActualDimension(), pos.Position.x, pos.Position.y, pos.Position.z, 0,0);
+ } catch (InvalidDeserialization e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ ChatHelpers.broadcastTo(stack.getPlayer(), ChatHelpers.macro("!Dark_Red!There is not a cached position. did you logout, or the server restart? Use a home or warp command instead."), stack.getServer());
+ }
+
+ return 0;
+ } else return 0;
+ }else {
+ ChatHelpers.broadcastTo(sp, ChatHelpers.macro(Messages.BUILDER_DIMENSION_DISALLOWED), stack.getServer());
+
+ return 0;
+ }
+ }else {
+ stack.sendFailure(ChatHelpers.macro(Messages.CONSOLE_ERROR));
+ return -1;
+ }
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/commands/homes/DelHomeCommand.java b/src/main/java/dev/zontreck/otemod/commands/homes/DelHomeCommand.java
deleted file mode 100644
index 18ddd46..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/homes/DelHomeCommand.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package dev.zontreck.otemod.commands.homes;
-
-import java.sql.Array;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.math.Vector3d;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.contents.TranslatableContents;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.phys.Vec2;
-import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.server.command.TextComponentHelper;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-
-public class DelHomeCommand {
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("rmhome").executes(c->rmHome(c.getSource(), "default")).then(Commands.argument("nickname", StringArgumentType.string()).executes(c -> rmHome(c.getSource(), StringArgumentType.getString(c, "nickname")))));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- private static int rmHome(CommandSourceStack ctx, String homeName)
- {
- // Request homes
-// String homeName = "";
-// CommandSourceStack ctx = ctx2.getSource();
-// homeName = StringArgumentType.getString(ctx2, "nickname");
-// if(homeName==null)return 0;
-
- if(! ctx.isPlayer())
- {
-
- ChatServerOverride.broadcastTo(ctx.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), ctx.getServer());
- return 1;
- }
- ServerPlayer p = ctx.getPlayer();
- Connection con = OTEMod.DB.getConnection();
- try {
- con.beginRequest();
- //Statement stat = con.createStatement();
-
-
- String SQL = "DELETE FROM `homes` WHERE `user`=? AND `home_name`=?;";
-
- PreparedStatement pstat = con.prepareStatement(SQL);
- pstat.setString(1, p.getStringUUID());
- pstat.setString(2, homeName);
-
- pstat.execute();
-
-
- ctx.sendSuccess(MutableComponent.create(new TranslatableContents("dev.zontreck.otemod.msgs.homes.del.success")), true);
- con.endRequest();
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- ctx.sendFailure(Component.translatable("dev.zontreck.otemod.msgs.homes.del.fail"));
- }
-
- return 0;
- }
-
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/homes/HomeCommand.java b/src/main/java/dev/zontreck/otemod/commands/homes/HomeCommand.java
deleted file mode 100644
index 7c9df77..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/homes/HomeCommand.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package dev.zontreck.otemod.commands.homes;
-
-import java.sql.Array;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.ibm.icu.impl.InvalidFormatException;
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.math.Vector3d;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import dev.zontreck.otemod.commands.teleport.TeleportActioner;
-import dev.zontreck.otemod.commands.teleport.TeleportContainer;
-import dev.zontreck.otemod.configs.PlayerFlyCache;
-import dev.zontreck.otemod.database.TeleportDestination;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.nbt.NbtUtils;
-import net.minecraft.network.chat.contents.TranslatableContents;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.TickTask;
-import net.minecraft.server.commands.BossBarCommands;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.BossEvent.BossBarColor;
-import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.effect.MobEffectUtil;
-import net.minecraft.world.effect.MobEffects;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.Vec2;
-import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.server.command.TextComponentHelper;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-
-public class HomeCommand {
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("home").executes(c-> home(c.getSource(), "default")).then(Commands.argument("nickname", StringArgumentType.string()).executes(c -> home(c.getSource(), StringArgumentType.getString(c, "nickname")))));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- private static int home(CommandSourceStack ctx, String homeName)
- {
- // Request homes
-// String homeName = "";
-// CommandSourceStack ctx = ctx2.getSource();
-// homeName = StringArgumentType.getString(ctx2, "nickname");
-// if(homeName==null)return 0;
-
- if(! ctx.isPlayer())
- {
-
- ChatServerOverride.broadcastTo(ctx.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), ctx.getServer());
- return 1;
- }
- ServerPlayer p = ctx.getPlayer();
- Connection con = OTEMod.DB.getConnection();
- String SQL="";
- try {
- con.beginRequest();
- Statement stat = con.createStatement();
- Vec3 position = p.position();
-
- Vec2 rot = p.getRotationVector();
-
- //stat.execute("REPLACE INTO `homes` (user, home_name, x, y, z, rot_x, rot_y, dimension) values (\"" + p.getStringUUID() + "\", \""+ homeName + "\", "+String.valueOf(position.x)+", "+String.valueOf(position.y)+", "+String.valueOf(position.z)+", "+String.valueOf(rot.x)+", "+String.valueOf(rot.y)+", \"" + p.getLevel().dimension().location().getNamespace() + ":" + p.getLevel().dimension().location().getPath() + "\");");
- // Query database now
- SQL = "SELECT * FROM `homes` WHERE `user`=? AND `home_name`=?;";
- //ResultSet rs = stat.executeQuery(SQL);
-
- PreparedStatement pstat = con.prepareStatement(SQL);
- pstat.setString(1, p.getStringUUID());
- pstat.setString(2, homeName);
-
- ResultSet rs = pstat.executeQuery();
-
- boolean has_home = false;
- while(rs.next()){
- has_home=true;
- // Now, begin to extract the home data
- TeleportDestination dest = new TeleportDestination(NbtUtils.snbtToStructure(rs.getString("teleporter")));
-
-
-
- position = dest.Position.asMinecraftVector();
- rot = dest.Rotation.asMinecraftVector();
-
- String dim = dest.Dimension;
- String[] dims = dim.split(":");
-
- ResourceLocation rl = new ResourceLocation(dims[0], dims[1]);
-
- ServerLevel dimL = null;
- for (ServerLevel lServerLevel : p.server.getAllLevels()) {
- ResourceLocation XL = lServerLevel.dimension().location();
-
- if(XL.getNamespace().equals(rl.getNamespace())){
- if(XL.getPath().equals(rl.getPath())){
- dimL = lServerLevel;
- }
- }
- }
-
- if(dimL == null)
- {
- SQL = "Failed to find the dimension";
- ctx.sendFailure(Component.literal(ChatColor.DARK_RED+ChatColor.BOLD+"FAILED TO LOCATE THAT DIMENSION. CONTACT THE SERVER ADMIN"));
- return 1;
- }
-
- TeleportActioner.ApplyTeleportEffect(p);
- // Instantiate a Teleport Runner
-
- final ServerPlayer f_p = p;
- final Vec3 f_pos = position;
- final Vec2 f_rot = rot;
- final ServerLevel f_dim = dimL;
- TeleportContainer cont = new TeleportContainer(f_p, f_pos, f_rot, f_dim);
- TeleportActioner.PerformTeleport(cont);
- }
-
- if(!has_home)throw new SQLException("NO HOME");
-
- ctx.sendSuccess(MutableComponent.create(new TranslatableContents("dev.zontreck.otemod.msgs.homes.goto.success")), true);
- con.endRequest();
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- if(!e.getMessage().equals("%%"))
- ctx.sendFailure(Component.translatable("dev.zontreck.otemod.msgs.homes.goto.fail"));
- else
- ctx.sendFailure(Component.literal("FAILED SQL: "+ ChatColor.GOLD+ SQL));
- } catch (InvalidFormatException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (CommandSyntaxException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- return 0;
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/homes/HomesCommand.java b/src/main/java/dev/zontreck/otemod/commands/homes/HomesCommand.java
deleted file mode 100644
index 8361c7e..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/homes/HomesCommand.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package dev.zontreck.otemod.commands.homes;
-
-import java.sql.Array;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.context.CommandContext;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import dev.zontreck.otemod.chat.Clickable;
-import dev.zontreck.otemod.chat.HoverTip;
-import net.minecraft.ChatFormatting;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.contents.TranslatableContents;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.WrittenBookItem;
-import net.minecraft.world.item.Item.Properties;
-import net.minecraftforge.server.command.TextComponentHelper;
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.HoverEvent;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.Style;
-import net.minecraft.network.chat.TextColor;
-
-public class HomesCommand {
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("homes").executes(HomesCommand::getHomes));
- }
-
- private static int getHomes(CommandContext ctx)
- {
- // Request homes
- if(! ctx.getSource().isPlayer())
- {
-
- ChatServerOverride.broadcastTo(ctx.getSource().getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), ctx.getSource().getServer());
- return 1;
- }
- ServerPlayer p = ctx.getSource().getPlayer();
- Connection con = OTEMod.DB.getConnection();
- try {
- con.beginRequest();
- Statement stat = con.createStatement();
- ResultSet rs = stat.executeQuery("SELECT `home_name` FROM `homes` WHERE `user`=\"" + p.getStringUUID()+"\"");
- List homes = new ArrayList();
- while(rs.next()){
- homes.add(rs.getString("home_name"));
- }
-
- ctx.getSource().sendSuccess(MutableComponent.create(new TranslatableContents("dev.zontreck.otemod.msgs.homes.total")).append(""+String.valueOf(homes.size())), true);
- con.endRequest();
-
- for (String string : homes) {
- Style st = Style.EMPTY.withFont(Style.DEFAULT_FONT).withHoverEvent(HoverTip.get(ChatColor.BOLD+ChatColor.DARK_GREEN+"Click here to go to this home")).withClickEvent(Clickable.command("/home "+string));
-
- ChatServerOverride.broadcastTo(ctx.getSource().getPlayer().getUUID(), Component.literal(ChatColor.BOLD + ChatColor.MINECOIN_GOLD+"["+ChatColor.resetChat()+ChatColor.UNDERLINE+ChatColor.BOLD+ChatColor.DARK_GREEN+"HOME"+ChatColor.resetChat()+ChatColor.BOLD+ChatColor.MINECOIN_GOLD+"] "+ChatColor.resetChat()+ChatColor.YELLOW+string).setStyle(st), ctx.getSource().getServer());
-
- }
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- return 0;
- }
-
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/homes/SetHomeCommand.java b/src/main/java/dev/zontreck/otemod/commands/homes/SetHomeCommand.java
deleted file mode 100644
index 58d42aa..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/homes/SetHomeCommand.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package dev.zontreck.otemod.commands.homes;
-
-import java.sql.Array;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.math.Vector3d;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import dev.zontreck.otemod.containers.Vector2;
-import dev.zontreck.otemod.containers.Vector3;
-import dev.zontreck.otemod.database.TeleportDestination;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.contents.TranslatableContents;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.phys.Vec2;
-import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.server.command.TextComponentHelper;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-
-public class SetHomeCommand {
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("sethome").executes(c->setHome(c.getSource(), "default")).then(Commands.argument("nickname", StringArgumentType.string()).executes(c -> setHome(c.getSource(), StringArgumentType.getString(c, "nickname")))));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- private static int setHome(CommandSourceStack ctx, String homeName)
- {
- // Request homes
-// String homeName = "";
-// CommandSourceStack ctx = ctx2.getSource();
-// homeName = StringArgumentType.getString(ctx2, "nickname");
-// if(homeName==null)return 0;
-
- if(! ctx.isPlayer())
- {
-
- ChatServerOverride.broadcastTo(ctx.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), ctx.getServer());
- return 1;
- }
- ServerPlayer p = ctx.getPlayer();
- Connection con = OTEMod.DB.getConnection();
- try {
- con.beginRequest();
- Statement stat = con.createStatement();
- Vec3 position = p.position();
- Vec2 rot = p.getRotationVector();
-
- TeleportDestination dest = new TeleportDestination(new Vector3(position), new Vector2(rot), p.getLevel().dimension().location().getNamespace() + ":" + p.getLevel().dimension().location().getPath());
-
- stat.execute("REPLACE INTO `homes` (user, home_name, teleporter) values (\"" + p.getStringUUID() + "\", \""+ homeName + "\", \""+ dest.toString() + "\");");
-
-
- ctx.sendSuccess(MutableComponent.create(new TranslatableContents("dev.zontreck.otemod.msgs.homes.set.success")), true);
- con.endRequest();
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- ctx.sendFailure(Component.translatable("dev.zontreck.otemod.msgs.homes.set.fail"));
- }
-
- return 0;
- }
-
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/items/ShareItemInChatCommand.java b/src/main/java/dev/zontreck/otemod/commands/items/ShareItemInChatCommand.java
new file mode 100644
index 0000000..1c8756a
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/commands/items/ShareItemInChatCommand.java
@@ -0,0 +1,63 @@
+package dev.zontreck.otemod.commands.items;
+
+import com.mojang.brigadier.CommandDispatcher;
+import dev.zontreck.libzontreck.chat.HoverTip;
+import dev.zontreck.libzontreck.profiles.Profile;
+import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.otemod.OTEMod;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.Style;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.AirItem;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.server.ServerLifecycleHooks;
+
+public class ShareItemInChatCommand {
+
+ public static void register(CommandDispatcher dispatcher)
+ {
+ dispatcher.register(Commands.literal("shareitem").executes(c->share_item(c.getSource())));
+
+ //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
+ //String arg = StringArgumentType.getString(command, "nickname");
+ //return setHome(command.getSource(), arg);
+ //}));
+ }
+
+ private static int share_item(CommandSourceStack source) {
+
+ if(source.getEntity() instanceof Player)
+ {
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+ ItemStack is = play.getItemInHand(InteractionHand.MAIN_HAND);
+ if(is.getItem() instanceof AirItem)
+ {
+ play.displayClientMessage(ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You cannot share air in the chat."), false);
+ return 0;
+ }
+
+ Profile prof;
+ try {
+ prof = Profile.get_profile_of(play.getUUID().toString());
+ } catch (UserProfileNotYetExistsException e) {
+ return 1;
+ }
+
+ MutableComponent component = ChatHelpers.macro(OTEMod.OTEPrefix).append(is.getDisplayName()).append(ChatHelpers.macro(" !White!-!Dark_Purple! Hover here to see the item that "+prof.name_color+prof.nickname+"!Dark_Purple! shared"));
+ Style style = Style.EMPTY.withFont(Style.DEFAULT_FONT);
+ component = component.withStyle(style.withHoverEvent(HoverTip.getItem(is)));
+
+ ChatHelpers.broadcast(component, ServerLifecycleHooks.getCurrentServer());
+
+ }else {
+ return 1;
+ }
+
+ return 0;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/commands/profilecmds/ChatColorCommand.java b/src/main/java/dev/zontreck/otemod/commands/profilecmds/ChatColorCommand.java
index 8b77dfa..a992ddf 100644
--- a/src/main/java/dev/zontreck/otemod/commands/profilecmds/ChatColorCommand.java
+++ b/src/main/java/dev/zontreck/otemod/commands/profilecmds/ChatColorCommand.java
@@ -1,22 +1,25 @@
package dev.zontreck.otemod.commands.profilecmds;
import com.mojang.brigadier.CommandDispatcher;
-
+import dev.zontreck.libzontreck.LibZontreck;
+import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.libzontreck.chat.ChatColor.ColorOptions;
+import dev.zontreck.libzontreck.profiles.Profile;
+import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException;
+import dev.zontreck.libzontreck.util.ChatHelpers;
import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import dev.zontreck.otemod.chat.ChatColor.ColorOptions;
-import dev.zontreck.otemod.configs.Profile;
+import dev.zontreck.otemod.implementation.Messages;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Player;
import net.minecraftforge.server.command.EnumArgument;
public class ChatColorCommand {
public static void register(CommandDispatcher dispatcher)
{
- dispatcher.register(Commands.literal("ccolor")
+ dispatcher.register(Commands.literal("chat_color")
.executes(c->setchatcolor(c.getSource(), ColorOptions.White))
.then(Commands.argument("color", EnumArgument.enumArgument(ChatColor.ColorOptions.class))//StringArgumentType.string())
.executes(c -> setchatcolor(c.getSource(), c.getArgument("color", ChatColor.ColorOptions.class)))// EnumArgument.getS(c, "color")))
@@ -36,16 +39,21 @@ public class ChatColorCommand {
String colorcoded = ChatColor.from(string);
// Get profile
- if(source.getPlayer()==null){
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), source.getServer());
+ if(!(source.getEntity() instanceof Player)){
+ return 1;
+ }
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+ Profile p;
+ try {
+ p = Profile.get_profile_of(play.getStringUUID());
+ } catch (UserProfileNotYetExistsException e) {
return 1;
}
- Profile p = Profile.get_profile_of(source.getPlayer().getStringUUID());
p.chat_color = colorcoded;
p.commit();
- OTEMod.PROFILES.put(source.getPlayer().getStringUUID(), p);
+ LibZontreck.PROFILES.put(play.getStringUUID(), p);
- source.sendSuccess(Component.literal(ChatColor.DARK_GRAY+ "["+ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY + "] "+ChatColor.DARK_PURPLE + "Your chat color has been updated"), false);
+ ChatHelpers.broadcastTo(play, ChatHelpers.macro(Messages.CHAT_COLOR_UPDATED), source.getServer());
return 0;
}
diff --git a/src/main/java/dev/zontreck/otemod/commands/profilecmds/NameColorCommand.java b/src/main/java/dev/zontreck/otemod/commands/profilecmds/NameColorCommand.java
index 1107d49..5211832 100644
--- a/src/main/java/dev/zontreck/otemod/commands/profilecmds/NameColorCommand.java
+++ b/src/main/java/dev/zontreck/otemod/commands/profilecmds/NameColorCommand.java
@@ -1,21 +1,25 @@
package dev.zontreck.otemod.commands.profilecmds;
import com.mojang.brigadier.CommandDispatcher;
-
+import dev.zontreck.libzontreck.LibZontreck;
+import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.libzontreck.chat.ChatColor.ColorOptions;
+import dev.zontreck.libzontreck.profiles.Profile;
+import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException;
+import dev.zontreck.libzontreck.util.ChatHelpers;
import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatColor.ColorOptions;
-import dev.zontreck.otemod.configs.Profile;
+import dev.zontreck.otemod.implementation.Messages;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Player;
import net.minecraftforge.server.command.EnumArgument;
public class NameColorCommand {
public static void register(CommandDispatcher dispatcher)
{
- dispatcher.register(Commands.literal("ncolor")
+ dispatcher.register(Commands.literal("nick_color")
.executes(c->setchatcolor(c.getSource(), ColorOptions.White))
.then(Commands.argument("color", EnumArgument.enumArgument(ChatColor.ColorOptions.class))//StringArgumentType.string())
.executes(c -> setchatcolor(c.getSource(), c.getArgument("color", ChatColor.ColorOptions.class)))// EnumArgument.getS(c, "color")))
@@ -35,16 +39,22 @@ public class NameColorCommand {
String colorcoded = ChatColor.from(string);
// Get profile
- if(source.getPlayer()==null){
- source.sendFailure(Component.literal(ChatColor.DARK_RED+"Only a player can use this command"));
+ if(!(source.getEntity() instanceof Player)){
+ return 1;
+ }
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+ Profile p;
+ try {
+ p = Profile.get_profile_of(play.getStringUUID());
+ } catch (UserProfileNotYetExistsException e) {
return 1;
}
- Profile p = Profile.get_profile_of(source.getPlayer().getStringUUID());
p.name_color = colorcoded;
p.commit();
- OTEMod.PROFILES.put(source.getPlayer().getStringUUID(), p);
+ LibZontreck.PROFILES.put(play.getStringUUID(), p);
- source.sendSuccess(Component.literal(ChatColor.DARK_GRAY+ "["+ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY + "] "+ChatColor.DARK_PURPLE + "Your name color has been updated"), false);
+
+ ChatHelpers.broadcastTo(play, ChatHelpers.macro(Messages.NAME_COLOR_UPDATED), source.getServer());
return 0;
}
diff --git a/src/main/java/dev/zontreck/otemod/commands/profilecmds/NickCommand.java b/src/main/java/dev/zontreck/otemod/commands/profilecmds/NickCommand.java
index a285194..e1a44a0 100644
--- a/src/main/java/dev/zontreck/otemod/commands/profilecmds/NickCommand.java
+++ b/src/main/java/dev/zontreck/otemod/commands/profilecmds/NickCommand.java
@@ -2,22 +2,24 @@ package dev.zontreck.otemod.commands.profilecmds;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.StringArgumentType;
-
+import dev.zontreck.libzontreck.LibZontreck;
+import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.libzontreck.profiles.Profile;
+import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException;
+import dev.zontreck.libzontreck.util.ChatHelpers;
import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatColor.ColorOptions;
-import dev.zontreck.otemod.configs.Profile;
+import dev.zontreck.otemod.implementation.Messages;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.Component;
-import net.minecraftforge.server.command.EnumArgument;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Player;
public class NickCommand {
public static void register(CommandDispatcher dispatcher)
{
dispatcher.register(Commands.literal("nick")
- .executes(c->setchatcolor(c.getSource(), c.getSource().getPlayer().getName().getString()))
+ .executes(c->setchatcolor(c.getSource(), c.getSource().getPlayerOrException().getName().getString()))
.then(Commands.argument("new_name", StringArgumentType.string())//StringArgumentType.string())
.executes(c -> setchatcolor(c.getSource(), StringArgumentType.getString(c, "new_name")))// EnumArgument.getS(c, "color")))
)
@@ -32,16 +34,23 @@ public class NickCommand {
public static int setchatcolor(CommandSourceStack source, String string) {
// Get profile
- if(source.getPlayer()==null){
- source.sendFailure(Component.literal(ChatColor.DARK_RED+"Only a player can use this command"));
+ if(!(source.getEntity() instanceof Player)){
+ return 1;
+ }
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+
+ Profile p;
+ try {
+ p = Profile.get_profile_of(play.getStringUUID());
+ } catch (UserProfileNotYetExistsException e) {
return 1;
}
- Profile p = Profile.get_profile_of(source.getPlayer().getStringUUID());
p.nickname = string;
p.commit();
- OTEMod.PROFILES.put(source.getPlayer().getStringUUID(), p);
+ LibZontreck.PROFILES.put(play.getStringUUID(), p);
- source.sendSuccess(Component.literal(ChatColor.DARK_GRAY+ "["+ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY + "] "+ChatColor.DARK_PURPLE + "Your nickname has been updated"), false);
+
+ ChatHelpers.broadcastTo(play, ChatHelpers.macro(Messages.NICK_UPDATED), source.getServer());
return 0;
}
diff --git a/src/main/java/dev/zontreck/otemod/commands/profilecmds/PrefixColorCommand.java b/src/main/java/dev/zontreck/otemod/commands/profilecmds/PrefixColorCommand.java
index 36bd5a9..1763fac 100644
--- a/src/main/java/dev/zontreck/otemod/commands/profilecmds/PrefixColorCommand.java
+++ b/src/main/java/dev/zontreck/otemod/commands/profilecmds/PrefixColorCommand.java
@@ -1,21 +1,25 @@
package dev.zontreck.otemod.commands.profilecmds;
import com.mojang.brigadier.CommandDispatcher;
-
+import dev.zontreck.libzontreck.LibZontreck;
+import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.libzontreck.chat.ChatColor.ColorOptions;
+import dev.zontreck.libzontreck.profiles.Profile;
+import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException;
+import dev.zontreck.libzontreck.util.ChatHelpers;
import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatColor.ColorOptions;
-import dev.zontreck.otemod.configs.Profile;
+import dev.zontreck.otemod.implementation.Messages;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Player;
import net.minecraftforge.server.command.EnumArgument;
public class PrefixColorCommand {
public static void register(CommandDispatcher dispatcher)
{
- dispatcher.register(Commands.literal("pcolor")
+ dispatcher.register(Commands.literal("prefix_color")
.executes(c->setchatcolor(c.getSource(), ColorOptions.White))
.then(Commands.argument("color", EnumArgument.enumArgument(ChatColor.ColorOptions.class))//StringArgumentType.string())
.executes(c -> setchatcolor(c.getSource(), c.getArgument("color", ChatColor.ColorOptions.class)))// EnumArgument.getS(c, "color")))
@@ -35,16 +39,22 @@ public class PrefixColorCommand {
String colorcoded = ChatColor.from(string);
// Get profile
- if(source.getPlayer()==null){
- source.sendFailure(Component.literal(ChatColor.DARK_RED+"Only a player can use this command"));
+ if(!(source.getEntity() instanceof Player)){
return 1;
}
- Profile p = Profile.get_profile_of(source.getPlayer().getStringUUID());
- p.name_color = colorcoded;
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+
+ Profile p;
+ try {
+ p = Profile.get_profile_of(play.getStringUUID());
+ } catch (UserProfileNotYetExistsException e) {
+ return 1;
+ }
+ p.prefix_color = colorcoded;
p.commit();
- OTEMod.PROFILES.put(source.getPlayer().getStringUUID(), p);
+ LibZontreck.PROFILES.put(play.getStringUUID(), p);
- source.sendSuccess(Component.literal(ChatColor.DARK_GRAY+ "["+ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY + "] "+ChatColor.DARK_PURPLE + "Your prefix color has been updated"), false);
+ ChatHelpers.broadcastTo(play, ChatHelpers.macro(Messages.PREFIX_COLOR_UPDATED), source.getServer());
return 0;
}
diff --git a/src/main/java/dev/zontreck/otemod/commands/profilecmds/PrefixCommand.java b/src/main/java/dev/zontreck/otemod/commands/profilecmds/PrefixCommand.java
index 3582d12..471cfc2 100644
--- a/src/main/java/dev/zontreck/otemod/commands/profilecmds/PrefixCommand.java
+++ b/src/main/java/dev/zontreck/otemod/commands/profilecmds/PrefixCommand.java
@@ -2,15 +2,17 @@ package dev.zontreck.otemod.commands.profilecmds;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.StringArgumentType;
-
+import dev.zontreck.libzontreck.LibZontreck;
+import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.libzontreck.profiles.Profile;
+import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException;
+import dev.zontreck.libzontreck.util.ChatHelpers;
import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatColor.ColorOptions;
-import dev.zontreck.otemod.configs.Profile;
+import dev.zontreck.otemod.implementation.Messages;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.Component;
-import net.minecraftforge.server.command.EnumArgument;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Player;
public class PrefixCommand {
@@ -32,16 +34,22 @@ public class PrefixCommand {
public static int setchatcolor(CommandSourceStack source, String string) {
// Get profile
- if(source.getPlayer()==null){
- source.sendFailure(Component.literal(ChatColor.DARK_RED+"Only a player can use this command"));
+ if(!(source.getEntity() instanceof Player)){
+ return 1;
+ }
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+
+ Profile p;
+ try {
+ p = Profile.get_profile_of(play.getStringUUID());
+ } catch (UserProfileNotYetExistsException e) {
return 1;
}
- Profile p = Profile.get_profile_of(source.getPlayer().getStringUUID());
p.prefix = string;
p.commit();
- OTEMod.PROFILES.put(source.getPlayer().getStringUUID(), p);
+ LibZontreck.PROFILES.put(play.getStringUUID(), p);
- source.sendSuccess(Component.literal(ChatColor.DARK_GRAY+ "["+ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY + "] "+ChatColor.DARK_PURPLE + "Your prefix has been updated"), false);
+ ChatHelpers.broadcastTo(play, ChatHelpers.macro(Messages.PREFIX_UPDATED), source.getServer());
return 0;
}
diff --git a/src/main/java/dev/zontreck/otemod/commands/teleport/RTPCommand.java b/src/main/java/dev/zontreck/otemod/commands/teleport/RTPCommand.java
deleted file mode 100644
index 8e0893b..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/teleport/RTPCommand.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package dev.zontreck.otemod.commands.teleport;
-
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-import java.util.UUID;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.BoolArgumentType;
-import com.mojang.brigadier.arguments.StringArgumentType;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import dev.zontreck.otemod.commands.CommandRegistry;
-import dev.zontreck.otemod.containers.Vector3;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.DoubleBlockCombiner.BlockType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.Vec3;
-
-public class RTPCommand {
-
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("rtp").executes(c->rtp(c.getSource(), false)).then(Commands.argument("ignorewater", BoolArgumentType.bool()).executes(c->rtp(c.getSource(), BoolArgumentType.getBool(c, "ignorewater")))));
-
- //executes(c -> doCancel(c.getSource())));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- public static Vector3 findPosition(ServerLevel lvl, boolean allowWater)
- {
- Vector3 v = new Vector3();
- boolean found_place = false;
- // We do not care how many tries it takes
-
- while (!found_place)
- {
-
- // Take our current position, and send us in a random direction
- Random rng = new Random(Instant.now().getEpochSecond());
- v.y = 300;
- v.x = rng.nextDouble(0xffff);
- v.z = rng.nextDouble(0xffff);
-
- boolean is_invalid_location = false;
- String block_place="";
-
- while(v.y!=-30)
- {
-
- BlockState b = lvl.getBlockState(new BlockPos(v.asMinecraftVector()));
- BlockState b2 = lvl.getBlockState(new BlockPos(v.moveUp().asMinecraftVector()));
- BlockState b3 = lvl.getBlockState(new BlockPos(v.moveDown().asMinecraftVector()));
-
- if(b.isAir()){
- if(b2.isAir()){
- if(!b3.isAir())
- {
- // Check names
- boolean valid=true;
- List blackLists = new ArrayList<>();
- if(!allowWater)
- blackLists.add(Blocks.WATER);
- blackLists.add(Blocks.LAVA);
-
- block_place = b3.getBlock().getName().getString();
- OTEMod.LOGGER.info(b3.getBlock().getName().getString());
- for(Block bx : blackLists)
- {
- if(b.is(bx) || b2.is(bx) || b3.is(bx)){
- valid=false;
- is_invalid_location=true;
- }
- }
-
- if(valid){
-
- found_place = true;
- break;
- }
-
- }
- }
- }
- v=v.moveDown();
- }
- }
-
- return v;
- }
-
- private static int rtp(CommandSourceStack source, boolean allowWater) {
-
- /*if(!CommandRegistry.canUse("rtp")) {
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.translatable("dev.zontreck.otemod.msgs.command_cooling_down").append(Component.literal(""+CommandRegistry.getRemaining("rtp"))).append(Component.translatable("dev.zontreck.otemod.msgs.command_cooling_down_seconds")), source.getServer());
-
- // exit
- //return 0; // Removed until the player data registry is implemented
- }
- CommandRegistry.markUsed("rtp");*/
- ServerPlayer pla = source.getPlayer();
- TeleportContainer cont = new TeleportContainer(pla, null, source.getPlayer().getRotationVector(), source.getLevel());
-
-
-
- Thread tx = new Thread(new Runnable() {
- public void run(){
- // We can now execute the loop to search for a safe spot!
- Vector3 v = new Vector3();
- // RTP is not designed to be safe really, but we at least want to check if where we are putting the player is air
-
- Vec3 pos = pla.position();
-
- boolean found_place= false;
-
- int tries=0;
- ChatServerOverride.broadcastTo(pla.getUUID(), Component.literal(ChatColor.DARK_GRAY + "["+ChatColor.DARK_GREEN+"OTEMOD"+ChatColor.DARK_GRAY+"] "+ChatColor.GREEN+"Searching for a suitable landing location..."), source.getServer());
- /*
- *
- *
- while(!found_place){
-
- // Take our current position, and send us in a random direction
- Random rng = new Random((long) (pos.x+pos.y+pos.z));
- v.y = 500;
- v.x = rng.nextDouble(0xffff);
- v.z = rng.nextDouble(0xffff);
-
- boolean is_invalid_location = false;
- String block_place="";
-
- // Begin to scan for ground
- while(v.y != -30)
- {
- // check block above and below
- BlockState b = source.getLevel().getBlockState(new BlockPos(v.asMinecraftVector()));
- BlockState b2 = source.getLevel().getBlockState(new BlockPos(v.moveUp().asMinecraftVector()));
- BlockState b3 = source.getLevel().getBlockState(new BlockPos(v.moveDown().asMinecraftVector()));
- //Block bx = b.getBlock();
-
- // Check that none of the blocks are water or lava
-
-
- if(b.isAir()){
- if(b2.isAir()){
- if(!b3.isAir()){
-
- // Check names
- boolean valid=true;
- List blackList = new ArrayList<>();
- if(!allowWater)
- blackList.add("Water");
- blackList.add("Lava");
-
- block_place = b3.getBlock().getName().getString();
- OTEMod.LOGGER.info(b3.getBlock().getName().getString());
- if(blackList.contains(b.getBlock().getName().getString())){
- valid=false;
- is_invalid_location=true;
- }
- if(blackList.contains(b2.getBlock().getName().getString())){
- valid=false;
- is_invalid_location=true;
- }
- if(blackList.contains(b3.getBlock().getName().getString())){
- valid=false;
- is_invalid_location=true;
- }
-
- if(valid){
-
- found_place = true;
- break;
- }
- }
- }
- }
-
- v =v.moveDown();
-
- }
- if(tries>=30)
- {
- // Aborting RTP
- ChatServerOverride.broadcastTo(pla.getUUID(), Component.literal(ChatColor.DARK_RED+"Could not find a suitable location after 30 tries. Giving up on RTP"), source.getServer());
- return;
- }
- tries++;
-
- String sAppend = "";
- if(is_invalid_location){
- sAppend = block_place + " is not valid";
- }
- ChatServerOverride.broadcastToAbove(pla.getUUID(), Component.literal(ChatColor.DARK_PURPLE+"Still searching.... Try ["+String.valueOf(tries)+"/30] "+sAppend), source.getServer());
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }*/
- v=findPosition(source.getLevel(), allowWater);
-
- ChatServerOverride.broadcastTo(pla.getUUID(), Component.literal(ChatColor.DARK_GRAY + "["+ChatColor.DARK_GREEN + "OTEMOD" + ChatColor.DARK_GRAY + "] "+ChatColor.DARK_PURPLE+" A suitable location has been found. Wormhole opening now!"), source.getServer());
-
- // Apply the effect
- TeleportActioner.ApplyTeleportEffect(pla);
- cont.Position=v.asMinecraftVector();
-
- TeleportActioner.PerformTeleport(cont);
-
- }
- });
-
- tx.start();
-
-
- return 0;
- }
-
- private static int doCancel(CommandSourceStack source, String TPID) {
- UUID teleporter = UUID.fromString(TPID);
- for(TeleportContainer cont : OTEMod.TeleportRegistry){
- if(cont.TeleportID.equals(teleporter)){
- // Accepting!
-
- ServerPlayer from = source.getServer().getPlayerList().getPlayer(cont.FromPlayer);
- ServerPlayer to = source.getServer().getPlayerList().getPlayer(cont.ToPlayer);
-
- Component comp = Component.literal(ChatColor.DARK_GRAY + "["+ ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY+"] " + ChatColor.DARK_PURPLE+"Teleport request was accepted. Opening wormhole!");
-
- ChatServerOverride.broadcastTo(cont.FromPlayer, comp, source.getServer());
- ChatServerOverride.broadcastTo(cont.ToPlayer, comp, source.getServer());
-
- OTEMod.TeleportRegistry.remove(cont);
-
-
- cont.PlayerInst = from;
- cont.Position = to.position();
- cont.Rotation = to.getRotationVector();
- cont.Dimension = to.getLevel();
-
- TeleportActioner.ApplyTeleportEffect(from);
- TeleportActioner.PerformTeleport(cont);
- return 0;
- }
- }
-
- Component comp = Component.literal(ChatColor.DARK_RED+"The teleport was not found, perhaps the request expired or was already cancelled/denied");
-
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), comp, source.getServer());
-
- return 0;
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/teleport/TPACommand.java b/src/main/java/dev/zontreck/otemod/commands/teleport/TPACommand.java
deleted file mode 100644
index cbb4b9c..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/teleport/TPACommand.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package dev.zontreck.otemod.commands.teleport;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.ArgumentType;
-import com.mojang.brigadier.arguments.StringArgumentType;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import dev.zontreck.otemod.chat.Clickable;
-import dev.zontreck.otemod.chat.HoverTip;
-import dev.zontreck.otemod.configs.Profile;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.commands.arguments.EntityArgument;
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.HoverEvent;
-import net.minecraft.network.chat.Style;
-import net.minecraft.server.level.ServerPlayer;
-
-public class TPACommand {
-
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("tpa").executes(c->usage(c.getSource())).then(Commands.argument("player", EntityArgument.player()).executes(c -> tpa(c.getSource(), EntityArgument.getPlayer(c, "player")))));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- private static int tpa(CommandSourceStack source, ServerPlayer serverPlayer) {
- // Send the request to player
- if(serverPlayer == null){
- source.sendFailure(Component.literal(ChatColor.DARK_RED+"Error: Player not found"));
- return 1;
- }
- if(!OTEMod.DEVELOPER){
- if(source.getPlayer().getUUID() == serverPlayer.getUUID()){
- source.sendFailure(Component.literal(ChatColor.DARK_RED+"You cannot teleport to yourself!"));
- return 1;
- }
- }
- TeleportContainer cont = new TeleportContainer(source.getPlayer().getUUID(), serverPlayer.getUUID());
-
- for(TeleportContainer cont2 : OTEMod.TeleportRegistry){
- if(cont2.compareTo(cont)==0){
- ChatServerOverride.broadcastTo(cont.FromPlayer, Component.literal(ChatColor.DARK_RED+ "You already have a TPA Request active, wait for it to expire, or use the cancel button/command"), source.getServer());
- return 0;
- }else {
- if(cont2.FromPlayer == cont.FromPlayer){
- ChatServerOverride.broadcastTo(cont.FromPlayer, Component.literal(ChatColor.DARK_RED+ "You already have a TPA Request active, wait for it to expire, or use the cancel button/command"), source.getServer());
- return 0;
- }
- }
- }
-
-
- ClickEvent ce = Clickable.command("/tpcancel "+cont.TeleportID.toString());
- HoverEvent he = HoverTip.get(ChatColor.DARK_GREEN+"Cancel this teleport request (Not yet implemented)");
-
- Style s = Style.EMPTY.withFont(Style.DEFAULT_FONT).withHoverEvent(he).withClickEvent(ce);
-
- // Send the alerts
- ChatServerOverride.broadcastTo(cont.FromPlayer, Component.literal(ChatColor.BOLD + ChatColor.DARK_GREEN +"TPA Request Sent! ").append(Component.literal(ChatColor.BOLD+ChatColor.DARK_GRAY+"["+ChatColor.DARK_RED+"X"+ChatColor.DARK_GRAY+"]").setStyle(s)), serverPlayer.server);
-
-
- ce = Clickable.command("/tpaccept "+cont.TeleportID.toString());
- he = HoverTip.get(ChatColor.DARK_GREEN + "Accept tp request");
- ClickEvent ce2 = Clickable.command("/tpdeny "+cont.TeleportID.toString());
- HoverEvent he2 = HoverTip.get(ChatColor.DARK_RED+"Deny this request");
- s = Style.EMPTY.withFont(Style.DEFAULT_FONT).withClickEvent(ce).withHoverEvent(he);
-
- Style s2 = Style.EMPTY.withFont(Style.DEFAULT_FONT).withClickEvent(ce2).withHoverEvent(he2);
-
- Profile p = Profile.get_profile_of(cont.FromPlayer.toString());
- ChatServerOverride.broadcastTo(cont.ToPlayer, Component.literal(p.name_color+p.nickname + ChatColor.BOLD + ChatColor.DARK_PURPLE+" is requesting to teleport to you\n \n").
- append(Component.literal(ChatColor.DARK_GRAY+"["+ChatColor.DARK_GREEN+"ACCEPT" + ChatColor.DARK_GRAY+"] ").setStyle(s)).
- append(Component.literal(ChatColor.DARK_GRAY + "["+ChatColor.DARK_RED+"DENY"+ChatColor.DARK_GRAY+"]").setStyle(s2)), serverPlayer.server);
-
- OTEMod.TeleportRegistry.add(cont);
- return 0;
- }
-
- private static int usage(CommandSourceStack source) {
- source.sendSuccess(Component.literal("/tpa USAGE\n\n "+ChatColor.BOLD + ChatColor.DARK_GRAY+"/tpa "+ChatColor.DARK_RED+"target_player\n"), false);
- return 0;
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/teleport/TPAHereCommand.java b/src/main/java/dev/zontreck/otemod/commands/teleport/TPAHereCommand.java
deleted file mode 100644
index d4570f2..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/teleport/TPAHereCommand.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package dev.zontreck.otemod.commands.teleport;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.ArgumentType;
-import com.mojang.brigadier.arguments.StringArgumentType;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import dev.zontreck.otemod.chat.Clickable;
-import dev.zontreck.otemod.chat.HoverTip;
-import dev.zontreck.otemod.configs.Profile;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.commands.arguments.EntityArgument;
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.HoverEvent;
-import net.minecraft.network.chat.Style;
-import net.minecraft.server.level.ServerPlayer;
-
-public class TPAHereCommand {
-
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("tpahere").executes(c->usage(c.getSource())).then(Commands.argument("player", EntityArgument.player()).executes(c -> tpa(c.getSource(), EntityArgument.getPlayer(c, "player")))));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- private static int tpa(CommandSourceStack source, ServerPlayer serverPlayer) {
- // Send the request to player
- if(serverPlayer == null){
- source.sendFailure(Component.literal(ChatColor.DARK_RED+"Error: Player not found"));
- return 1;
- }
- if(!OTEMod.DEVELOPER){
- if(source.getPlayer().getUUID() == serverPlayer.getUUID()){
- source.sendFailure(Component.literal(ChatColor.DARK_RED+"You cannot teleport to yourself!"));
- return 1;
- }
- }
- TeleportContainer cont = new TeleportContainer(serverPlayer.getUUID(), source.getPlayer().getUUID());
-
- for(TeleportContainer cont2 : OTEMod.TeleportRegistry){
- if(cont2.compareTo(cont)==0){
- ChatServerOverride.broadcastTo(cont.ToPlayer, Component.literal(ChatColor.DARK_RED+ "You already have a TPA Request active, wait for it to expire, or use the cancel button/command"), source.getServer());
- return 0;
- }else {
- if(cont2.ToPlayer.equals(cont.ToPlayer)){
- ChatServerOverride.broadcastTo(cont.FromPlayer, Component.literal(ChatColor.DARK_RED+ "You already have a TPA Request active, wait for it to expire, or use the cancel button/command"), source.getServer());
- return 0;
- }
- }
- }
-
-
- ClickEvent ce = Clickable.command("/tpcancel "+cont.TeleportID.toString());
- HoverEvent he = HoverTip.get(ChatColor.DARK_GREEN+"Cancel this teleport request (Not yet implemented)");
-
- Style s = Style.EMPTY.withFont(Style.DEFAULT_FONT).withHoverEvent(he).withClickEvent(ce);
-
- // Send the alerts
- ChatServerOverride.broadcastTo(cont.ToPlayer, Component.literal(ChatColor.BOLD + ChatColor.DARK_GREEN +"TPA Request Sent! ").append(Component.literal(ChatColor.BOLD+ChatColor.DARK_GRAY+"["+ChatColor.DARK_RED+"X"+ChatColor.DARK_GRAY+"]").setStyle(s)), serverPlayer.server);
-
-
- ce = Clickable.command("/tpaccept "+cont.TeleportID.toString());
- he = HoverTip.get(ChatColor.DARK_GREEN + "Accept tp request");
- ClickEvent ce2 = Clickable.command("/tpdeny "+cont.TeleportID.toString());
- HoverEvent he2 = HoverTip.get(ChatColor.DARK_RED+"Deny this request");
- s = Style.EMPTY.withFont(Style.DEFAULT_FONT).withClickEvent(ce).withHoverEvent(he);
-
- Style s2 = Style.EMPTY.withFont(Style.DEFAULT_FONT).withClickEvent(ce2).withHoverEvent(he2);
-
- Profile p = Profile.get_profile_of(cont.ToPlayer.toString());
- ChatServerOverride.broadcastTo(cont.FromPlayer, Component.literal(p.name_color+p.nickname + ChatColor.BOLD + ChatColor.DARK_PURPLE+" is requesting you to teleport to them\n \n").
- append(Component.literal(ChatColor.DARK_GRAY+"["+ChatColor.DARK_GREEN+"ACCEPT" + ChatColor.DARK_GRAY+"] ").setStyle(s)).
- append(Component.literal(ChatColor.DARK_GRAY + "["+ChatColor.DARK_RED+"DENY"+ChatColor.DARK_GRAY+"]").setStyle(s2)), serverPlayer.server);
-
- OTEMod.TeleportRegistry.add(cont);
- return 0;
- }
-
- private static int usage(CommandSourceStack source) {
- source.sendSuccess(Component.literal("/tpa USAGE\n\n "+ChatColor.BOLD + ChatColor.DARK_GRAY+"/tpa "+ChatColor.DARK_RED+"target_player\n"), false);
- return 0;
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/teleport/TPAcceptCommand.java b/src/main/java/dev/zontreck/otemod/commands/teleport/TPAcceptCommand.java
deleted file mode 100644
index 75c6414..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/teleport/TPAcceptCommand.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package dev.zontreck.otemod.commands.teleport;
-
-import java.util.UUID;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.StringArgumentType;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerPlayer;
-
-public class TPAcceptCommand {
-
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("tpaccept").then(Commands.argument("TeleportUUID", StringArgumentType.string()).executes(c->doCancel(c.getSource(), StringArgumentType.getString(c, "TeleportUUID")))));
-
- //executes(c -> doCancel(c.getSource())));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- private static int doCancel(CommandSourceStack source, String TPID) {
- UUID teleporter = UUID.fromString(TPID);
- for(TeleportContainer cont : OTEMod.TeleportRegistry){
- if(cont.TeleportID.equals(teleporter)){
- // Accepting!
-
- ServerPlayer from = source.getServer().getPlayerList().getPlayer(cont.FromPlayer);
- ServerPlayer to = source.getServer().getPlayerList().getPlayer(cont.ToPlayer);
-
- Component comp = Component.literal(ChatColor.DARK_GRAY + "["+ ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY+"] " + ChatColor.DARK_PURPLE+"Teleport request was accepted. Opening wormhole!");
-
- ChatServerOverride.broadcastTo(cont.FromPlayer, comp, source.getServer());
- ChatServerOverride.broadcastTo(cont.ToPlayer, comp, source.getServer());
-
- OTEMod.TeleportRegistry.remove(cont);
-
-
- cont.PlayerInst = from;
- cont.Position = to.position();
- cont.Rotation = to.getRotationVector();
- cont.Dimension = to.getLevel();
-
- TeleportActioner.ApplyTeleportEffect(from);
- TeleportActioner.PerformTeleport(cont);
- return 0;
- }
- }
-
- Component comp = Component.literal(ChatColor.DARK_RED+"The teleport was not found, perhaps the request expired or was already cancelled/denied");
-
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), comp, source.getServer());
-
- return 0;
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/teleport/TPCancelCommand.java b/src/main/java/dev/zontreck/otemod/commands/teleport/TPCancelCommand.java
deleted file mode 100644
index d6b2ae9..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/teleport/TPCancelCommand.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package dev.zontreck.otemod.commands.teleport;
-
-import java.util.UUID;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.StringArgumentType;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.Component;
-
-public class TPCancelCommand {
-
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("tpcancel").then(Commands.argument("TeleportUUID", StringArgumentType.string()).executes(c->doCancel(c.getSource(), StringArgumentType.getString(c, "TeleportUUID")))));
-
- //executes(c -> doCancel(c.getSource())));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- private static int doCancel(CommandSourceStack source, String TPID) {
- UUID teleporter = UUID.fromString(TPID);
- for(TeleportContainer cont : OTEMod.TeleportRegistry){
- if(cont.TeleportID.equals(teleporter)){
- // Canceling!
- Component comp = Component.literal(ChatColor.DARK_GRAY + "["+ ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY+"] " + ChatColor.DARK_PURPLE+"Teleport request was cancelled");
-
- ChatServerOverride.broadcastTo(cont.FromPlayer, comp, source.getServer());
- ChatServerOverride.broadcastTo(cont.ToPlayer, comp, source.getServer());
-
- OTEMod.TeleportRegistry.remove(cont);
- return 0;
- }
- }
-
- Component comp = Component.literal(ChatColor.DARK_RED+"The teleport was not found, perhaps the request expired or was already cancelled");
-
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), comp, source.getServer());
-
- return 0;
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/teleport/TPDenyCommand.java b/src/main/java/dev/zontreck/otemod/commands/teleport/TPDenyCommand.java
deleted file mode 100644
index bc076c8..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/teleport/TPDenyCommand.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package dev.zontreck.otemod.commands.teleport;
-
-import java.util.UUID;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.StringArgumentType;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.Component;
-
-public class TPDenyCommand {
-
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("tpdeny").then(Commands.argument("TeleportUUID", StringArgumentType.string()).executes(c->doCancel(c.getSource(), StringArgumentType.getString(c, "TeleportUUID")))));
-
- //executes(c -> doCancel(c.getSource())));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- private static int doCancel(CommandSourceStack source, String TPID) {
- UUID teleporter = UUID.fromString(TPID);
- for(TeleportContainer cont : OTEMod.TeleportRegistry){
- if(cont.TeleportID.equals(teleporter)){
- // Canceling!
- Component comp = Component.literal(ChatColor.DARK_GRAY + "["+ ChatColor.DARK_GREEN+ "OTEMOD" + ChatColor.DARK_GRAY+"] " + ChatColor.DARK_PURPLE+"Teleport request was denied");
-
- ChatServerOverride.broadcastTo(cont.FromPlayer, comp, source.getServer());
- ChatServerOverride.broadcastTo(cont.ToPlayer, comp, source.getServer());
-
- OTEMod.TeleportRegistry.remove(cont);
- return 0;
- }
- }
-
- Component comp = Component.literal(ChatColor.DARK_RED+"The teleport was not found, perhaps the request expired or was already cancelled/denied");
-
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), comp, source.getServer());
-
- return 0;
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/teleport/TeleportActioner.java b/src/main/java/dev/zontreck/otemod/commands/teleport/TeleportActioner.java
deleted file mode 100644
index 3f3c1f0..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/teleport/TeleportActioner.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package dev.zontreck.otemod.commands.teleport;
-
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.effect.MobEffects;
-
-public class TeleportActioner
-{
- public static void PerformTeleport(TeleportContainer contain){
- //sub_runnable run = new sub_runnable(contain);
- Thread t = new Thread(new TeleportRunnable(contain));
- t.start();
- }
-
- public static void ApplyTeleportEffect(ServerPlayer player){
-
- // 10/05/2022 - Thinking ahead here to future proof it so i can do things in threads safely
- // By adding this task onto the main server thread, any thread can call the TeleportActioner and it will be actioned on the main thread without needing to repeat the process of sending this to the server thread.
- player.server.execute(new Runnable(){
- public void run(){
-
- MobEffectInstance inst = new MobEffectInstance(MobEffects.DARKNESS, 200, 1, true, true);
- MobEffectInstance regen = new MobEffectInstance(MobEffects.REGENERATION, 200, 2, true, true);
-
- // 10-05-2022 - Adjusted to 100 on duration due to a small issue where it would sometimes stop levitation prior to the teleport taking effect.
- // Small tradeoff is the player now levitates slightly longer at the destination. This is acceptable. Compensated by increasing regen strength by 1
- MobEffectInstance invul = new MobEffectInstance(MobEffects.LEVITATION, 100, 1, true, true);
-
-
- player.addEffect(inst);
- player.addEffect(regen);
- player.addEffect(invul); // ensure the player can't fall into lava in the short time we are not in control (if the player was silly enough to make a home above lava!!!)
-
- }
- });
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/teleport/TeleportContainer.java b/src/main/java/dev/zontreck/otemod/commands/teleport/TeleportContainer.java
deleted file mode 100644
index 002e4c9..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/teleport/TeleportContainer.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package dev.zontreck.otemod.commands.teleport;
-
-import java.time.Instant;
-import java.util.UUID;
-
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.phys.Vec2;
-import net.minecraft.world.phys.Vec3;
-
-public class TeleportContainer implements Comparable{
- public UUID FromPlayer;
- public UUID ToPlayer;
- public long StartedAt;
- public UUID TeleportID;
-
- /*
- * The following variables are only used when actioning the teleport itself, and should only be initialized once the teleport is about to engage
- */
- public ServerPlayer PlayerInst;
- public Vec3 Position;
- public Vec2 Rotation;
- public ServerLevel Dimension;
-
-
- public boolean has_expired(){
- if(Instant.now().getEpochSecond() > (StartedAt + (60)))
- {
- return true;
- }else return false;
- }
-
- public TeleportContainer (UUID From, UUID To)
- {
- FromPlayer = From;
- ToPlayer=To;
- TeleportID = UUID.randomUUID();
-
- StartedAt = Instant.now().getEpochSecond();
- }
-
- public TeleportContainer(ServerPlayer f_p, Vec3 f_pos, Vec2 f_rot, ServerLevel f_dim) {
- SetTeleportDestination(f_p, f_pos, f_rot, f_dim);
- }
-
- private void SetTeleportDestination(ServerPlayer f_p, Vec3 f_pos, Vec2 f_rot, ServerLevel f_dim) {
- PlayerInst = f_p;
- Position = f_pos;
- Rotation = f_rot;
- Dimension = f_dim;
- }
-
- @Override
- public int compareTo(Object o) {
- if(o instanceof TeleportContainer){
- TeleportContainer cont = (TeleportContainer)o;
- if(cont.FromPlayer != FromPlayer){
- return -1;
- }else {
- if(cont.ToPlayer != ToPlayer)return 1;
- else return 0;
- }
- }else return -1;
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/teleport/TeleportRunnable.java b/src/main/java/dev/zontreck/otemod/commands/teleport/TeleportRunnable.java
deleted file mode 100644
index 8d5c130..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/teleport/TeleportRunnable.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package dev.zontreck.otemod.commands.teleport;
-
-import dev.zontreck.otemod.configs.PlayerFlyCache;
-
-public class TeleportRunnable implements Runnable
-{
-
- public final TeleportContainer Action;
- public TeleportRunnable(TeleportContainer cont){
- Action = cont;
- }
-
- @Override
- public void run() {
-
- try {
- Thread.sleep(3000);
- } catch (InterruptedException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- PlayerFlyCache c = PlayerFlyCache.cachePlayer(Action.PlayerInst);
- Action.PlayerInst.teleportTo(Action.Dimension, Action.Position.x, Action.Position.y, Action.Position.z, Action.Rotation.y, Action.Rotation.x);
-
-
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- c.Assert(Action.PlayerInst);
-
- Action.PlayerInst.setPos(Action.Position);
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/vaults/StarterCommand.java b/src/main/java/dev/zontreck/otemod/commands/vaults/StarterCommand.java
new file mode 100644
index 0000000..f3035a3
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/commands/vaults/StarterCommand.java
@@ -0,0 +1,98 @@
+package dev.zontreck.otemod.commands.vaults;
+
+import com.mojang.brigadier.CommandDispatcher;
+import dev.zontreck.libzontreck.profiles.Profile;
+import dev.zontreck.libzontreck.profiles.UserProfileNotYetExistsException;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.otemod.OTEMod;
+import dev.zontreck.otemod.implementation.Messages;
+import dev.zontreck.otemod.implementation.PlayerFirstJoinTag;
+import dev.zontreck.otemod.implementation.vault.NoMoreVaultException;
+import dev.zontreck.otemod.implementation.vault.StarterContainer;
+import dev.zontreck.otemod.implementation.vault.VaultContainer;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.SimpleMenuProvider;
+import net.minecraftforge.network.NetworkHooks;
+
+public class StarterCommand
+{
+ public static void register(CommandDispatcher dispatcher)
+ {
+ dispatcher.register(Commands.literal("starter").executes(x->openStarterMenu(x.getSource())).then(Commands.argument("player", EntityArgument.player()).executes(x->starterCommand(x.getSource(), EntityArgument.getPlayer(x, "player")))));
+ }
+
+ public static int starterCommand(CommandSourceStack ctx, ServerPlayer player)
+ {
+ if(ctx.hasPermission(ctx.getServer().getOperatorUserPermissionLevel()))
+ {
+ try {
+ vendStarterKit(player);
+ } catch (UserProfileNotYetExistsException e) {
+ throw new RuntimeException(e);
+ }
+ return 0;
+ }
+ return 1;
+ }
+
+ public static void vendStarterKit(ServerPlayer player) throws UserProfileNotYetExistsException {
+ Profile prof = Profile.get_profile_of(player.getStringUUID());
+ PlayerFirstJoinTag PFJT = PlayerFirstJoinTag.now();
+ PFJT.LastGiven=0L;
+
+ PFJT.save(prof.NBT);
+
+ OTEMod.checkFirstJoin(player);
+ }
+
+ public static int openStarterMenu(CommandSourceStack ctx)
+ {
+ ServerPlayer player = ctx.getPlayer();
+ if(player != null)
+ {
+ if(player.hasPermissions(ctx.getServer().getOperatorUserPermissionLevel()))
+ {
+ try {
+ StarterContainer container = new StarterContainer(player);
+ NetworkHooks.openScreen(player, new SimpleMenuProvider(container.serverMenu, Component.literal("Starter Gear")));
+
+
+ // Add to the master vault registry
+ if(StarterContainer.VAULT_REGISTRY.containsKey(player.getUUID()))StarterContainer.VAULT_REGISTRY.remove(player.getUUID());
+ StarterContainer.VAULT_REGISTRY.put(player.getUUID(), container);
+ } catch (NoMoreVaultException e) {
+ throw new RuntimeException(e);
+ }
+
+ }else {
+ ChatHelpers.broadcastTo(player, ChatHelpers.macro(Messages.STARTER_FAILURE_PERMISSIONS), ctx.getServer());
+ }
+
+ return 0;
+ }
+ ctx.sendFailure(ChatHelpers.macro(Messages.CONSOLE_ERROR));
+ return 1;
+ }
+
+
+ public static void doOpen(ServerPlayer p){
+
+ StarterContainer container;
+ try {
+ container = new StarterContainer(p);
+ } catch (NoMoreVaultException e) {
+ ChatHelpers.broadcastTo(p.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+"!Dark_Red!You cannot open anymore vaults. Craft a new vault!"), p.server);
+ return;
+ }
+
+ NetworkHooks.openScreen(p, new SimpleMenuProvider(container.serverMenu, Component.literal("Starter Gear")));
+
+ // Add to the master vault registry
+ if(StarterContainer.VAULT_REGISTRY.containsKey(p.getUUID()))VaultContainer.VAULT_REGISTRY.remove(p.getUUID());
+ StarterContainer.VAULT_REGISTRY.put(p.getUUID(), container);
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/commands/vaults/TrashCommand.java b/src/main/java/dev/zontreck/otemod/commands/vaults/TrashCommand.java
index 2e63b8f..9d6cee0 100644
--- a/src/main/java/dev/zontreck/otemod/commands/vaults/TrashCommand.java
+++ b/src/main/java/dev/zontreck/otemod/commands/vaults/TrashCommand.java
@@ -1,16 +1,14 @@
package dev.zontreck.otemod.commands.vaults;
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-
import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.IntegerArgumentType;
-
-import dev.zontreck.otemod.implementation.VaultContainer;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.otemod.OTEMod;
+import dev.zontreck.otemod.implementation.vault.NoMoreVaultException;
+import dev.zontreck.otemod.implementation.vault.VaultContainer;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.SimpleMenuProvider;
import net.minecraftforge.network.NetworkHooks;
@@ -29,14 +27,21 @@ public class TrashCommand {
private static int vault(CommandSourceStack source) {
//VaultContainer cont = new VaultContainer(i, source.getPlayer().getUUID());
//cont.startOpen(source.getPlayer());
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+
+ VaultContainer container;
+ try {
+ container = new VaultContainer(play, -1);
+ } catch (NoMoreVaultException e) {
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You cannot open anymore vaults. Craft a new vault!"), play.server);
+ return 0;
+ }
- VaultContainer container = new VaultContainer(source.getPlayer(), -1);
-
- NetworkHooks.openScreen(source.getPlayer(), new SimpleMenuProvider(container.serverMenu, Component.literal("Trash")));
+ NetworkHooks.openScreen(play, new SimpleMenuProvider(container.serverMenu, Component.literal("Trash")));
// Add to the master vault registry
- if(VaultContainer.VAULT_REGISTRY.containsKey(source.getPlayer().getUUID()))VaultContainer.VAULT_REGISTRY.remove(source.getPlayer().getUUID());
- VaultContainer.VAULT_REGISTRY.put(source.getPlayer().getUUID(), container);
+ if(VaultContainer.VAULT_REGISTRY.containsKey(play.getUUID()))VaultContainer.VAULT_REGISTRY.remove(play.getUUID());
+ VaultContainer.VAULT_REGISTRY.put(play.getUUID(), container);
return 0;
}
diff --git a/src/main/java/dev/zontreck/otemod/commands/vaults/VaultCommand.java b/src/main/java/dev/zontreck/otemod/commands/vaults/VaultCommand.java
index 0a2f32a..0dbd9b0 100644
--- a/src/main/java/dev/zontreck/otemod/commands/vaults/VaultCommand.java
+++ b/src/main/java/dev/zontreck/otemod/commands/vaults/VaultCommand.java
@@ -1,16 +1,15 @@
package dev.zontreck.otemod.commands.vaults;
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.IntegerArgumentType;
-
-import dev.zontreck.otemod.implementation.VaultContainer;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.otemod.OTEMod;
+import dev.zontreck.otemod.implementation.vault.NoMoreVaultException;
+import dev.zontreck.otemod.implementation.vault.VaultContainer;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.SimpleMenuProvider;
import net.minecraftforge.network.NetworkHooks;
@@ -30,15 +29,32 @@ public class VaultCommand {
private static int vault(CommandSourceStack source, int i) {
//VaultContainer cont = new VaultContainer(i, source.getPlayer().getUUID());
//cont.startOpen(source.getPlayer());
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+ if(i <0)
+ {
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You can only specify a vault number in the positive range"), source.getServer());
+ return 0;
+ }
+ doOpen(play, i);
- VaultContainer container = new VaultContainer(source.getPlayer(), i);
-
- NetworkHooks.openScreen(source.getPlayer(), new SimpleMenuProvider(container.serverMenu, Component.literal("Vault "+i)));
-
- // Add to the master vault registry
- if(VaultContainer.VAULT_REGISTRY.containsKey(source.getPlayer().getUUID()))VaultContainer.VAULT_REGISTRY.remove(source.getPlayer().getUUID());
- VaultContainer.VAULT_REGISTRY.put(source.getPlayer().getUUID(), container);
return 0;
}
+
+ public static void doOpen(ServerPlayer p, int i){
+
+ VaultContainer container;
+ try {
+ container = new VaultContainer(p, i);
+ } catch (NoMoreVaultException e) {
+ ChatHelpers.broadcastTo(p.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You cannot open anymore vaults. Craft a new vault!"), p.server);
+ return;
+ }
+
+ NetworkHooks.openScreen(p, new SimpleMenuProvider(container.serverMenu, Component.literal("Vault " + i)));
+
+ // Add to the master vault registry
+ if(VaultContainer.VAULT_REGISTRY.containsKey(p.getUUID()))VaultContainer.VAULT_REGISTRY.remove(p.getUUID());
+ VaultContainer.VAULT_REGISTRY.put(p.getUUID(), container);
+ }
}
diff --git a/src/main/java/dev/zontreck/otemod/commands/warps/DelWarpCommand.java b/src/main/java/dev/zontreck/otemod/commands/warps/DelWarpCommand.java
deleted file mode 100644
index 424ed5b..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/warps/DelWarpCommand.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package dev.zontreck.otemod.commands.warps;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.StringArgumentType;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import dev.zontreck.otemod.containers.Vector2;
-import dev.zontreck.otemod.containers.Vector3;
-import dev.zontreck.otemod.database.TeleportDestination;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.contents.TranslatableContents;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.phys.Vec2;
-import net.minecraft.world.phys.Vec3;
-
-public class DelWarpCommand {
-
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("delwarp").then(Commands.argument("nickname", StringArgumentType.string()).executes(c -> setWarp(c.getSource(), StringArgumentType.getString(c, "nickname")))));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- private static int setWarp(CommandSourceStack source, String string) {
-
- if(! source.isPlayer())
- {
-
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), source.getServer());
- return 1;
- }
- ServerPlayer p = source.getPlayer();
- Connection con = OTEMod.DB.getConnection();
- try {
- con.beginRequest();
- PreparedStatement pstat;
- Vec3 position = p.position();
- Vec2 rot = p.getRotationVector();
-
- TeleportDestination dest = new TeleportDestination(new Vector3(position), new Vector2(rot), p.getLevel().dimension().location().getNamespace() + ":" + p.getLevel().dimension().location().getPath());
-
- String SQL = "DELETE FROM `warps` WHERE `warpname`=? AND `owner`=?;";
- pstat = con.prepareStatement(SQL);
- pstat.setString(1, string);
- pstat.setString(2, p.getStringUUID());
- pstat.execute();
-
-
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.GREEN).append(Component.translatable("dev.zontreck.otemod.msgs.warps.del.success")), source.getServer());
-
- con.endRequest();
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.warps.del.fail")), source.getServer());
- }
-
- return 0;
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/warps/RTPWarpCommand.java b/src/main/java/dev/zontreck/otemod/commands/warps/RTPWarpCommand.java
deleted file mode 100644
index b47c227..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/warps/RTPWarpCommand.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package dev.zontreck.otemod.commands.warps;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.StringArgumentType;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import dev.zontreck.otemod.containers.Vector2;
-import dev.zontreck.otemod.containers.Vector3;
-import dev.zontreck.otemod.database.TeleportDestination;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.contents.TranslatableContents;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.phys.Vec2;
-import net.minecraft.world.phys.Vec3;
-
-public class RTPWarpCommand {
-
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("rtpwarp").then(Commands.argument("nickname", StringArgumentType.string()).executes(c -> setWarp(c.getSource(), StringArgumentType.getString(c, "nickname")))));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- private static int setWarp(CommandSourceStack source, String string) {
-
- if(! source.isPlayer())
- {
-
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), source.getServer());
- return 1;
- }
- ServerPlayer p = source.getPlayer();
- Connection con = OTEMod.DB.getConnection();
- try {
- con.beginRequest();
- PreparedStatement pstat;
- Vec3 position = p.position();
- Vec2 rot = p.getRotationVector();
-
- TeleportDestination dest = new TeleportDestination(new Vector3(position), new Vector2(rot), p.getLevel().dimension().location().getNamespace() + ":" + p.getLevel().dimension().location().getPath());
-
- String SQL = "REPLACE INTO `warps` (warpname, owner, warptype, teleporter) values (?, ?, ?, ?);";
- pstat = con.prepareStatement(SQL);
- pstat.setString(1, string);
- pstat.setString(2, p.getStringUUID());
- pstat.setInt(3, 1);
- pstat.setString(4, dest.toString());
- pstat.execute();
-
-
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.GREEN).append(Component.translatable("dev.zontreck.otemod.msgs.warps.set.success")), source.getServer());
-
- con.endRequest();
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.warps.set.fail")), source.getServer());
- }
-
- return 0;
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/warps/SetWarpCommand.java b/src/main/java/dev/zontreck/otemod/commands/warps/SetWarpCommand.java
deleted file mode 100644
index 97f2e01..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/warps/SetWarpCommand.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package dev.zontreck.otemod.commands.warps;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.StringArgumentType;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import dev.zontreck.otemod.containers.Vector2;
-import dev.zontreck.otemod.containers.Vector3;
-import dev.zontreck.otemod.database.TeleportDestination;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.contents.TranslatableContents;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.phys.Vec2;
-import net.minecraft.world.phys.Vec3;
-
-public class SetWarpCommand {
-
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("setwarp").then(Commands.argument("nickname", StringArgumentType.string()).executes(c -> setWarp(c.getSource(), StringArgumentType.getString(c, "nickname")))));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- private static int setWarp(CommandSourceStack source, String string) {
-
- if(! source.isPlayer())
- {
-
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.only_player")), source.getServer());
- return 1;
- }
- ServerPlayer p = source.getPlayer();
- Connection con = OTEMod.DB.getConnection();
- try {
- con.beginRequest();
- PreparedStatement pstat;
- Vec3 position = p.position();
- Vec2 rot = p.getRotationVector();
-
- TeleportDestination dest = new TeleportDestination(new Vector3(position), new Vector2(rot), p.getLevel().dimension().location().getNamespace() + ":" + p.getLevel().dimension().location().getPath());
-
- String SQL = "REPLACE INTO `warps` (warpname, owner, warptype, teleporter) values (?, ?, ?, ?);";
- pstat = con.prepareStatement(SQL);
- pstat.setString(1, string);
- pstat.setString(2, p.getStringUUID());
- pstat.setInt(3, 0);
- pstat.setString(4, dest.toString());
- pstat.execute();
-
-
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.GREEN).append(Component.translatable("dev.zontreck.otemod.msgs.warps.set.success")), source.getServer());
-
- con.endRequest();
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED).append(Component.translatable("dev.zontreck.otemod.msgs.warps.set.fail")), source.getServer());
- }
-
- return 0;
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/warps/WarpCommand.java b/src/main/java/dev/zontreck/otemod/commands/warps/WarpCommand.java
deleted file mode 100644
index 5bff4a2..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/warps/WarpCommand.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package dev.zontreck.otemod.commands.warps;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.StringArgumentType;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import dev.zontreck.otemod.chat.Clickable;
-import dev.zontreck.otemod.commands.teleport.RTPCommand;
-import dev.zontreck.otemod.commands.teleport.TeleportActioner;
-import dev.zontreck.otemod.commands.teleport.TeleportContainer;
-import dev.zontreck.otemod.database.TeleportDestination;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.nbt.NbtUtils;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.Style;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-
-public class WarpCommand {
-
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("warp").executes(c-> nowarp(c.getSource())).then(Commands.argument("name", StringArgumentType.string()).executes(c->warp(c.getSource(), StringArgumentType.getString(c, "name")))));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- private static int warp(CommandSourceStack source, String string) {
- if(!source.isPlayer())return 1;
-
- ServerPlayer p = source.getPlayer();
- Connection con = OTEMod.DB.getConnection();
- String SQL = "";
- try{
- con.beginRequest();
-
- PreparedStatement pstat;
- SQL = "SELECT * FROM `warps` WHERE `warpname`=?;";
- pstat=con.prepareStatement(SQL);
- pstat.setString(1, string);
- ResultSet rs = pstat.executeQuery();
- // Get the first result
- if(rs.next())
- {
- TeleportDestination dest = new TeleportDestination(NbtUtils.snbtToStructure(rs.getString("teleporter")));
-
- String dim = dest.Dimension;
- String[] dims = dim.split(":");
-
- ResourceLocation rl = new ResourceLocation(dims[0], dims[1]);
-
- ServerLevel dimL = null;
- for (ServerLevel lServerLevel : p.server.getAllLevels()) {
- ResourceLocation XL = lServerLevel.dimension().location();
-
- if(XL.getNamespace().equals(rl.getNamespace())){
- if(XL.getPath().equals(rl.getPath())){
- dimL = lServerLevel;
- }
- }
- }
-
- if(dimL == null)
- {
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.RED+"DIMENSION COULD NOT BE FOUND"), source.getServer());
- return 1;
- }
-
- final int type = rs.getInt("warptype");
- final ServerLevel f_dim = dimL;
-
- Thread tx = new Thread(new Runnable(){
- public void run(){
-
- if(type==1){
- dest.Position = RTPCommand.findPosition(source.getLevel(), false);
- }
-
- TeleportActioner.ApplyTeleportEffect(p);
- TeleportContainer tc = new TeleportContainer(p, dest.Position.asMinecraftVector(), dest.Rotation.asMinecraftVector(), f_dim);
- TeleportActioner.PerformTeleport(tc);
- }
- });
- tx.start();
- }else {
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED+"No such warp"), source.getServer());
- }
-
-
- con.endRequest();
- }catch(Exception e){
- e.printStackTrace();
- }
- return 0;
- }
-
- private static int nowarp(CommandSourceStack source) {
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), Component.literal(ChatColor.DARK_RED + "You must supply the warp name. If you need to know what warps are available, please use the warps command, or click this message.").withStyle(Style.EMPTY.withFont(Style.DEFAULT_FONT).withClickEvent(Clickable.command("/warps"))), source.getServer());
- return 0;
- }
-
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/warps/WarpsCommand.java b/src/main/java/dev/zontreck/otemod/commands/warps/WarpsCommand.java
deleted file mode 100644
index 0a5dec3..0000000
--- a/src/main/java/dev/zontreck/otemod/commands/warps/WarpsCommand.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package dev.zontreck.otemod.commands.warps;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import com.mojang.brigadier.CommandDispatcher;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import dev.zontreck.otemod.chat.ChatServerOverride;
-import dev.zontreck.otemod.chat.Clickable;
-import dev.zontreck.otemod.chat.HoverTip;
-import dev.zontreck.otemod.configs.Profile;
-import dev.zontreck.otemod.containers.Vector2;
-import dev.zontreck.otemod.containers.Vector3;
-import dev.zontreck.otemod.database.TeleportDestination;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.HoverEvent;
-import net.minecraft.network.chat.Style;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.phys.Vec2;
-import net.minecraft.world.phys.Vec3;
-
-public class WarpsCommand {
-
- public static void register(CommandDispatcher dispatcher)
- {
- dispatcher.register(Commands.literal("warps").executes(c-> warps(c.getSource())));
-
- //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
- //String arg = StringArgumentType.getString(command, "nickname");
- //return setHome(command.getSource(), arg);
- //}));
- }
-
- private static int warps(CommandSourceStack source) {
- if(!source.isPlayer())
- {
- return 1;
- }
-
- ServerPlayer p = source.getPlayer();
- Connection con = OTEMod.DB.getConnection();
- try{
- // Begin
- con.beginRequest();
- PreparedStatement pstat = con.prepareStatement("SELECT * FROM `warps`;"); // We want the warp owner, and the warp type, and name. We don't really care about the teleport properties right now, but a future version will show lore on the tooltip to indicate where it goes
-
- ResultSet rs = pstat.executeQuery();
- int count=0;
- while(rs.next())
- {
- // Lets do it!
- count++;
- }
- rs=pstat.executeQuery();// Reset the query
- ChatServerOverride.broadcastTo(p.getUUID(), Component.literal(ChatColor.DARK_GRAY+"["+ChatColor.DARK_GREEN+"OTEMOD" + ChatColor.DARK_GRAY+"] "+ChatColor.resetChat() + "There are "+count+" warps available"), source.getServer());
-
- while(rs.next())
- {
- // This is a warp!
- // Pull the owner profile
- Profile prof = Profile.get_profile_of(rs.getString("owner"));
- String warpName = rs.getString("warpname");
- int warpType = rs.getInt("warptype");
- String appendType = (warpType == 0) ? "standard warp." : "RTP Warp. This has a position randomizer.";
-
- HoverEvent hover = HoverTip.get(ChatColor.BOLD + ChatColor.DARK_PURPLE + "This warp is a "+appendType);
- ClickEvent click = Clickable.command("/warp "+warpName);
- Style S = Style.EMPTY.withFont(Style.DEFAULT_FONT).withHoverEvent(hover).withClickEvent(click);
-
- Component warpMsg = Component.literal(ChatColor.GREEN + warpName + ChatColor.resetChat()).withStyle(S);
-
- // Now, display the warp name, along with the warp's owner information
- HoverEvent h2 = HoverTip.get(prof.name_color+prof.nickname+ChatColor.resetChat()+ChatColor.AQUA+" is the owner of this warp");
- S = Style.EMPTY.withFont(Style.DEFAULT_FONT).withHoverEvent(h2);
- Component ownerInfo = Component.literal(ChatColor.GOLD+ " [Hover to see the warp's info]").withStyle(S);
-
- // Combine the two
- warpMsg = Component.literal("").append(warpMsg).append(ownerInfo);
- ChatServerOverride.broadcastTo(source.getPlayer().getUUID(), warpMsg, source.getServer());
- }
- }catch (Exception E)
- {
- E.printStackTrace();
- }
- return 0;
- }
-
-}
diff --git a/src/main/java/dev/zontreck/otemod/commands/zschem/LoadSchem.java b/src/main/java/dev/zontreck/otemod/commands/zschem/LoadSchem.java
new file mode 100644
index 0000000..97621c8
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/commands/zschem/LoadSchem.java
@@ -0,0 +1,137 @@
+package dev.zontreck.otemod.commands.zschem;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.libzontreck.vectors.WorldPosition;
+import dev.zontreck.otemod.OTEMod;
+import dev.zontreck.otemod.integrations.LuckPermsHelper;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.NbtIo;
+import net.minecraft.nbt.Tag;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraftforge.fml.loading.FMLConfig;
+import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.server.ServerLifecycleHooks;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class LoadSchem {
+
+ public static void register(CommandDispatcher dispatcher)
+ {
+ dispatcher.register(Commands.literal("loadzschem").executes(c-> loadSchematicUsage(c.getSource())).then(Commands.argument("name", StringArgumentType.string()).executes(z->loadSchematic(z.getSource(), StringArgumentType.getString(z, "name")))));
+
+ //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
+ //String arg = StringArgumentType.getString(command, "nickname");
+ //return setHome(command.getSource(), arg);
+ //}));
+ }
+
+ private static int loadSchematic(CommandSourceStack source, String name) {
+ // Perform sanity checks
+
+
+ /*
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+ if(play==null)return 1;
+
+ if(!LuckPermsHelper.hasGroupOrPerm(play, Permissions.zschem, Permissions.zschem_load)){
+ LuckPermsHelper.sendNoPermissionsMessage(play, Permissions.zschem_load, Permissions.zschem);
+ return 1;
+ }
+
+ if(MemoryHolder.hasPlayerCached(play))
+ {
+ Container cont = MemoryHolder.getContainer(play);
+ if(cont == null)
+ {
+
+ loadSchematicUsage(source);
+ }else {
+ if(cont.Pos1 != OTEMod.ZERO_VECTOR)
+ {
+ // Lets go!
+ List blocks = new ArrayList();
+ // First we calculate every vector between pos1 and pos2.
+ // Then we subtract pos1 from the vector to acquire a relative position.
+ // Then we save the block with this relative position to the blocks list
+ // Once serialized, it is then possible to add the position. Note that this makes it impossible to rotate a zschem like with worldedit, but thats usually fine for our usecases. once in-game worldedit can be used to rotate.
+ // TODO: Also- It is possible that a rotational implementation can be added in the future
+
+ Path configDir = FMLPaths.GAMEDIR.get().resolve(FMLConfig.defaultConfigPath());
+ configDir = configDir.resolve("ZSchems");
+ File X = configDir.toFile();
+ if(!X.exists())
+ {
+ X.mkdir();
+ }
+ configDir = configDir.resolve(name+"-zschem.nbt");
+
+ if(configDir.toFile().exists()){
+ CompoundTag CT=new CompoundTag();
+ try {
+ CT = NbtIo.readCompressed(configDir.toFile());
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ return 1;
+ }
+
+ ListTag blst = CT.getList("blocks", CompoundTag.TAG_COMPOUND);
+ Iterator tags = blst.iterator();
+ while(tags.hasNext())
+ {
+ CompoundTag nxt = (CompoundTag)tags.next();
+ StoredBlock sb = new StoredBlock(nxt);
+ ServerLevel pasteLvl = cont.lvl;
+ sb.updateWorld(pasteLvl);
+
+ WorldPosition wp = sb.getWorldPosition();
+ Vector3 superPos = cont.Pos1;
+ wp.Position = superPos.add(wp.Position);
+ sb.setPosition(wp.Position);
+
+
+ blocks.add(sb);
+
+ }
+
+ MemoryHolder.setBlocks(play, blocks);
+
+ }else {
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix + " !Dark_Red!No such ZSchem exists!"), source.getServer());
+ return 0;
+ }
+
+
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!ZSchem loaded from disk!"), ServerLifecycleHooks.getCurrentServer());
+ return 0;
+ }
+ }
+ }
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro("!Dark_Red! You must set the first position"), ServerLifecycleHooks.getCurrentServer());
+
+ return 0;*/
+ return 0;
+ }
+
+ private static int loadSchematicUsage(CommandSourceStack source)
+ {
+ String usage = OTEMod.OTEPrefix;
+ usage += "!gold! /loadzschem [string:name]";
+ ServerPlayer play=(ServerPlayer)source.getEntity();
+ if(play==null)return 1;
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(usage), ServerLifecycleHooks.getCurrentServer());
+ return 0;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/commands/zschem/Place.java b/src/main/java/dev/zontreck/otemod/commands/zschem/Place.java
new file mode 100644
index 0000000..e0c71cd
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/commands/zschem/Place.java
@@ -0,0 +1,71 @@
+package dev.zontreck.otemod.commands.zschem;
+
+import com.mojang.brigadier.CommandDispatcher;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.otemod.OTEMod;
+import dev.zontreck.otemod.integrations.LuckPermsHelper;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraftforge.server.ServerLifecycleHooks;
+
+import java.util.Collections;
+import java.util.List;
+
+// This command will place the loaded schematic in world. The schematic will originate from position 1. The positions are relative and are added onto position 1.
+public class Place {
+
+ public static void register(CommandDispatcher dispatcher)
+ {
+ dispatcher.register(Commands.literal("placezschem").executes(c-> place(c.getSource())));
+
+ //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
+ //String arg = StringArgumentType.getString(command, "nickname");
+ //return setHome(command.getSource(), arg);
+ //}));
+ }
+
+ private static int place(CommandSourceStack source) {
+
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+ if(play==null)return 1;
+/*
+ if(!LuckPermsHelper.hasGroupOrPerm(play, Permissions.zschem, Permissions.zschem_place)){
+ LuckPermsHelper.sendNoPermissionsMessage(play, Permissions.zschem_place, Permissions.zschem);
+ return 1;
+ }
+
+ if(!MemoryHolder.hasPlayerCached(play)){
+
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You must first load the zschem!"), ServerLifecycleHooks.getCurrentServer());
+
+ return 1;
+ }
+
+ Container cont = MemoryHolder.getContainer(play);
+ List blocks = cont.blocks;
+ Collections.shuffle(blocks);
+
+ if(cont.Pos1 != OTEMod.ZERO_VECTOR)
+ {
+ WorldProp system = WorldProp.acquire(cont.lvl);
+ // Begin the process
+ for (StoredBlock storedBlock : blocks) {
+ // alter the stored block and send it off to the queue system for the relevant world!
+
+ system.customEnqueue(storedBlock);
+ }
+
+ }else {
+
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You must first load the zschem!"), ServerLifecycleHooks.getCurrentServer());
+
+ return 1;
+ }
+
+
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!Enqueued!"), ServerLifecycleHooks.getCurrentServer());
+*/
+ return 0;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/commands/zschem/PlaceAsAir.java b/src/main/java/dev/zontreck/otemod/commands/zschem/PlaceAsAir.java
new file mode 100644
index 0000000..9532f93
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/commands/zschem/PlaceAsAir.java
@@ -0,0 +1,78 @@
+package dev.zontreck.otemod.commands.zschem;
+
+import com.mojang.brigadier.CommandDispatcher;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.otemod.OTEMod;
+import dev.zontreck.otemod.integrations.LuckPermsHelper;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraftforge.server.ServerLifecycleHooks;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+// This command will place the loaded schematic in world. The schematic will originate from position 1. The positions are relative and are added onto position 1.
+public class PlaceAsAir {
+
+ public static void register(CommandDispatcher dispatcher)
+ {
+ dispatcher.register(Commands.literal("zsetair").executes(c-> place(c.getSource())));
+
+ //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
+ //String arg = StringArgumentType.getString(command, "nickname");
+ //return setHome(command.getSource(), arg);
+ //}));
+ }
+
+ private static int place(CommandSourceStack source) {
+
+ /*
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+ if(play==null)return 1;
+
+ if(!LuckPermsHelper.hasGroupOrPerm(play, Permissions.zschem, Permissions.zschem_air)){
+ LuckPermsHelper.sendNoPermissionsMessage(play, Permissions.zschem_air, Permissions.zschem);
+ return 1;
+ }
+
+ if(!MemoryHolder.hasPlayerCached(play)){
+
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You must first set the positions!"), ServerLifecycleHooks.getCurrentServer());
+
+ return 1;
+ }
+
+ Container cont = MemoryHolder.getContainer(play);
+
+ if(cont.Pos1 != OTEMod.ZERO_VECTOR && cont.Pos2 != OTEMod.ZERO_VECTOR)
+ {
+ WorldProp system = WorldProp.acquire(cont.lvl);
+ // Begin the process
+ List positions = cont.Pos1.makeCube(cont.Pos2);
+ Collections.shuffle(positions);
+ Iterator v3 = positions.iterator();
+
+ while(v3.hasNext())
+ {
+ Vector3 pos = v3.next();
+ StoredBlock sb = new StoredBlock(pos.asBlockPos(), Blocks.AIR.defaultBlockState(), source.getLevel());
+ system.customEnqueue(sb);
+ }
+
+
+ }else {
+
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Red!You must first set the positions!"), ServerLifecycleHooks.getCurrentServer());
+
+ return 1;
+ }
+
+
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!Enqueued!"), ServerLifecycleHooks.getCurrentServer());
+*/
+ return 0;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/commands/zschem/SaveSchem.java b/src/main/java/dev/zontreck/otemod/commands/zschem/SaveSchem.java
new file mode 100644
index 0000000..639109c
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/commands/zschem/SaveSchem.java
@@ -0,0 +1,121 @@
+package dev.zontreck.otemod.commands.zschem;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.otemod.OTEMod;
+import dev.zontreck.otemod.integrations.LuckPermsHelper;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.core.BlockPos;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.NbtIo;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraftforge.fml.loading.FMLConfig;
+import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.server.ServerLifecycleHooks;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SaveSchem {
+
+ public static void register(CommandDispatcher dispatcher)
+ {
+ dispatcher.register(Commands.literal("savezschem").executes(c-> saveSchematicUsage(c.getSource())).then(Commands.argument("name", StringArgumentType.string()).executes(z->saveSchematic(z.getSource(), StringArgumentType.getString(z, "name")))));
+
+ //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
+ //String arg = StringArgumentType.getString(command, "nickname");
+ //return setHome(command.getSource(), arg);
+ //}));
+ }
+
+ private static int saveSchematic(CommandSourceStack source, String name) {
+ // Perform sanity checks
+
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+ if(play==null)return 1;
+ /*
+ if(!LuckPermsHelper.hasGroupOrPerm(play, Permissions.zschem, Permissions.zschem_save)){
+ LuckPermsHelper.sendNoPermissionsMessage(play, Permissions.zschem_save, Permissions.zschem);
+ return 1;
+ }
+
+ if(MemoryHolder.hasPlayerCached(play))
+ {
+ Container cont = MemoryHolder.getContainer(play);
+ if(cont == null)
+ {
+
+ saveSchematicUsage(source);
+ }else {
+ if(cont.Pos1 != OTEMod.ZERO_VECTOR && cont.Pos2 != OTEMod.ZERO_VECTOR)
+ {
+ // Lets go!
+ List blocks = new ArrayList();
+ // First we calculate every vector between pos1 and pos2.
+ // Then we subtract pos1 from the vector to acquire a relative position.
+ // Then we save the block with this relative position to the blocks list
+ // Once serialized, it is then possible to add the position. Note that this makes it impossible to rotate a zschem like with worldedit, but thats usually fine for our usecases. once in-game worldedit can be used to rotate.
+ // TODO: Also- It is possible that a rotational implementation can be added in the future
+
+ List positions = cont.Pos1.makeCube(cont.Pos2);
+
+ for (Vector3 vector3 : positions) {
+ Vector3 v3 = vector3.subtract(cont.Pos1);
+
+ BlockPos current = vector3.asBlockPos();
+
+ StoredBlock sb = new StoredBlock(current, cont.lvl.getBlockState(current), cont.lvl);
+ sb.setPosition(v3);
+
+ blocks.add(sb);
+ }
+
+ CompoundTag savedSchem = new CompoundTag();
+ ListTag lst = new ListTag();
+ for (StoredBlock sBlock : blocks) {
+ lst.add(sBlock.serialize());
+ }
+ savedSchem.put("blocks", lst);
+
+
+ Path configDir = FMLPaths.GAMEDIR.get().resolve(FMLConfig.defaultConfigPath());
+ configDir = configDir.resolve("ZSchems");
+ File X = configDir.toFile();
+ if(!X.exists())
+ {
+ X.mkdir();
+ }
+ configDir = configDir.resolve(name+"-zschem.nbt");
+
+ // Save file!
+ try {
+ NbtIo.writeCompressed(savedSchem, configDir.toFile());
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(OTEMod.OTEPrefix+" !Dark_Green!ZSchem saved to disk!"), ServerLifecycleHooks.getCurrentServer());
+ return 0;
+ }
+ }
+ }
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro("!Dark_Red! You must first set the positions"), ServerLifecycleHooks.getCurrentServer());
+*/
+ return 0;
+ }
+
+ private static int saveSchematicUsage(CommandSourceStack source)
+ {
+ String usage = OTEMod.OTEPrefix;
+ usage += "!gold! /savezschem [string:name]";
+ ServerPlayer play=(ServerPlayer)source.getEntity();
+ if(play==null)return 1;
+ ChatHelpers.broadcastTo(play.getUUID(), ChatHelpers.macro(usage), ServerLifecycleHooks.getCurrentServer());
+ return 0;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/commands/zschem/SetPos1.java b/src/main/java/dev/zontreck/otemod/commands/zschem/SetPos1.java
new file mode 100644
index 0000000..ab3dfe6
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/commands/zschem/SetPos1.java
@@ -0,0 +1,42 @@
+package dev.zontreck.otemod.commands.zschem;
+
+import com.mojang.brigadier.CommandDispatcher;
+import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.otemod.OTEMod;
+import dev.zontreck.otemod.integrations.LuckPermsHelper;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraftforge.server.ServerLifecycleHooks;
+
+public class SetPos1 {
+
+ public static void register(CommandDispatcher dispatcher)
+ {
+ dispatcher.register(Commands.literal("zpos1").executes(c-> setzPos1(c.getSource())));
+
+ //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
+ //String arg = StringArgumentType.getString(command, "nickname");
+ //return setHome(command.getSource(), arg);
+ //}));
+ }
+
+ private static int setzPos1(CommandSourceStack source) {
+
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+ if(play==null)return 1;
+/*
+ if(!LuckPermsHelper.hasGroupOrPerm(play, Permissions.zschem, Permissions.zschem_pos1)){
+ LuckPermsHelper.sendNoPermissionsMessage(play, Permissions.zschem_pos1, Permissions.zschem);
+ return 1;
+ }
+ MemoryHolder.setPos1(play, new Vector3(source.getPosition()));
+ MemoryHolder.setLevel(play, source.getLevel());
+
+ ChatHelpers.broadcastTo(play.getUUID(), Component.literal(OTEMod.OTEPrefix+ChatColor.doColors(" !Dark_Green!Position 1 set!")), ServerLifecycleHooks.getCurrentServer());
+*/
+ return 0;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/commands/zschem/SetPos2.java b/src/main/java/dev/zontreck/otemod/commands/zschem/SetPos2.java
new file mode 100644
index 0000000..2070e57
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/commands/zschem/SetPos2.java
@@ -0,0 +1,43 @@
+package dev.zontreck.otemod.commands.zschem;
+
+import com.mojang.brigadier.CommandDispatcher;
+import dev.zontreck.libzontreck.chat.ChatColor;
+import dev.zontreck.libzontreck.util.ChatHelpers;
+import dev.zontreck.otemod.OTEMod;
+import dev.zontreck.otemod.integrations.LuckPermsHelper;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraftforge.server.ServerLifecycleHooks;
+
+public class SetPos2 {
+
+ public static void register(CommandDispatcher dispatcher)
+ {
+ dispatcher.register(Commands.literal("zpos2").executes(c-> setzPos2(c.getSource())));
+
+ //dispatcher.register(Commands.literal("sethome").then(Commands.argument("nickname", StringArgumentType.string())).executes(command -> {
+ //String arg = StringArgumentType.getString(command, "nickname");
+ //return setHome(command.getSource(), arg);
+ //}));
+ }
+
+ private static int setzPos2(CommandSourceStack source) {
+ ServerPlayer play = (ServerPlayer)source.getEntity();
+ if(play==null)return 1;
+
+ /*
+ if(!LuckPermsHelper.hasGroupOrPerm(play, Permissions.zschem, Permissions.zschem_pos2)){
+ LuckPermsHelper.sendNoPermissionsMessage(play, Permissions.zschem_pos2, Permissions.zschem);
+ return 1;
+ }
+
+ MemoryHolder.setPos2(play, new Vector3(source.getPosition()));
+ MemoryHolder.setLevel(play, source.getLevel());
+
+ ChatHelpers.broadcastTo(play.getUUID(), Component.literal(OTEMod.OTEPrefix+ChatColor.doColors(" !Dark_Green!Position 2 set!")), ServerLifecycleHooks.getCurrentServer());
+*/
+ return 0;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/configs/OTEServerConfig.java b/src/main/java/dev/zontreck/otemod/configs/OTEServerConfig.java
deleted file mode 100644
index d13dd8e..0000000
--- a/src/main/java/dev/zontreck/otemod/configs/OTEServerConfig.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package dev.zontreck.otemod.configs;
-
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.common.ForgeConfigSpec;
-
-public class OTEServerConfig {
- public static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
- public static final ForgeConfigSpec SPEC;
-
- public static final ForgeConfigSpec.ConfigValue
> INITIAL_ITEMS_TO_GIVE_ON_FIRST_JOIN;
-
- public static final ForgeConfigSpec.ConfigValue HOST_ADDR;
- public static final ForgeConfigSpec.ConfigValue PORT;
- public static final ForgeConfigSpec.ConfigValue USERNAME;
- public static final ForgeConfigSpec.ConfigValue PASSWORD;
- public static final ForgeConfigSpec.ConfigValue DATABASE;
- public static final ForgeConfigSpec.ConfigValue ITEM_DESPAWN_TIMER;
- public static final ForgeConfigSpec.ConfigValue RTP_COOLDOWN;
-
- static {
- List defaults = new ArrayList();
-
- BUILDER.push("OTE");
- INITIAL_ITEMS_TO_GIVE_ON_FIRST_JOIN = BUILDER.comment("What items, identified by modid:item, to give to a brand new user on the server").define("New Player Gear", defaults);
- HOST_ADDR = BUILDER.comment("Database Host (MySQL)").define("host", "127.0.0.1");
- PORT = BUILDER.comment("Database Port (MySQL)").define("port", 3306);
- USERNAME = BUILDER.comment("Database Username (MySQL)").define("user", "ote");
- PASSWORD = BUILDER.comment("Database Password (MySQL)").define("password", "password");
- DATABASE = BUILDER.comment("Database Name (MySQL)").define("database", "otemod");
- ITEM_DESPAWN_TIMER = BUILDER.comment("How many times should the item's expire be cancelled. The vanilla expire time is 5 minutes, so this would be ticked down once every 5 minutes.").define("item_extra_lives", (60/5));
- BUILDER.pop();
- BUILDER.push("COMMANDS");
-
- RTP_COOLDOWN = BUILDER.comment("How many seconds between RTP uses? This can be quite laggy on the server due to the potential that new chunks are getting generated").define("rtp.cooldown", 30); // Default of 30 should be enough
-
-
- BUILDER.pop();
- SPEC=BUILDER.build();
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/configs/PlayerFlyCache.java b/src/main/java/dev/zontreck/otemod/configs/PlayerFlyCache.java
index 5ae9aec..90498c2 100644
--- a/src/main/java/dev/zontreck/otemod/configs/PlayerFlyCache.java
+++ b/src/main/java/dev/zontreck/otemod/configs/PlayerFlyCache.java
@@ -1,6 +1,7 @@
package dev.zontreck.otemod.configs;
import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Abilities;
public class PlayerFlyCache
{
@@ -17,6 +18,10 @@ public class PlayerFlyCache
}
public void Assert(ServerPlayer play){
+ Abilities playerAbilities = play.getAbilities();
+ playerAbilities.flying=Flying;
+ playerAbilities.mayfly=FlyEnabled;
+ play.onUpdateAbilities();
}
}
\ No newline at end of file
diff --git a/src/main/java/dev/zontreck/otemod/configs/Profile.java b/src/main/java/dev/zontreck/otemod/configs/Profile.java
deleted file mode 100644
index bf6952b..0000000
--- a/src/main/java/dev/zontreck/otemod/configs/Profile.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package dev.zontreck.otemod.configs;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-import dev.zontreck.otemod.OTEMod;
-import dev.zontreck.otemod.chat.ChatColor;
-import net.minecraft.server.level.ServerPlayer;
-
-public class Profile {
- public String username;
- public String user_id;
- public String prefix;
- public String nickname;
- public String name_color; // ChatColor.X
- public String prefix_color;
- public String chat_color;
-
- public Profile(String username, String prefix, String nickname, String name_color, String ID, String prefix_color, String chat_color) {
- this.username = username;
- this.prefix = prefix;
- this.nickname = nickname;
- this.name_color = name_color;
- this.user_id = ID;
- this.prefix_color = prefix_color;
- this.chat_color = chat_color;
- }
-
-
- public static Profile get_profile_of(String UUID)
- {
- if(OTEMod.PROFILES.containsKey(UUID)){
- return OTEMod.PROFILES.get(UUID);
- }else {
- // profile does not exist!
- // how can this happen?
- return null;
- }
- }
-
- public static Profile factory(ServerPlayer play)
- {
- Profile p = new Profile(play.getName().getString(), "Member", play.getDisplayName().getString(), ChatColor.GREEN, play.getStringUUID(), ChatColor.AQUA, ChatColor.WHITE);
- return p;
- }
-
- public void commit()
- {
- // Send player to server!
- Connection con = OTEMod.DB.getConnection();
- String SQL = "REPLACE INTO `profiles` (username, uuid, prefix, nickname, name_color, prefix_color, chat_color) values (?, ?, ?, ?, ?, ?, ?);";
- try {
- PreparedStatement pstat = con.prepareStatement(SQL);
- pstat.setString(1, username);
- pstat.setString(2, user_id);
- pstat.setString(3, prefix);
- pstat.setString(4, nickname);
- pstat.setString(5, name_color);
- pstat.setString(6, prefix_color);
- pstat.setString(7, chat_color);
-
- pstat.execute();
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/configs/snbt/ServerConfig.java b/src/main/java/dev/zontreck/otemod/configs/snbt/ServerConfig.java
new file mode 100644
index 0000000..151ea03
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/configs/snbt/ServerConfig.java
@@ -0,0 +1,116 @@
+package dev.zontreck.otemod.configs.snbt;
+
+import dev.zontreck.libzontreck.util.SNbtIo;
+import dev.zontreck.otemod.configs.snbt.sections.*;
+import dev.zontreck.otemod.database.OTEDatastore;
+import net.minecraft.nbt.CompoundTag;
+
+import java.nio.file.Path;
+
+public class ServerConfig
+{
+ public static final String TAG_VERSION = "revision";
+ public static final Path FILE = OTEDatastore.of("server.snbt");
+
+ public static General general = new General();
+ public static Drops drops = new Drops();
+ public static Cooldowns cooldowns = new Cooldowns();
+ public static AntiGrief antigrief = new AntiGrief();
+ public static ChatOverrides chatOverrides = new ChatOverrides();
+
+
+
+ public static int revision = 0;
+
+
+ private static final int CURRENT_VERSION = 1;
+
+ public static void load()
+ {
+ CompoundTag tag = SNbtIo.loadSnbt(FILE);
+
+ deserialize(tag);
+
+ }
+
+ public static void commit()
+ {
+
+
+ SNbtIo.writeSnbt(FILE, serialize());
+ }
+
+ private static void migrate(int from, int to)
+ {
+ if(from == to)
+ {
+ return;
+ } else if(from > to)
+ {
+ throw new ArithmeticException("Cannot downgrade");
+ } else {
+ migration(from+1);
+ migrate(from+1,to);
+ }
+ }
+
+ private static void migration(int newVer)
+ {
+ revision = newVer;
+
+ switch (newVer)
+ {
+ case 1:
+ {
+ general = new General();
+ drops = new Drops();
+ cooldowns = new Cooldowns();
+ antigrief = new AntiGrief();
+ chatOverrides = new ChatOverrides();
+ break;
+ }
+ }
+
+ commit();
+ }
+
+ public static CompoundTag serialize()
+ {
+
+ CompoundTag tag = new CompoundTag();
+ tag.putInt(TAG_VERSION, revision);
+ tag.put(General.TAG_NAME, general.save());
+ tag.put(Cooldowns.TAG_NAME, cooldowns.save());
+ tag.put(AntiGrief.TAG_NAME, antigrief.save());
+ tag.put(ChatOverrides.TAG_NAME, chatOverrides.save());
+ tag.put(Drops.TAG_NAME, drops.save());
+
+
+ return tag;
+ }
+
+ public static void deserialize(CompoundTag tag)
+ {
+
+ revision = tag.getInt(TAG_VERSION);
+
+ migrate(revision, CURRENT_VERSION);
+
+ if(tag.contains(General.TAG_NAME))
+ general = General.load(tag.getCompound(General.TAG_NAME));
+
+ if(tag.contains(Drops.TAG_NAME))
+ drops = Drops.load(tag.getCompound(Drops.TAG_NAME));
+
+ if(tag.contains(Cooldowns.TAG_NAME))
+ cooldowns = Cooldowns.load(tag.getCompound(Cooldowns.TAG_NAME));
+
+ if(tag.contains(AntiGrief.TAG_NAME))
+ antigrief = AntiGrief.load(tag.getCompound(AntiGrief.TAG_NAME));
+
+ if(tag.contains(ChatOverrides.TAG_NAME))
+ chatOverrides = ChatOverrides.load(tag.getCompound(ChatOverrides.TAG_NAME));
+
+ }
+
+}
diff --git a/src/main/java/dev/zontreck/otemod/configs/snbt/sections/AntiGrief.java b/src/main/java/dev/zontreck/otemod/configs/snbt/sections/AntiGrief.java
new file mode 100644
index 0000000..49a97d5
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/configs/snbt/sections/AntiGrief.java
@@ -0,0 +1,81 @@
+package dev.zontreck.otemod.configs.snbt.sections;
+
+import dev.zontreck.ariaslib.util.Lists;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.StringTag;
+import net.minecraft.nbt.Tag;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AntiGrief
+{
+ public static final String TAG_NAME = "antigrief";
+ public static final String TAG_HEALER_TIMER = "healerTimer";
+ public static final String TAG_DEBUG = "debug";
+ public static final String TAG_HEALER_TIME_BETWEEN = "timeBetween";
+ public static final String TAG_MAX_TRIES = "maxTries";
+ public static final String TAG_EXCLUDE_DIMS = "excludeDimensions";
+
+
+
+
+ public int healerTimer = 250;
+ public boolean debug = false;
+ public int timeBetween = 20;
+ public int maxTries = 10;
+ public List blacklistedDimensions = Lists.of("minecraft:the_nether", "minecraft:the_end", "otemod:resource", "otemod:threshold");
+
+
+
+ public CompoundTag save()
+ {
+ CompoundTag tag = new CompoundTag();
+ tag.putInt(TAG_HEALER_TIMER, healerTimer);
+ tag.putBoolean(TAG_DEBUG, debug);
+ tag.putInt(TAG_HEALER_TIME_BETWEEN, timeBetween);
+ tag.putInt(TAG_MAX_TRIES, maxTries);
+ ListTag blacklist = new ListTag();
+ for(String str : blacklistedDimensions)
+ {
+ blacklist.add(StringTag.valueOf(str));
+ }
+ tag.put(TAG_EXCLUDE_DIMS, blacklist);
+
+
+ return tag;
+ }
+
+ public static AntiGrief load(CompoundTag tag)
+ {
+ AntiGrief ag = new AntiGrief();
+
+ if(tag.contains(TAG_HEALER_TIMER))
+ ag.healerTimer = tag.getInt(TAG_HEALER_TIMER);
+
+ if(tag.contains(TAG_DEBUG))
+ ag.debug = tag.getBoolean(TAG_DEBUG);
+
+ if(tag.contains(TAG_HEALER_TIME_BETWEEN))
+ ag.timeBetween = tag.getInt(TAG_HEALER_TIME_BETWEEN);
+
+ if(tag.contains(TAG_MAX_TRIES))
+ ag.maxTries = tag.getInt(TAG_MAX_TRIES);
+
+ if(tag.contains(TAG_EXCLUDE_DIMS))
+ {
+ ag.blacklistedDimensions = new ArrayList<>();
+ ListTag blacklist = tag.getList(TAG_EXCLUDE_DIMS, ListTag.TAG_STRING);
+ for(Tag entry : blacklist)
+ {
+ StringTag stringTag = (StringTag) entry;
+ ag.blacklistedDimensions.add(stringTag.getAsString());
+ }
+ }
+
+
+
+ return ag;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/configs/snbt/sections/ChatOverrides.java b/src/main/java/dev/zontreck/otemod/configs/snbt/sections/ChatOverrides.java
new file mode 100644
index 0000000..13b8f13
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/configs/snbt/sections/ChatOverrides.java
@@ -0,0 +1,46 @@
+package dev.zontreck.otemod.configs.snbt.sections;
+
+import dev.zontreck.ariaslib.util.Lists;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.StringTag;
+import net.minecraft.nbt.Tag;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChatOverrides
+{
+ public static final String TAG_NAME = "chatOverride";
+ public static final String TAG_PRETTIFIER = "enablePrettifier";
+ public static final String TAG_JOIN_LEAVE = "enableJoinLeaveMessages";
+
+
+ public boolean enablePrettifier = true;
+ public boolean enableJoinLeave = true;
+
+
+
+ public CompoundTag save()
+ {
+ CompoundTag tag = new CompoundTag();
+ tag.putBoolean(TAG_PRETTIFIER, enablePrettifier);
+ tag.putBoolean(TAG_JOIN_LEAVE, enableJoinLeave);
+
+ return tag;
+ }
+
+ public static ChatOverrides load(CompoundTag tag)
+ {
+ ChatOverrides ag = new ChatOverrides();
+
+ if(tag.contains(TAG_PRETTIFIER))
+ ag.enablePrettifier = tag.getBoolean(TAG_PRETTIFIER);
+
+ if(tag.contains(TAG_JOIN_LEAVE))
+ ag.enableJoinLeave = tag.getBoolean(TAG_JOIN_LEAVE);
+
+
+ return ag;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/configs/snbt/sections/Cooldowns.java b/src/main/java/dev/zontreck/otemod/configs/snbt/sections/Cooldowns.java
new file mode 100644
index 0000000..5b0ac02
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/configs/snbt/sections/Cooldowns.java
@@ -0,0 +1,95 @@
+package dev.zontreck.otemod.configs.snbt.sections;
+
+import dev.zontreck.ariaslib.util.Maps;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.Tag;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class Cooldowns
+{
+ public static final String TAG_NAME = "cooldowns";
+ public static final String TAG_LIST = "commands";
+
+ public Map commands = Maps.of();
+
+
+ public CompoundTag save()
+ {
+ CompoundTag tag = new CompoundTag();
+ ListTag lst = new ListTag();
+ for(Map.Entry entry : commands.entrySet())
+ {
+ Command cmd = new Command(entry.getKey(), entry.getValue());
+ lst.add(cmd.save());
+ }
+
+ tag.put(TAG_LIST, lst);
+
+ return tag;
+ }
+
+
+ public static Cooldowns load(CompoundTag tag)
+ {
+ Cooldowns cd = new Cooldowns();
+ ListTag lst = tag.getList(TAG_LIST, ListTag.TAG_COMPOUND);
+ for(Tag entry : lst)
+ {
+ CompoundTag compoundTag = (CompoundTag) entry;
+ Command cmd = Command.load(compoundTag);
+ cd.commands.put(cmd.command, cmd.seconds);
+ }
+
+
+ return cd;
+ }
+
+
+ public static class Command
+ {
+ public static final String TAG_COMMAND = "command";
+ public static final String TAG_SECONDS = "seconds";
+
+
+ public String command;
+ public int seconds;
+
+ private Command()
+ {
+
+ }
+
+ public Command(String cmd, int sec)
+ {
+ command=cmd;
+ seconds=sec;
+ }
+
+ public CompoundTag save()
+ {
+ CompoundTag tag = new CompoundTag();
+ tag.putString(TAG_COMMAND, command);
+ tag.putInt(TAG_SECONDS, seconds);
+
+ return tag;
+ }
+
+ public static Command load(CompoundTag tag)
+ {
+ Command cmd = new Command();
+
+ if(tag.contains(TAG_COMMAND))
+ cmd.command = tag.getString(TAG_COMMAND);
+
+ if(tag.contains(TAG_SECONDS))
+ cmd.seconds = tag.getInt(TAG_SECONDS);
+
+
+ return cmd;
+ }
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/configs/snbt/sections/Drops.java b/src/main/java/dev/zontreck/otemod/configs/snbt/sections/Drops.java
new file mode 100644
index 0000000..a12aa22
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/configs/snbt/sections/Drops.java
@@ -0,0 +1,42 @@
+package dev.zontreck.otemod.configs.snbt.sections;
+
+import net.minecraft.nbt.CompoundTag;
+
+public class Drops
+{
+ public static final String TAG_NAME = "drops";
+ public static final String TAG_PLAYER_HEAD_DROPS = "enablePlayerHeadDrops";
+ public static final String TAG_SPAWN_EGG_CHANCE = "mobEggingChance";
+ public static final String TAG_PLAYER_HEAD_CHANCE = "playerHeadChance";
+
+ public boolean enablePlayerHeadChance = true;
+ public int mobEggingChance = 5;
+ public int playerHeadChance=10;
+
+
+ public CompoundTag save()
+ {
+ CompoundTag tag = new CompoundTag();
+ tag.putBoolean(TAG_PLAYER_HEAD_DROPS, enablePlayerHeadChance);
+ tag.putFloat(TAG_SPAWN_EGG_CHANCE, mobEggingChance);
+ tag.putFloat(TAG_PLAYER_HEAD_CHANCE, playerHeadChance);
+
+ return tag;
+ }
+
+ public static Drops load(CompoundTag tag)
+ {
+ Drops drops = new Drops();
+
+ if(tag.contains(TAG_PLAYER_HEAD_DROPS))
+ drops.enablePlayerHeadChance = tag.getBoolean(TAG_PLAYER_HEAD_DROPS);
+
+ if(tag.contains(TAG_SPAWN_EGG_CHANCE))
+ drops.mobEggingChance = tag.getInt(TAG_SPAWN_EGG_CHANCE);
+
+ if(tag.contains(TAG_PLAYER_HEAD_CHANCE))
+ drops.playerHeadChance = tag.getInt(TAG_PLAYER_HEAD_CHANCE);
+
+ return drops;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/configs/snbt/sections/General.java b/src/main/java/dev/zontreck/otemod/configs/snbt/sections/General.java
new file mode 100644
index 0000000..64ded15
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/configs/snbt/sections/General.java
@@ -0,0 +1,71 @@
+package dev.zontreck.otemod.configs.snbt.sections;
+
+import net.minecraft.nbt.CompoundTag;
+
+public class General
+{
+ public static final String TAG_NAME = "general";
+ public static final String TAG_DEBUG = "debug";
+ public static final String TAG_STARTER_KIT = "givesStarterKitOnChange";
+ public static final String TAG_ALLOW_BUILDER_DIM = "allowNonOppedBuilders";
+ public static final String TAG_MAX_VAULTS = "maxVaults";
+ public static final String TAG_INFINITE_VAULTS = "infiniteVaults";
+ public static final String TAG_ITEM_DESPAWN_TIMER = "itemDespawnTimer";
+ public static final String TAG_DEATH_MESSAGES = "enableDeathMessages";
+
+
+
+
+ public boolean debug = false;
+ public boolean givesStarterKitOnChanged = false;
+ public boolean allowBuilder = false;
+ public int maxVaults = 27;
+ public boolean infiniteVaults = false;
+ public int itemDespawnTimer = 2;
+ public boolean enableDeathMessages = true;
+
+
+ public CompoundTag save()
+ {
+ CompoundTag tag = new CompoundTag();
+ tag.putBoolean(TAG_DEBUG, debug);
+ tag.putBoolean(TAG_STARTER_KIT, givesStarterKitOnChanged);
+ tag.putBoolean(TAG_ALLOW_BUILDER_DIM, allowBuilder);
+ tag.putInt(TAG_MAX_VAULTS, maxVaults);
+ tag.putBoolean(TAG_INFINITE_VAULTS, infiniteVaults);
+ tag.putInt(TAG_ITEM_DESPAWN_TIMER, itemDespawnTimer);
+ tag.putBoolean(TAG_DEATH_MESSAGES, enableDeathMessages);
+
+
+ return tag;
+ }
+
+ public static General load(CompoundTag tag)
+ {
+ General general = new General();
+ if(tag.contains(TAG_DEBUG))
+ general.debug = tag.getBoolean(TAG_DEBUG);
+
+ if(tag.contains(TAG_STARTER_KIT))
+ general.givesStarterKitOnChanged = tag.getBoolean(TAG_STARTER_KIT);
+
+ if(tag.contains(TAG_ALLOW_BUILDER_DIM))
+ general.allowBuilder = tag.getBoolean(TAG_ALLOW_BUILDER_DIM);
+
+ if(tag.contains(TAG_MAX_VAULTS))
+ general.maxVaults = tag.getInt(TAG_MAX_VAULTS);
+
+ if(tag.contains(TAG_INFINITE_VAULTS))
+ general.infiniteVaults = tag.getBoolean(TAG_INFINITE_VAULTS);
+
+ if(tag.contains(TAG_ITEM_DESPAWN_TIMER))
+ general.itemDespawnTimer = tag.getInt(TAG_ITEM_DESPAWN_TIMER);
+
+ if(tag.contains(TAG_DEATH_MESSAGES))
+ general.enableDeathMessages = tag.getBoolean(TAG_DEATH_MESSAGES);
+
+
+
+ return general;
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/containers/Vector2.java b/src/main/java/dev/zontreck/otemod/containers/Vector2.java
deleted file mode 100644
index d9878c5..0000000
--- a/src/main/java/dev/zontreck/otemod/containers/Vector2.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package dev.zontreck.otemod.containers;
-
-import com.ibm.icu.impl.InvalidFormatException;
-
-import net.minecraft.world.phys.Vec2;
-import net.minecraft.world.phys.Vec3;
-
-public class Vector2
-{
- 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 InvalidFormatException
- {
- // 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 InvalidFormatException("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) + ">";
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/containers/Vector3.java b/src/main/java/dev/zontreck/otemod/containers/Vector3.java
deleted file mode 100644
index f4baf37..0000000
--- a/src/main/java/dev/zontreck/otemod/containers/Vector3.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package dev.zontreck.otemod.containers;
-
-import com.ibm.icu.impl.InvalidFormatException;
-
-import net.minecraft.world.phys.Vec3;
-
-public class Vector3
-{
- public double x;
- public double y;
- public double z;
-
- public Vec3 asMinecraftVector(){
- return new Vec3(x, y, z);
- }
-
- 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(String pos) throws InvalidFormatException
- {
- // 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 InvalidFormatException("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 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)+">";
- }
-}
diff --git a/src/main/java/dev/zontreck/otemod/data/ModBlockModelsProvider.java b/src/main/java/dev/zontreck/otemod/data/ModBlockModelsProvider.java
new file mode 100644
index 0000000..29e52ce
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/data/ModBlockModelsProvider.java
@@ -0,0 +1,34 @@
+package dev.zontreck.otemod.data;
+
+import dev.zontreck.otemod.OTEMod;
+import net.minecraft.data.PackOutput;
+import net.minecraftforge.client.model.generators.BlockModelBuilder;
+import net.minecraftforge.client.model.generators.BlockModelProvider;
+import net.minecraftforge.common.data.ExistingFileHelper;
+
+public class ModBlockModelsProvider extends BlockModelProvider
+{
+ public ModBlockModelsProvider(PackOutput output, ExistingFileHelper helper)
+ {
+ super(output, OTEMod.MOD_ID, helper);
+ }
+
+ @Override
+ protected void registerModels() {
+
+ // Model file paths
+ String cubeModel = "block/cube";
+ String sideTexture = "#side";
+ String frontTexture = "#front";
+
+ // Model Builder for your block
+ cubeAll("rotatable", modLoc(cubeModel))
+ .texture("particle", modLoc(sideTexture))
+ .texture("down", modLoc(sideTexture))
+ .texture("up", modLoc(sideTexture))
+ .texture("north", modLoc(frontTexture))
+ .texture("east", modLoc(sideTexture))
+ .texture("south", modLoc(sideTexture))
+ .texture("west", modLoc(sideTexture));
+ }
+}
diff --git a/src/main/java/dev/zontreck/otemod/data/ModBlockStatesProvider.java b/src/main/java/dev/zontreck/otemod/data/ModBlockStatesProvider.java
new file mode 100644
index 0000000..cb2857f
--- /dev/null
+++ b/src/main/java/dev/zontreck/otemod/data/ModBlockStatesProvider.java
@@ -0,0 +1,407 @@
+package dev.zontreck.otemod.data;
+
+import dev.zontreck.otemod.OTEMod;
+import dev.zontreck.otemod.blocks.ModBlocks;
+import net.minecraft.core.Direction;
+import net.minecraft.data.PackOutput;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.*;
+import net.minecraft.world.level.block.state.properties.*;
+import net.minecraftforge.client.model.generators.BlockStateProvider;
+import net.minecraftforge.client.model.generators.ConfiguredModel;
+import net.minecraftforge.client.model.generators.ModelFile;
+import net.minecraftforge.client.model.generators.VariantBlockStateBuilder;
+import net.minecraftforge.common.data.ExistingFileHelper;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+public class ModBlockStatesProvider extends BlockStateProvider {
+ public ModBlockStatesProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
+ super(output, OTEMod.MOD_ID, existingFileHelper);
+ }
+
+ @Override
+ protected void registerStatesAndModels() {
+ blockWithItem(ModBlocks.ETERNIUM_ORE_BLOCK);
+ blockWithItem(ModBlocks.VAULT_STEEL_ORE_BLOCK);
+ blockWithItem(ModBlocks.NETHER_VAULT_STEEL_ORE_BLOCK);
+ blockWithItem(ModBlocks.ETERNIUM_BLOCK);
+ blockWithItem(ModBlocks.DEEPSLATE_ETERNIUM_ORE_BLOCK);
+ blockWithItem(ModBlocks.COMPRESSED_OBSIDIAN_BLOCK);
+ blockWithItem(ModBlocks.LAYERED_COMPRESSED_OBSIDIAN_BLOCK);
+ blockWithItem(ModBlocks.POOL_TILE);
+ stairBlock(ModBlocks.POOL_TILE_STAIRS, ModBlocks.POOL_TILE);
+ slabBlock(ModBlocks.POOL_TILE_SLAB, ModBlocks.POOL_TILE);
+ blockWithItem(ModBlocks.POOL_LIGHT);
+ blockWithItem(ModBlocks.DIRTY_POOL_TILE);
+ stairBlock(ModBlocks.DIRTY_POOL_TILE_STAIRS, ModBlocks.DIRTY_POOL_TILE);
+ slabBlock(ModBlocks.DIRTY_POOL_TILE_SLAB, ModBlocks.DIRTY_POOL_TILE);
+ blockWithItem(ModBlocks.DIRTY_POOL_LIGHT);
+ blockWithItem(ModBlocks.FILTHY_POOL_LIGHT);
+ blockWithItem(ModBlocks.DARK_POOL_TILE);
+ blockWithItem(ModBlocks.DARK_POOL_LIGHT);
+ stairBlock(ModBlocks.DARK_POOL_TILE_STAIRS, ModBlocks.DARK_POOL_TILE);
+ slabBlock(ModBlocks.DARK_POOL_TILE_SLAB, ModBlocks.DARK_POOL_TILE);
+ blockWithItem(ModBlocks.BLUE_POOL_TILE);
+ stairBlock(ModBlocks.BLUE_POOL_TILE_STAIRS, ModBlocks.BLUE_POOL_TILE);
+ slabBlock(ModBlocks.BLUE_POOL_TILE_SLAB, ModBlocks.BLUE_POOL_TILE);
+ blockWithItem(ModBlocks.BLUE_POOL_LIGHT);
+ blockWithItem(ModBlocks.DIRTY_BLUE_POOL_TILE);
+ stairBlock(ModBlocks.DIRTY_BLUE_POOL_TILE_STAIRS, ModBlocks.DIRTY_BLUE_POOL_TILE);
+ slabBlock(ModBlocks.DIRTY_BLUE_POOL_TILE_SLAB, ModBlocks.DIRTY_BLUE_POOL_TILE);
+ blockWithItem(ModBlocks.DIRTY_BLUE_POOL_LIGHT);
+ blockWithItem(ModBlocks.FILTHY_BLUE_POOL_LIGHT);
+ blockWithItem(ModBlocks.RED_POOL_TILE);
+ stairBlock(ModBlocks.RED_POOL_TILE_STAIRS, ModBlocks.RED_POOL_TILE);
+ slabBlock(ModBlocks.RED_POOL_TILE_SLAB, ModBlocks.RED_POOL_TILE);
+ blockWithItem(ModBlocks.RED_POOL_LIGHT);
+ blockWithItem(ModBlocks.DIRTY_RED_POOL_LIGHT);
+ blockWithItem(ModBlocks.FILTHY_RED_POOL_LIGHT);
+ blockWithItem(ModBlocks.DIRTY_RED_POOL_TILE);
+ stairBlock(ModBlocks.DIRTY_RED_POOL_TILE_STAIRS, ModBlocks.DIRTY_RED_POOL_TILE);
+ slabBlock(ModBlocks.DIRTY_RED_POOL_TILE_SLAB, ModBlocks.DIRTY_RED_POOL_TILE);
+ blockWithItem(ModBlocks.DARK_RED_WOOL);
+ carpetBlock(ModBlocks.DARK_RED_CARPET, ModBlocks.DARK_RED_WOOL);
+
+ blockWithItem(ModBlocks.GREEN_POOL_TILE);
+ stairBlock(ModBlocks.GREEN_POOL_TILE_STAIRS, ModBlocks.GREEN_POOL_TILE);
+ slabBlock(ModBlocks.GREEN_POOL_TILE_SLAB, ModBlocks.GREEN_POOL_TILE);
+ blockWithItem(ModBlocks.GREEN_POOL_LIGHT);
+ blockWithItem(ModBlocks.DIRTY_GREEN_POOL_LIGHT);
+ blockWithItem(ModBlocks.FILTHY_GREEN_POOL_LIGHT);
+ blockWithItem(ModBlocks.DIRTY_GREEN_POOL_TILE);
+ stairBlock(ModBlocks.DIRTY_GREEN_POOL_TILE_STAIRS, ModBlocks.DIRTY_GREEN_POOL_TILE);
+ slabBlock(ModBlocks.DIRTY_GREEN_POOL_TILE_SLAB, ModBlocks.DIRTY_GREEN_POOL_TILE);
+
+ blockWithExistingModel(ModBlocks.UNCRAFTER, "block/custommodel/uncrafter", true);
+
+ }
+
+ private void blockWithExistingModel(RegistryObject blk, String model, boolean rotatable)
+ {
+ ResourceLocation modelLoc = new ResourceLocation(OTEMod.MOD_ID, model);
+ ModelFile mFile = models().withExistingParent(name(blk.get()), modelLoc);
+
+ if(!rotatable)
+ simpleBlock(blk.get(), mFile);
+ else horizontalBlock(blk.get(), mFile);
+
+ simpleBlockItem(blk.get(), mFile);
+ }
+
+ private void doorBlock(RegistryObject blk, ResourceLocation textureTop, ResourceLocation textureBottom)
+ {
+ doorBlockWithRenderType((DoorBlock) blk.get(), textureBottom, textureTop, new ResourceLocation("translucent"));
+
+ simpleBlockItem(blk.get(), models().doorBottomLeft(name(blk.get()), textureBottom, textureTop));
+ }
+
+ private void wallBlock(RegistryObject blk, ResourceLocation texture)
+ {
+ wallBlock((WallBlock) blk.get(), texture);
+ var wallInv = models().wallInventory(name(blk.get()) + "_inventory", texture);
+
+ simpleBlockItem(blk.get(), wallInv);
+ }
+
+ private void blockWithItem(RegistryObject blockRegistryObject) {
+ simpleBlockWithItem(blockRegistryObject.get(), cubeAll(blockRegistryObject.get()));
+ }
+
+ private void blockWithItem(RegistryObject blockRegistryObject, ModelFile model) {
+ simpleBlockWithItem(blockRegistryObject.get(), model);
+ }
+
+ private void stairBlock(RegistryObject blk, RegistryObject