From cffd3e4a765ace879ca0eff89f78dd115e1885fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bo=C5=99ivoj=20Van=C3=AD=C4=8Dek?= Date: Tue, 1 Sep 2026 20:29:31 +0200 Subject: [PATCH] Prvni verze --- .gitattributes | 5 + .gitignore | 25 + CREDITS.txt | 65 + LICENSE.txt | 523 ++++++++ README.txt | 46 + build.gradle | 284 +++++ changelog.txt | 1056 +++++++++++++++++ gradle.properties | 54 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 62076 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 245 ++++ gradlew.bat | 92 ++ settings.gradle | 13 + .../java/com/titanicmc/titanic/Config.java | 71 ++ .../com/titanicmc/titanic/TitanicMod.java | 61 + .../titanicmc/titanic/block/BoilerBlock.java | 65 + .../titanicmc/titanic/block/ChairBlock.java | 51 + .../titanic/block/CrankshaftBlock.java | 14 + .../titanicmc/titanic/block/HelmBlock.java | 78 ++ .../titanic/block/HelmSocketBlock.java | 24 + .../titanic/block/LiftingFrameBlock.java | 106 ++ .../titanic/block/RepairPanelBlock.java | 50 + .../titanicmc/titanic/block/WinchBlock.java | 62 + .../blockentity/BoilerBlockEntity.java | 122 ++ .../titanic/blockentity/HelmBlockEntity.java | 70 ++ .../blockentity/LiftingFrameBlockEntity.java | 71 ++ .../blockentity/RepairPanelBlockEntity.java | 211 ++++ .../titanicmc/titanic/entity/SeatEntity.java | 59 + .../titanic/event/ForgeEventHandler.java | 19 + .../titanic/registry/ModBlockEntities.java | 33 + .../titanic/registry/ModBlockTags.java | 23 + .../titanicmc/titanic/registry/ModBlocks.java | 105 ++ .../titanic/registry/ModCreativeTabs.java | 33 + .../titanic/registry/ModEntities.java | 23 + .../titanic/registry/ModFeatures.java | 19 + .../titanicmc/titanic/registry/ModItems.java | 48 + .../titanic/ship/ShipRaiseScheduler.java | 79 ++ .../com/titanicmc/titanic/ship/ShipUtil.java | 211 ++++ .../titanic/ship/TitanicShipControl.java | 230 ++++ .../titanic/worldgen/WreckFeature.java | 173 +++ src/main/resources/META-INF/mods.toml | 94 ++ .../assets/titanic/blockstates/boiler.json | 5 + .../titanic/blockstates/broken_porthole.json | 5 + .../assets/titanic/blockstates/chair.json | 5 + .../titanic/blockstates/crankshaft.json | 5 + .../titanic/blockstates/damaged_hull.json | 5 + .../assets/titanic/blockstates/helm.json | 8 + .../titanic/blockstates/helm_socket.json | 8 + .../titanic/blockstates/lifting_frame.json | 9 + .../titanic/blockstates/repair_panel.json | 5 + .../assets/titanic/blockstates/ship_hull.json | 5 + .../assets/titanic/blockstates/winch.json | 5 + .../resources/assets/titanic/lang/en_us.json | 50 + .../assets/titanic/models/block/boiler.json | 29 + .../titanic/models/block/broken_porthole.json | 6 + .../assets/titanic/models/block/chair.json | 14 + .../titanic/models/block/crankshaft.json | 10 + .../titanic/models/block/damaged_hull.json | 6 + .../assets/titanic/models/block/helm.json | 78 ++ .../titanic/models/block/helm_socket.json | 6 + .../titanic/models/block/lifting_frame.json | 19 + .../titanic/models/block/repair_panel.json | 28 + .../titanic/models/block/ship_hull.json | 6 + .../assets/titanic/models/block/winch.json | 12 + .../assets/titanic/models/item/boiler.json | 1 + .../assets/titanic/models/item/chair.json | 1 + .../titanic/models/item/crankshaft.json | 1 + .../assets/titanic/models/item/helm.json | 1 + .../titanic/models/item/lifting_frame.json | 1 + .../titanic/models/item/repair_panel.json | 1 + .../assets/titanic/models/item/ship_hull.json | 1 + .../titanic/models/item/ships_wheel.json | 6 + .../titanic/models/item/steel_cable.json | 6 + .../titanic/models/item/steel_ingot.json | 6 + .../assets/titanic/models/item/winch.json | 1 + .../titanic/textures/block/boiler_door.png | Bin 0 -> 377 bytes .../titanic/textures/block/boiler_side.png | Bin 0 -> 403 bytes .../titanic/textures/block/boiler_top.png | Bin 0 -> 396 bytes .../textures/block/broken_porthole.png | Bin 0 -> 326 bytes .../titanic/textures/block/chair_cushion.png | Bin 0 -> 410 bytes .../titanic/textures/block/chair_wood.png | Bin 0 -> 559 bytes .../textures/block/crankshaft_metal.png | Bin 0 -> 424 bytes .../titanic/textures/block/damaged_hull.png | Bin 0 -> 652 bytes .../titanic/textures/block/helm_socket.png | Bin 0 -> 576 bytes .../titanic/textures/block/helm_wheel_rim.png | Bin 0 -> 395 bytes .../titanic/textures/block/helm_wood.png | Bin 0 -> 571 bytes .../textures/block/lifting_frame_beam.png | Bin 0 -> 398 bytes .../textures/block/repair_panel_front.png | Bin 0 -> 170 bytes .../textures/block/repair_panel_side.png | Bin 0 -> 398 bytes .../titanic/textures/block/ship_hull.png | Bin 0 -> 426 bytes .../titanic/textures/block/ships_wheel.png | Bin 0 -> 410 bytes .../titanic/textures/block/steel_cable.png | Bin 0 -> 314 bytes .../titanic/textures/block/steel_ingot.png | Bin 0 -> 221 bytes .../titanic/textures/block/winch_drum.png | Bin 0 -> 339 bytes .../titanic/textures/block/winch_frame.png | Bin 0 -> 393 bytes .../titanic/textures/item/ships_wheel.png | Bin 0 -> 410 bytes .../titanic/textures/item/steel_cable.png | Bin 0 -> 314 bytes .../titanic/textures/item/steel_ingot.png | Bin 0 -> 221 bytes .../titanic/forge/biome_modifier/wreck.json | 6 + .../titanic/loot_tables/blocks/boiler.json | 12 + .../loot_tables/blocks/broken_porthole.json | 4 + .../titanic/loot_tables/blocks/chair.json | 12 + .../loot_tables/blocks/crankshaft.json | 12 + .../loot_tables/blocks/damaged_hull.json | 4 + .../data/titanic/loot_tables/blocks/helm.json | 12 + .../loot_tables/blocks/helm_socket.json | 4 + .../loot_tables/blocks/lifting_frame.json | 12 + .../loot_tables/blocks/repair_panel.json | 12 + .../titanic/loot_tables/blocks/ship_hull.json | 12 + .../titanic/loot_tables/blocks/winch.json | 12 + .../data/titanic/tags/blocks/ship_blocks.json | 19 + .../worldgen/configured_feature/wreck.json | 4 + .../worldgen/placed_feature/wreck.json | 19 + src/main/resources/pack.mcmeta | 8 + 114 files changed, 5138 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 CREDITS.txt create mode 100644 LICENSE.txt create mode 100644 README.txt create mode 100644 build.gradle create mode 100644 changelog.txt create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/titanicmc/titanic/Config.java create mode 100644 src/main/java/com/titanicmc/titanic/TitanicMod.java create mode 100644 src/main/java/com/titanicmc/titanic/block/BoilerBlock.java create mode 100644 src/main/java/com/titanicmc/titanic/block/ChairBlock.java create mode 100644 src/main/java/com/titanicmc/titanic/block/CrankshaftBlock.java create mode 100644 src/main/java/com/titanicmc/titanic/block/HelmBlock.java create mode 100644 src/main/java/com/titanicmc/titanic/block/HelmSocketBlock.java create mode 100644 src/main/java/com/titanicmc/titanic/block/LiftingFrameBlock.java create mode 100644 src/main/java/com/titanicmc/titanic/block/RepairPanelBlock.java create mode 100644 src/main/java/com/titanicmc/titanic/block/WinchBlock.java create mode 100644 src/main/java/com/titanicmc/titanic/blockentity/BoilerBlockEntity.java create mode 100644 src/main/java/com/titanicmc/titanic/blockentity/HelmBlockEntity.java create mode 100644 src/main/java/com/titanicmc/titanic/blockentity/LiftingFrameBlockEntity.java create mode 100644 src/main/java/com/titanicmc/titanic/blockentity/RepairPanelBlockEntity.java create mode 100644 src/main/java/com/titanicmc/titanic/entity/SeatEntity.java create mode 100644 src/main/java/com/titanicmc/titanic/event/ForgeEventHandler.java create mode 100644 src/main/java/com/titanicmc/titanic/registry/ModBlockEntities.java create mode 100644 src/main/java/com/titanicmc/titanic/registry/ModBlockTags.java create mode 100644 src/main/java/com/titanicmc/titanic/registry/ModBlocks.java create mode 100644 src/main/java/com/titanicmc/titanic/registry/ModCreativeTabs.java create mode 100644 src/main/java/com/titanicmc/titanic/registry/ModEntities.java create mode 100644 src/main/java/com/titanicmc/titanic/registry/ModFeatures.java create mode 100644 src/main/java/com/titanicmc/titanic/registry/ModItems.java create mode 100644 src/main/java/com/titanicmc/titanic/ship/ShipRaiseScheduler.java create mode 100644 src/main/java/com/titanicmc/titanic/ship/ShipUtil.java create mode 100644 src/main/java/com/titanicmc/titanic/ship/TitanicShipControl.java create mode 100644 src/main/java/com/titanicmc/titanic/worldgen/WreckFeature.java create mode 100644 src/main/resources/META-INF/mods.toml create mode 100644 src/main/resources/assets/titanic/blockstates/boiler.json create mode 100644 src/main/resources/assets/titanic/blockstates/broken_porthole.json create mode 100644 src/main/resources/assets/titanic/blockstates/chair.json create mode 100644 src/main/resources/assets/titanic/blockstates/crankshaft.json create mode 100644 src/main/resources/assets/titanic/blockstates/damaged_hull.json create mode 100644 src/main/resources/assets/titanic/blockstates/helm.json create mode 100644 src/main/resources/assets/titanic/blockstates/helm_socket.json create mode 100644 src/main/resources/assets/titanic/blockstates/lifting_frame.json create mode 100644 src/main/resources/assets/titanic/blockstates/repair_panel.json create mode 100644 src/main/resources/assets/titanic/blockstates/ship_hull.json create mode 100644 src/main/resources/assets/titanic/blockstates/winch.json create mode 100644 src/main/resources/assets/titanic/lang/en_us.json create mode 100644 src/main/resources/assets/titanic/models/block/boiler.json create mode 100644 src/main/resources/assets/titanic/models/block/broken_porthole.json create mode 100644 src/main/resources/assets/titanic/models/block/chair.json create mode 100644 src/main/resources/assets/titanic/models/block/crankshaft.json create mode 100644 src/main/resources/assets/titanic/models/block/damaged_hull.json create mode 100644 src/main/resources/assets/titanic/models/block/helm.json create mode 100644 src/main/resources/assets/titanic/models/block/helm_socket.json create mode 100644 src/main/resources/assets/titanic/models/block/lifting_frame.json create mode 100644 src/main/resources/assets/titanic/models/block/repair_panel.json create mode 100644 src/main/resources/assets/titanic/models/block/ship_hull.json create mode 100644 src/main/resources/assets/titanic/models/block/winch.json create mode 100644 src/main/resources/assets/titanic/models/item/boiler.json create mode 100644 src/main/resources/assets/titanic/models/item/chair.json create mode 100644 src/main/resources/assets/titanic/models/item/crankshaft.json create mode 100644 src/main/resources/assets/titanic/models/item/helm.json create mode 100644 src/main/resources/assets/titanic/models/item/lifting_frame.json create mode 100644 src/main/resources/assets/titanic/models/item/repair_panel.json create mode 100644 src/main/resources/assets/titanic/models/item/ship_hull.json create mode 100644 src/main/resources/assets/titanic/models/item/ships_wheel.json create mode 100644 src/main/resources/assets/titanic/models/item/steel_cable.json create mode 100644 src/main/resources/assets/titanic/models/item/steel_ingot.json create mode 100644 src/main/resources/assets/titanic/models/item/winch.json create mode 100644 src/main/resources/assets/titanic/textures/block/boiler_door.png create mode 100644 src/main/resources/assets/titanic/textures/block/boiler_side.png create mode 100644 src/main/resources/assets/titanic/textures/block/boiler_top.png create mode 100644 src/main/resources/assets/titanic/textures/block/broken_porthole.png create mode 100644 src/main/resources/assets/titanic/textures/block/chair_cushion.png create mode 100644 src/main/resources/assets/titanic/textures/block/chair_wood.png create mode 100644 src/main/resources/assets/titanic/textures/block/crankshaft_metal.png create mode 100644 src/main/resources/assets/titanic/textures/block/damaged_hull.png create mode 100644 src/main/resources/assets/titanic/textures/block/helm_socket.png create mode 100644 src/main/resources/assets/titanic/textures/block/helm_wheel_rim.png create mode 100644 src/main/resources/assets/titanic/textures/block/helm_wood.png create mode 100644 src/main/resources/assets/titanic/textures/block/lifting_frame_beam.png create mode 100644 src/main/resources/assets/titanic/textures/block/repair_panel_front.png create mode 100644 src/main/resources/assets/titanic/textures/block/repair_panel_side.png create mode 100644 src/main/resources/assets/titanic/textures/block/ship_hull.png create mode 100644 src/main/resources/assets/titanic/textures/block/ships_wheel.png create mode 100644 src/main/resources/assets/titanic/textures/block/steel_cable.png create mode 100644 src/main/resources/assets/titanic/textures/block/steel_ingot.png create mode 100644 src/main/resources/assets/titanic/textures/block/winch_drum.png create mode 100644 src/main/resources/assets/titanic/textures/block/winch_frame.png create mode 100644 src/main/resources/assets/titanic/textures/item/ships_wheel.png create mode 100644 src/main/resources/assets/titanic/textures/item/steel_cable.png create mode 100644 src/main/resources/assets/titanic/textures/item/steel_ingot.png create mode 100644 src/main/resources/data/titanic/forge/biome_modifier/wreck.json create mode 100644 src/main/resources/data/titanic/loot_tables/blocks/boiler.json create mode 100644 src/main/resources/data/titanic/loot_tables/blocks/broken_porthole.json create mode 100644 src/main/resources/data/titanic/loot_tables/blocks/chair.json create mode 100644 src/main/resources/data/titanic/loot_tables/blocks/crankshaft.json create mode 100644 src/main/resources/data/titanic/loot_tables/blocks/damaged_hull.json create mode 100644 src/main/resources/data/titanic/loot_tables/blocks/helm.json create mode 100644 src/main/resources/data/titanic/loot_tables/blocks/helm_socket.json create mode 100644 src/main/resources/data/titanic/loot_tables/blocks/lifting_frame.json create mode 100644 src/main/resources/data/titanic/loot_tables/blocks/repair_panel.json create mode 100644 src/main/resources/data/titanic/loot_tables/blocks/ship_hull.json create mode 100644 src/main/resources/data/titanic/loot_tables/blocks/winch.json create mode 100644 src/main/resources/data/titanic/tags/blocks/ship_blocks.json create mode 100644 src/main/resources/data/titanic/worldgen/configured_feature/wreck.json create mode 100644 src/main/resources/data/titanic/worldgen/placed_feature/wreck.json create mode 100644 src/main/resources/pack.mcmeta diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f811f6a --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +# Disable autocrlf on generated files, they always generate with LF +# Add any extra files or paths here to make git stop saying they +# are changed when only line endings change. +src/generated/**/.cache/cache text eol=lf +src/generated/**/*.json text eol=lf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..12f8644 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run + +# Files from Forge MDK +forge*changelog.txt diff --git a/CREDITS.txt b/CREDITS.txt new file mode 100644 index 0000000..a70c53d --- /dev/null +++ b/CREDITS.txt @@ -0,0 +1,65 @@ +Minecraft Forge: Credits/Thank You + +Forge is a set of tools and modifications to the Minecraft base game code to assist +mod developers in creating new and exciting content. It has been in development for +several years now, but I would like to take this time thank a few people who have +helped it along it's way. + +First, the people who originally created the Forge projects way back in Minecraft +alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance +of me taking over the project, who knows what Minecraft modding would be today. + +Secondly, someone who has worked with me, and developed some of the core features +that allow modding to be as functional, and as simple as it is, cpw. For developing +FML, which stabelized the client and server modding ecosystem. As well as the base +loading system that allows us to modify Minecraft's code as elegently as possible. + +Mezz, who has stepped up as the issue and pull request manager. Helping to keep me +sane as well as guiding the community into creating better additions to Forge. + +Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which +I am a part}. For creating some of the core tools needed to make Minecraft modding +both possible, and as stable as can be. + On that note, here is some specific information of the MCP data we use: + * Minecraft Coder Pack (MCP) * + Forge Mod Loader and Minecraft Forge have permission to distribute and automatically + download components of MCP and distribute MCP data files. This permission is not + transitive and others wishing to redistribute the Minecraft Forge source independently + should seek permission of MCP or remove the MCP data files and request their users + to download MCP separately. + +And lastly, the countless community members who have spent time submitting bug reports, +pull requests, and just helping out the community in general. Thank you. + +--LexManos + +========================================================================= + +This is Forge Mod Loader. + +You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml + +This minecraft mod is a clean open source implementation of a mod loader for minecraft servers +and minecraft clients. + +The code is authored by cpw. + +It began by partially implementing an API defined by the client side ModLoader, authored by Risugami. +http://www.minecraftforum.net/topic/75440- +This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader. + +It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge. +http://www.minecraftforge.net/ + +Additionally, it contains an implementation of topological sort based on that +published at http://keithschwarz.com/interesting/code/?dir=topological-sort + +It also contains code from the Maven project for performing versioned dependency +resolution. http://maven.apache.org/ + +It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/ +with credit to it's authors. + +Forge Mod Loader downloads components from the Minecraft Coder Pack +(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team. + diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..249debe --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,523 @@ +Unless noted below, Minecraft Forge, Forge Mod Loader, and all +parts herein are licensed under the terms of the LGPL 2.1 found +here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and +copied below. + +Homepage: http://minecraftforge.net/ + https://github.com/MinecraftForge/MinecraftForge + + +A note on authorship: +All source artifacts are property of their original author, with +the exclusion of the contents of the patches directory and others +copied from it from time to time. Authorship of the contents of +the patches directory is retained by the Minecraft Forge project. +This is because the patches are partially machine generated +artifacts, and are changed heavily due to the way forge works. +Individual attribution within them is impossible. + +Consent: +All contributions to Forge must consent to the release of any +patch content to the Forge project. + +A note on infectivity: +The LGPL is chosen specifically so that projects may depend on Forge +features without being infected with its license. That is the +purpose of the LGPL. Mods and others using this code via ordinary +Java mechanics for referencing libraries are specifically not bound +by Forge's license for the Mod code. + + +=== MCP Data === +This software includes data from the Minecraft Coder Pack (MCP), with kind permission +from them. The license to MCP data is not transitive - distribution of this data by +third parties requires independent licensing from the MCP team. This data is not +redistributable without permission from the MCP team. + +=== Sharing === +I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of +the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. + +-- Runtime patcher -- +License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher +and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses) + +-- ASM transformers -- +License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories) +under any alternative open source license as classified by the OSI (http://opensource.org/licenses) + +========================================================================= +This software includes portions from the Apache Maven project at +http://maven.apache.org/ specifically the ComparableVersion.java code. It is +included based on guidelines at +http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html +with notices intact. The only change is a non-functional change of package name. + +This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating +binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ +authored by genman, heikok, pivot. +The only changes are to replace some Trove collection types with standard Java collections, and repackaged. + +This software includes the Monocraft font from https://github.com/IdreesInc/Monocraft/ for use in the early loading +display. +========================================================================= + + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..46add15 --- /dev/null +++ b/README.txt @@ -0,0 +1,46 @@ + +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` +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` +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: https://docs.minecraftforge.net/en/1.20.1/gettingstarted/ +LexManos' Install Video: https://youtu.be/8VEdtQLuLO0 +Forge Forums: https://forums.minecraftforge.net/ +Forge Discord: https://discord.minecraftforge.net/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..3254758 --- /dev/null +++ b/build.gradle @@ -0,0 +1,284 @@ +plugins { + id 'eclipse' + id 'idea' + id 'maven-publish' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' +} + +version = mod_version +group = mod_group_id + +base { + archivesName = mod_id +} + +// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. +java.toolchain.languageVersion = JavaLanguageVersion.of(17) + +println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" +minecraft { + // The mappings can be changed at any time and must be in the following format. + // 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 MinecraftForge + // 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: mapping_channel, version: mapping_version + + // 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.minecraftforge.net/en/latest/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 { + // applies to all the run configs below + configureEach { + workingDirectory project.file('run') + + // 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', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + property 'forge.logging.console.level', 'debug' + + mods { + "${mod_id}" { + source sourceSets.main + } + } + } + + client { + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', mod_id + } + + server { + property 'forge.enabledGameTestNamespaces', mod_id + args '--nogui' + } + + // 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 { + // 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', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + } + } +} + +// Include resources generated by data generators. +sourceSets.main.resources { srcDir 'src/generated/resources' } + +repositories { + // Put repositories for dependencies here + // ForgeGradle automatically adds the Forge maven and Maven Central for you + + maven { + // Valkyrien Skies 2 - ship physics library used to make the raised/repaired Titanic actually sail + name = 'Valkyrien Skies' + url = 'https://maven.valkyrienskies.org' + content { + includeGroup 'org.valkyrienskies' + includeGroup 'org.valkyrienskies.core' + } + } + + maven { + // Required at runtime by Valkyrien Skies (it is written in Kotlin) + name = 'Kotlin for Forge' + url = 'https://thedarkcolour.github.io/KotlinForForge/' + content { + includeGroup 'thedarkcolour' + } + } + + maven { + // Only needed for one small transitive dependency of Valkyrien Skies core (jackson-kotlin-dsl) + name = 'JitPack' + url = 'https://jitpack.io' + content { + includeGroup 'com.github.Rubydesic' + } + } + + // 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 + // flatDir { + // dir 'libs' + // } +} + +// fg.deobf() resolves its own internal probe configuration to locate the raw artifact before +// remapping it, and that probe does not honour excludes attached only to the outer +// `implementation(...) { exclude ... }` block. Applying the excludes globally makes sure +// Valkyrien Skies' optional Create/Flywheel/profiler compat dependencies (which require extra +// repositories we don't want to add) are never resolved anywhere in the build, since we don't +// use Create. +configurations.all { + exclude group: 'com.simibubi.create' + exclude group: 'net.createmod.ponder' + exclude group: 'dev.engine-room.flywheel' + exclude group: 'com.tterrag.registrate' + exclude group: 'curse.maven' + exclude group: 'maven.modrinth' + exclude group: 'com.jozufozu.resourcefullib' +} + +dependencies { + // 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.minecraftforge:forge:${minecraft_version}-${forge_version}" + + // 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}") + + // Kotlin runtime for Forge - required by Valkyrien Skies (written in Kotlin) at runtime. + implementation fg.deobf("thedarkcolour:kotlinforforge:${kotlinforforge_version}") + + // Valkyrien Skies 2 - lets a group of blocks (the raised/repaired Titanic) become + // a physical, floating, steerable "ship" once assembled. + // We don't use Create, so all of VS2's optional Create/Flywheel/profiler compat + // dependencies (which otherwise require extra repos like Modrinth/CurseMaven) are excluded. + implementation(fg.deobf("org.valkyrienskies:valkyrienskies-120-forge:${vs2_version}")) { + exclude group: 'com.simibubi', module: '' + exclude group: 'com.simibubi.create', module: '' + exclude group: 'net.createmod.ponder', module: '' + exclude group: 'dev.engine-room', module: '' + exclude group: 'dev.engine-room.flywheel', module: '' + exclude group: 'com.jozufozu', module: '' + exclude group: 'com.tterrag.registrate', module: '' + exclude group: 'curse.maven', module: '' + exclude group: 'maven.modrinth', module: '' + } + implementation("org.valkyrienskies.core:api:${vscore_version}") { + exclude group: 'org.joml', module: '' + } + implementation("org.valkyrienskies.core:internal:${vscore_version}") { + exclude group: 'org.joml', module: '' + } + implementation("org.valkyrienskies.core:util:${vscore_version}") { + exclude group: 'org.joml', module: '' + } + // joml-primitives (AABBdc etc.) is excluded above along with the rest of the org.joml + // group to avoid duplicating the base joml classes Minecraft already provides - but + // joml-primitives itself isn't provided by Minecraft. VS2 already bundles it at runtime + // via its own Jar-in-Jar, so this only needs to be visible at compile time. + compileOnly 'org.joml:joml-primitives:1.10.0' + + // For more info: + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html +} + +// 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.named('processResources', ProcessResources).configure { + var replaceProperties = [ + minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, + forge_version: forge_version, forge_version_range: forge_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, + ] + inputs.properties replaceProperties + + filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { + expand replaceProperties + [project: project] + } +} + +// 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' +// } + +// Example configuration to allow publishing using the maven-publish plugin +publishing { + publications { + register('mavenJava', MavenPublication) { + artifact jar + } + } + repositories { + maven { + url "file://${project.projectDir}/mcmodsrepo" + } + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 0000000..09b1725 --- /dev/null +++ b/changelog.txt @@ -0,0 +1,1056 @@ +1.20.1 Changelog +47.4 +==== + - 47.4.5 Fix ServerChatEvent thread not using correct class loader. (#10591) + - 47.4.4 Fix ignitedByLava making blocks permanently flammable (#10570) + - 47.4.3 Add back magic number to make mixin happy. + - 47.4.2 Fix container screens closing when opened with an extended REACH attribute. Fixes #10560 + Also fixes cases where creative mode effected reach incorrectly. + - 47.4.1 Deprecate EntityRenderersEvent.AddLayers functions that hard case to LivingEntityRenderers as the backing maps do not guarantee that type. (#10513) + Co-authored-by: LexManos + - 47.4.0 1.20.1 RB 4 + https://forums.minecraftforge.net/topic/154387-forge-474-minecraft-1201/ + +47.3 +==== + - 47.3.39 Fix ForgeDev's test runs not working due to dead test mod (#10483) + - 47.3.38 Cache this.useItem before running item break logic, Fixes #10344 (#10376) + - 47.3.37 Speed up mod annotation scanning by ~30% (#10470) + Co-authored-by: LexManos + - 47.3.36 Add missed license headers (#10479) + - 47.3.35 Add '#forge:chorus_additionally_grows_on' tag for similar mechanics to '#minecraft:azalea_grows_on' but for chorus (#10456) + - 47.3.34 Fix cancelling ProjectileImpactEvent still firing onBlockHit (#10481) + - 47.3.33 Honor attacker shield disabling status (#10321) + - 47.3.32 Add fast graphics render type to block model jsons (#10393) + Make modded leaves behave like vanilla leaves by default (Fixes #10389) + - 47.3.31 Fix invalidly symlinked worlds crashing on level select (#10439) + - 47.3.30 Backport even more future ResourceLocation methods (#10428) + - 47.3.29 Ensure NetworkConstants is loaded before mod construction (#10407) + - 47.3.28 Account for problematic mixins in VillagerTrades.EmeraldsForVillagerTypeItem (#10402) + - 47.3.27 Fix incorrect method reference in TntBlock.explode() + - 47.3.26 Fix issues in VillagerTrades.EmeraldsForVillagerTypeItem related to custom Villager Types (#10315) + Add VillagerType#registerBiomeType + - 47.3.25 Add `clientSideOnly` feature to mods.toml (#10085) (backport of #9804 to 1.20.1) + Co-authored-by: Jonathing + - 47.3.24 Fix non-passengers being tickable without checking canUpdate() (#10304) + - 47.3.23 Fix finalizeSpawn's return value not being used correctly (#10301) + - 47.3.22 Bump CoreMods to 5.2.4 (#10263) + - 47.3.21 Allow mipmap lowering to be disabled (#10252) + - 47.3.20 Add optional fix of use item duration, disabled by default (#10246) + - 47.3.19 Backport some Vanilla 1.21 `ResourceLocation` methods (#10241) + Co-authored-by: Paint_Ninja + - 47.3.18 Simplify memory usage display on loading screen (#10233) + Co-authored-by: Paint_Ninja + - 47.3.17 Deprecate `@ObjectHolder`, add a couple of fast-paths (#10228) + Co-authored-by: Paint_Ninja + - 47.3.16 Skip Vanilla classes for the `CapabilityTokenSubclass` transformer (#10221) + Co-authored-by: Paint_Ninja + - 47.3.15 Skip Forge classes in the RuntimeEnumExtender transformer (#10216) + Mod classes are still transformed as usual + Co-authored-by: Paint_Ninja + - 47.3.14 Skip processing Forge classes in `RuntimeDistCleaner` (#10208) + Co-authored-by: Paint_Ninja + - 47.3.13 Disable clean on TeamCity (#10258) + - 47.3.12 Bump CoreMods to 5.2 (#10130) + Full Changelog: + https://gist.github.com/Jonathing/c3ad28b2a048ac839a7baba5417ee870 + The key features are: + - ES6 language support + - Thoroughly updated ASMAPI, with full documentation + - Bug fixes (some optional for backwards-compatibility) + - Partial internal code cleanup + - Request CoreMods to not apply fix for ASMAPI.findFirstInstructionBefore by default + - Updated ASM to 9.7.1 + - Updated Nashorn to 15.4 + - 47.3.11 Remove unneeded boat patch (backport of #10061 to 1.20.1) (#10096) + Co-authored-by: andan42 <49289986+andan42@users.noreply.github.com> + - 47.3.10 Optionally supply FMLJavaModLoadingContext as a param to mod constructors (backport of #10074 to 1.20.1) (#10100) + Co-authored-by: RealMangoRage + - 47.3.9 Minor cleanup to ModListScreen and VersionChecker (backport of #9988 to 1.20.1) (#10095) + - 47.3.8 Cleanup FML Bindings (backport of #10004 to 1.20.1) (#10094) + - 47.3.7 Early display fixes/workarounds for buggy drivers. Backport of #9921 to 1.20.1 (#10073) + - 47.3.6 Add a way to render tooltips from Formatted text and TooltipComponents elements (#10055) + Backport of #10056 for 1.20.1 + - 47.3.5 Make HangingSignBlockEntity useable with custom BlockEntityTypes. #10038 + - 47.3.4 Unlock wrapped registries when firing register events. (#10035) + Co-authored-by: LexManos + - 47.3.3 Choose default JarJar mod file type based on parent JAR (#10023) + Co-authored-by: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> + - 47.3.2 Fixed falling block entities not rendering as moving blocks (#10006) (#10018) + Co-authored-by: Ven + - 47.3.1 Fix boat travel distance being incorrect. Closes #9997 #9999 + - 47.3.0 1.20.1 RB 3 + https://forums.minecraftforge.net/topic/139825-forge-473-minecraft-1201/ + +47.2 +==== + - 47.2.36 Bump gradle to 8.8 + - 47.2.35 Bump gradle and java runtime version on team city + - 47.2.34 Fix LevelSettings ignoring data configuration. Close #9938 + - 47.2.33 Fix erroneous patch in FireBlock. Closes #9996 + - 47.2.32 Fix early window crash when parsing options.txt (#9934) + Backport of #9933 + - 47.2.31 Prevent mixins from crashing the game when there are missing mods (#9916) + 1.20.1 backport of 49.0.14 + - 47.2.30 Fix NPE when acceptableValues in defineInList() does not allow nulls, backport of #9903 (#9907) + Co-authored-by: J-RAP + - 47.2.29 Fix Crowdin (#9929) + - 47.2.28 Optimise capabilities a tad, backport of #9886 (#9911) + - 47.2.27 Add helper method to `OnDatapackSyncEvent`, backport of #9901 (#9919) + - 47.2.26 Add CPU usage config option to early window, hide by default, backport of #9866 (#9915) + - 47.2.25 Fix slightly offset mods screen link positioning, backport of #9860 (#9861) + Co-authored-by: Dennis C <11262040+XFactHD@users.noreply.github.com> + - 47.2.24 Make common config screen registration tasks easier, backport of #9884 (#9912) + - 47.2.23 Add Leaves method to ModelProvider.java (#9889) + - 47.2.22 [1.20.1] Bump CoreMods and ASM (#9897) + - CoreMods 5.1.2 -> 5.1.6 + - ASM 9.6 -> 9.7 + - 47.2.21 Bump some deps (#9880) + - CoreMods 5.0.1 -> 5.1.2 + - ASM 9.5 -> 9.6 + - Installer 2.1 -> 2.2 + - Installer tools 1.3.0 -> 1.4.1 + - 47.2.20 Fix missing patch for Item.onInventoryTick. Closes #9812 + - 47.2.19 Make common DisplayTest registration tasks easier (#9823) + - 47.2.18 Optimise ForgeConfigSpec and make Range public (#9824) + Backport of #9810 to 1.20.1 + - 47.2.17 Datagen addOptionalTag/s methods that allow passing the TagKey itself instead of passing the location (#9807) (#9808) + - 47.2.16 Update VersionSupportMatrix.java (#9805) + - 47.2.15 Backport of Registries optimization, now uses fastutils collections to minimize boxing + - 47.2.14 Fix patch offset + - 47.2.13 Fix fire related mobs not taking enough freezing damage. Closes #9686 + - 47.2.12 Fix TagLoader error not printing tag name correctly. Closes #9693 + - 47.2.11 Fix LoadingErrorScreen inner headers are not centered. Closes #9687 + - 47.2.10 Rework KeyModifiers system to properly allow keybinds to be triggered when multiple modifiers are pressed. + Fix setting keybinds whel using keyboard inputs to select the menu. Closes #9793 + - 47.2.9 Fix KeyModifiers not being properly taken into account. Closes #9806 + - 47.2.8 Don't turn off VSync when rendering from Minecraft context (#9801) + Co-authored-by: embeddedt <42941056+embeddedt@users.noreply.github.com> + - 47.2.7 Fix rare crash with early display window, fixes MinecraftForge#9673 (#9799) + - 47.2.6 Fix tag loading being unordered. Closes #9774 + - 47.2.5 Fix misaligned patch in RegistryDataLoader + - 47.2.4 Backport CrashReportAnalyser to 1.20.1 (#9757) + - 47.2.3 Minor MDK changes (#9752) + - 47.2.2 Improve mod description formatting in mods screen (#9769) + Co-authored-by: Su5eD + - 47.2.1 [1.20.1] Improve mod loading error message for errors inside mod constructors (#9707) + - 47.2.0 1.20.1 RB + +47.1 +==== + - 47.1.47 Keep order of sources in PackRepository (#9702) + Co-authored-by: dhyces <10985914+dhyces@users.noreply.github.com> + - 47.1.46 Fix DelegatingPackResources searching resource path twice (#9697) + - 47.1.45 Fix `Level` leak in debug HUD (#9699) + Co-authored-by: malte0811 + - 47.1.44 Fix PlayerSpawnPhantomsEvent not being fired (#9689) + - 47.1.43 Enhance LivingBreathEvent and LivingDrownEvent. Closes #9680 + Also remove 3.5MB of useless data from the installer. + - 47.1.42 Partially revert LazyOptional changes, now no longer internally uses weak references. + - 47.1.41 Make LazyOptional's internal references to invalidation listeners use WeakReference, and allow modders to unregister themselves. Closes #8805 + - 47.1.40 Revert EntityEvent.Size changes to before #9018 was called. (#9679) + Kept newly added methods for binary compatibility but deprecated them all for removal. + The entire pose/eye/size system needs to be reevaluated and address some of Mojang's changes. + However this should fix any bugs that pulling that PR may of caused. + - 47.1.39 Add a config option to restore the calculate all normals behavior in case some setups require old broken behavior. (#9670) + - 47.1.38 Fix rounding errors on models with 45 degree normals by favoring one Direction (#9669) + Should fix flickering issues when breaking custom models and having our vanilla solution disabled. + - 47.1.37 Moved ForgeHooksClient.onCreativeModeTabBuildContents to ForgeHooks to fix #9662 + - 47.1.36 Fix tag removal functionality that broke during the 1.19 update. Closes #9053 and #8949 + - 47.1.35 Replace string with forge tag in vanilla recipes. Closes #9062 + - 47.1.34 Fix new brain hooks not persisting active activities. + - 47.1.33 Fix breaking overlay flickering on campfires by using vanilla method to calculate block normals. (#9664) + - 47.1.32 Cleanup usages of static imports and build script so that our build doesn't spam useless error like messages. + So that it is easier to see real errors. + Add compatibility checking to standard testing tasks. + - 47.1.31 Added Action value to PlayerInteractEvent.LeftClickEvent to expose what action fired the event. #9175 + - 47.1.30 Fix parameter names in IForgeDimensionSpecialEffects.adjustLightmapColors to better describe what they are. (#9656) + - 47.1.29 Re-add EntityEvent.Size methods to maintain bincompat + - 47.1.28 Added LivingMakeBrainEvent, to allow a consistent way for modders to manipulate entity Brains. #9292 + - 47.1.27 Add LivingSwapHandItemsEvent + - 47.1.26 Fixed FluidUtil#tryFillContainer returning invalid result when simulating #9358 + - 47.1.25 Re-add in-game mod menu (#9652) + - 47.1.24 Fix Entity eye height for multipart entities. + - 47.1.23 Fix conflicting keybindings not having the correct click count set. #9360 + - 47.1.22 Fix the Emissive Rendering for Experimental Light Pipeline (#9651) + - 47.1.21 Fixed AdvancementsScreen.java.patch buttons not rendering (#9649) + - 47.1.20 Properly Handle Fluid Updates while in a Boat #9428 + - 47.1.19 New hook in IClientBlockExtensions to handle enabling tinting on breaking particles. #9446 + - 47.1.18 Fix invalid index when ticking itemstacks in a player nventory by adding a new onInventoryTick event. Closes #9453 + - 47.1.17 Make the FireworkShapes enum extensible (Closes #9486) + - 47.1.16 Add `EmptyEnergyStorage` (#9487) + - 47.1.15 Support IPv6 address compression for logged IPs + - 47.1.14 Make item name rendering and status bar rendering respect additional gui overlays being rendered by mods (#9648) + - 47.1.13 Fix EyeHeight event being fired twice (#9647) + - 47.1.12 Add PlayerSpawnPhantomsEvent, utilized to block or forcefully allow PhantomSpawner to spawn phantoms (#9644) + - 47.1.11 Fix creative mode screen not correctly using CreativeModeTab::getTabsImage (#9627) + - 47.1.10 Add option to advertise dedicated servers to LAN. + - 47.1.9 Fix entity eye height loop. + - 47.1.8 Particle Description Data Provider. + - 47.1.7 Add LivingBreatheEvent and LivingDrownEvent (#9525) + - 47.1.6 Fix entity size event not being fired, changed it to split eye height and size calculations. (#9535) + - 47.1.5 AlterGroundEvent for modifying block placement performed by AlterGroundDecorator (#9637) + - 47.1.4 Change ProjectileHitEvent to return a result instead of being cancelable. Closes #9642 + - 47.1.3 Replace static import with regular one to fix S2S and non-official mappings. (#9633) + - 47.1.2 Add missing null check for TagsProvider#existingFileHelper (#9638) + - 47.1.1 Add GuiGraphics helpers for blitNineSliced and blitRepeating that support specifying a custom texture size (#9641) + - 47.1.0 1.20.1 Recommended Build + +47.0 +==== + - 47.0.50 Fix FMLOnly loading. Closes #9609 + - 47.0.49 Improve logging for server connections (#9618) + - 47.0.48 Fix placing fluids into waterlogged blocks with FluidUtil::tryPlaceFluid. To behave more like vanilla MC-127110 (#9586) + - 47.0.47 Expose loaded RegistryAccess through AddReloadListenerEvent (#9613) + - 47.0.46 Fix GLM applying to entities when killed. Closes #9551 + - 47.0.45 Add unordered creative tabs after vanilla and perform a second level sorting of tabs by registry name to ensure tabs are ordered the same between game restarts (#9612) + - 47.0.44 Fix Early Loading window FPS snafu where it could spam (#9619) + unlimited screen updates. Probably a good way to gently toast an ancient laptop. + - 47.0.43 Make overloads consistent for defineListAllowEmpty in ForgeConfigSpec.Builder (#9604) + - 47.0.42 Moved GameShuttingDownEvent hook to DedicatedServer class. Fixes #9601 + - 47.0.41 Fix PitcherCropBlock not calling canSustainPlant, not allowing it to be placed on custom farmland. Close #9611 + - 47.0.40 Add null check to NetworkHooks.openScreen. Closes #9597 + - 47.0.39 Fix ShieldBlockEvent not correctly performing damaged functions when not all damage is blocked. (#9615) + - 47.0.38 Add IP address to client disconnect message. Closes #9603 + - 47.0.37 Fix hotbar items not dimming when sleeping in bed. Closes #9616 + - 47.0.36 Bump Eventbus to address NullPointerException when classloading things on some threads. Closes #9570 + - 47.0.35 Try and be a bit nicer about handling bad [feature] definitions (#9606) + * Try and be a bit nicer about handling bad [feature] definitions - they're single square bracket defined and require strings for feature bound values. + * Some more tweaks to the feature system to output useful and well formatted error messages when bounds fail. Requires SPI 7.0.1 and the language string "fml.modloading.feature.missing" has changed. + * Use immutable lists where possible and generally tidy things a bit + - 47.0.34 [HotFix]: Somehow not caught by CI, but there was an issue in the SpawnUtils to handle. + - 47.0.33 Remove amount from FluidStack hashCode to fix the equal/hashCode java contract (#9602) + - 47.0.32 Add example usage for configs to the MDK (#9596) + Demonstrates proper usage of different config value types, validation, transformation/parsing, load/reload handling and direct field access. + - 47.0.31 Demonstrate configureEach in run configs (#9594) + - 47.0.30 Reduce verbosity of prepareRuns doc in MDK (#9593) + - 47.0.29 Lazily configure MDK tasks, improve IDE support (#9592) + - 47.0.28 Fix not dropping xp for player sourced explosions and various other cases when xp should drop (#9588) + - 47.0.27 add item handler capability to chiseled bookshelf (#9587) + - 47.0.26 Fix ignoring maxUpStep method overrides on entities (#9583) + - 47.0.25 Add missing damage type tag provider modid, existing file helper constructor overload (#9581) + - 47.0.24 Expose holder lookup registry provider as a helper in RegistriesDatapackGenerator (#9580) + - 47.0.23 Fix gametest collection causing secondary crash in loading error state (#9568) + - 47.0.22 Fix SpriteCoordinateExpander not working with chained methods (MC-263524) (#9564) + - 47.0.21 Expose EntityRendererProvider.Context to AddLayers event (#9562) + - 47.0.20 [1.20] Add events for checking spawn conditions (SpawnPlacementCheck and PositionCheck) (#9469) + - 47.0.19 Another tweak to the early display. We start a timer process while we create the window, in case it hangs. Also add a skip version config, to try and help in cases where the driver is stupid. (#9595) + - 47.0.18 Auto generate names for modded loot pools. Fixes #9589 (#9591) + - 47.0.17 More tweaks to the mod loading callbacks to make loading bars work better (#9585) + - 47.0.16 Reimplement LootPool name patches and hooks (#9573) + - 47.0.15 Fix experimental lighting pipeline breaking vanilla's emissive rendering. Closes #9552 (#9582) + - 47.0.14 Update early loading default configs to match standard expectations. (#9577) + Also allow a global override env variable for darkmode always. "FML_EARLY_WINDOW_DARK" + - 47.0.13 Add proper duplicate mod error message that includes the mod id(s) and mod files. (#9474) + - 47.0.12 Add missing stack tooltip rendering hooks (#9533) + Fix automatic tooltip wrapping discarding empty lines used as spacers + - 47.0.11 Add piston push reaction overrides to Block class (#9538) + - 47.0.10 Fix missing calls to level-sensitive block SoundType getter (#9553) + - 47.0.9 Fix forge registries that have wrappers/support tags not being in the HolderLookup Provider that is provided to the GatherDataEvent (#9566) + - 47.0.8 Make IItemDecorator a functional interface again. Fixes #9563 (#9574) + - 47.0.7 Make 1.20.x the main TC branch. + - 47.0.6 Fix custom geometry in parent models not being resolved (#9572) + - 47.0.5 Make the scheduled thread factory setDaemon on it's threads. Should allow things to close properly if something deadly happens early on. (#9575) + - 47.0.4 This is an early display window system for forge. (#9558) + - 47.0.3 fix the JIJ break by bumping SJH. apologies. + - 47.0.2 update libs (#9565) + - 47.0.1 Update Armor Layer Implementation to Match Vanilla (#9547) + - 47.0.0 1.20.1 Update + +46.0 +==== + - 46.0.14 Fix JAR compatibility checks for 1.20 (#9556) + - 46.0.13 [1.20] Add `AFTER_LEVEL` render level stage (#9555) + - 46.0.12 Reorder overlay layers to match vanilla (#9550) + - 46.0.11 Re-implement missing level-sensitive block light hook in ChunkAccess (#9536) + - 46.0.10 Fix issues in the deserialization of empty ingredients (#9537) + - 46.0.9 Fix wrong variable passed into EnchantmentClue lookup Fixes #9543 (#9544) + - 46.0.8 Fix incorrect depth test state in debug graph rendering Fixes #9534 (#9539) + - 46.0.7 Fix initCapabilities patch location in ServerLevel Fixes #9526 (#9531) + - 46.0.6 Use Spinning Effect Intensity instead of Partial Tick for Portal Overlay Fixes #9529 (#9530) + - 46.0.5 Fix getArmorModelHook patch, Fixex #9523 (#9528) + - 46.0.4 Fix duplicate Map writes in PlayerList patch. (#9521) + - 46.0.3 Fix Forge Version including MC version in MDK. + - 46.0.2 Fix patch in light propagation (#9532) + - 46.0.1 Attempt to fix jar signing + Gradle 8 is stupid and doesn't (easily) allow in-place tasks, so a temporary fix has been made in ForgeGradle 6 + - 46.0.0 Forge 1.20 + - Creative mode tabs are now a registry; the `BuildContents` event was renamed to `BuildCreativeModeTabContentsEvent` and moved it to its own class + - The pack format is now 15 for both resource packs and data packs + - `ScreenUtils` was deprecated in favor of a `GuiGraphics` extension + - Forge and the MDK were updated to Gradle 8 and FG6 + - The Forge common config file was removed (it only contained the deprecated old fields for resource caching, which was removed in 1.19.3) + - Registry dummy entries were removed + - `RemappingVertexPipeline` was fixed to forward the `endVertex()` call + - Forge tool tags were removed in favor of vanilla ones + Co-authored-by: ChampionAsh5357 + Co-authored-by: coehlrich + Co-authored-by: Dennis C <11262040+XFactHD@users.noreply.github.com> + Co-authored-by: Matyrobbrt + +45.1 +==== + - 45.1.0 1.19.4 Recommended Build + +45.0 +==== + - 45.0.66 Add method to GatherDataEvent to obtain collection of all input paths. (#9499) + - 45.0.65 Log error when Sheets is class-loaded before registration is completed (#9475) + - 45.0.64 [1.19.x] Re-implement RenderTooltipEvent.Color (#9497) + * Reimplement RenderTooltipEvent.Color + * Formatting, comments, EXC + * Deprecate instead of replacing + - 45.0.63 Add API for registering custom world preset editors (#9436) + - 45.0.62 Remove unneeded extra reload of datapacks on world creation screen (#9454) + - 45.0.61 Bump ASM to 9.5 + - 45.0.60 Fix crash when running server from root directory + Fixes #9498 + - 45.0.59 Fix root transform matrix format, allow using all four root transform formats (#9496) + - 45.0.58 Add missing AT lines to allow registering custom game rule boolean/integer types (#9489) + - 45.0.57 [1.19.x] Fix SaplingGrowTreeEvent#setFeature being ignored in FungusBlock (#9485) + Co-authored-by: Brennan Ward <3682588+Shadows-of-Fire@users.noreply.github.com> + - 45.0.56 Restore AccessibilityOnboardingScreen + Fixes #9488 + - 45.0.55 Update documentation on FinalizeSpawn (#9467) + - 45.0.54 Fix fluids without sound event causing exception in tryFillContainer and tryEmptyContainer (#9445) + - 45.0.53 Make FakePlayerFactory respect the given ServerLevel (#9479) + - 45.0.52 Collect and log exceptions occurring in DeferredWorkQueue tasks (#9449) + - 45.0.51 Fix `NamespacedWrapper#wrapAsHolder` (#9450) + - 45.0.50 Fixes ChatScreen calling .setScreen (#9443) + Fix test compile failures also. + - 45.0.49 Determine the Forge version the PR was built against when running PR compat checks (#9374) + - 45.0.48 Add buildscript test to error on deprecated members that should of been removed. (#9460) + - 45.0.47 Remove erroneous brace patch in Inventory (#9462) + Fixes #9459 + - 45.0.46 [1.19.4] Move root transform builder to ModelBuilder to allow use in ItemModelBuilder (#9456) + - 45.0.45 Fix forge grindstone hooks allowing stacks of non-stackable items (#9457) + - 45.0.44 [1.19.4] Fix FMLOnly (#9415) + - 45.0.43 Fix ItemLayerModel erroneously adding particle texture to layer texture list (#9441) + - 45.0.42 Temporary fix for Canceling ProjectileImpactEvents of Piercing ammo. + Event needs to be re-worked to have finer control. #9370 + - 45.0.41 Fix dummy air blocks not being marked as air (#9440) + - 45.0.40 Add support for splitting the login packet (#9367) + It contains full copies of data registries and can easily surpass vanilla's limits + - 45.0.39 Remove Attack Range and Reach Distance and add Block Reach and Entity Reach (#9361) + - 45.0.38 Add default bucket sounds for milk (#9432) + - 45.0.37 Deprecate Item.onUsingTick, as vanilla provides the same function in Item.onUseTick now. Closes #9342 + - 45.0.36 Fix ScreenEvent.Init.[Pre/Post] not working correctly (#9431) + - 45.0.35 Allow FenceGateBlock to be used without a WoodType. Closes #9392 + - 45.0.34 Deprecate duplicate tool tags that vanilla added in 1.19.4 + We will maintain a seperate 'tools' tag until Mojang adds all relevent tool tags. + Closes #9393 + - 45.0.33 Fix BlockEvent.Break not using ItemStack enchantment hooks. + - 45.0.32 Move Block.onCatchFire to above block removal to allow usage of BlockEntity data. Closes #9400 + - 45.0.31 Fix FinalizeSpawn not blocking spawns during worldgen (#9420) + - 45.0.30 Fixed issue with MutableHashedLinkedMap when removing multiple sequential entries in the middle of the map. + Added Unit tests for MutableHashLinkedMap + Added support for removing using the iterator + Added concurrent modification detection to the iterator + Added default constructor with basic hashing strategy. + Closes #9426 + - 45.0.29 Loosen access for BucketItem's canBlockContainFluid (#9421) + - 45.0.28 Update and Regenerate Datapacks (#9419) + Add generation for pack.mcmeta + - 45.0.27 Restore ability to change message in ClientChatEvent (#9377) + - 45.0.26 Remove duplicate line in FoodData patch (#9424) + The line was accidentally duplicated in the 1.19.4 update and patching + process. + Fixes #9422 + - 45.0.25 Rename RegisterParticleProviderEvent's register methods to describe what kind of particle providers they register (deprecating old methods to avoid breaking) and minor docs tweaks (#9388) + - 45.0.24 Update pack versions (#9414) + - 45.0.23 [1.19.4] Revamp and fix spawn events (#9133) + - 45.0.22 [1.19.4] Replace blitOffset parameter with PoseStack in IItemDecorator (#9409) + * Replace blitOffset with PoseStack in IItemDecorator + * Circumvent breaking changes + * Fix blitOffset type + - 45.0.21 Fix JSON model root transforms (#9410) + - 45.0.20 Fix tossed items not being able to be picked up by other players. Closes #9412 (#9404) + - 45.0.19 Fix infinite BE render bounds failing frustum intersection test. Closes #9321 (#9407) + - 45.0.18 Make ForgeSlider use the new vanilla texture (#9406) + - 45.0.17 Add BlockSetType#register to accesstransformer.cfg (#9386) + - 45.0.16 Add option to completely hide a crash-callable depending on a runtime value (#9372) + - 45.0.15 Add isNewChunk to ChunkEvent.Load (#9369) + - 45.0.14 Remove DistExecutor calls in PistonEventTest (#9348) + - 45.0.13 Fix hardcoded precipitation in ClimateSettingsBuilder (#9402) + This effectively caused all biomes to have precipitation, such as + minecraft:desert. + Fixes #9397 + - 45.0.12 Fix incorrect variable used for swimming check (#9403) + Because of the incorrect variable, the check to stop sprinting (and stop + swimming) never fired correctly. + 1.19.3's `flag5` variable was renamed to `flag7` in 1.19.4; however, + this was not caught during patching because of the fuzzy patcher. + Fixes #9399 + - 45.0.11 Fix incorrect boolean used for glint effect (#9401) + The `flag1` variable is ultimately controlled by whether the armor slot + being rendered is for the leggings, which explains this bug where the + leggings always had the enchantment glint but not any other armor piece. + Fixes #9394 + - 45.0.10 Fixed ModMismatchDisconnectedScreen displaying missing mods wrongly (#9398) + - 45.0.9 Fix misaligned text render type patch (#9391) + - 45.0.8 Remove thread filter from processing clientside custom payloads. Closes @9390 + - 45.0.7 Fix LivingEntity patch which caused crash while entities got hurt. Closes #9389 + - 45.0.6 Fix wrong parameters in `Screen#renderTooltipInternal` patch (#9387) + - 45.0.5 Fix misaligned patch in LevelRenderer. Closes #9385 + - 45.0.4 Remove our fix for MC-121048 as it has been fixed by Vanilla (#9381) + - 45.0.3 Fix advancements not loading, bug seems to be fixed by vanilla now. Closes #9384 + - 45.0.2 Fixed patch verifier for cases where patches lowered access levels. Closes #9383 + - 45.0.1 Fix crouching while sprinting stopping the player when step height is modified. Closes #9376 + - 45.0.0 Forge 1.19.4 + Properly move `ServerStatusPing` to codec + Reimplement custom display contexts + Co-authored-by: Matyrobbrt + Co-authored-by: coehlrich + +44.1 +==== + - 44.1.23 Fix experimental world warning screen appearing everytime (#9375) + - 44.1.22 Fix continuing to use items after dropping or when a shield breaks (MC-231097, MC-168573) (#9344) + - 44.1.21 Add onStopUsing hook to IForgeItem (#9343) + - 44.1.20 Document RegisterParticleProvidersEvent's APIs (#9346) + - 44.1.19 Fix incorrect ListTag.getLongArray result (MC-260378) (#9351) + - 44.1.18 Fix missing patch that left TagBuilder#replace unused (#9354) + - 44.1.17 Add 2 new RenderLevelStageEvent.Stage for After Entities and After Block Entities (#9259) + - 44.1.16 Cleanup StemBlock Patch (#9337) + - 44.1.15 Cleanup ItemProperties patch (#9332) + - 44.1.14 Make IForgeIntrinsicHolderTagAppender methods properly chainable (#9331) + - 44.1.13 Fix in custom fluids not respecting max height correctly. (#9319) + - 44.1.12 Fix inconsistent vaporization in BucketItem & FluidType (#9269) + - 44.1.11 Fix reloading event firing during server shutdown and add explicit unloading event instead (#9016) + - 44.1.10 Homogenize and/or holdersets when serializing to prevent serializing to NBT from crashing (#9048) Fixes #9043 + - 44.1.9 [1.19.x] Fix `ForgeSlider` not respecting custom height (#9237) + - 44.1.8 Fix stepsound for blocks in the inside_step_sound_blocks tag. (#9318) + - 44.1.7 Fix missing hanging sign material for modded wood type (#9303) + - 44.1.6 Fire TickEvent.LevelTickEvent on ClientLevel tick (#9299) + - 44.1.5 Add ClientChatReceivedEvent for system messages (#9284) + - 44.1.4 PR Action update (#9274) + - 44.1.3 fix HangingSignEditScreen crash when using custom wood types using modid (#9294) + - 44.1.2 Bump SecureJarHandler version, to help identify invalid mods. + - 44.1.1 [1.19.3] Hotfix missing null check in createUnbakedItemElements (#9285) + - 44.1.0 Mark 1.19.3 Recommended Build + +44.0 +==== + - 44.0.49 [1.19.3] Allow Item and Elements models to specify static color, sky light, and block light values. (#9106) + - 44.0.48 Fix StemBlock not checking canSustainPlant for the correct block, it now checks for Melons/Pumpkins instead of the stem itself. (#9270) + - 44.0.47 Add github shared actions for automation purposes. (#9251) + - 44.0.46 Add translate key for Forge pack.mcmeta description (#9260) + - 44.0.45 Fix broken link for update checker docs in mdk (#9271) + - 44.0.44 Remove duplicate updateNeighbourForOutputSignal call Fixes #9169 (#9234) + - 44.0.43 Add helper methods to access the set of loaded sprite locations (#9223) + - 44.0.42 Disable guiLight3d for generated item models (#9230) + - 44.0.41 Remove resource caching (#9254) + - 44.0.40 Add TradeWithVillagerEvent (#9244) + - 44.0.39 Update link for Parchment "Getting Started" (#9243) + - 44.0.38 Allows DatapackBuiltinEntriesProvider to datagen LevelStems (#9247) + - 44.0.37 Add a method to LootContext.Builder that allows changing the queried loot table id (#9084) + - 44.0.36 [1.19.3] Fix Datagen Tests and Providers (#9212) + - 44.0.35 Fix concrete powder not being hydrated by singular water sources (#9236) + - 44.0.34 [1.19.3] Fix LootTableLoadEvent not getting fired (#9239) + - 44.0.33 Allow using custom factories in button builders (#9238) + - 44.0.32 Fix logspam when a root resource is requested from DelegatingPackResources, fixes #9197 (#9227) + - 44.0.31 [1.19.3] Fix `retrieveRegistryLookup` attempting to get the registry lookup from a `HolderGetter` (#9225) + - 44.0.30 [1.19.3] Add ability to datagen forge specific values in pack.mcmeta (#9221) + Co-authored-by: sciwhiz12 + - 44.0.29 Add block atlas config to register forge:white texture (#9187) + - 44.0.28 Fix ExtendedButton not being highlighted when focused (#9144) + - 44.0.27 Separate checkAndFix from the check* tasks. (#9213) + - 44.0.26 Fix forge resources overriding vanilla ones (#9222) + - 44.0.25 Fix tooltip customization not working for creative inventory (#9218) + - 44.0.24 Fix glowing item frame entity's texture (#9126) + Fixes #9123 + - 44.0.23 Fix datapack registries not being synced to clients (#9219) + - 44.0.22 Fix creatives tabs rendering overlapping tabs if the selected tab isn't on the current page. (#9214) + - 44.0.21 Fix `SidedInvWrapper` not accounting for vanilla stacking special cases in brewing stands and furnaces (#9189) + - 44.0.20 Update to the latest JarJar. (#9217) + - 44.0.19 Specify NetworkHooks#getEntitySpawningPacket Generic Return Type (#9220) + - 44.0.18 Fix using a DeferredRegister on a non-forge wrapped registry. Closes #9199 + - 44.0.17 Add support for custom CreativeModeTab implementations (#9210) + - 44.0.16 Simplify tree grower patches (#9209) + - 44.0.15 Replace AdvancementProvider patch with Forge helper (#9188) + - 44.0.14 Allow using `PackOutput`s in Forge-added datagen classes (#9182) + - 44.0.13 Add simpleBlockWithItem for data gens (#9170) + - 44.0.12 Fix running test mods (#9211) + - 44.0.11 [1.19.3] Fix models nested in custom geometries not resolving parents (#9200) + - 44.0.10 Fix OBJ Loader caches not being thread-safe. (#9204) + - 44.0.9 [1.19.3] Add event before baked models are cached by the BlockModelShaper (#9190) + - 44.0.8 Fix compatibility checker task configuration (#9202) + - 44.0.7 Fix chat offset (#9184) + - 44.0.6 Redesign CreativeTab collection event to be a lot more straight forward. (#9198) + - 44.0.5 Move ICondition patch placement to before MC throws an error. + Disable the explicitly erroring test biome modifier. + - 44.0.4 Fix BlockStateProvider not waiting for models before finishing. (#9196) Fixes #9195: + - 44.0.3 Fix tooltips not rendering on screens. Closes #9191 + - 44.0.2 Fix merged mod resource pack not returning all resources with the same name when asked. Closes #9194 + - 44.0.1 Fix searching using the wrong prefix for items or tags. Fixes #9176 Fixes #9179 (#9177) + - 44.0.0 Forge 1.19.3 + Created a CreativeModeTabEvent to register creative mode tabs and populate entries per tab + Moved datapack registries to DataPackRegistryEvent.NewRegistry event instead of tying them to ForgeRegistry + Made it easier for mods to datagen datapack builtin entries with DatapackBuiltinEntriesProvider + Provided access to lookupProvider for datagen + Updated dependencies to match versions used by vanilla and update JarJar to 0.3.18 + Added a test mod for the new CreativeModeTabEvent + Throws better error message for Forge registries in tag datagen + Deleted ForgeRegistryTagsProvider + Updated ClientChatReceivedEvent and ServerChatEvent for Mojang changes + Added patches for both sign related methods in ModelLayers + Changed RegisterShadersEvent to use ResourceProvider + Migrated old Mojang math types to JOML + Co-authored-by: Marc Hermans + Co-authored-by: LexManos + Co-authored-by: sciwhiz12 + Co-authored-by: coehlrich + +43.2 +==== + - 43.2.0 43.2 Recommended Build. + +43.1 +==== + - 43.1.65 Allow discovering services from the mods folder that use java's modular definition. (#9143) + - 43.1.64 Make Datapack Registries support ICondition(s) (#9113) + - 43.1.63 Enable additional build types to handle pull request validation. (#9159) + - 43.1.62 Check source permission level before selector permission (#9147) + In some situations, such as execution of a function by an advancement as + part of its reward, a command source stack may have a backing source of + a ServerPlayer which may lack the entity selector permission and have an + explicit permission level that should allow the use of entity selectors, + through CommandSourceStack#withPermission. + We now check if the permission level of the command source stack is + sufficient for entity selectors _before_ checking if the source is a + player and if they have the requisite permission. + This means that an operator permission level of 2 will always override + the Forge entity selector permission. + Fixes #9137 + - 43.1.61 Fix fires spreading too/igniting custom portal frames. (#9142) + - 43.1.60 Add supplier to FlowerBlock so it works with custom MobEffects (#9139) + - 43.1.59 Fix some logical bugs related to the Grindstone Event (#9089) + - 43.1.58 Call baked model's `getModelData` before `getRenderTypes` (#9163) + - 43.1.57 Make Util.memoize thread-safe (#9155) + - 43.1.56 Rendering tweaks and fixes: Part 4 (#9065) + - 43.1.55 Fix `Transformation` loading `PoseStack` (#9083) + - 43.1.54 Add simple block appearance API (#9066) + - 43.1.53 Fix invalidated modded packets when on LAN (#9157) + - 43.1.52 Improve extensibility of DetectorRailBlock and PoweredRailBlock (#9130) + - 43.1.51 Fix launch handler minecraft classpath locator (#9120) + - 43.1.50 Add HitResult to `EntityTeleportEvent$EnderPearl` (#9135) + - 43.1.49 Throw aggregate exception for erroneous registry event dispatch (#9111) + This means that exceptions occurring during the dispatch of the registry + events, such as those from the suppliers of RegistryObjects, properly + cause a crash rather than merely being logged and allowing the game to + reach the main menu. + Fixes #8720 + - 43.1.48 Add missing semi-colon near the Dist import statement in example mod. + - 43.1.47 Fix ClientModEvents example not subscribing to client-sided events (#9097) + - 43.1.46 Use GitHub action to lock issues with the `spam` label (#9087) + - 43.1.45 Remove structures slave map to Feature registry (#9091) + - 43.1.44 Improve logging of missing or unsupported dependencies (#9104) + - 43.1.43 [1.19.x] Fix ValueSpec caching the return value incorrectly (#9046) + - 43.1.42 [1.19.x] Add event for registering spawn placements, and modifying existing (#9024) + - 43.1.41 [1.19.x] Add event for items being stacked or swapped in a GUI. (#9050) + - 43.1.40 [1.19.x] Fix PlayerInteractEvent.EntityInteractSpecific not cancelling on a server (#9079) + - 43.1.39 Fix canceling phantom spawns preventing any further attempts that tick. (#9041) + - 43.1.38 Rename fluid type milk translation keys (#9077) + - 43.1.37 Fix minecart speed with water (#9076) + - 43.1.36 Add a cancellable event that gets fired when a Totem of Undying is used (#9069) + - 43.1.35 Fix performance issue and logging when resource caching is enabled (#9029) + - 43.1.34 Fix NPE when feeding wolves and cats (#9074) + - 43.1.33 Fix logically breaking change to ForgeConfigSpec.Builder#comment where modders could not add a empty line to the start of comments. (#9061) + - 43.1.32 Fix ServiceLoader bug + - 43.1.31 Fix ClientChatReceivedEvent for system messages + - 43.1.30 Make ForgeConfigSpec$Builder.comment able to be called multiple times for the same entry. (#9056) + - 43.1.29 Fix control modifier for mac with `KeyMapping`s using Alt instead of Super (#9057) + - 43.1.28 Fix is_desert tag not being applied correctly. (#9051) + - 43.1.27 Fix mob griefing event for SmallFireballs not using owner entity. (#9038) + - 43.1.26 Fix minecarts on rails not properly slowing down in water (#9033) + - 43.1.25 Change codestyle for BookShelves tag. Closes #9027 + Add IS_CAVE tag Closes #8885 + Add IS_DESERT tag Closes #8979 + Simplify Mangrove Swamp tags Closes #8980 + - 43.1.24 Allow faces of an "elements" model to have disabled ambient occlusion (#9019) + - 43.1.23 [1.19.x] Recipe ID-based grouping between modded and vanilla recipes. (#8876) + - 43.1.22 Update fence_gates/wooden (#8936) + - 43.1.21 [1.19.x] Added event for growing fungus (#8981) + - 43.1.20 Added Bookshelves block tag (#8991) + - 43.1.19 Create a Forge EntityType Tag for Bosses (#9017) + - 43.1.18 Allow mods to specify shader import namespace (#9021) + - 43.1.17 Grindstone Events (#8934) + One to modify the output, and one to modify the input. + - 43.1.16 Fix the serialized names of the enum (#9014) + - 43.1.15 Fix `tryEmptyContainerAndStow` duping fluids with stackable containers (#9004) + - 43.1.14 Add mod mismatch event (#8989) + - 43.1.13 [1.19.x] add methods with more context to tree growers (#8956) + - 43.1.12 [1.19.X] Adding more precise events for Advancements (#8360) + - 43.1.11 Default IItemHandler capability for shulker box itemstacks (#8827) + Co-authored-by: LexManos + - 43.1.10 [1.19] Add hook for items to remain in the hotbar when picking blocks/entities (#8872) + - 43.1.9 [1.19.x] Block Model Builder Root Transform Support (#8860) + Co-authored-by: sciwhiz12 + - 43.1.8 [1.19.x] Make LivingSetAttackTargetEvent compatible with the Brain/Behavior system. (Port of PR #8918) (#8954) + - 43.1.7 [1.19.x] Add IForgeBlock#onTreeGrow to replace IForgeBlock#onPlantGrow from 1.16 (#8999) + - 43.1.6 [1.19.x] Moved Player.resetAttackStrengthTicker() to the end of Player.attack() (#9000) + - 43.1.5 fix misplaced patch in sapling block (#9005) + - 43.1.4 Fix failed entity interactions consuming the click. (#9007) + - 43.1.3 Fix entity selector permission check to check original source (#8995) + Permission checks should be against the command source and not the + target entity, as is done in vanilla. + Fixes #8994 + - 43.1.2 Hotfix for 1.19.2 item animation bug (#8987) + * [HOT FIX]: Fixes #8985 by no-oping for vanilla models instead of throwing error + - 43.1.1 Add ability to Auto register capabilities via annotation (#8972) + - 43.1.0 1.19.2 RB + +43.0 +==== + - 43.0.22 Added ItemDecorator API (#8794) + - 43.0.21 [1.19.x] Custom usage animations for items (#8932) + - 43.0.20 Allow registering custom `ColorResolver`s (#8880) + - 43.0.19 [1.19] Allow custom outline rendering on EntityRenderers and BlockEntityRenderers (#8938) + - 43.0.18 Redirect checks for entity selector use to a permission (#8947) + This allows greater flexibility for configuring servers with + operator-like permissions to user groups through the permissions API and + their permissions handler of choice without needing to grant the + vanilla operator permission to any player. + The new permission is "forge:use_entity_selectors", which is granted by + default to players with permission level 2 (GAMEMASTERS) and above. + The hook falls back to checking the permission level if the source of + the command is not a ServerPlayer, such as for command blocks and + functions. + - 43.0.17 Allow FakePlayer to report its position (#8963) + - 43.0.16 Add alternate version of renderEntityInInventory to allow for directly specifying the angles (#8961) + - 43.0.15 Add cancellable ToastAddEvent (#8952) + - 43.0.14 Modify ScreenEvent.RenderInventoryMobEffects to allow moving the effect stack left or right (#8951) + - 43.0.13 Fix Enchantment#doPostHurt and Enchantment#doPostAttack being called twice for players. Fixes MC-248272 (#8948) + - 43.0.12 Remove reflective implementation of ICustomPacket. (#8973) + Make vanilla custom packets able to be sent multiple times. Closes #8969 + - 43.0.11 Filter name spaces to directories only. Closes #8413 + - 43.0.10 Fix a corner case where the UMLB can not extract a version from a library. (#8967) + - 43.0.9 Fix worlds with removed dimension types unable to load. (#8959) Closes #8800 + - 43.0.8 Fix issue where unknown chunk generators would cause DFU to fail. (#8957) + - 43.0.7 Fix comments and documentation that were missed during the review of #8712 (#8945) + - 43.0.6 Make AnvilUpdateEvent fire even if the second input is empty, which means it fires even if only changing the item name. (#8905) + - 43.0.5 Fix `LivingEntity#isBlocking` to use `ToolActions#SHIELD_BLOCK` instead of `UseAnim#BLOCK` (#8933) + - 43.0.4 Add Custom HolderSet Types allowing for logical combining of sets. (#8928) + - 43.0.3 Add values to VersionSupportMatrix to support loading mods that restrict versions to 1.19.1 on 1.19.2 (#8946) + - 43.0.2 Fix certain particles not updating their bounding box when their position changes (#8925) + - 43.0.1 Update EventBus to address concurrency issue in ModLauncher Factory. Closes #8924 + - 43.0.0 1.19.2 + +42.0 +==== + - 42.0.9 Remove calls to getStepHeight in Player#maybeBackOffFromEdge (#8927) + - 42.0.8 Add forge tags for tools and armors, these DO NOT replace ToolActions, and are designed just for Recipes. (#8914) + - 42.0.7 Add Biomes.BEACH to Tags (#8892) + - 42.0.6 Let NetworkInstance.isRemotePresent check minecraft:register for channel IDs. (#8921) + - 42.0.5 Add an event for when the chunk ticket level is updated (#8909) + - 42.0.4 Re-add PotentialSpawns event (#8712) + - 42.0.3 Fix misplaced patch in ItemEntityRenderer breaking ItemEntityRenderer#shouldBob() (#8919) + - 42.0.2 [1.19] [HotFix] Fix the dedicated server not having access to the JiJ filesystems. (#8931) + - 42.0.1 Match Mojang's action bar fix for MC-72687 (#8917) + - 42.0.0 Forge 1.19.1 + Load natives from classpath + Make command argument types a forge registry + Add `EntityMobGriefingEvent` to `Allay#wantsToPickUp` + Overhaul `ServerChatEvent` to use `ChatDecorator` system + Remove `ClientChatEvent#setMessage` for now + Gradle 7.5 + +41.1 +==== + - 41.1.0 Mark 1.19 RB + +41.0 +==== + - 41.0.113 Allow faces of an "elements" model to be made emissive (#8890) + - 41.0.112 Fix invalid channel names sent from the server causing the network thread to error. (#8902) + - 41.0.111 Fix PlayerEvent.BreakSpeed using magic block position to signify invalid position. Closes #8906 + - 41.0.110 Fix cases where URIs would not work properly with JarInJar (#8900) + - 41.0.109 Add new hook to allow modification of lightmap via Dimension special effects (#8863) + - 41.0.108 Fix Forge's packet handling on play messages. (#8875) + - 41.0.107 Add API for tab list header/footer (#8803) + - 41.0.106 Allow modded blocks overriding canStickTo prevent sticking to vanilla blocks/other modded blocks (#8837) + - 41.0.105 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 3 (#8864) + Fix weighted baked models not respecting children render types + Allow fluid container model to use base texture as particle + Fix inverted behavior in composite model building. Fixes #8871 + - 41.0.104 Fix crossbows not firing ArrowLooseEvent (#8887) + - 41.0.103 Add User-Agent header to requests made by the update checker (#8881) + Format: Java-http-client/ MinecraftForge/ / + - 41.0.102 Output the full path in a crash report so it is easier to find the outer mod when a crash in Jar-In-Jar occurs. (#8856) + - 41.0.101 Clean up the pick item ("middle mouse click") patches (#8870) + - 41.0.100 [1.19.x] Hotfix for test mods while the refactor is ongoing + - 41.0.99 add event to SugarCaneBlock (#8877) + - 41.0.98 Fix Global Loot Modifiers not using Dispatch Codec (#8859) + - 41.0.97 Allow block render types to be set in datagen (#8852) + - 41.0.96 Fix renderBreakingTexture not using the target's model data (#8849) + - 41.0.95 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 2 (#8854) + * Add getter for the component names in an unbaked geometry + * Fix render type hint not being copied in BlockGeometryBakingContext + * Ensure BlockRenderDispatches's renderSingleBlock uses the correct buffer + - 41.0.94 [1.19.x] Apply general renames, A SRG is provided for modders. (#8840) + See https://gist.github.com/SizableShrimp/882a671ff74256d150776da08c89ef72 + - 41.0.93 Fix mob block breaking AI not working correctly when chunk 0,0 is unloaded. Closes #8853 + - 41.0.92 Fix crash when breaking blocks with multipart models and remove caching. Closes #8850 + - 41.0.91 Fixed `CompositeModel.Baked.Builder.build()` passing arguments in the wrong order (#8846) + - 41.0.90 Make cutout mipmaps explicitly opt-in for item/entity rendering (#8845) + * Make cutout mipmaps explicitly opt-in for item/entity rendering + * Default render type domain to "minecraft" in model datagens + - 41.0.89 Fixed multipart block models not using the new model driven render type system. (#8844) + - 41.0.88 Update to the latest JarJar to fix a collision issue where multiple jars could provide an exact match. (#8847) + - 41.0.87 Add FML config to disable DFU optimizations client-side. (#8842) + * Add client-side command line argument to disable DFU optimizations. + * Switch to using FMLConfig value instead. + - 41.0.86 [1.19] Fixed broken BufferBuilder.putBulkData(ByteBuffer) added by Forge (#8819) + * Fixes BufferBuilder.putBulkData(ByteBuffer) + * use nextElementByte + * Fixed merge conflict + - 41.0.85 [1.19.x] Fix shulker boxes allowing input of items, that return false for Item#canFitInsideContainerItems, through hoppers. (#8823) + * Make ShulkerBoxBlockEntity#canPlaceItemThroughFace delegate to Item#canFitInsideContainerItems. + * Switch to using Or and add comment. + * Switch Or to And. + - 41.0.84 [1.19.x] Added RenderLevelStageEvent to replace RenderLevelLastEvent (#8820) + * Ported RenderLevelStageEvent from 1.18.2 + * Updated to fix merge conflicts + - 41.0.83 [1.19.x] Fix door datagenerator (#8821) + * Fix door datagenerator + Fix datagenerator for door blocks. Successor to #8687, addresses comments made there about statement complexity. + * Fix extra space around parameter + Fix extra space before comma around a parameter. + - 41.0.82 Create PieceBeardifierModifier to re-enable piecewise beardifier definitions (#8798) + - 41.0.81 Allow blocks to provide a dynamic MaterialColor for display on maps (#8812) + - 41.0.80 [1.19.x] BiomeTags Fixes/Improvements (#8711) + * dimension specific tag fix + * remove forge:is_beach cause vanilla has it already + * remove forge tags for new 1.19 vanilla tags (savanna, beach, overworld, end) + Co-authored-by: Flemmli97 + - 41.0.79 1.19 - Remove GlobalLootModifierSerializer and move to Codecs (#8721) + * convert GLM serializer class to codec + * cleanup + * GLM list needs to be sorted + * datagen + * simplify serialization + * fix test mods (oops) + * properly use suppliers for codec as they are registry obj + - 41.0.78 Implement item hooks for potions and enchantments (#8718) + * Implement item hooks for potions and enchantments + * code style fixes + - 41.0.77 Re-apply missing patch to ServerLevel.EntityCallbacks#onTrackingEnd() (#8828) + - 41.0.76 Double Bar Rendering fixed (#8806) (#8807) + * Double Bar Rendering fixed (#8806) + * Added requested changes by sciwhiz12 + - 41.0.75 Multiple tweaks and fixes to the recent changes in the client refactor PR (#8836) + * Add an easy way to get the NamedGuiOverlay from a vanilla overlay + * Fix static member ordering crash in UnitTextureAtlasSprite + * Allow boss bar rendering to be cancelled + * Make fluid container datagen use the new name + - 41.0.74 Add FogMode to ViewportEvent.RenderFog (#8825) + - 41.0.73 Provide additional context to the getFieldOfView event (#8830) + - 41.0.72 Pass renderType to IForgeBakedModel.useAmbientOcclusion (#8834) + - 41.0.71 Load custom ITransformationServices from the classpath in dev (#8818) + * Add a classpath transformer discoverer to load custom transformation services from the classpath + * Update ClasspathTransformerDiscoverer to 1.18 + * Update license year + * Update license header + * Fix the other license headers + * Update ClasspathTransformerDiscoverer to 1.19 + - 41.0.70 Handle modded packets on the network thread (#8703) + * Handle modded packets on the network thread + - On the server we simply need to remove the call to + ensureRunningOnSameThread. + - On the client side, we now handle the packet at the very start of the + call. We make sure we're running from a network thread to prevent + calling the handling code twice. + While this does mean we no longer call .release(), in practice this + doesn't cause any leaks as ClientboundCustomPayloadPacket releases + for us. + * Clarify behaviour a little in the documentation + * Javadoc formatting + * Add a helper method for handling packets on the main thread + Also rename the network thread one. Should make it clearer the expected + behaviour of the two, and make it clearer there's a potentially breaking + change. + * Add back consumer() methods + Also document EventNetworkChannel, to clarify the thread behaviour + there. + * Add since = "1.19" to deprecated annotations + - 41.0.69 Cache resource listing calls in resource packs (#8829) + * Make the resource lookups cached. + * Include configurability and handle patch cleanup. + * Document and comment the cache manager. + * Make thread selection configurable. + * Implement a configurable loading mechanic that falls back to default behaviour when the config is not bound yet. + * Use boolean supplier and fix wildcard import. + * Clean up the VPR since this is more elegant. + * Clean up the VPR since this is more elegant. + * Address review comments. + * Address more review comments. + * Fix formatting on `getSource` + * Address comments by ichtt + * Adapt to pups requests. + * Stupid idea. + * Attempt this again with a copy on write list. + * Fix a concurrency and loading issue. + * Fix #8813 + Checks if the paths are valid resource paths. + * Move the new methods on vanilla Patch. + - 41.0.68 Update SJH and JIJ + - 41.0.67 Fix #8833 (#8835) + - 41.0.66 Fix backwards fabulous check in SimpleBakedModel (#8832) + Yet another blunder we missed during the review of #8786. + - 41.0.65 Make texture atlas in StandaloneGeometryBakingContext configurable (#8831) + - 41.0.64 [1.19.X] Client code cleanup, updates, and other refactors (#8786) + * Revert "Allow safely registering RenderType predicates at any time (#8685)" + This reverts commit be7275443fd939db9c58bcad47079c3767789ac1. + * Renderable API refactors + - Rename "render values" to "context" + - Rename SimpleRenderable to CompositeRenderable to better reflect its use + - Remove IMultipartRenderValues since it doesn't have any real use + - Add extensive customization options to BakedModelRenderable + * ClientRegistry and MinecraftForgeClient refactors + - Add sprite loader manager and registration event + - Add spectator shader manager and registration event + - Add client tooltip factory manager and registration event + - Add recipe book manager and registration event + - Add key mapping registration event + - Remove ClientRegistry, as everything has been moved out of it + - Remove registration methods from MinecraftForgeClient, as they have dedicated events now + * Dimension special effects refactors + - Fold handlers into an extension class and remove public mutable fields + - Add dimension special effects manager and registration event + * HUD overlay refactors + - Rename to IGuiOverlay match vanilla (instead of Ingame) + - Add overlay manager and registration event + - Move vanilla overlays to a standalone enum + * Model loader refactors + - Rename IModelLoader to IGeometryLoader + - Add loader manager and registration event + - Fold all model events into one + - Move registration of additionally loaded models to an event + - Remove ForgeModelBakery and related classes as they served no purpose anymore + * Render properties refactors + - Rename all render properties to client extensions and relocate accordingly + - Move lookups to the respective interfaces + * Model data refactors + - Convert model data to a final class backed by an immutable map and document mutability requirements. This addresses several thread-safety issues in the current implementation which could result in race conditions + - Transfer ownership of the data manager to the client level. This addresses several issues that arise when multiple levels are used at once + * GUI and widget refactors + - Move all widgets to the correct package + - Rename GuiUtils and children to match vanilla naming + * New vertex pipeline API + - Move to vanilla's VertexConsumer + - Roll back recent PR making VertexConsumer format-aware. This is the opposite of what vanilla does, and should not be relevant with the updated lighting pipeline + * Lighting pipeline refactors + - Move to dedicated lighting package + - Separate flat and smooth lighters + - Convert from a vertex pipeline transformer to a pure vertex source (input is baked quads) + * Model geometry API refactors + - Rename IModelGeometry to IUnbakedGeometry + - Rename IModelConfiguration to IGeometryBakingContext + - Rename other elements to match vanilla naming + - Remove current changes to ModelState, as they do not belong there. Transforms should be specified through vanilla's system. ModelState is intended to transfer state from the blockstate JSON + - Remove multipart geometries and geometry parts. After some discussion, these should not be exposed. Instead, geometries should be baked with only the necessary parts enabled + * Make render types a first-class citizen in baked models + - Add named render types (block + entity + fabulous entity) + - Add named render type manager + registration event + - Make BakedModel aware of render types and transfer control over which ones are used to it instead of ItemBlockRenderTypes (fallback) + - (additional) Add concatenated list view. A wrapper for multiple lists that iterates through them in order without the cost of merging them. Useful for merging lists of baked quads + * General event refactors + - Several renames to either match vanilla or improve clarity + - Relocate client chat event dispatching out of common code + * Forge model type refactors + - Rename SeparatePerspectiveModel to SeparateTransformsModel + - Rename ItemModelMesherForge to ForgeItemModelShaper + - Rename DynamicBucketModel to DynamicFluidContainerModel + - Prefix all OBJ-related classes with "Obj" and decouple parsing from construction + - Extract ElementsModel from model loader registry + - Add EmptyModel (baked, unbaked and loader) + - Refactor CompositeModel to take over ItemMultiLayerBakedModel + - Remove FluidModel as it's not used and isn't compatible with the new fluid rendering in modern versions + - Move model loader registration to a proper event handler + - Update names of several JSON fields (backwards-compatible) + - Update datagens to match + * Miscellaneous changes and overlapping patches + - Dispatch all new registration events + - Convert ExtendedServerListData to a record + - Add/remove hooks from ForgeHooksClient as necessary + * Update test mods + * Fix VertexConsumerWrapper returning parent instead of itself + * Additional event cleanup pass + As discussed on Discord: + - Remove "@hidden" and "@see " javadoc annotations from all client events and replace them with @ApiStatus.Internal annotation + - Make all events that shouldn't be fired directly into abstract classes with protected constructors + - Another styling pass, just in case (caught some missed classes) + * Add proper deprecation javadocs and de-dupe some vertex consumer code + * Replace sets of chunk render types with a faster BitSet-backed collection + This largely addresses potential performance concerns that using a plain HashSet might involve by making lookups and iteration as linear as they can likely be (aside from using a plain byte/int/long for bit storage). Further performance concerns related to the implementation may be addressed separately, as all the implementation details are hidden from the end user + * Requested changes + - Remove MinecraftForgeClient and move members to Minecraft, IForgeMinecraft and StencilManager + - Allow non-default elements to be passed into VertexConsumer and add support to derived classes + - Move array instantiation out of quad processing in lighting pipeline + - Fix flipped fluid container model + - Set default UV1 to the correct values in the remapping pipeline + - Minor documentation changes + * Add/update EXC entries and fix AT comment + * Add test mod as per Orion's request + * Additional requested changes + * Allow custom model types to request the particle texture to be loaded + * Even more requested changes + * Improve generics in ConcatenatedListView and add missing fallbacks + * Fix fluid render types being bound to the fluid and not its holder + * Remove non-contractual nullability in ChunkRenderTypeSet and add isEmpty + Additionally, introduce chunk render type checks in ItemBlockRenderTypes + Co-authored-by: Dennis C + - 41.0.63 Implement full support for IPv6 (#8742) + - 41.0.62 Fix certain user-configured options being overwritten incorrectly due to validators. (#8780) + - 41.0.61 Allow safely registering RenderType predicates at any time (#8685) + - 41.0.60 Fix crash after loading error due to fluid texture gathering and config lookup (#8802) + - 41.0.59 Remove the configuration option for handling empty tags in ingredients. (#8799) + Now empty tags are considered broken in all states. + - 41.0.58 Fix MC-105317 Structure blocks do not rotate entities correctly when loading (#8792) + - 41.0.57 Fire ChunkWatchEvents after sending packets (#8747) + - 41.0.56 Add item handler capability to chest boats (#8787) + - 41.0.55 Add getter for correct BiomeSpecialEffectsBuilder to BiomeInfo$Builder (#8781) + - 41.0.54 Fix BlockToolModificationEvent missing cancelable annotation (#8778) + - 41.0.53 Fix ticking chunk tickets from forge's chunk manager not causing chunks to fully tick (#8775) + - 41.0.52 Fix default audio device config loading string comparison issue (#8767) + - 41.0.51 Fix missed vanilla method overrides in ForgeRegistry (#8766) + - 41.0.50 Add MinecraftServer reference to ServerTickEvent (#8765) + - 41.0.49 Fix TagsProviders for datapack registries not recognizing existing files (#8761) + - 41.0.48 Add callback after a BlockState was changed and the neighbors were updated (#8686) + - 41.0.47 Add biome tag entries for 1.19 biomes (#8684) + - 41.0.46 Make fishing rods use tool actions for relevant logic (#8681) + - 41.0.45 Update BootstrapLauncher to 1.1.1 and remove the forced + merge of text2speech since new BSL does it. + - 41.0.44 Merge text2speech libs together so the natives are part of the jar + - 41.0.43 Make Forge ConfigValues implement Supplier. (#8776) + - 41.0.42 Fix merge derp in AbstractModProvider and logic derp in ModDiscoverer + - 41.0.41 Add "send to mods in order" method to ModList and use it (#8759) + * Add "send to mods in order" method to ModList and use it in RegistryEvents and DataGen.. + * Also preserve order in runAll + * Do better comparator thanks @pupnewfster + * postEvent as well. + - 41.0.40 Update SJH to 2.0.2.. (#8774) + * Update SJH to 2.0.3.. + - 41.0.39 Sanity check the version specified in the mod file (#8749) + * Sanity check the version specified in the mod file to + make sure it's compatible with JPMS standards for + version strings. + Closes #8748 + Requires SPI 6 + - 41.0.38 Fix SP-Devtime world loading crash due to missing server configs (#8757) + - 41.0.37 Remove ForgeWorldPreset and related code (#8756) + Vanilla has a working replacement. + - 41.0.36 Change ConfigValue#get() to throw if called before config loaded (#8236) + This prevents silent issues where a mod gets the value of the setting + before configs are loaded, which means the default value is always + returned. + As there may be situations where the getting the config setting before + configs are loaded is needed, and it is not preferable to hardcode the + default value, the original behavior is made available through #getRaw. + Implements and closes #7716 + * Remove getRaw() method + This is effectively replaced with the expression `spec.isLoaded() ? + configValue.get() : configValue.getDefault()`. + * Remove forceSystemNanoTime config setting + As implemented, it never had any effect as any place where the config + value would be queried happens before the configs are loaded. + - 41.0.35 Fix EnumArgument to use enum names for suggestions (#8728) + Previously, the suggestions used the string representation of the enum + through Enum#toString, which can differ from the name of the enum as + required by Enum#valueOf, causing invalid suggestions (both in gui and + through the error message). + - 41.0.34 Jar-In-Jar (#8715) + - 41.0.33 [1.19] Fix data-gen output path of custom data-pack registries (#8724) + - 41.0.32 Fix player dive and surface animations in custom fluids (#8738) + - 41.0.31 [1.19.x] Affect ItemEntity Motion in Custom Fluids (#8737) + - 41.0.30 [1.19] Add support for items to add enchantments without setting them in NBT (#8719) + - 41.0.29 [1.19.x] Add stock biome modifier types for adding features and spawns (#8697) + - 41.0.28 [1.19.x] Fluid API Overhaul (#8695) + - 41.0.27 Replace StructureSpawnListGatherEvent with StructureModifiers (#8717) + - 41.0.26 Use stack sensitive translation key by default for FluidAttributes. (#8707) + - 41.0.25 Delete LootItemRandomChanceCondition which added looting bonus enchantment incorrectly. (#8733) + - 41.0.24 Update EventBus to 6.0, ModLauncher to 10.0.1 and BootstrapLauncher to 1.1 (#8725) + - 41.0.23 Replace support bot with support action (#8700) + - 41.0.22 Fix Reach Distance / Attack Range being clamped at 6.0 (#8699) + - 41.0.21 [1.19.x] Fix mods' worldgen data not being loaded when creating new singleplayer worlds (#8693) + - 41.0.20 [1.19.x] Fix experimental confirmation screen (#8727) + - 41.0.19 Move is_mountain to forge's tag instead of vanilla's (#8726) + - 41.0.18 [1.19.x] Add CommandBuildContext to Register Command Events (#8716) + - 41.0.17 Only rewrite datagen cache when needed (#8709) + - 41.0.16 Implement a simple feature system for Forge (#8670) + * Implement a simple feature system for Forge. Allows mods to demand certain features are available in the loading system. An example for java_version is provided, but not expected to be used widely. This is more targeted to properties of the display, such as GL version and glsl profile. + Requires https://github.com/MinecraftForge/ForgeSPI/pull/13 to be merged first in ForgeSPI, and the SPI to be updated appropriately in build.gradle files. + * rebase onto 1.19 and add in SPI update + - 41.0.15 displayTest option in mods.toml (#8656) + * displayTest option in mods.toml + * "MATCH_VERSION" (or none) is existing match version string behaviour + * "IGNORE_SERVER_VERSION" accepts anything and sends special SERVERONLY string + * "IGNORE_ALL_VERSION" accepts anything and sends an empty string + * "NONE" allows the mod to supply their own displaytest using the IExtensionPoint mechanism. + * Update display test with feedback and added the mods.toml discussion in mdk. + - 41.0.14 Update forgeSPI to v5 (#8696) + - 41.0.13 Make IVertexConsumers such as the lighting pipeline, be aware of which format they are dealing with. (#8692) + Also fix Lighting pipeline ignoring the overlay coords from the block renderer. + - 41.0.12 Fixed misaligned patch to invalidateCaps in Entity (#8705) + - 41.0.11 Fix readAdditionalLevelSaveData (#8704) + - 41.0.10 Fixes setPos to syncPacketPositionCodec (#8702) + - 41.0.9 Fix wrong param passed to PlayLevelSoundEvent.AtEntity (#8688) + - 41.0.8 Override initialize in SlotItemHandler, so it uses the itemhandler instead of container (#8679) + - 41.0.7 Update MDK for 1.19 changes (#8675) + - 41.0.6 Add helper to RecipeType, and fix eclipse compiler error in test class. + - 41.0.5 Update modlauncher to latest (#8691) + - 41.0.4 Fix getting entity data serializer id crashing due to improper port to new registry system (#8678) + - 41.0.3 Fire registry events in the order vanilla registers to registries (#8677) + Custom registries are still fired in alphabetical order, after all vanilla registries. + Move forge's data_serializers registry to forge namespace. + - 41.0.2 Add method with pre/post wrap to allow setting/clearing mod context. (#8682) + Fixes ActiveContainer in ModContext not being present in registry events. Closes #8680 + - 41.0.1 Fix the Curlie oopsie + - 41.0.0 Forge 1.19 + * Bump pack.mcmeta formats + * 1.19 biome modifiers + * Mark ClientPlayerNetworkEvent.LoggedOutEvent's getters as nullable + * Add docs and package-info to client extension interfaces package + * Move RenderBlockOverlayEvent hooks to ForgeHooksClient + * Add package-infos to client events package + * Rename SoundLoadEvent to SoundEngineLoadEvent + This reduces confusion from consumers which may think the + name SoundLoadEvent refers to an individual sound being loaded rather + than the sound engine. + * Document and change SoundLoadEvent to fire on mod bus + Previously, it fired on both the mod bus and the Forge bus, which is + confusing for consumers. + * Delete SoundSetupEvent + Looking at its original implementation shows that there isn't an + appropriate place in the new sound code to reinsert the event, and the + place of 'sound engine/manager initialization event' is taken already by SoundLoadEvent. + * Perform some cleanup on client events + - Removed nullable annotations from ClientPlayerNetworkEvent + - Renamed #getPartialTicks methods to #getPartialTick, to be consistent + with vanilla's naming of the partial tick + - Cleanup documentation to remove line breaks, use the + spelling 'cancelled' over + 'canceled', and improve docs on existing and + new methods. + * Remove EntityEvent.CanUpdate + Closes MinecraftForge/MinecraftForge#6394 + * Switch to Jetbrains nullability annotations + * New PlayLevelSoundEvent; replaces old PlaySoundAtEntityEvent + * Remove ForgeWorldPresetScreens + * Remove IForgeRegistryEntry + * Remove use of List in FML's CompletableFutures + * Add docs to mod loading stages, stages, and phases + * Gradle 7.4.2 + * Use SLF4J in FMLLoader and other subprojects + * Switch dynamic versions in subprojects to pinned ones + * Switch ForgeRoot and MDK to FG plugin markers + * Configure Forge javadoc task + The task now uses a custom stylesheet with MCForge elements, and + configured to combine the generation from the four FML subprojects + (fmlloader, fmlcore, javafmllanguage, mclanguage) and the Forge project + into the javadoc output. + * Update docs/md files, for 1.19 update and the move away from IRC to Discord. + * Make "Potentially dangerous alternative prefix" a debug warning, not info. + Co-authored-by: Curle + Co-authored-by: sciwhiz12 + diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..9c68002 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,54 @@ +# 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=-Xmx3G +org.gradle.daemon=false + + +## Environment Properties + +# The Minecraft version must agree with the Forge version to get a valid artifact +minecraft_version=1.20.1 +# The Minecraft version range can use any release version of Minecraft as bounds. +# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly +# as they do not follow standard versioning conventions. +minecraft_version_range=[1.20.1,1.21) +# The Forge version must agree with the Minecraft version to get a valid artifact +forge_version=47.4.5 +# The Forge version range can use any version of Forge as bounds or match the loader version range +forge_version_range=[47,) +# The loader version range can only use the major version of Forge/FML as bounds +loader_version_range=[47,) +# The mapping channel to use for mappings. +mapping_channel=official +# The mapping version to query from 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=titanic +# The human-readable display name for the mod. +mod_name=Titanic +# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. +mod_license=All Rights Reserved +# The mod version. See https://semver.org/ +mod_version=0.1.0 +# 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. +mod_group_id=com.titanicmc.titanic +# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. +mod_authors=TitanicMC +# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. +mod_description=Raise the wreck, repair her in dry dock and sail the Titanic.\nRequires Valkyrien Skies 2 for ship physics. + + +## Library versions + +# Valkyrien Skies 2 (ship physics library) - Forge 1.20.1 build +vs2_version=2.4.13+a22354cf66 +# Valkyrien Skies Core (must match the vs2 build's core version) +vscore_version=1.1.0+46c89d8af9 +# Kotlin For Forge (required at runtime by Valkyrien Skies, which is written in Kotlin) +kotlinforforge_version=4.10.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1962a79e29d3e0ab67b14947c167a862655af9b GIT binary patch literal 62076 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..2617362 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..aeb74cb --- /dev/null +++ b/gradlew @@ -0,0 +1,245 @@ +#!/bin/sh + +# +# 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. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# 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». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# 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/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +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 +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + 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. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +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! +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 + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..93f1b80 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,13 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' +} \ No newline at end of file diff --git a/src/main/java/com/titanicmc/titanic/Config.java b/src/main/java/com/titanicmc/titanic/Config.java new file mode 100644 index 0000000..55d655f --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/Config.java @@ -0,0 +1,71 @@ +package com.titanicmc.titanic; + +import net.minecraftforge.common.ForgeConfigSpec; + +/** + * Common (server-authoritative) config for the Titanic mod. + */ +public class Config { + + public static final ForgeConfigSpec SPEC; + + public static final ForgeConfigSpec.IntValue WRECK_RARITY; + public static final ForgeConfigSpec.IntValue DRY_DOCK_IRON_REQUIRED; + public static final ForgeConfigSpec.IntValue DRY_DOCK_GLASS_REQUIRED; + public static final ForgeConfigSpec.IntValue DRY_DOCK_GLASS_PANES_REQUIRED; + public static final ForgeConfigSpec.IntValue DRY_DOCK_REPEATERS_REQUIRED; + public static final ForgeConfigSpec.IntValue DRY_DOCK_COMPARATORS_REQUIRED; + public static final ForgeConfigSpec.IntValue DRY_DOCK_CHESTS_REQUIRED; + public static final ForgeConfigSpec.IntValue DRY_DOCK_PLANKS_REQUIRED; + public static final ForgeConfigSpec.IntValue DRY_DOCK_REDSTONE_BLOCKS_REQUIRED; + public static final ForgeConfigSpec.IntValue MAX_SHIP_BLOCKS; + public static final ForgeConfigSpec.DoubleValue RAISE_SPEED; + public static final ForgeConfigSpec.DoubleValue BOILER_HEAT_PER_FUEL; + public static final ForgeConfigSpec.DoubleValue ENGINE_POWER_PER_HEAT; + + static { + ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder(); + + builder.push("world_generation"); + WRECK_RARITY = builder + .comment("1 in N ocean chunks (approximately) will attempt to place a Titanic wreck.") + .defineInRange("wreckRarity", 800, 1, 100000); + builder.pop(); + + builder.push("ships"); + MAX_SHIP_BLOCKS = builder + .comment("Safety limit on how many connected blocks may be assembled into one ship.") + .defineInRange("maxShipBlocks", 20000, 100, 200000); + RAISE_SPEED = builder + .comment("Upward speed (blocks/tick) applied while a wreck is being raised to the surface.") + .defineInRange("raiseSpeed", 0.08, 0.001, 1.0); + BOILER_HEAT_PER_FUEL = builder + .comment("Heat generated per fuel-tick burned in a Boiler.") + .defineInRange("boilerHeatPerFuel", 0.02, 0.0001, 10.0); + ENGINE_POWER_PER_HEAT = builder + .comment("Engine power applied to the ship per unit of accumulated heat, when a Crankshaft is adjacent.") + .defineInRange("enginePowerPerHeat", 4000.0, 1.0, 1000000.0); + builder.pop(); + + builder.push("dry_dock_repair"); + DRY_DOCK_IRON_REQUIRED = builder.comment("Iron ingots required to repair the hull (3 * 64 per the design doc).") + .defineInRange("ironIngots", 192, 1, 100000); + DRY_DOCK_GLASS_REQUIRED = builder.comment("Glass blocks required for portholes/windows.") + .defineInRange("glassBlocks", 64, 1, 100000); + DRY_DOCK_GLASS_PANES_REQUIRED = builder.comment("Glass panes required.") + .defineInRange("glassPanes", 64, 1, 100000); + DRY_DOCK_REPEATERS_REQUIRED = builder.comment("Redstone repeaters required (engine control linkages).") + .defineInRange("repeaters", 16, 1, 100000); + DRY_DOCK_COMPARATORS_REQUIRED = builder.comment("Redstone comparators required (gauges/telegraph).") + .defineInRange("comparators", 20, 1, 100000); + DRY_DOCK_CHESTS_REQUIRED = builder.comment("Chests required (cargo holds / boiler feed bunkers).") + .defineInRange("chests", 64, 1, 100000); + DRY_DOCK_PLANKS_REQUIRED = builder.comment("Planks required (deck planking).") + .defineInRange("planks", 50, 1, 100000); + DRY_DOCK_REDSTONE_BLOCKS_REQUIRED = builder.comment("Redstone blocks required (power for the engine telegraph).") + .defineInRange("redstoneBlocks", 10, 1, 100000); + builder.pop(); + + SPEC = builder.build(); + } +} diff --git a/src/main/java/com/titanicmc/titanic/TitanicMod.java b/src/main/java/com/titanicmc/titanic/TitanicMod.java new file mode 100644 index 0000000..c740807 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/TitanicMod.java @@ -0,0 +1,61 @@ +package com.titanicmc.titanic; + +import com.mojang.logging.LogUtils; +import com.titanicmc.titanic.event.ForgeEventHandler; +import com.titanicmc.titanic.registry.ModBlockEntities; +import com.titanicmc.titanic.registry.ModBlocks; +import com.titanicmc.titanic.registry.ModCreativeTabs; +import com.titanicmc.titanic.registry.ModEntities; +import com.titanicmc.titanic.registry.ModFeatures; +import com.titanicmc.titanic.registry.ModItems; +import com.titanicmc.titanic.ship.TitanicShipControl; +import kotlin.Unit; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.slf4j.Logger; +import org.valkyrienskies.mod.common.VSGameUtilsKt; + +/** + * Titanic - raise the wreck, repair her in dry dock, and sail her again. + *

+ * Ship physics (buoyancy, steering, collisions) are provided by the Valkyrien Skies 2 + * library mod. This mod never manually shuffles blocks around to fake movement; once a + * structure is "assembled" via {@code org.valkyrienskies.mod.common.assembly.ShipAssembler} + * it becomes a real physics object that VS2 simulates every tick. + */ +@Mod(TitanicMod.MODID) +public class TitanicMod { + + public static final String MODID = "titanic"; + public static final Logger LOGGER = LogUtils.getLogger(); + + public TitanicMod(FMLJavaModLoadingContext context) { + IEventBus modEventBus = context.getModEventBus(); + + ModItems.ITEMS.register(modEventBus); + ModBlocks.BLOCKS.register(modEventBus); + ModBlockEntities.BLOCK_ENTITIES.register(modEventBus); + ModEntities.ENTITIES.register(modEventBus); + ModFeatures.FEATURES.register(modEventBus); + ModCreativeTabs.TABS.register(modEventBus); + + context.registerConfig(ModConfig.Type.COMMON, Config.SPEC); + + MinecraftForge.EVENT_BUS.register(new ForgeEventHandler()); + + // Required by Valkyrien Skies 2: any class attached to a ship via + // LoadedServerShip#setAttachment must first be registered with its attachment + // registry, or setAttachment throws IllegalArgumentException. This mod's mods.toml + // declares an AFTER ordering dependency on valkyrienskies, so its core (and this + // registry) is guaranteed to already be initialized here. TitanicShipControl carries + // only in-memory runtime state (raise/engine state, a live ship reference) that should + // never be persisted, hence the transient serializer. + VSGameUtilsKt.getVsCore().registerAttachment(TitanicShipControl.class, builder -> { + builder.useTransientSerializer(); + return Unit.INSTANCE; + }); + } +} diff --git a/src/main/java/com/titanicmc/titanic/block/BoilerBlock.java b/src/main/java/com/titanicmc/titanic/block/BoilerBlock.java new file mode 100644 index 0000000..9214e22 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/block/BoilerBlock.java @@ -0,0 +1,65 @@ +package com.titanicmc.titanic.block; + +import com.titanicmc.titanic.blockentity.BoilerBlockEntity; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.BaseEntityBlock; +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.phys.BlockHitResult; +import org.jetbrains.annotations.Nullable; + +/** A huge coal-fired boiler. See {@link BoilerBlockEntity} for behaviour. */ +public class BoilerBlock extends BaseEntityBlock { + + public BoilerBlock(Properties properties) { + super(properties); + } + + @Override + public RenderShape getRenderShape(BlockState state) { + return RenderShape.MODEL; + } + + @Override + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, + BlockHitResult hit) { + if (level.isClientSide) return InteractionResult.SUCCESS; + if (!(level.getBlockEntity(pos) instanceof BoilerBlockEntity boiler)) return InteractionResult.PASS; + + ItemStack held = player.getItemInHand(hand); + if (!held.isEmpty() && boiler.tryFeed(held)) { + player.displayClientMessage(Component.translatable("message.titanic.boiler_fed"), true); + return InteractionResult.CONSUME; + } + player.displayClientMessage(Component.translatable( + boiler.isBurning() ? "message.titanic.boiler_burning" : "message.titanic.boiler_needs_fuel"), true); + return InteractionResult.CONSUME; + } + + @Nullable + @Override + public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new BoilerBlockEntity(pos, state); + } + + @Nullable + @Override + public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { + if (level.isClientSide) return null; + return (lvl, pos, st, be) -> { + if (be instanceof BoilerBlockEntity boiler) { + boiler.serverTick((ServerLevel) lvl); + } + }; + } +} diff --git a/src/main/java/com/titanicmc/titanic/block/ChairBlock.java b/src/main/java/com/titanicmc/titanic/block/ChairBlock.java new file mode 100644 index 0000000..48e8a50 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/block/ChairBlock.java @@ -0,0 +1,51 @@ +package com.titanicmc.titanic.block; + +import com.titanicmc.titanic.entity.SeatEntity; +import com.titanicmc.titanic.registry.ModEntities; +import net.minecraft.core.BlockPos; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; + +import java.util.List; + +/** + * A simple dining-room / cabin chair. Right-click to sit down; sneak to get back up. + * Works fine on an assembled ship since VS2 handles entities riding blocks-on-ships. + */ +public class ChairBlock extends Block { + + public ChairBlock(Properties properties) { + super(properties); + } + + @Override + public InteractionResult use(net.minecraft.world.level.block.state.BlockState state, Level level, BlockPos pos, + Player player, InteractionHand hand, BlockHitResult hit) { + if (level.isClientSide) { + return InteractionResult.SUCCESS; + } + if (player.isPassenger() || player.isShiftKeyDown()) { + return InteractionResult.PASS; + } + + AABB searchBox = new AABB(pos).inflate(0.2); + List existing = level.getEntitiesOfClass(SeatEntity.class, searchBox); + SeatEntity seat = existing.isEmpty() ? null : existing.get(0); + + if (seat == null) { + seat = ModEntities.SEAT.get().create(level); + if (seat == null) return InteractionResult.PASS; + seat.setPos(pos.getX() + 0.5, pos.getY() + 0.2, pos.getZ() + 0.5); + level.addFreshEntity(seat); + } + + player.startRiding(seat, true); + return InteractionResult.CONSUME; + } +} diff --git a/src/main/java/com/titanicmc/titanic/block/CrankshaftBlock.java b/src/main/java/com/titanicmc/titanic/block/CrankshaftBlock.java new file mode 100644 index 0000000..af319b4 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/block/CrankshaftBlock.java @@ -0,0 +1,14 @@ +package com.titanicmc.titanic.block; + +import net.minecraft.world.level.block.Block; + +/** + * Purely a structural marker: a {@link BoilerBlock} only converts its heat into ship + * propulsion while at least one Crankshaft is directly adjacent to it. This forces the + * player to actually build out an "engine room" rather than dropping a single block. + */ +public class CrankshaftBlock extends Block { + public CrankshaftBlock(Properties properties) { + super(properties); + } +} diff --git a/src/main/java/com/titanicmc/titanic/block/HelmBlock.java b/src/main/java/com/titanicmc/titanic/block/HelmBlock.java new file mode 100644 index 0000000..4e5b71d --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/block/HelmBlock.java @@ -0,0 +1,78 @@ +package com.titanicmc.titanic.block; + +import com.titanicmc.titanic.blockentity.HelmBlockEntity; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; +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.BaseEntityBlock; +import net.minecraft.world.level.block.Block; +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.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.phys.BlockHitResult; +import org.jetbrains.annotations.Nullable; + +/** The real ship's wheel, installed automatically once dry dock repairs are finished. */ +public class HelmBlock extends BaseEntityBlock { + + public HelmBlock(Properties properties) { + super(properties); + registerDefaultState(this.stateDefinition.any().setValue(BlockStateProperties.HORIZONTAL_FACING, Direction.NORTH)); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + builder.add(BlockStateProperties.HORIZONTAL_FACING); + } + + @Nullable + @Override + public BlockState getStateForPlacement(BlockPlaceContext context) { + return defaultBlockState().setValue(BlockStateProperties.HORIZONTAL_FACING, context.getHorizontalDirection().getOpposite()); + } + + @Override + public RenderShape getRenderShape(BlockState state) { + return RenderShape.MODEL; + } + + @Override + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, + BlockHitResult hit) { + if (level.isClientSide) return InteractionResult.SUCCESS; + if (!(level.getBlockEntity(pos) instanceof HelmBlockEntity helm)) return InteractionResult.PASS; + + if (helm.sit(player)) { + return InteractionResult.CONSUME; + } + player.displayClientMessage(Component.translatable("message.titanic.helm_not_seaworthy"), true); + return InteractionResult.CONSUME; + } + + @Nullable + @Override + public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new HelmBlockEntity(pos, state); + } + + @Nullable + @Override + public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { + if (level.isClientSide) return null; + return (lvl, pos, st, be) -> { + if (be instanceof HelmBlockEntity helm) { + helm.serverTick(); + } + }; + } +} diff --git a/src/main/java/com/titanicmc/titanic/block/HelmSocketBlock.java b/src/main/java/com/titanicmc/titanic/block/HelmSocketBlock.java new file mode 100644 index 0000000..6f2c00d --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/block/HelmSocketBlock.java @@ -0,0 +1,24 @@ +package com.titanicmc.titanic.block; + +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; + +/** + * Generated on the wreck's bridge during world generation, marking where the real helm will + * be installed once dry dock repairs are finished. Never placeable by the player. + */ +public class HelmSocketBlock extends Block { + + public HelmSocketBlock(Properties properties) { + super(properties); + registerDefaultState(this.stateDefinition.any().setValue(BlockStateProperties.HORIZONTAL_FACING, Direction.NORTH)); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + builder.add(BlockStateProperties.HORIZONTAL_FACING); + } +} diff --git a/src/main/java/com/titanicmc/titanic/block/LiftingFrameBlock.java b/src/main/java/com/titanicmc/titanic/block/LiftingFrameBlock.java new file mode 100644 index 0000000..8ce0c41 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/block/LiftingFrameBlock.java @@ -0,0 +1,106 @@ +package com.titanicmc.titanic.block; + +import com.titanicmc.titanic.blockentity.LiftingFrameBlockEntity; +import com.titanicmc.titanic.registry.ModBlockEntities; +import com.titanicmc.titanic.registry.ModItems; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.BaseEntityBlock; +import net.minecraft.world.level.block.Block; +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.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.block.state.properties.IntegerProperty; +import net.minecraft.world.phys.BlockHitResult; +import org.jetbrains.annotations.Nullable; + +/** + * The recovery "box" a player builds and lowers over the sunken wreck. It has four eyes; + * right-clicking it with a Steel Cable threads one eye at a time. Once all four are threaded + * the frame is "rigged" and can be linked to a {@link WinchBlock} on a surface vessel to + * start the raise sequence. + */ +public class LiftingFrameBlock extends BaseEntityBlock { + + public static final IntegerProperty CABLES = IntegerProperty.create("cables", 0, 4); + + public LiftingFrameBlock(Properties properties) { + super(properties); + registerDefaultState(this.stateDefinition.any().setValue(CABLES, 0)); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + builder.add(CABLES); + } + + @Override + public RenderShape getRenderShape(BlockState state) { + return RenderShape.MODEL; + } + + @Override + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, + BlockHitResult hit) { + if (level.isClientSide) { + return InteractionResult.SUCCESS; + } + + BlockEntity be = level.getBlockEntity(pos); + if (!(be instanceof LiftingFrameBlockEntity frame)) { + return InteractionResult.PASS; + } + + ItemStack held = player.getItemInHand(hand); + int cables = state.getValue(CABLES); + + if (cables < 4 && held.is(ModItems.STEEL_CABLE.get())) { + held.shrink(1); + level.setBlock(pos, state.setValue(CABLES, cables + 1), 3); + player.displayClientMessage( + Component.translatable("message.titanic.frame_threaded", cables + 1, 4), true); + if (cables + 1 == 4) { + player.displayClientMessage(Component.translatable("message.titanic.frame_rigged"), true); + } + return InteractionResult.CONSUME; + } + + if (cables >= 4) { + player.displayClientMessage( + Component.translatable(frame.isLinkedToWinch() + ? "message.titanic.frame_already_linked" + : "message.titanic.frame_needs_winch"), true); + } else { + player.displayClientMessage( + Component.translatable("message.titanic.frame_needs_cable", 4 - cables), true); + } + return InteractionResult.CONSUME; + } + + @Nullable + @Override + public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new LiftingFrameBlockEntity(pos, state); + } + + @Nullable + @Override + public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { + if (level.isClientSide) return null; + return (lvl, pos, st, blockEntity) -> { + if (blockEntity instanceof LiftingFrameBlockEntity frame) { + frame.serverTick((ServerLevel) lvl); + } + }; + } +} diff --git a/src/main/java/com/titanicmc/titanic/block/RepairPanelBlock.java b/src/main/java/com/titanicmc/titanic/block/RepairPanelBlock.java new file mode 100644 index 0000000..c4eb8a7 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/block/RepairPanelBlock.java @@ -0,0 +1,50 @@ +package com.titanicmc.titanic.block; + +import com.titanicmc.titanic.blockentity.RepairPanelBlockEntity; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.BaseEntityBlock; +import net.minecraft.world.level.block.RenderShape; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; +import org.jetbrains.annotations.Nullable; + +/** + * Generated inside the wreck's bridge. Right-click while holding a repair material to hand + * it in. See {@link RepairPanelBlockEntity} for the full repair logic. + */ +public class RepairPanelBlock extends BaseEntityBlock { + + public RepairPanelBlock(Properties properties) { + super(properties); + } + + @Override + public RenderShape getRenderShape(BlockState state) { + return RenderShape.MODEL; + } + + @Override + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, + BlockHitResult hit) { + if (level.isClientSide) return InteractionResult.SUCCESS; + if (!(level.getBlockEntity(pos) instanceof RepairPanelBlockEntity panel)) return InteractionResult.PASS; + + ItemStack held = player.getItemInHand(hand); + panel.handleDeliver((ServerLevel) level, player, held); + return InteractionResult.CONSUME; + } + + @Nullable + @Override + public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new RepairPanelBlockEntity(pos, state); + } +} diff --git a/src/main/java/com/titanicmc/titanic/block/WinchBlock.java b/src/main/java/com/titanicmc/titanic/block/WinchBlock.java new file mode 100644 index 0000000..4756fad --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/block/WinchBlock.java @@ -0,0 +1,62 @@ +package com.titanicmc.titanic.block; + +import com.titanicmc.titanic.blockentity.LiftingFrameBlockEntity; +import com.titanicmc.titanic.registry.ModItems; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; + +/** + * Placed on the player's recovery vessel above the water. Right-clicking with a Steel Cable + * searches straight down for a fully rigged {@link LiftingFrameBlock} and, if found, links the + * two together, starting the automatic raise sequence. + */ +public class WinchBlock extends Block { + + private static final int MAX_SEARCH_DEPTH = 256; + + public WinchBlock(Properties properties) { + super(properties); + } + + @Override + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, + BlockHitResult hit) { + if (level.isClientSide) { + return InteractionResult.SUCCESS; + } + + ItemStack held = player.getItemInHand(hand); + if (!held.is(ModItems.STEEL_CABLE.get())) { + player.displayClientMessage(Component.translatable("message.titanic.winch_needs_cable"), true); + return InteractionResult.CONSUME; + } + + BlockPos.MutableBlockPos search = pos.mutable(); + for (int i = 0; i < MAX_SEARCH_DEPTH; i++) { + search.move(0, -1, 0); + BlockEntity be = level.getBlockEntity(search); + if (be instanceof LiftingFrameBlockEntity frame) { + if (!frame.isRigged(level.getBlockState(search))) { + player.displayClientMessage(Component.translatable("message.titanic.frame_not_rigged"), true); + return InteractionResult.CONSUME; + } + held.shrink(1); + frame.linkToWinch(pos); + player.displayClientMessage(Component.translatable("message.titanic.raise_started"), true); + return InteractionResult.CONSUME; + } + } + + player.displayClientMessage(Component.translatable("message.titanic.no_frame_found"), true); + return InteractionResult.CONSUME; + } +} diff --git a/src/main/java/com/titanicmc/titanic/blockentity/BoilerBlockEntity.java b/src/main/java/com/titanicmc/titanic/blockentity/BoilerBlockEntity.java new file mode 100644 index 0000000..10568ad --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/blockentity/BoilerBlockEntity.java @@ -0,0 +1,122 @@ +package com.titanicmc.titanic.blockentity; + +import com.titanicmc.titanic.Config; +import com.titanicmc.titanic.block.CrankshaftBlock; +import com.titanicmc.titanic.registry.ModBlockEntities; +import com.titanicmc.titanic.ship.ShipUtil; +import com.titanicmc.titanic.ship.TitanicShipControl; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.Container; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.common.ForgeHooks; +import org.valkyrienskies.core.api.ships.LoadedServerShip; + +/** + * Burns fuel to build up heat. Heat only turns into ship propulsion while a + * {@link CrankshaftBlock} is directly adjacent - this represents the engine room + * requiring both giant boilers and their crankshafts to actually drive the propellers. + *

+ * Fuel can be fed directly by right-clicking with a burnable item, or the boiler will + * automatically pull one burnable item per cycle from any directly adjacent chest. + */ +public class BoilerBlockEntity extends BlockEntity { + + private int burnTimeRemaining = 0; + + public BoilerBlockEntity(BlockPos pos, BlockState state) { + super(ModBlockEntities.BOILER.get(), pos, state); + } + + /** Attempts to feed the boiler with the given item. Returns true if it was consumed. */ + public boolean tryFeed(ItemStack stack) { + int burnTime = ForgeHooks.getBurnTime(stack, null); + if (burnTime <= 0) { + return false; + } + stack.shrink(1); + burnTimeRemaining += burnTime; + setChanged(); + return true; + } + + public void serverTick(ServerLevel level) { + if (burnTimeRemaining <= 0) { + tryAutoFeedFromChest(level); + } + + if (burnTimeRemaining <= 0) { + return; + } + + burnTimeRemaining--; + + if (!hasAdjacentCrankshaft(level)) { + return; + } + + LoadedServerShip ship = ShipUtil.getLoadedShipManagingPos(level, getBlockPos()); + if (ship == null) { + return; + } + + TitanicShipControl control = ship.getAttachment(TitanicShipControl.class); + if (control == null || !control.isRepaired()) { + // Un-repaired hulls can't safely run their engines yet. + return; + } + + double power = Config.BOILER_HEAT_PER_FUEL.get() * Config.ENGINE_POWER_PER_HEAT.get(); + control.addEnginePower(power); + setChanged(); + } + + private boolean hasAdjacentCrankshaft(ServerLevel level) { + for (Direction direction : Direction.values()) { + if (level.getBlockState(getBlockPos().relative(direction)).getBlock() instanceof CrankshaftBlock) { + return true; + } + } + return false; + } + + private void tryAutoFeedFromChest(ServerLevel level) { + for (Direction direction : Direction.values()) { + BlockEntity neighbor = level.getBlockEntity(getBlockPos().relative(direction)); + if (!(neighbor instanceof Container container)) { + continue; + } + for (int slot = 0; slot < container.getContainerSize(); slot++) { + ItemStack stack = container.getItem(slot); + if (stack.isEmpty()) continue; + int burnTime = ForgeHooks.getBurnTime(stack, null); + if (burnTime > 0) { + container.removeItem(slot, 1); + burnTimeRemaining += burnTime; + setChanged(); + return; + } + } + } + } + + public boolean isBurning() { + return burnTimeRemaining > 0; + } + + @Override + protected void saveAdditional(CompoundTag tag) { + super.saveAdditional(tag); + tag.putInt("BurnTime", burnTimeRemaining); + } + + @Override + public void load(CompoundTag tag) { + super.load(tag); + burnTimeRemaining = tag.getInt("BurnTime"); + } +} diff --git a/src/main/java/com/titanicmc/titanic/blockentity/HelmBlockEntity.java b/src/main/java/com/titanicmc/titanic/blockentity/HelmBlockEntity.java new file mode 100644 index 0000000..347c313 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/blockentity/HelmBlockEntity.java @@ -0,0 +1,70 @@ +package com.titanicmc.titanic.blockentity; + +import com.titanicmc.titanic.registry.ModBlockEntities; +import com.titanicmc.titanic.ship.ShipUtil; +import com.titanicmc.titanic.ship.TitanicShipControl; +import net.minecraft.commands.arguments.EntityAnchorArgument; +import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.phys.Vec3; +import org.valkyrienskies.core.api.ships.LoadedServerShip; +import org.valkyrienskies.mod.common.ValkyrienSkiesMod; +import org.valkyrienskies.mod.common.entity.ShipMountingEntity; + +/** + * The real, working ship's wheel. Right-click it to sit down and steer, just like the + * wheelhouse of the real Titanic: forward/back on the wheel throttles the engines, left/right + * turns the rudder. + */ +public class HelmBlockEntity extends BlockEntity { + + private ShipMountingEntity seat; + + public HelmBlockEntity(BlockPos pos, BlockState state) { + super(ModBlockEntities.HELM.get(), pos, state); + } + + public void serverTick() { + LoadedServerShip ship = getShip(); + if (ship == null) return; + + TitanicShipControl control = ship.getAttachment(TitanicShipControl.class); + if (control == null) { + // Normally a Helm only exists after the Repair Panel finishes repairs (which + // already marks the control as repaired). This is just a safety net for ships + // that got a Helm some other way (e.g. placed directly in creative mode). + control = new TitanicShipControl(); + control.markRepaired(); + ship.setAttachment(TitanicShipControl.class, control); + } + control.ship = ship; + } + + private LoadedServerShip getShip() { + return ShipUtil.getLoadedShipManagingPos((net.minecraft.server.level.ServerLevel) level, getBlockPos()); + } + + public boolean sit(Player player) { + LoadedServerShip ship = getShip(); + if (ship == null) { + return false; + } + + if (seat == null || !seat.isAlive()) { + seat = ValkyrienSkiesMod.SHIP_MOUNTING_ENTITY_TYPE.create(level); + if (seat == null) return false; + + var facing = getBlockState().getValue(BlockStateProperties.HORIZONTAL_FACING); + Vec3 offset = Vec3.atLowerCornerOf(getBlockPos()).add(0.5, 1.1, 0.5).add(facing.getOpposite().getStepX() * 0.6, 0, facing.getOpposite().getStepZ() * 0.6); + seat.moveTo(offset.x, offset.y, offset.z); + seat.lookAt(EntityAnchorArgument.Anchor.EYES, offset.add(facing.getStepX(), 0, facing.getStepZ())); + seat.setController(true); + ((net.minecraft.server.level.ServerLevel) level).addFreshEntityWithPassengers(seat); + } + + return player.startRiding(seat, true); + } +} diff --git a/src/main/java/com/titanicmc/titanic/blockentity/LiftingFrameBlockEntity.java b/src/main/java/com/titanicmc/titanic/blockentity/LiftingFrameBlockEntity.java new file mode 100644 index 0000000..74ddcd1 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/blockentity/LiftingFrameBlockEntity.java @@ -0,0 +1,71 @@ +package com.titanicmc.titanic.blockentity; + +import com.titanicmc.titanic.registry.ModBlockEntities; +import com.titanicmc.titanic.ship.ShipUtil; +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; + +/** + * Tracks the rigging state of a {@link com.titanicmc.titanic.block.LiftingFrameBlock}. + * Once linked to a winch, {@link #serverTick(ServerLevel)} drives the raise sequence by + * asking {@link ShipUtil} to assemble the wreck into a Valkyrien Skies ship and apply a + * temporary lifting force until it breaches the surface. + */ +public class LiftingFrameBlockEntity extends BlockEntity { + + private boolean linkedToWinch = false; + private BlockPos winchPos = null; + private boolean raiseStarted = false; + + public LiftingFrameBlockEntity(BlockPos pos, BlockState state) { + super(ModBlockEntities.LIFTING_FRAME.get(), pos, state); + } + + public boolean isRigged(BlockState state) { + return state.getValue(com.titanicmc.titanic.block.LiftingFrameBlock.CABLES) >= 4; + } + + public boolean isLinkedToWinch() { + return linkedToWinch; + } + + public void linkToWinch(BlockPos winch) { + this.linkedToWinch = true; + this.winchPos = winch.immutable(); + setChanged(); + } + + public void serverTick(ServerLevel level) { + if (raiseStarted || !linkedToWinch || winchPos == null) { + return; + } + if (!isRigged(getBlockState())) { + return; + } + raiseStarted = true; + ShipUtil.beginWreckRaise(level, getBlockPos()); + } + + @Override + protected void saveAdditional(CompoundTag tag) { + super.saveAdditional(tag); + tag.putBoolean("LinkedToWinch", linkedToWinch); + tag.putBoolean("RaiseStarted", raiseStarted); + if (winchPos != null) { + tag.putLong("WinchPos", winchPos.asLong()); + } + } + + @Override + public void load(CompoundTag tag) { + super.load(tag); + linkedToWinch = tag.getBoolean("LinkedToWinch"); + raiseStarted = tag.getBoolean("RaiseStarted"); + if (tag.contains("WinchPos")) { + winchPos = BlockPos.of(tag.getLong("WinchPos")); + } + } +} diff --git a/src/main/java/com/titanicmc/titanic/blockentity/RepairPanelBlockEntity.java b/src/main/java/com/titanicmc/titanic/blockentity/RepairPanelBlockEntity.java new file mode 100644 index 0000000..d362304 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/blockentity/RepairPanelBlockEntity.java @@ -0,0 +1,211 @@ +package com.titanicmc.titanic.blockentity; + +import com.titanicmc.titanic.Config; +import com.titanicmc.titanic.registry.ModBlockEntities; +import com.titanicmc.titanic.registry.ModBlocks; +import com.titanicmc.titanic.registry.ModItems; +import com.titanicmc.titanic.ship.ShipUtil; +import com.titanicmc.titanic.ship.TitanicShipControl; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import org.valkyrienskies.core.api.ships.LoadedServerShip; + +import java.util.List; +import java.util.Set; + +/** + * Generated as part of the wreck's bridge structure, so it automatically becomes part of the + * ship at assembly time. Players hand in dry dock repair materials here; every delivery + * proportionally patches the hull's damaged blocks and broken portholes. The final part, + * the ship's wheel, finishes the job by installing a real, working {@link com.titanicmc.titanic.block.HelmBlock}. + */ +public class RepairPanelBlockEntity extends BlockEntity { + + private enum Material { + IRON, GLASS, PANES, REPEATERS, COMPARATORS, CHESTS, PLANKS, REDSTONE_BLOCKS + } + + private final int[] delivered = new int[Material.values().length]; + private boolean wheelDelivered = false; + + private int hullTotal = -1; + private int portholeTotal = -1; + + public RepairPanelBlockEntity(BlockPos pos, BlockState state) { + super(ModBlockEntities.REPAIR_PANEL.get(), pos, state); + } + + public void handleDeliver(ServerLevel level, Player player, ItemStack stack) { + if (stack.is(ModItems.SHIPS_WHEEL_PART.get())) { + deliverWheel(level, player); + return; + } + + Material material = classify(stack); + if (material == null) { + player.displayClientMessage(Component.translatable("message.titanic.repair_wrong_item"), true); + return; + } + + int required = requiredFor(material); + int have = delivered[material.ordinal()]; + if (have >= required) { + player.displayClientMessage(Component.translatable("message.titanic.repair_material_done"), true); + return; + } + + int amount = Math.min(stack.getCount(), required - have); + stack.shrink(amount); + delivered[material.ordinal()] += amount; + setChanged(); + + player.displayClientMessage(Component.translatable("message.titanic.repair_delivered", + delivered[material.ordinal()], required), true); + + applyRepairProgress(level); + } + + private void deliverWheel(ServerLevel level, Player player) { + if (!isMaterialsComplete()) { + player.displayClientMessage(Component.translatable("message.titanic.repair_needs_materials_first"), true); + return; + } + if (wheelDelivered) { + player.displayClientMessage(Component.translatable("message.titanic.repair_already_done"), true); + return; + } + + wheelDelivered = true; + setChanged(); + finishRepair(level, player); + } + + private boolean isMaterialsComplete() { + for (Material material : Material.values()) { + if (delivered[material.ordinal()] < requiredFor(material)) { + return false; + } + } + return true; + } + + private void applyRepairProgress(ServerLevel level) { + int totalRequired = 0; + int totalDelivered = 0; + for (Material material : Material.values()) { + totalRequired += requiredFor(material); + totalDelivered += delivered[material.ordinal()]; + } + double progress = totalRequired == 0 ? 1.0 : (double) totalDelivered / (double) totalRequired; + + Set shipBlocks = ShipUtil.collectConnectedBlocks(level, getBlockPos(), Config.MAX_SHIP_BLOCKS.get()); + + if (hullTotal < 0) { + hullTotal = ShipUtil.findBlocksOfType(level, shipBlocks, ModBlocks.DAMAGED_HULL.get()).size(); + } + if (portholeTotal < 0) { + portholeTotal = ShipUtil.findBlocksOfType(level, shipBlocks, ModBlocks.BROKEN_PORTHOLE.get()).size(); + } + + convertRemaining(level, shipBlocks, ModBlocks.DAMAGED_HULL.get(), ModBlocks.SHIP_HULL.get().defaultBlockState(), + hullTotal, progress); + convertRemaining(level, shipBlocks, ModBlocks.BROKEN_PORTHOLE.get(), Blocks.GLASS_PANE.defaultBlockState(), + portholeTotal, progress); + } + + private void convertRemaining(ServerLevel level, Set shipBlocks, net.minecraft.world.level.block.Block from, + BlockState toState, int total, double progress) { + if (total <= 0) return; + List remaining = ShipUtil.findBlocksOfType(level, shipBlocks, from); + int alreadyConverted = total - remaining.size(); + int shouldBeConverted = (int) Math.floor(progress * total); + int toConvertNow = Math.max(0, shouldBeConverted - alreadyConverted); + + for (int i = 0; i < toConvertNow && i < remaining.size(); i++) { + level.setBlock(remaining.get(i), toState, 3); + } + } + + private void finishRepair(ServerLevel level, Player player) { + Set shipBlocks = ShipUtil.collectConnectedBlocks(level, getBlockPos(), Config.MAX_SHIP_BLOCKS.get()); + List sockets = ShipUtil.findBlocksOfType(level, shipBlocks, ModBlocks.HELM_SOCKET.get()); + + for (BlockPos socketPos : sockets) { + Direction facing = level.getBlockState(socketPos).hasProperty(BlockStateProperties.HORIZONTAL_FACING) + ? level.getBlockState(socketPos).getValue(BlockStateProperties.HORIZONTAL_FACING) + : Direction.NORTH; + level.setBlock(socketPos, ModBlocks.HELM.get().defaultBlockState() + .setValue(BlockStateProperties.HORIZONTAL_FACING, facing), 3); + } + + LoadedServerShip ship = ShipUtil.getLoadedShipManagingPos(level, getBlockPos()); + if (ship != null) { + TitanicShipControl control = ship.getAttachment(TitanicShipControl.class); + if (control == null) { + control = new TitanicShipControl(); + ship.setAttachment(TitanicShipControl.class, control); + } + control.markRepaired(); + } + + level.players().forEach(p -> p.displayClientMessage(Component.translatable("message.titanic.repair_complete"), false)); + } + + private static Material classify(ItemStack stack) { + if (stack.is(Items.IRON_INGOT)) return Material.IRON; + if (stack.is(Items.GLASS)) return Material.GLASS; + if (stack.is(Items.GLASS_PANE)) return Material.PANES; + if (stack.is(Items.REPEATER)) return Material.REPEATERS; + if (stack.is(Items.COMPARATOR)) return Material.COMPARATORS; + if (stack.getItem() instanceof net.minecraft.world.item.BlockItem blockItem + && blockItem.getBlock() instanceof net.minecraft.world.level.block.ChestBlock) { + return Material.CHESTS; + } + if (stack.is(ItemTags.PLANKS)) return Material.PLANKS; + if (stack.is(Items.REDSTONE_BLOCK)) return Material.REDSTONE_BLOCKS; + return null; + } + + private static int requiredFor(Material material) { + return switch (material) { + case IRON -> Config.DRY_DOCK_IRON_REQUIRED.get(); + case GLASS -> Config.DRY_DOCK_GLASS_REQUIRED.get(); + case PANES -> Config.DRY_DOCK_GLASS_PANES_REQUIRED.get(); + case REPEATERS -> Config.DRY_DOCK_REPEATERS_REQUIRED.get(); + case COMPARATORS -> Config.DRY_DOCK_COMPARATORS_REQUIRED.get(); + case CHESTS -> Config.DRY_DOCK_CHESTS_REQUIRED.get(); + case PLANKS -> Config.DRY_DOCK_PLANKS_REQUIRED.get(); + case REDSTONE_BLOCKS -> Config.DRY_DOCK_REDSTONE_BLOCKS_REQUIRED.get(); + }; + } + + @Override + protected void saveAdditional(CompoundTag tag) { + super.saveAdditional(tag); + tag.putIntArray("Delivered", delivered); + tag.putBoolean("WheelDelivered", wheelDelivered); + tag.putInt("HullTotal", hullTotal); + tag.putInt("PortholeTotal", portholeTotal); + } + + @Override + public void load(CompoundTag tag) { + super.load(tag); + int[] loaded = tag.getIntArray("Delivered"); + System.arraycopy(loaded, 0, delivered, 0, Math.min(loaded.length, delivered.length)); + wheelDelivered = tag.getBoolean("WheelDelivered"); + hullTotal = tag.contains("HullTotal") ? tag.getInt("HullTotal") : -1; + portholeTotal = tag.contains("PortholeTotal") ? tag.getInt("PortholeTotal") : -1; + } +} diff --git a/src/main/java/com/titanicmc/titanic/entity/SeatEntity.java b/src/main/java/com/titanicmc/titanic/entity/SeatEntity.java new file mode 100644 index 0000000..356577e --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/entity/SeatEntity.java @@ -0,0 +1,59 @@ +package com.titanicmc.titanic.entity; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.level.Level; + +/** + * Invisible, non-solid mount used so a player can "sit" on a chair. Spawned on demand by + * {@link com.titanicmc.titanic.block.ChairBlock} and removed automatically once nobody is + * riding it. + */ +public class SeatEntity extends Entity { + + public SeatEntity(EntityType type, Level level) { + super(type, level); + this.noPhysics = true; + this.blocksBuilding = false; + } + + @Override + public void tick() { + super.tick(); + if (!level().isClientSide && this.getPassengers().isEmpty() && this.tickCount > 0) { + this.discard(); + } + } + + @Override + protected void defineSynchedData() { + // No synced data needed. + } + + @Override + protected void readAdditionalSaveData(CompoundTag tag) { + // Nothing to persist. + } + + @Override + protected void addAdditionalSaveData(CompoundTag tag) { + // Nothing to persist. + } + + @Override + public boolean isPickable() { + return false; + } + + @Override + public boolean isPushable() { + return false; + } + + @Override + public boolean shouldBeSaved() { + return false; + } +} diff --git a/src/main/java/com/titanicmc/titanic/event/ForgeEventHandler.java b/src/main/java/com/titanicmc/titanic/event/ForgeEventHandler.java new file mode 100644 index 0000000..f90252b --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/event/ForgeEventHandler.java @@ -0,0 +1,19 @@ +package com.titanicmc.titanic.event; + +import com.titanicmc.titanic.ship.ShipRaiseScheduler; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; + +/** + * Cross-cutting game event handling. Registered on the Forge event bus in + * {@link com.titanicmc.titanic.TitanicMod}. + */ +public class ForgeEventHandler { + + @SubscribeEvent + public void onServerTick(TickEvent.ServerTickEvent event) { + if (event.phase == TickEvent.Phase.END) { + ShipRaiseScheduler.tick(); + } + } +} diff --git a/src/main/java/com/titanicmc/titanic/registry/ModBlockEntities.java b/src/main/java/com/titanicmc/titanic/registry/ModBlockEntities.java new file mode 100644 index 0000000..4ecc4da --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/registry/ModBlockEntities.java @@ -0,0 +1,33 @@ +package com.titanicmc.titanic.registry; + +import com.titanicmc.titanic.TitanicMod; +import com.titanicmc.titanic.blockentity.BoilerBlockEntity; +import com.titanicmc.titanic.blockentity.HelmBlockEntity; +import com.titanicmc.titanic.blockentity.LiftingFrameBlockEntity; +import com.titanicmc.titanic.blockentity.RepairPanelBlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class ModBlockEntities { + + public static final DeferredRegister> BLOCK_ENTITIES = + DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, TitanicMod.MODID); + + public static final RegistryObject> LIFTING_FRAME = + BLOCK_ENTITIES.register("lifting_frame", () -> BlockEntityType.Builder.of( + LiftingFrameBlockEntity::new, ModBlocks.LIFTING_FRAME.get()).build(null)); + + public static final RegistryObject> REPAIR_PANEL = + BLOCK_ENTITIES.register("repair_panel", () -> BlockEntityType.Builder.of( + RepairPanelBlockEntity::new, ModBlocks.REPAIR_PANEL.get()).build(null)); + + public static final RegistryObject> HELM = + BLOCK_ENTITIES.register("helm", () -> BlockEntityType.Builder.of( + HelmBlockEntity::new, ModBlocks.HELM.get()).build(null)); + + public static final RegistryObject> BOILER = + BLOCK_ENTITIES.register("boiler", () -> BlockEntityType.Builder.of( + BoilerBlockEntity::new, ModBlocks.BOILER.get()).build(null)); +} diff --git a/src/main/java/com/titanicmc/titanic/registry/ModBlockTags.java b/src/main/java/com/titanicmc/titanic/registry/ModBlockTags.java new file mode 100644 index 0000000..29423f5 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/registry/ModBlockTags.java @@ -0,0 +1,23 @@ +package com.titanicmc.titanic.registry; + +import com.titanicmc.titanic.TitanicMod; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; + +public class ModBlockTags { + + private ModBlockTags() { + } + + /** + * Every block that can legitimately be part of a generated Titanic wreck/ship: the hull + * plating itself plus all the furniture/fixture blocks {@link com.titanicmc.titanic.worldgen.WreckFeature} + * places inside it. Used to bound {@link com.titanicmc.titanic.ship.ShipUtil#collectConnectedBlocks} + * so a flood fill starting on the wreck can never spill out into the surrounding seafloor + * terrain the wreck happens to be resting on/against. + */ + public static final TagKey SHIP_BLOCKS = TagKey.create(Registries.BLOCK, + new ResourceLocation(TitanicMod.MODID, "ship_blocks")); +} diff --git a/src/main/java/com/titanicmc/titanic/registry/ModBlocks.java b/src/main/java/com/titanicmc/titanic/registry/ModBlocks.java new file mode 100644 index 0000000..daaf34f --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/registry/ModBlocks.java @@ -0,0 +1,105 @@ +package com.titanicmc.titanic.registry; + +import com.titanicmc.titanic.TitanicMod; +import com.titanicmc.titanic.block.BoilerBlock; +import com.titanicmc.titanic.block.ChairBlock; +import com.titanicmc.titanic.block.CrankshaftBlock; +import com.titanicmc.titanic.block.HelmBlock; +import com.titanicmc.titanic.block.HelmSocketBlock; +import com.titanicmc.titanic.block.LiftingFrameBlock; +import com.titanicmc.titanic.block.RepairPanelBlock; +import com.titanicmc.titanic.block.WinchBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.MapColor; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class ModBlocks { + + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, TitanicMod.MODID); + + /** Rusted, holed hull plating - generated by the wreck, converted to {@link #SHIP_HULL} on repair. */ + public static final RegistryObject DAMAGED_HULL = BLOCKS.register("damaged_hull", + () -> new Block(BlockBehaviour.Properties.of() + .mapColor(MapColor.COLOR_BROWN) + .strength(4.0f, 20.0f) + .sound(SoundType.NETHERITE_BLOCK) + .requiresCorrectToolForDrops())); + + /** Freshly patched hull plating - what {@link #DAMAGED_HULL} becomes once repaired. */ + public static final RegistryObject SHIP_HULL = BLOCKS.register("ship_hull", + () -> new Block(BlockBehaviour.Properties.of() + .mapColor(MapColor.METAL) + .strength(5.0f, 20.0f) + .sound(SoundType.METAL) + .requiresCorrectToolForDrops())); + + /** A shattered porthole - generated by the wreck, converted to a glass pane on repair. */ + public static final RegistryObject BROKEN_PORTHOLE = BLOCKS.register("broken_porthole", + () -> new Block(BlockBehaviour.Properties.of() + .mapColor(MapColor.COLOR_LIGHT_GRAY) + .strength(1.0f) + .sound(SoundType.GLASS) + .noOcclusion())); + + /** Marks where the real helm will be installed once repairs finish. World-gen only. */ + public static final RegistryObject HELM_SOCKET = BLOCKS.register("helm_socket", + () -> new HelmSocketBlock(BlockBehaviour.Properties.of() + .mapColor(MapColor.WOOD) + .strength(3.0f) + .sound(SoundType.WOOD) + .noOcclusion())); + + /** The real, working ship's wheel. */ + public static final RegistryObject HELM = BLOCKS.register("helm", + () -> new HelmBlock(BlockBehaviour.Properties.of() + .mapColor(MapColor.WOOD) + .strength(3.5f) + .sound(SoundType.WOOD) + .noOcclusion())); + + public static final RegistryObject LIFTING_FRAME = BLOCKS.register("lifting_frame", + () -> new LiftingFrameBlock(BlockBehaviour.Properties.of() + .mapColor(MapColor.METAL) + .strength(5.0f) + .sound(SoundType.METAL) + .noOcclusion())); + + public static final RegistryObject WINCH = BLOCKS.register("winch", + () -> new WinchBlock(BlockBehaviour.Properties.of() + .mapColor(MapColor.METAL) + .strength(5.0f) + .sound(SoundType.METAL))); + + public static final RegistryObject REPAIR_PANEL = BLOCKS.register("repair_panel", + () -> new RepairPanelBlock(BlockBehaviour.Properties.of() + .mapColor(MapColor.COLOR_LIGHT_BLUE) + .strength(4.0f) + .sound(SoundType.METAL) + .lightLevel(state -> 6))); + + public static final RegistryObject BOILER = BLOCKS.register("boiler", + () -> new BoilerBlock(BlockBehaviour.Properties.of() + .mapColor(MapColor.COLOR_BLACK) + .strength(6.0f, 20.0f) + .sound(SoundType.METAL) + .lightLevel(state -> 3) + .requiresCorrectToolForDrops())); + + public static final RegistryObject CRANKSHAFT = BLOCKS.register("crankshaft", + () -> new CrankshaftBlock(BlockBehaviour.Properties.of() + .mapColor(MapColor.METAL) + .strength(6.0f, 20.0f) + .sound(SoundType.METAL) + .requiresCorrectToolForDrops())); + + public static final RegistryObject CHAIR = BLOCKS.register("chair", + () -> new ChairBlock(BlockBehaviour.Properties.of() + .mapColor(MapColor.WOOD) + .strength(2.5f) + .sound(SoundType.WOOD) + .noOcclusion())); +} diff --git a/src/main/java/com/titanicmc/titanic/registry/ModCreativeTabs.java b/src/main/java/com/titanicmc/titanic/registry/ModCreativeTabs.java new file mode 100644 index 0000000..3d454f7 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/registry/ModCreativeTabs.java @@ -0,0 +1,33 @@ +package com.titanicmc.titanic.registry; + +import com.titanicmc.titanic.TitanicMod; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.RegistryObject; + +public class ModCreativeTabs { + + public static final DeferredRegister TABS = + DeferredRegister.create(Registries.CREATIVE_MODE_TAB, TitanicMod.MODID); + + public static final RegistryObject TITANIC_TAB = TABS.register("titanic", + () -> CreativeModeTab.builder() + .title(Component.translatable("itemGroup.titanic")) + .icon(() -> ModItems.HELM.get().getDefaultInstance()) + .displayItems((parameters, output) -> { + output.accept(ModItems.STEEL_INGOT.get()); + output.accept(ModItems.STEEL_CABLE.get()); + output.accept(ModItems.SHIPS_WHEEL_PART.get()); + output.accept(ModItems.SHIP_HULL.get()); + output.accept(ModItems.LIFTING_FRAME.get()); + output.accept(ModItems.WINCH.get()); + output.accept(ModItems.REPAIR_PANEL.get()); + output.accept(ModItems.BOILER.get()); + output.accept(ModItems.CRANKSHAFT.get()); + output.accept(ModItems.CHAIR.get()); + output.accept(ModItems.HELM.get()); + }) + .build()); +} diff --git a/src/main/java/com/titanicmc/titanic/registry/ModEntities.java b/src/main/java/com/titanicmc/titanic/registry/ModEntities.java new file mode 100644 index 0000000..fa9e49f --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/registry/ModEntities.java @@ -0,0 +1,23 @@ +package com.titanicmc.titanic.registry; + +import com.titanicmc.titanic.TitanicMod; +import com.titanicmc.titanic.entity.SeatEntity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +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.ENTITY_TYPES, TitanicMod.MODID); + + public static final RegistryObject> SEAT = ENTITIES.register("seat", + () -> EntityType.Builder.of(SeatEntity::new, MobCategory.MISC) + .sized(0.1f, 0.1f) + .noSummon() + .noSave() + .clientTrackingRange(6) + .build("seat")); +} diff --git a/src/main/java/com/titanicmc/titanic/registry/ModFeatures.java b/src/main/java/com/titanicmc/titanic/registry/ModFeatures.java new file mode 100644 index 0000000..fcb2587 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/registry/ModFeatures.java @@ -0,0 +1,19 @@ +package com.titanicmc.titanic.registry; + +import com.mojang.serialization.Codec; +import com.titanicmc.titanic.TitanicMod; +import com.titanicmc.titanic.worldgen.WreckFeature; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class ModFeatures { + + public static final DeferredRegister> FEATURES = + DeferredRegister.create(ForgeRegistries.FEATURES, TitanicMod.MODID); + + public static final RegistryObject> WRECK = + FEATURES.register("wreck", () -> new WreckFeature(NoneFeatureConfiguration.CODEC)); +} diff --git a/src/main/java/com/titanicmc/titanic/registry/ModItems.java b/src/main/java/com/titanicmc/titanic/registry/ModItems.java new file mode 100644 index 0000000..90dcc5a --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/registry/ModItems.java @@ -0,0 +1,48 @@ +package com.titanicmc.titanic.registry; + +import com.titanicmc.titanic.TitanicMod; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class ModItems { + + public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, TitanicMod.MODID); + + /** Smelted from iron; used to craft steel cables and hull-repair adjacent recipes. */ + public static final RegistryObject STEEL_INGOT = ITEMS.register("steel_ingot", + () -> new Item(new Item.Properties())); + + /** + * Threaded through a Lifting Frame's four eyes and then joined to a Winch to raise the wreck. + * Consumed on use. + */ + public static final RegistryObject STEEL_CABLE = ITEMS.register("steel_cable", + () -> new Item(new Item.Properties())); + + /** + * The final part delivered to the Repair Panel. Consuming it slots a real, + * controllable helm into the wreck's bridge and finishes the repair. + */ + public static final RegistryObject SHIPS_WHEEL_PART = ITEMS.register("ships_wheel", + () -> new Item(new Item.Properties())); + + public static final RegistryObject SHIP_HULL = ITEMS.register("ship_hull", + () -> new BlockItem(ModBlocks.SHIP_HULL.get(), new Item.Properties())); + public static final RegistryObject LIFTING_FRAME = ITEMS.register("lifting_frame", + () -> new BlockItem(ModBlocks.LIFTING_FRAME.get(), new Item.Properties())); + public static final RegistryObject WINCH = ITEMS.register("winch", + () -> new BlockItem(ModBlocks.WINCH.get(), new Item.Properties())); + public static final RegistryObject REPAIR_PANEL = ITEMS.register("repair_panel", + () -> new BlockItem(ModBlocks.REPAIR_PANEL.get(), new Item.Properties())); + public static final RegistryObject BOILER = ITEMS.register("boiler", + () -> new BlockItem(ModBlocks.BOILER.get(), new Item.Properties())); + public static final RegistryObject CRANKSHAFT = ITEMS.register("crankshaft", + () -> new BlockItem(ModBlocks.CRANKSHAFT.get(), new Item.Properties())); + public static final RegistryObject CHAIR = ITEMS.register("chair", + () -> new BlockItem(ModBlocks.CHAIR.get(), new Item.Properties())); + public static final RegistryObject HELM = ITEMS.register("helm", + () -> new BlockItem(ModBlocks.HELM.get(), new Item.Properties())); +} diff --git a/src/main/java/com/titanicmc/titanic/ship/ShipRaiseScheduler.java b/src/main/java/com/titanicmc/titanic/ship/ShipRaiseScheduler.java new file mode 100644 index 0000000..a0ab3b8 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/ship/ShipRaiseScheduler.java @@ -0,0 +1,79 @@ +package com.titanicmc.titanic.ship; + +import com.titanicmc.titanic.TitanicMod; +import net.minecraft.server.level.ServerLevel; +import org.valkyrienskies.core.api.ships.LoadedServerShip; +import org.valkyrienskies.core.api.world.ServerShipWorld; +import org.valkyrienskies.mod.common.VSGameUtilsKt; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/** + * Freshly {@link ShipUtil#assembleWreck assembled} ships are not always a + * {@link LoadedServerShip} on the very tick they're created - Valkyrien Skies relocates the + * collected blocks into a brand new ship storage area, and that area only becomes "loaded" + * once VS2 finishes registering it, which can take a tick or more. + *

+ * Rather than giving up immediately when that happens, pending raises are tracked here by the + * ship's stable {@code long} id (not by {@link net.minecraft.core.BlockPos}, since the seed + * position's block may itself have just been physically relocated as part of assembly) and + * retried every server tick until the ship reports itself loaded, or a generous timeout is hit. + */ +public final class ShipRaiseScheduler { + + /** ~30 seconds at 20 TPS. VS2 normally finishes loading within a tick or two. */ + private static final int MAX_WAIT_TICKS = 600; + + private static final List PENDING = new ArrayList<>(); + + private ShipRaiseScheduler() { + } + + /** Queues an already-assembled-but-not-yet-loaded ship to begin raising once it loads. */ + public static void schedule(ServerLevel level, long shipId, double targetWorldY) { + PENDING.add(new Pending(level, shipId, targetWorldY)); + } + + /** Call once per server tick (see {@link com.titanicmc.titanic.event.ForgeEventHandler}). */ + public static void tick() { + if (PENDING.isEmpty()) { + return; + } + Iterator it = PENDING.iterator(); + while (it.hasNext()) { + Pending pending = it.next(); + ServerShipWorld shipWorld = VSGameUtilsKt.getShipObjectWorld(pending.level.getServer()); + LoadedServerShip ship = shipWorld.getLoadedShips().getById(pending.shipId); + if (ship != null) { + TitanicMod.LOGGER.info( + "Ship {} finished loading after {} ticks - beginning raise to y={}", + pending.shipId, pending.ticksWaited, pending.targetWorldY); + ShipUtil.beginRaiseSafely(pending.level, ship, pending.targetWorldY); + it.remove(); + continue; + } + pending.ticksWaited++; + if (pending.ticksWaited > MAX_WAIT_TICKS) { + TitanicMod.LOGGER.warn( + "Gave up waiting for assembled ship {} to finish loading for raising after {} ticks", + pending.shipId, pending.ticksWaited); + it.remove(); + } + } + } + + private static final class Pending { + final ServerLevel level; + final long shipId; + final double targetWorldY; + int ticksWaited = 0; + + Pending(ServerLevel level, long shipId, double targetWorldY) { + this.level = level; + this.shipId = shipId; + this.targetWorldY = targetWorldY; + } + } +} diff --git a/src/main/java/com/titanicmc/titanic/ship/ShipUtil.java b/src/main/java/com/titanicmc/titanic/ship/ShipUtil.java new file mode 100644 index 0000000..91d3892 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/ship/ShipUtil.java @@ -0,0 +1,211 @@ +package com.titanicmc.titanic.ship; + +import com.titanicmc.titanic.Config; +import com.titanicmc.titanic.TitanicMod; +import com.titanicmc.titanic.registry.ModBlockTags; +import net.minecraft.core.BlockPos; +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.state.BlockState; +import net.minecraft.world.phys.AABB; + +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.joml.primitives.AABBdc; +import org.valkyrienskies.core.api.ships.LoadedServerShip; +import org.valkyrienskies.core.api.ships.ServerShip; +import org.valkyrienskies.mod.common.VSGameUtilsKt; +import org.valkyrienskies.mod.common.assembly.ShipAssembler; + +/** + * All direct interop with the Valkyrien Skies 2 API lives here, so any future API changes + * only need to be fixed in one place. + *

+ * Important VS2 quirk this class relies on: once a structure is assembled into a ship, every + * one of its blocks keeps living at its original ("storage") {@link BlockPos} for as long as + * the ship exists, even though the ship visually moves elsewhere in the world. Any BlockPos + * handed to us through normal block/interaction callbacks (place, use, block entity ticking) + * is always already in that stable storage space - Valkyrien Skies transparently remaps + * rendering, physics and click-raycasts for us. That means code elsewhere in this mod never + * needs to special-case "is this block on a ship" positions; it can use them exactly like any + * other {@link BlockPos}. + */ +public final class ShipUtil { + + private ShipUtil() { + } + + /** + * Returns the ship that manages storage of the block at {@code pos}, or {@code null} if + * that position isn't part of any assembled ship. + */ + public static ServerShip getShipManagingPos(ServerLevel level, BlockPos pos) { + return VSGameUtilsKt.getShipManagingPos(level, pos); + } + + /** + * Same as {@link #getShipManagingPos}, but only returns a result if the ship is currently + * loaded (required to read/write ship attachments like {@link TitanicShipControl}). + */ + public static LoadedServerShip getLoadedShipManagingPos(ServerLevel level, BlockPos pos) { + ServerShip ship = getShipManagingPos(level, pos); + return ship instanceof LoadedServerShip loaded ? loaded : null; + } + + /** + * Flood-fills every block tagged {@link ModBlockTags#SHIP_BLOCKS} connected to {@code seed} + * (up to the configured safety limit). Used both to gather the initial wreck for assembly + * and to re-scan an already assembled ship's blocks (e.g. to find remaining damaged blocks). + *

+ * Only blocks that are actually part of a Titanic wreck/ship qualify - anything else (air, + * fluids, and, importantly, the natural seafloor terrain a wreck rests on/against) acts as a + * boundary the fill does not cross. Without this restriction a seed touching bare stone, + * sand, or gravel would keep flooding through the entire connected landmass until it hit + * {@code maxBlocks}, producing a huge, malformed "ship" instead of just the wreck. + *

+ * {@code seed} itself is always accepted and expanded from regardless of that tag, even if + * it isn't a wreck block - callers seed this from player-placed attachment points like the + * {@link com.titanicmc.titanic.block.LiftingFrameBlock} lowered over the wreck, which need + * to bridge into the tagged wreck blocks touching them rather than being rejected outright. + */ + public static Set collectConnectedBlocks(ServerLevel level, BlockPos seed, int maxBlocks) { + Set collected = new HashSet<>(); + Set visited = new HashSet<>(); + ArrayDeque queue = new ArrayDeque<>(); + + BlockPos immutableSeed = seed.immutable(); + queue.add(immutableSeed); + visited.add(immutableSeed.asLong()); + + while (!queue.isEmpty() && collected.size() < maxBlocks) { + BlockPos pos = queue.poll(); + BlockState state = level.getBlockState(pos); + boolean isSeed = pos.equals(immutableSeed); + if (!isSeed && !state.is(ModBlockTags.SHIP_BLOCKS)) { + continue; + } + if (state.isAir() || !state.getFluidState().isEmpty()) { + continue; + } + collected.add(pos); + + for (int dx = -1; dx <= 1; dx++) { + for (int dy = -1; dy <= 1; dy++) { + for (int dz = -1; dz <= 1; dz++) { + if (dx == 0 && dy == 0 && dz == 0) continue; + BlockPos next = pos.offset(dx, dy, dz); + long key = next.asLong(); + if (visited.add(key)) { + queue.add(next); + } + } + } + } + } + return collected; + } + + /** Filters a previously collected block set down to positions currently holding {@code block}. */ + public static List findBlocksOfType(ServerLevel level, Set allBlocks, Block block) { + List found = new ArrayList<>(); + for (BlockPos pos : allBlocks) { + if (level.getBlockState(pos).is(block)) { + found.add(pos); + } + } + return found; + } + + /** + * Flood-fills every {@link ModBlockTags#SHIP_BLOCKS}-tagged block connected to {@code seed} + * and hands the collected region to Valkyrien Skies so it becomes one real, physically + * simulated ship. + */ + public static ServerShip assembleWreck(ServerLevel level, BlockPos seed) { + Set collected = collectConnectedBlocks(level, seed, Config.MAX_SHIP_BLOCKS.get()); + if (collected.isEmpty()) { + return null; + } + + TitanicMod.LOGGER.info("Assembling Titanic hull with {} blocks", collected.size()); + return ShipAssembler.assembleToShip(level, collected, 1.0); + } + + /** Kicks off the raise sequence: assembles the wreck and applies lifting force until it surfaces. */ + public static void beginWreckRaise(ServerLevel level, BlockPos seed) { + ServerShip assembled = getShipManagingPos(level, seed); + if (assembled == null) { + assembled = assembleWreck(level, seed); + } + if (assembled == null) { + TitanicMod.LOGGER.warn("Failed to assemble wreck at {} for raising", seed); + return; + } + + double targetWorldY = level.getSeaLevel() + 1; + TitanicMod.LOGGER.info("Wreck assembled as ship id={} (already loaded={}), raise target y={}", + assembled.getId(), assembled instanceof LoadedServerShip, targetWorldY); + if (assembled instanceof LoadedServerShip ship) { + beginRaiseSafely(level, ship, targetWorldY); + } else { + // A freshly assembled ship isn't always immediately Loaded - VS2 relocates the + // collected blocks into a new ship storage area that can take a tick or more to + // finish registering. Retry by stable ship id until it comes online instead of + // failing outright (see ShipRaiseScheduler for why id, not BlockPos, is used). + ShipRaiseScheduler.schedule(level, assembled.getId(), targetWorldY); + } + } + + /** + * Pushes any player standing on/near the ship safely clear before starting the raise, then + * begins it. + *

+ * The raise repeatedly re-asserts the ship's position directly (see + * {@link TitanicShipControl}), which was observed to violently launch a player standing on + * the hull ~100 blocks away over the course of the raise - each of those position + * corrections appears to trigger Minecraft's own "entity is stuck inside a block" pushback + * against the player, and dozens of small pushes over a few seconds add up fast. Moving + * players safely above the ship first avoids that class of collision entirely. + */ + public static void beginRaiseSafely(ServerLevel level, LoadedServerShip ship, double targetWorldY) { + pushPlayersClear(level, ship); + getOrCreateControl(ship).beginRaise(targetWorldY); + } + + /** Teleports any player inside/near the ship's world AABB to a safe spot directly above it. */ + private static void pushPlayersClear(ServerLevel level, LoadedServerShip ship) { + AABBdc shipAabb = ship.getWorldAABB(); + AABB searchArea = new AABB( + shipAabb.minX(), shipAabb.minY(), shipAabb.minZ(), + shipAabb.maxX(), shipAabb.maxY(), shipAabb.maxZ()) + .inflate(4.0); + double safeY = shipAabb.maxY() + 10.0; + + for (ServerPlayer player : level.getEntitiesOfClass(ServerPlayer.class, searchArea)) { + if (player.getY() < safeY) { + player.teleportTo(player.getX(), safeY, player.getZ()); + player.setDeltaMovement(0.0, 0.0, 0.0); + player.fallDistance = 0.0f; + } + } + } + + /** Gets or creates the {@link TitanicShipControl} attachment for a loaded ship. */ + public static TitanicShipControl getOrCreateControl(LoadedServerShip ship) { + TitanicShipControl control = ship.getAttachment(TitanicShipControl.class); + if (control == null) { + control = new TitanicShipControl(); + ship.setAttachment(TitanicShipControl.class, control); + } + // Keep this in sync unconditionally (cheap) so a valid LoadedServerShip reference is + // always available for direct transform manipulation (see TitanicShipControl.onServerTick), + // not just once a Helm block entity happens to refresh it. + control.ship = ship; + return control; + } +} diff --git a/src/main/java/com/titanicmc/titanic/ship/TitanicShipControl.java b/src/main/java/com/titanicmc/titanic/ship/TitanicShipControl.java new file mode 100644 index 0000000..e5d11c5 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/ship/TitanicShipControl.java @@ -0,0 +1,230 @@ +package com.titanicmc.titanic.ship; + +import com.titanicmc.titanic.TitanicMod; +import org.joml.Vector3d; +import org.joml.Vector3dc; +import org.valkyrienskies.core.api.ships.LoadedServerShip; +import org.valkyrienskies.core.api.ships.PhysShip; +import org.valkyrienskies.core.api.ships.ServerTickListener; +import org.valkyrienskies.core.api.ships.ShipPhysicsListener; +import org.valkyrienskies.core.api.ships.properties.ShipTransform; +import org.valkyrienskies.core.api.world.PhysLevel; +import org.valkyrienskies.mod.api.SeatedControllingPlayer; + +/** + * Per-ship "brain" attached to every assembled Titanic hull. Handles three responsibilities: + *

    + *
  • Raising: steps the hull's position directly upward each tick until it breaches the + * surface (see {@link #onServerTick}).
    • + *
  • Buoyancy assist: while not yet repaired, the wreck is full of holes and shouldn't + * realistically float - we cancel out net gravity so it doesn't sink while under tow.
    • + *
  • Propulsion: Boilers (with an adjacent Crankshaft) feed {@link #addEnginePower(double)} + * every tick; that power is turned into forward thrust in the direction the helm is + * facing, and steering torque from the helm's turn input.
    • + *
+ */ +public final class TitanicShipControl implements ShipPhysicsListener, ServerTickListener { + + private static final double GRAVITY = 10.0; + /** + * Linear damping applied to vertical velocity every physics tick (see {@link #physTick}). + * Keeps any velocity the hull picks up (from collisions, residual momentum, etc.) from + * building up and coasting the hull upward/downward forever once gravity is cancelled below. + */ + private static final double VERTICAL_DAMPING = 2.0; + /** + * Blocks climbed per server tick while raising (20 ticks/sec, so ~3 blocks/sec). + *

+ * Raising is driven by directly stepping the ship's transform via + * {@link org.valkyrienskies.core.api.ships.ServerShip#unsafeSetTransform} rather than by + * applying physics forces. Force-based raising (mass * constant acceleration, every physics + * tick) proved wildly unreliable for hulls this large: observed overshoot ranged from a few + * blocks to 600+ blocks past the target in under a second, wildly out of proportion to the + * force actually intended - almost certainly some multiplier/timestep mismatch specific to + * hulls with this many blocks/this much mass. Direct, small, per-tick position steps sidestep + * that whole class of problem entirely. + */ + private static final double RAISE_SPEED_PER_TICK = 0.15; + + private volatile boolean raising = false; + private volatile double raiseTargetWorldY = 62.0; + private volatile boolean repaired = false; + + private double pendingEnginePower = 0.0; + private double enginePower = 0.0; + + private int raiseTickCounter = 0; + private boolean loggedInvalidMass = false; + + /** + * Our own authoritative X/Y/Z for the ship while raising, forced onto it every tick via + * {@link org.valkyrienskies.core.api.ships.ServerShip#unsafeSetTransform} regardless of + * whatever position VS2's physics/collision engine may have produced in between our ticks. + *

+ * The read-back position ({@code getTransform()}) was observed to become wildly corrupted + * mid-raise (Y jumping to values in the tens of thousands, even decreasing between ticks, + * which our own upward-only stepping could never do) - a bug in VS2 itself when a + * freshly-assembled hull's collision is resolved against the terrain/water it was just cut + * out of. Trusting that read-back to decide "where to step from next" let the corruption + * compound. Tracking our own value here and always re-asserting it sidesteps that entirely: + * whatever VS2 does to the ship between our ticks is simply overwritten back to where we + * expect it to be on the very next tick. + */ + private double raiseX = Double.NaN; + private double raiseY = Double.NaN; + private double raiseZ = Double.NaN; + + /** Refreshed every game tick by the Helm block entity so physTick can find the seated player. */ + public volatile LoadedServerShip ship; + + public void beginRaise(double targetWorldY) { + this.raising = true; + this.raiseTargetWorldY = targetWorldY; + // NaN sentinel: onServerTick seeds these from the ship's real position on its first + // raising tick, then owns them exclusively from there on (see field javadoc above). + this.raiseX = Double.NaN; + this.raiseY = Double.NaN; + this.raiseZ = Double.NaN; + TitanicMod.LOGGER.info("TitanicShipControl.beginRaise: target y={}", targetWorldY); + } + + public boolean isRaising() { + return raising; + } + + public void markRepaired() { + this.repaired = true; + } + + public boolean isRepaired() { + return repaired; + } + + /** Called by a Boiler/Crankshaft pair every game tick to contribute propulsion power. */ + public void addEnginePower(double power) { + pendingEnginePower += power; + } + + @Override + public void onServerTick() { + enginePower = pendingEnginePower; + pendingEnginePower = 0.0; + + if (!raising) { + return; + } + LoadedServerShip currentShip = this.ship; + if (currentShip == null) { + return; + } + + ShipTransform transform = currentShip.getTransform(); + if (Double.isNaN(raiseY)) { + // First tick of this raise - seed our own tracked position from the real one once. + Vector3dc startPos = transform.getPosition(); + raiseX = startPos.x(); + raiseY = startPos.y(); + raiseZ = startPos.z(); + } + + if (raiseY >= raiseTargetWorldY) { + raising = false; + TitanicMod.LOGGER.info("Raising complete at y={}", raiseY); + return; + } + + raiseY = Math.min(raiseY + RAISE_SPEED_PER_TICK, raiseTargetWorldY); + Vector3d newPos = new Vector3d(raiseX, raiseY, raiseZ); + ShipTransform newTransform = + transform.copy(newPos, transform.getPositionInModel(), transform.getRotation(), transform.getScaling()); + currentShip.unsafeSetTransform(newTransform); + + if (raiseTickCounter++ % 20 == 0) { + TitanicMod.LOGGER.info("Raising: y={} target={} (actual ship-reported y={})", + raiseY, raiseTargetWorldY, transform.getPosition().y()); + } + } + + @Override + public void physTick(PhysShip physShip, PhysLevel physLevel) { + double mass = physShip.getMass(); + + if (!(mass > 0.0) || !Double.isFinite(mass)) { + // A ship's inertia data can momentarily be unset/invalid right as it finishes + // loading. Applying forces computed from a bogus mass (0, NaN, Infinity) would + // inject garbage into the physics engine, which can corrupt or silently delete the + // ship - skip this tick entirely rather than risk that. + if (!loggedInvalidMass) { + TitanicMod.LOGGER.warn("TitanicShipControl.physTick: skipping tick(s), invalid mass={}", mass); + loggedInvalidMass = true; + } + return; + } + + // Valkyrien Skies has its own built-in fluid buoyancy simulation, which was fighting + // our own hand-tuned gravity-cancel/raise force below - both were pushing the hull + // upward at once, and depending on how much of the hull happened to be submerged that + // combination produced wildly inconsistent, sometimes huge, overshoot (observed + // anywhere from a few blocks to 150+ blocks past the raise target). We want full manual + // control over vertical motion here, so disable VS2's automatic buoyancy/fluid drag + // entirely and let our own forces be the only thing acting on it. + physShip.setBuoyantFactor(0.0); + physShip.setDoFluidDrag(false); + + // NOTE: marking the ship static while raising was tried here to stop VS2's own + // physics/collision engine from fighting our unsafeSetTransform calls. It backfired in a + // different way than expected: our position updates DID appear to take effect visually + // for the player (the hull was seen rising for a few seconds), but the physics engine's + // own internal position never actually moved (confirmed via logging - it stayed pinned + // at the pre-raise value for the entire raise) and un-staticing at the end snapped + // everything back to that stale position, which is what looked like the ship + // "disappearing" right after the visible rise. VS2's own reference usage of + // unsafeSetTransform (its ShipCreatorItem) never touches setStatic either, so we don't + // either - we stay dynamic and simply re-assert our own tracked position every tick in + // onServerTick (see the raiseX/Y/Z field javadoc), unconditionally overwriting whatever + // the physics engine did to it in between. Now that beginRaiseSafely moves nearby + // players out of the way first, the engine's own uncontrolled collision response during + // that tug-of-war can no longer launch anyone even if it still happens. + + Vector3dc centerOfMass = physShip.getCenterOfMass(); + + // While actively raising, position is driven directly in onServerTick via + // unsafeSetTransform - don't also fight it with gravity-cancel force here. + if (!raising && !repaired) { + // Cancel gravity so the patched-up hull doesn't sink under tow. + physShip.applyWorldForce(new Vector3d(0.0, mass * GRAVITY, 0.0), centerOfMass); + } + + // Always bleed off vertical velocity a little so any residual momentum (from + // collisions, buoyancy remnants, etc.) doesn't coast the hull upward/downward forever + // once other vertical forces are balanced out. + double verticalVelocity = physShip.getVelocity().y(); + physShip.applyWorldForce(new Vector3d(0.0, -mass * verticalVelocity * VERTICAL_DAMPING, 0.0), centerOfMass); + + LoadedServerShip currentShip = this.ship; + SeatedControllingPlayer controller = + currentShip != null ? currentShip.getAttachment(SeatedControllingPlayer.class) : null; + + if (enginePower > 0.0001 && controller != null) { + Vector3d forwardDirection = new Vector3d( + controller.getSeatInDirection().getStepX(), + 0.0, + controller.getSeatInDirection().getStepZ()); + physShip.getTransform().getShipToWorldRotation().transform(forwardDirection); + forwardDirection.normalize(); + + Vector3d thrust = forwardDirection.mul(enginePower * controller.getForwardImpulse()); + physShip.applyWorldForce(thrust, centerOfMass); + + float turn = controller.getLeftImpulse(); + if (Math.abs(turn) > 0.0001) { + double turnStrength = enginePower * 0.02 * turn; + physShip.applyWorldTorque(new Vector3d(0.0, turnStrength, 0.0)); + } + } + + // Always damp angular velocity a little so the hull doesn't spin forever. + Vector3dc omega = physShip.getAngularVelocity(); + physShip.applyWorldTorque(new Vector3d(omega).mul(-mass * 0.02)); + } +} diff --git a/src/main/java/com/titanicmc/titanic/worldgen/WreckFeature.java b/src/main/java/com/titanicmc/titanic/worldgen/WreckFeature.java new file mode 100644 index 0000000..9806260 --- /dev/null +++ b/src/main/java/com/titanicmc/titanic/worldgen/WreckFeature.java @@ -0,0 +1,173 @@ +package com.titanicmc.titanic.worldgen; + +import com.mojang.serialization.Codec; +import com.titanicmc.titanic.registry.ModBlocks; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; +import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import net.minecraftforge.fml.ModList; +import net.minecraftforge.registries.ForgeRegistries; + +/** + * Procedurally builds a stylised, single-piece Titanic wreck lying on the seafloor. This is + * deliberately a simplified silhouette (a tapered hull with a bow, a few interior rooms, and + * marked bridge/engine areas) rather than a 1:1 scale replica - it's generated entirely in + * code, with no schematic/NBT structure file and no player-visible "assembly" of separate + * pieces. + */ +public class WreckFeature extends Feature { + + private static final int LENGTH = 48; + private static final int WIDTH = 9; + private static final int HEIGHT = 12; + private static final int BOW_TAPER = LENGTH / 4; + + public WreckFeature(Codec codec) { + super(codec); + } + + @Override + public boolean place(FeaturePlaceContext context) { + WorldGenLevel level = context.level(); + RandomSource random = context.random(); + BlockPos origin = anchorToChunk(context.origin()); + + int centerZ = WIDTH / 2; + + for (int x = 0; x < LENGTH; x++) { + int halfWidth = halfWidthAt(x); + boolean bowTip = x == 0; + boolean sternWall = x == LENGTH - 1; + + for (int y = 0; y < HEIGHT; y++) { + boolean keel = y == 0; + boolean deck = y == HEIGHT - 1; + + for (int z = centerZ - halfWidth; z <= centerZ + halfWidth; z++) { + boolean sideWall = z == centerZ - halfWidth || z == centerZ + halfWidth; + boolean shell = bowTip || sternWall || keel || deck || sideWall; + + BlockPos pos = origin.offset(x, y, z - centerZ); + + if (!shell) { + // Hollow interior. + level.setBlock(pos, Blocks.WATER.defaultBlockState(), 2); + continue; + } + + if (deck && random.nextFloat() < 0.06f) { + // A few holes punched through the deck. + level.setBlock(pos, Blocks.WATER.defaultBlockState(), 2); + continue; + } + + if (sideWall && !bowTip && !sternWall && y == HEIGHT / 2 && z % 3 == 0) { + level.setBlock(pos, ModBlocks.BROKEN_PORTHOLE.get().defaultBlockState(), 2); + continue; + } + + if (shell && random.nextFloat() < 0.1f && !keel) { + // Damage: leave a gap in the hull plating. + continue; + } + + level.setBlock(pos, ModBlocks.DAMAGED_HULL.get().defaultBlockState(), 2); + } + } + } + + buildEngineRoom(level, origin, centerZ, random); + buildGalleyAndCabins(level, origin, centerZ, random); + buildBridge(level, origin, centerZ); + + return true; + } + + /** + * The placement modifiers ({@code in_square} + {@code heightmap}) hand us an origin whose + * X/Z can land anywhere within the chunk currently being decorated. Since the hull is + * {@link #LENGTH} (48) blocks long in X - three chunks' worth - building it forward from + * that arbitrary in-chunk X would routinely write into chunks more than one chunk away from + * the decorating chunk, which is exactly what trips vanilla's "Detected setBlock in a far + * chunk" sanity check (a plain {@link Feature}'s {@link WorldGenLevel} is only guaranteed + * safe for writes within one chunk of the one being decorated). + *

+ * To stay inside that safe window regardless of where in its chunk the origin happens to + * fall, the hull is anchored to the decorating chunk's own boundary instead of to the + * origin's exact X: it always starts one full chunk before that chunk and runs for exactly + * three chunks (48 blocks), i.e. spanning the decorating chunk minus-one through plus-one - + * precisely the safe range - every time. Only X is adjusted; Y (from the heightmap sample) + * and Z (the hull is only {@link #WIDTH} blocks wide, well under one chunk) are left as-is. + */ + private static BlockPos anchorToChunk(BlockPos origin) { + int chunkStartX = origin.getX() - Math.floorMod(origin.getX(), 16); + return new BlockPos(chunkStartX - 16, origin.getY(), origin.getZ()); + } + + private static int halfWidthAt(int x) { + int half = WIDTH / 2; + if (x < BOW_TAPER) { + int taperedHalf = Math.round(half * ((x + 1f) / BOW_TAPER)); + return Math.max(1, taperedHalf); + } + return half; + } + + private void buildEngineRoom(WorldGenLevel level, BlockPos origin, int centerZ, RandomSource random) { + int startX = LENGTH / 4 + 2; + int floorY = 1; + + for (int i = 0; i < 3; i++) { + int x = startX + i * 2; + BlockPos boilerPos = origin.offset(x, floorY, 0); + level.setBlock(boilerPos, ModBlocks.BOILER.get().defaultBlockState(), 2); + level.setBlock(boilerPos.relative(Direction.SOUTH), ModBlocks.CRANKSHAFT.get().defaultBlockState(), 2); + } + } + + private void buildGalleyAndCabins(WorldGenLevel level, BlockPos origin, int centerZ, RandomSource random) { + int x = (int) (LENGTH * 0.62); + int floorY = 1; + + BlockState cookingBlock = getFarmersDelightCookingBlock(); + level.setBlock(origin.offset(x, floorY, -2), cookingBlock, 2); + level.setBlock(origin.offset(x, floorY, 2), ModBlocks.CHAIR.get().defaultBlockState(), 2); + level.setBlock(origin.offset(x + 1, floorY, 2), ModBlocks.CHAIR.get().defaultBlockState(), 2); + + int cabinX = (int) (LENGTH * 0.72); + level.setBlock(origin.offset(cabinX, floorY, -1), Blocks.RED_BED.defaultBlockState() + .setValue(BlockStateProperties.HORIZONTAL_FACING, Direction.EAST) + .setValue(BlockStateProperties.BED_PART, net.minecraft.world.level.block.state.properties.BedPart.FOOT), 2); + level.setBlock(origin.offset(cabinX + 1, floorY, -1), Blocks.RED_BED.defaultBlockState() + .setValue(BlockStateProperties.HORIZONTAL_FACING, Direction.EAST) + .setValue(BlockStateProperties.BED_PART, net.minecraft.world.level.block.state.properties.BedPart.HEAD), 2); + } + + private void buildBridge(WorldGenLevel level, BlockPos origin, int centerZ) { + int x = LENGTH - 6; + int floorY = HEIGHT - 3; + + level.setBlock(origin.offset(x, floorY, 0), ModBlocks.HELM_SOCKET.get().defaultBlockState() + .setValue(BlockStateProperties.HORIZONTAL_FACING, Direction.WEST), 2); + level.setBlock(origin.offset(x - 1, floorY, 0), ModBlocks.REPAIR_PANEL.get().defaultBlockState(), 2); + } + + private static BlockState getFarmersDelightCookingBlock() { + if (ModList.get().isLoaded("farmersdelight")) { + var block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation("farmersdelight", "cooking_pot")); + if (block != null) { + return block.defaultBlockState(); + } + } + return Blocks.FURNACE.defaultBlockState(); + } +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..4d66285 --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,94 @@ +# This is an example mods.toml file. It contains the data relating to the loading mods. +# There are several mandatory fields (#mandatory), and many more that are optional (#optional). +# The overall format is standard TOML format, v0.5.0. +# Note that there are a couple of TOML lists in this file. +# Find more information on toml format here: https://github.com/toml-lang/toml +# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml +modLoader="javafml" #mandatory +# A version range to match for said mod loader - for regular FML @Mod it will be the forge version +loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. +# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. +license="${mod_license}" +# A URL to refer people to when problems occur with this mod +#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional +# If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or Open to LAN), +# set this to true, and Forge will set the correct displayTest for you and skip loading your mod on dedicated servers. +#clientSideOnly=true #optional - defaults to false if absent +# A list of mods - how many allowed here is determined by the individual mod loader +[[mods]] #mandatory +# The modid of the mod +modId="${mod_id}" #mandatory +# The version number of the mod +version="${mod_version}" #mandatory +# A display name for the mod +displayName="${mod_name}" #mandatory +# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ +#updateJSONURL="https://change.me.example.invalid/updates.json" #optional +# A URL for the "homepage" for this mod, displayed in the mod UI +#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional +# A file name (in the root of the mod JAR) containing a logo for display +#logoFile="examplemod.png" #optional +# A text field displayed in the mod UI +#credits="" #optional +# A text field displayed in the mod UI +authors="${mod_authors}" #optional +# Display Test controls the display for your mod in the server connection screen +# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod. +# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod. +# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component. +# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value. +# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself. +#displayTest="MATCH_VERSION" # if nothing is specified, MATCH_VERSION is the default when clientSideOnly=false, otherwise IGNORE_ALL_VERSION when clientSideOnly=true (#optional) + +# The description text for the mod (multi line!) (#mandatory) +description='''${mod_description}''' +# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. +[[dependencies.${mod_id}]] #optional + # the modid of the dependency + modId="forge" #mandatory + # Does this dependency have to exist - if not, ordering below must be specified + mandatory=true #mandatory + # The version range of the dependency + versionRange="${forge_version_range}" #mandatory + # An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory + # BEFORE - This mod is loaded BEFORE the dependency + # AFTER - This mod is loaded AFTER the dependency + ordering="NONE" + # Side this dependency is applied on - BOTH, CLIENT, or SERVER + side="BOTH" +# Here's another dependency +[[dependencies.${mod_id}]] + modId="minecraft" + mandatory=true + # This version range declares a minimum of the current minecraft version up to but not including the next major version + versionRange="${minecraft_version_range}" + ordering="NONE" + side="BOTH" +# Valkyrien Skies 2 provides the ship physics that make the repaired Titanic actually sail. +[[dependencies.${mod_id}]] + modId="valkyrienskies" + mandatory=true + versionRange="[2.0,)" + ordering="AFTER" + side="BOTH" +# Valkyrien Skies is written in Kotlin and needs the Kotlin runtime provided by this mod. +[[dependencies.${mod_id}]] + modId="kotlinforforge" + mandatory=true + versionRange="[4.10,)" + ordering="AFTER" + side="BOTH" +# Optional: if Farmer's Delight is installed, the Titanic's galley uses its cooking blocks/food. +[[dependencies.${mod_id}]] + modId="farmersdelight" + mandatory=false + versionRange="[1.20.1,)" + ordering="AFTER" + side="BOTH" + +# Features are specific properties of the game environment, that you may want to declare you require. This example declares +# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't +# stop your mod loading on the server for example. +#[features.${mod_id}] +#openGLVersion="[3.2,)" diff --git a/src/main/resources/assets/titanic/blockstates/boiler.json b/src/main/resources/assets/titanic/blockstates/boiler.json new file mode 100644 index 0000000..0c5a74b --- /dev/null +++ b/src/main/resources/assets/titanic/blockstates/boiler.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "titanic:block/boiler" } + } +} diff --git a/src/main/resources/assets/titanic/blockstates/broken_porthole.json b/src/main/resources/assets/titanic/blockstates/broken_porthole.json new file mode 100644 index 0000000..9217fa7 --- /dev/null +++ b/src/main/resources/assets/titanic/blockstates/broken_porthole.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "titanic:block/broken_porthole" } + } +} diff --git a/src/main/resources/assets/titanic/blockstates/chair.json b/src/main/resources/assets/titanic/blockstates/chair.json new file mode 100644 index 0000000..ef9819f --- /dev/null +++ b/src/main/resources/assets/titanic/blockstates/chair.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "titanic:block/chair" } + } +} diff --git a/src/main/resources/assets/titanic/blockstates/crankshaft.json b/src/main/resources/assets/titanic/blockstates/crankshaft.json new file mode 100644 index 0000000..c937749 --- /dev/null +++ b/src/main/resources/assets/titanic/blockstates/crankshaft.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "titanic:block/crankshaft" } + } +} diff --git a/src/main/resources/assets/titanic/blockstates/damaged_hull.json b/src/main/resources/assets/titanic/blockstates/damaged_hull.json new file mode 100644 index 0000000..f483d9c --- /dev/null +++ b/src/main/resources/assets/titanic/blockstates/damaged_hull.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "titanic:block/damaged_hull" } + } +} diff --git a/src/main/resources/assets/titanic/blockstates/helm.json b/src/main/resources/assets/titanic/blockstates/helm.json new file mode 100644 index 0000000..567dfd6 --- /dev/null +++ b/src/main/resources/assets/titanic/blockstates/helm.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "titanic:block/helm" }, + "facing=south": { "model": "titanic:block/helm", "y": 180 }, + "facing=west": { "model": "titanic:block/helm", "y": 270 }, + "facing=east": { "model": "titanic:block/helm", "y": 90 } + } +} diff --git a/src/main/resources/assets/titanic/blockstates/helm_socket.json b/src/main/resources/assets/titanic/blockstates/helm_socket.json new file mode 100644 index 0000000..4affdce --- /dev/null +++ b/src/main/resources/assets/titanic/blockstates/helm_socket.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "titanic:block/helm_socket" }, + "facing=south": { "model": "titanic:block/helm_socket", "y": 180 }, + "facing=west": { "model": "titanic:block/helm_socket", "y": 270 }, + "facing=east": { "model": "titanic:block/helm_socket", "y": 90 } + } +} diff --git a/src/main/resources/assets/titanic/blockstates/lifting_frame.json b/src/main/resources/assets/titanic/blockstates/lifting_frame.json new file mode 100644 index 0000000..d871d62 --- /dev/null +++ b/src/main/resources/assets/titanic/blockstates/lifting_frame.json @@ -0,0 +1,9 @@ +{ + "variants": { + "cables=0": { "model": "titanic:block/lifting_frame" }, + "cables=1": { "model": "titanic:block/lifting_frame" }, + "cables=2": { "model": "titanic:block/lifting_frame" }, + "cables=3": { "model": "titanic:block/lifting_frame" }, + "cables=4": { "model": "titanic:block/lifting_frame" } + } +} diff --git a/src/main/resources/assets/titanic/blockstates/repair_panel.json b/src/main/resources/assets/titanic/blockstates/repair_panel.json new file mode 100644 index 0000000..2d80d26 --- /dev/null +++ b/src/main/resources/assets/titanic/blockstates/repair_panel.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "titanic:block/repair_panel" } + } +} diff --git a/src/main/resources/assets/titanic/blockstates/ship_hull.json b/src/main/resources/assets/titanic/blockstates/ship_hull.json new file mode 100644 index 0000000..1f8da37 --- /dev/null +++ b/src/main/resources/assets/titanic/blockstates/ship_hull.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "titanic:block/ship_hull" } + } +} diff --git a/src/main/resources/assets/titanic/blockstates/winch.json b/src/main/resources/assets/titanic/blockstates/winch.json new file mode 100644 index 0000000..81a25fe --- /dev/null +++ b/src/main/resources/assets/titanic/blockstates/winch.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "titanic:block/winch" } + } +} diff --git a/src/main/resources/assets/titanic/lang/en_us.json b/src/main/resources/assets/titanic/lang/en_us.json new file mode 100644 index 0000000..55bb221 --- /dev/null +++ b/src/main/resources/assets/titanic/lang/en_us.json @@ -0,0 +1,50 @@ +{ + "itemGroup.titanic": "Titanic", + + "item.titanic.steel_ingot": "Steel Ingot", + "item.titanic.steel_cable": "Steel Cable", + "item.titanic.ships_wheel": "Ship's Wheel (Part)", + "item.titanic.ship_hull": "Ship Hull Plating", + "item.titanic.lifting_frame": "Lifting Frame", + "item.titanic.winch": "Winch", + "item.titanic.repair_panel": "Repair Panel", + "item.titanic.boiler": "Boiler", + "item.titanic.crankshaft": "Crankshaft", + "item.titanic.chair": "Chair", + "item.titanic.helm": "Ship's Helm", + + "block.titanic.damaged_hull": "Damaged Hull Plating", + "block.titanic.ship_hull": "Ship Hull Plating", + "block.titanic.broken_porthole": "Broken Porthole", + "block.titanic.helm_socket": "Helm Socket", + "block.titanic.helm": "Ship's Helm", + "block.titanic.lifting_frame": "Lifting Frame", + "block.titanic.winch": "Winch", + "block.titanic.repair_panel": "Repair Panel", + "block.titanic.boiler": "Boiler", + "block.titanic.crankshaft": "Crankshaft", + "block.titanic.chair": "Chair", + + "message.titanic.frame_threaded": "Cable threaded: %s/%s", + "message.titanic.frame_rigged": "The lifting frame is fully rigged! Link it to a winch on the surface.", + "message.titanic.frame_already_linked": "This frame is already linked to a winch.", + "message.titanic.frame_needs_winch": "Fully rigged. Now link a winch above with a Steel Cable.", + "message.titanic.frame_needs_cable": "This frame still needs %s more cable(s).", + "message.titanic.winch_needs_cable": "You need a Steel Cable to link this winch.", + "message.titanic.frame_not_rigged": "The lifting frame below isn't fully rigged yet.", + "message.titanic.raise_started": "The cable is taut - the wreck is being raised!", + "message.titanic.no_frame_found": "No lifting frame found directly below this winch.", + + "message.titanic.boiler_fed": "You feed the boiler.", + "message.titanic.boiler_burning": "The boiler is already burning.", + "message.titanic.boiler_needs_fuel": "The boiler needs fuel.", + + "message.titanic.helm_not_seaworthy": "She isn't seaworthy yet - finish the dry dock repairs first.", + + "message.titanic.repair_wrong_item": "The repair panel doesn't need that.", + "message.titanic.repair_material_done": "That material has already been fully delivered.", + "message.titanic.repair_delivered": "Delivered: %s/%s", + "message.titanic.repair_needs_materials_first": "Deliver all other materials before installing the ship's wheel.", + "message.titanic.repair_already_done": "The ship's wheel has already been installed.", + "message.titanic.repair_complete": "Repairs complete - the Titanic sails again!" +} diff --git a/src/main/resources/assets/titanic/models/block/boiler.json b/src/main/resources/assets/titanic/models/block/boiler.json new file mode 100644 index 0000000..ea27006 --- /dev/null +++ b/src/main/resources/assets/titanic/models/block/boiler.json @@ -0,0 +1,29 @@ +{ + "textures": { + "side": "titanic:block/boiler_side", + "top": "titanic:block/boiler_top", + "door": "titanic:block/boiler_door" + }, + "elements": [ + { + "name": "tank", + "from": [1, 0, 1], + "to": [15, 14, 15], + "faces": { + "down": {"texture": "#top"}, "up": {"texture": "#top"}, + "north": {"texture": "#door"}, "south": {"texture": "#side"}, + "west": {"texture": "#side"}, "east": {"texture": "#side"} + } + }, + { + "name": "cap", + "from": [0, 14, 0], + "to": [16, 16, 16], + "faces": { + "down": {"texture": "#top"}, "up": {"texture": "#top"}, + "north": {"texture": "#top"}, "south": {"texture": "#top"}, + "west": {"texture": "#top"}, "east": {"texture": "#top"} + } + } + ] +} diff --git a/src/main/resources/assets/titanic/models/block/broken_porthole.json b/src/main/resources/assets/titanic/models/block/broken_porthole.json new file mode 100644 index 0000000..f5c13d7 --- /dev/null +++ b/src/main/resources/assets/titanic/models/block/broken_porthole.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "titanic:block/broken_porthole" + } +} diff --git a/src/main/resources/assets/titanic/models/block/chair.json b/src/main/resources/assets/titanic/models/block/chair.json new file mode 100644 index 0000000..145dee6 --- /dev/null +++ b/src/main/resources/assets/titanic/models/block/chair.json @@ -0,0 +1,14 @@ +{ + "textures": { + "wood": "titanic:block/chair_wood", + "cushion": "titanic:block/chair_cushion" + }, + "elements": [ + { "name": "leg_nw", "from": [2, 0, 2], "to": [4, 7, 4], "faces": {"down":{"texture":"#wood"},"up":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"west":{"texture":"#wood"},"east":{"texture":"#wood"}} }, + { "name": "leg_ne", "from": [12, 0, 2], "to": [14, 7, 4], "faces": {"down":{"texture":"#wood"},"up":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"west":{"texture":"#wood"},"east":{"texture":"#wood"}} }, + { "name": "leg_sw", "from": [2, 0, 12], "to": [4, 7, 14], "faces": {"down":{"texture":"#wood"},"up":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"west":{"texture":"#wood"},"east":{"texture":"#wood"}} }, + { "name": "leg_se", "from": [12, 0, 12], "to": [14, 7, 14], "faces": {"down":{"texture":"#wood"},"up":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"west":{"texture":"#wood"},"east":{"texture":"#wood"}} }, + { "name": "seat", "from": [2, 7, 2], "to": [14, 9, 14], "faces": {"down":{"texture":"#wood"},"up":{"texture":"#cushion"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"west":{"texture":"#wood"},"east":{"texture":"#wood"}} }, + { "name": "backrest", "from": [2, 9, 2], "to": [14, 16, 4], "faces": {"down":{"texture":"#wood"},"up":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#cushion"},"west":{"texture":"#wood"},"east":{"texture":"#wood"}} } + ] +} diff --git a/src/main/resources/assets/titanic/models/block/crankshaft.json b/src/main/resources/assets/titanic/models/block/crankshaft.json new file mode 100644 index 0000000..c2454fa --- /dev/null +++ b/src/main/resources/assets/titanic/models/block/crankshaft.json @@ -0,0 +1,10 @@ +{ + "textures": { + "metal": "titanic:block/crankshaft_metal" + }, + "elements": [ + { "name": "flywheel_left", "from": [2, 3, 5], "to": [6, 13, 11], "faces": {"down":{"texture":"#metal"},"up":{"texture":"#metal"},"north":{"texture":"#metal"},"south":{"texture":"#metal"},"west":{"texture":"#metal"},"east":{"texture":"#metal"}} }, + { "name": "shaft", "from": [4, 6, 6], "to": [12, 10, 10], "faces": {"down":{"texture":"#metal"},"up":{"texture":"#metal"},"north":{"texture":"#metal"},"south":{"texture":"#metal"},"west":{"texture":"#metal"},"east":{"texture":"#metal"}} }, + { "name": "flywheel_right", "from": [10, 3, 5], "to": [14, 13, 11], "faces": {"down":{"texture":"#metal"},"up":{"texture":"#metal"},"north":{"texture":"#metal"},"south":{"texture":"#metal"},"west":{"texture":"#metal"},"east":{"texture":"#metal"}} } + ] +} diff --git a/src/main/resources/assets/titanic/models/block/damaged_hull.json b/src/main/resources/assets/titanic/models/block/damaged_hull.json new file mode 100644 index 0000000..a389df1 --- /dev/null +++ b/src/main/resources/assets/titanic/models/block/damaged_hull.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "titanic:block/damaged_hull" + } +} diff --git a/src/main/resources/assets/titanic/models/block/helm.json b/src/main/resources/assets/titanic/models/block/helm.json new file mode 100644 index 0000000..efe3c10 --- /dev/null +++ b/src/main/resources/assets/titanic/models/block/helm.json @@ -0,0 +1,78 @@ +{ + "textures": { + "wood": "titanic:block/helm_wood", + "rim": "titanic:block/helm_wheel_rim" + }, + "elements": [ + { + "name": "base", + "from": [2, 0, 2], + "to": [14, 3, 14], + "faces": { + "down": {"texture": "#wood"}, "up": {"texture": "#wood"}, + "north": {"texture": "#wood"}, "south": {"texture": "#wood"}, + "west": {"texture": "#wood"}, "east": {"texture": "#wood"} + } + }, + { + "name": "pole", + "from": [6, 3, 6], + "to": [10, 12, 10], + "faces": { + "down": {"texture": "#wood"}, "up": {"texture": "#wood"}, + "north": {"texture": "#wood"}, "south": {"texture": "#wood"}, + "west": {"texture": "#wood"}, "east": {"texture": "#wood"} + } + }, + { + "name": "wheel_hub", + "from": [6, 9, 6], + "to": [10, 13, 10], + "faces": { + "down": {"texture": "#rim"}, "up": {"texture": "#rim"}, + "north": {"texture": "#rim"}, "south": {"texture": "#rim"}, + "west": {"texture": "#rim"}, "east": {"texture": "#rim"} + } + }, + { + "name": "wheel_top", + "from": [5, 14, 7], + "to": [11, 16, 9], + "faces": { + "down": {"texture": "#rim"}, "up": {"texture": "#rim"}, + "north": {"texture": "#rim"}, "south": {"texture": "#rim"}, + "west": {"texture": "#rim"}, "east": {"texture": "#rim"} + } + }, + { + "name": "wheel_bottom", + "from": [5, 6, 7], + "to": [11, 8, 9], + "faces": { + "down": {"texture": "#rim"}, "up": {"texture": "#rim"}, + "north": {"texture": "#rim"}, "south": {"texture": "#rim"}, + "west": {"texture": "#rim"}, "east": {"texture": "#rim"} + } + }, + { + "name": "wheel_left", + "from": [5, 8, 7], + "to": [7, 14, 9], + "faces": { + "down": {"texture": "#rim"}, "up": {"texture": "#rim"}, + "north": {"texture": "#rim"}, "south": {"texture": "#rim"}, + "west": {"texture": "#rim"}, "east": {"texture": "#rim"} + } + }, + { + "name": "wheel_right", + "from": [9, 8, 7], + "to": [11, 14, 9], + "faces": { + "down": {"texture": "#rim"}, "up": {"texture": "#rim"}, + "north": {"texture": "#rim"}, "south": {"texture": "#rim"}, + "west": {"texture": "#rim"}, "east": {"texture": "#rim"} + } + } + ] +} diff --git a/src/main/resources/assets/titanic/models/block/helm_socket.json b/src/main/resources/assets/titanic/models/block/helm_socket.json new file mode 100644 index 0000000..dc93167 --- /dev/null +++ b/src/main/resources/assets/titanic/models/block/helm_socket.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "titanic:block/helm_socket" + } +} diff --git a/src/main/resources/assets/titanic/models/block/lifting_frame.json b/src/main/resources/assets/titanic/models/block/lifting_frame.json new file mode 100644 index 0000000..3dfc5a3 --- /dev/null +++ b/src/main/resources/assets/titanic/models/block/lifting_frame.json @@ -0,0 +1,19 @@ +{ + "textures": { + "beam": "titanic:block/lifting_frame_beam" + }, + "elements": [ + { "name": "post_nw", "from": [1, 0, 1], "to": [3, 16, 3], "faces": {"down":{"texture":"#beam"},"up":{"texture":"#beam"},"north":{"texture":"#beam"},"south":{"texture":"#beam"},"west":{"texture":"#beam"},"east":{"texture":"#beam"}} }, + { "name": "post_ne", "from": [13, 0, 1], "to": [15, 16, 3], "faces": {"down":{"texture":"#beam"},"up":{"texture":"#beam"},"north":{"texture":"#beam"},"south":{"texture":"#beam"},"west":{"texture":"#beam"},"east":{"texture":"#beam"}} }, + { "name": "post_sw", "from": [1, 0, 13], "to": [3, 16, 15], "faces": {"down":{"texture":"#beam"},"up":{"texture":"#beam"},"north":{"texture":"#beam"},"south":{"texture":"#beam"},"west":{"texture":"#beam"},"east":{"texture":"#beam"}} }, + { "name": "post_se", "from": [13, 0, 13], "to": [15, 16, 15], "faces": {"down":{"texture":"#beam"},"up":{"texture":"#beam"},"north":{"texture":"#beam"},"south":{"texture":"#beam"},"west":{"texture":"#beam"},"east":{"texture":"#beam"}} }, + { "name": "top_north", "from": [1, 13, 1], "to": [15, 16, 3], "faces": {"down":{"texture":"#beam"},"up":{"texture":"#beam"},"north":{"texture":"#beam"},"south":{"texture":"#beam"},"west":{"texture":"#beam"},"east":{"texture":"#beam"}} }, + { "name": "top_south", "from": [1, 13, 13], "to": [15, 16, 15], "faces": {"down":{"texture":"#beam"},"up":{"texture":"#beam"},"north":{"texture":"#beam"},"south":{"texture":"#beam"},"west":{"texture":"#beam"},"east":{"texture":"#beam"}} }, + { "name": "top_west", "from": [1, 13, 1], "to": [3, 16, 15], "faces": {"down":{"texture":"#beam"},"up":{"texture":"#beam"},"north":{"texture":"#beam"},"south":{"texture":"#beam"},"west":{"texture":"#beam"},"east":{"texture":"#beam"}} }, + { "name": "top_east", "from": [13, 13, 1], "to": [15, 16, 15], "faces": {"down":{"texture":"#beam"},"up":{"texture":"#beam"},"north":{"texture":"#beam"},"south":{"texture":"#beam"},"west":{"texture":"#beam"},"east":{"texture":"#beam"}} }, + { "name": "bottom_north", "from": [1, 0, 1], "to": [15, 3, 3], "faces": {"down":{"texture":"#beam"},"up":{"texture":"#beam"},"north":{"texture":"#beam"},"south":{"texture":"#beam"},"west":{"texture":"#beam"},"east":{"texture":"#beam"}} }, + { "name": "bottom_south", "from": [1, 0, 13], "to": [15, 3, 15], "faces": {"down":{"texture":"#beam"},"up":{"texture":"#beam"},"north":{"texture":"#beam"},"south":{"texture":"#beam"},"west":{"texture":"#beam"},"east":{"texture":"#beam"}} }, + { "name": "bottom_west", "from": [1, 0, 1], "to": [3, 3, 15], "faces": {"down":{"texture":"#beam"},"up":{"texture":"#beam"},"north":{"texture":"#beam"},"south":{"texture":"#beam"},"west":{"texture":"#beam"},"east":{"texture":"#beam"}} }, + { "name": "bottom_east", "from": [13, 0, 1], "to": [15, 3, 15], "faces": {"down":{"texture":"#beam"},"up":{"texture":"#beam"},"north":{"texture":"#beam"},"south":{"texture":"#beam"},"west":{"texture":"#beam"},"east":{"texture":"#beam"}} } + ] +} diff --git a/src/main/resources/assets/titanic/models/block/repair_panel.json b/src/main/resources/assets/titanic/models/block/repair_panel.json new file mode 100644 index 0000000..a48e935 --- /dev/null +++ b/src/main/resources/assets/titanic/models/block/repair_panel.json @@ -0,0 +1,28 @@ +{ + "textures": { + "side": "titanic:block/repair_panel_side", + "front": "titanic:block/repair_panel_front" + }, + "elements": [ + { + "name": "back_plate", + "from": [1, 1, 12], + "to": [15, 15, 16], + "faces": { + "down": {"texture": "#side"}, "up": {"texture": "#side"}, + "north": {"texture": "#side"}, "south": {"texture": "#side"}, + "west": {"texture": "#side"}, "east": {"texture": "#side"} + } + }, + { + "name": "screen", + "from": [3, 3, 9], + "to": [13, 13, 12], + "faces": { + "down": {"texture": "#side"}, "up": {"texture": "#side"}, + "north": {"texture": "#front"}, "south": {"texture": "#side"}, + "west": {"texture": "#side"}, "east": {"texture": "#side"} + } + } + ] +} diff --git a/src/main/resources/assets/titanic/models/block/ship_hull.json b/src/main/resources/assets/titanic/models/block/ship_hull.json new file mode 100644 index 0000000..8a32ede --- /dev/null +++ b/src/main/resources/assets/titanic/models/block/ship_hull.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "titanic:block/ship_hull" + } +} diff --git a/src/main/resources/assets/titanic/models/block/winch.json b/src/main/resources/assets/titanic/models/block/winch.json new file mode 100644 index 0000000..c756b6a --- /dev/null +++ b/src/main/resources/assets/titanic/models/block/winch.json @@ -0,0 +1,12 @@ +{ + "textures": { + "frame": "titanic:block/winch_frame", + "drum": "titanic:block/winch_drum" + }, + "elements": [ + { "name": "stand_left", "from": [1, 0, 6], "to": [3, 10, 10], "faces": {"down":{"texture":"#frame"},"up":{"texture":"#frame"},"north":{"texture":"#frame"},"south":{"texture":"#frame"},"west":{"texture":"#frame"},"east":{"texture":"#frame"}} }, + { "name": "stand_right", "from": [13, 0, 6], "to": [15, 10, 10], "faces": {"down":{"texture":"#frame"},"up":{"texture":"#frame"},"north":{"texture":"#frame"},"south":{"texture":"#frame"},"west":{"texture":"#frame"},"east":{"texture":"#frame"}} }, + { "name": "drum", "from": [3, 6, 6], "to": [13, 10, 10], "faces": {"down":{"texture":"#drum"},"up":{"texture":"#drum"},"north":{"texture":"#drum"},"south":{"texture":"#drum"},"west":{"texture":"#drum"},"east":{"texture":"#drum"}} }, + { "name": "handle", "from": [13, 9, 9], "to": [16, 11, 11], "faces": {"down":{"texture":"#frame"},"up":{"texture":"#frame"},"north":{"texture":"#frame"},"south":{"texture":"#frame"},"west":{"texture":"#frame"},"east":{"texture":"#frame"}} } + ] +} diff --git a/src/main/resources/assets/titanic/models/item/boiler.json b/src/main/resources/assets/titanic/models/item/boiler.json new file mode 100644 index 0000000..04d4d8e --- /dev/null +++ b/src/main/resources/assets/titanic/models/item/boiler.json @@ -0,0 +1 @@ +{ "parent": "titanic:block/boiler" } diff --git a/src/main/resources/assets/titanic/models/item/chair.json b/src/main/resources/assets/titanic/models/item/chair.json new file mode 100644 index 0000000..ad0d280 --- /dev/null +++ b/src/main/resources/assets/titanic/models/item/chair.json @@ -0,0 +1 @@ +{ "parent": "titanic:block/chair" } diff --git a/src/main/resources/assets/titanic/models/item/crankshaft.json b/src/main/resources/assets/titanic/models/item/crankshaft.json new file mode 100644 index 0000000..45fc907 --- /dev/null +++ b/src/main/resources/assets/titanic/models/item/crankshaft.json @@ -0,0 +1 @@ +{ "parent": "titanic:block/crankshaft" } diff --git a/src/main/resources/assets/titanic/models/item/helm.json b/src/main/resources/assets/titanic/models/item/helm.json new file mode 100644 index 0000000..0aed3f4 --- /dev/null +++ b/src/main/resources/assets/titanic/models/item/helm.json @@ -0,0 +1 @@ +{ "parent": "titanic:block/helm" } diff --git a/src/main/resources/assets/titanic/models/item/lifting_frame.json b/src/main/resources/assets/titanic/models/item/lifting_frame.json new file mode 100644 index 0000000..3d311c2 --- /dev/null +++ b/src/main/resources/assets/titanic/models/item/lifting_frame.json @@ -0,0 +1 @@ +{ "parent": "titanic:block/lifting_frame" } diff --git a/src/main/resources/assets/titanic/models/item/repair_panel.json b/src/main/resources/assets/titanic/models/item/repair_panel.json new file mode 100644 index 0000000..7472515 --- /dev/null +++ b/src/main/resources/assets/titanic/models/item/repair_panel.json @@ -0,0 +1 @@ +{ "parent": "titanic:block/repair_panel" } diff --git a/src/main/resources/assets/titanic/models/item/ship_hull.json b/src/main/resources/assets/titanic/models/item/ship_hull.json new file mode 100644 index 0000000..b41bdc0 --- /dev/null +++ b/src/main/resources/assets/titanic/models/item/ship_hull.json @@ -0,0 +1 @@ +{ "parent": "titanic:block/ship_hull" } diff --git a/src/main/resources/assets/titanic/models/item/ships_wheel.json b/src/main/resources/assets/titanic/models/item/ships_wheel.json new file mode 100644 index 0000000..330fc3f --- /dev/null +++ b/src/main/resources/assets/titanic/models/item/ships_wheel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "titanic:item/ships_wheel" + } +} diff --git a/src/main/resources/assets/titanic/models/item/steel_cable.json b/src/main/resources/assets/titanic/models/item/steel_cable.json new file mode 100644 index 0000000..86cbca3 --- /dev/null +++ b/src/main/resources/assets/titanic/models/item/steel_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "titanic:item/steel_cable" + } +} diff --git a/src/main/resources/assets/titanic/models/item/steel_ingot.json b/src/main/resources/assets/titanic/models/item/steel_ingot.json new file mode 100644 index 0000000..4a0dec3 --- /dev/null +++ b/src/main/resources/assets/titanic/models/item/steel_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "titanic:item/steel_ingot" + } +} diff --git a/src/main/resources/assets/titanic/models/item/winch.json b/src/main/resources/assets/titanic/models/item/winch.json new file mode 100644 index 0000000..287d269 --- /dev/null +++ b/src/main/resources/assets/titanic/models/item/winch.json @@ -0,0 +1 @@ +{ "parent": "titanic:block/winch" } diff --git a/src/main/resources/assets/titanic/textures/block/boiler_door.png b/src/main/resources/assets/titanic/textures/block/boiler_door.png new file mode 100644 index 0000000000000000000000000000000000000000..47c8d0dcdb7e117aea521e8c04e96f20904c7c06 GIT binary patch literal 377 zcmV-<0fzpGP)}c^_;=fKan2C3e}*-*)vWNgk}OTf1B`OVix2 z+qSo+=`7Dn+2c6dy6$m*KBtP=wnsbRcztE?PhV zkBGqA1S)s}@TzKLBj1M}YosE9*uVg&rR4LS_}=~AKfriM9RC)4tuC4BsBwkd^Pij# X6%%`y%U4cb00000NkvXXu0mjf%ITW) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/titanic/textures/block/boiler_side.png b/src/main/resources/assets/titanic/textures/block/boiler_side.png new file mode 100644 index 0000000000000000000000000000000000000000..dfd18420c06c24a9ed45e2d77e95af8ad6af644d GIT binary patch literal 403 zcmV;E0c`$>P)>2zt&=exaLpA9}9 z&utuU?S6k2zTNKa{r;+V@Gu2fshx?eTckA-vrVMG}J5YEx&4%T)sxfse!C z)D=j;?tyiuGI4~?E|=>+0ifG{f2@S_d2H9~)Yj{5$8(Ds1{VQFlIH~!nFEY$njT$| z&QVwd5-=))Gc>Yc%8-RXLpkz`Kz9U)Vu_l~W>;7ui?QIG3TJ%_NK86}f>EF&3sI<% znr=aX$Ml1Bi)6*fGZWn@q`C+Mcv2V(2APW^(d4rwm<_lH$jx3OIkywm-8a%Sl+!Kn zCYUwqj4Ynn(PX}bY^4aWD-wtz5;IhZa-uM5`xbQOF$C1W^Px&k+!m-4?`y=EpM`%4 xGWGmuQJ`3jc;7;%8ca5+k<3o+1qHq-`vbgwVDHJ13b+6O002ovPDHLkV1g8Wv=9IQ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/titanic/textures/block/boiler_top.png b/src/main/resources/assets/titanic/textures/block/boiler_top.png new file mode 100644 index 0000000000000000000000000000000000000000..7b51a8632632cd26c413b17b045a279b553afed8 GIT binary patch literal 396 zcmV;70dxL|P);CV`5!A^yOcwkRSo-$C^UjPbXoXE=qoP4g2(p)z+ q1z^4uVTbN4Cd#=TO?fYBkp2Sw<7;Ibf#e|o00008s@tKuJHx{M6sqo5tp#c zI0a!HG*J)$bQ}OZk$pzUnPLTF^j#<;g?tr@%f#|uj{$rL0>D2(=C6L`G*H^bkAPqF Y1jT0CMl|-=f&c&j07*qoM6N<$f^Ln5$p8QV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/titanic/textures/block/chair_cushion.png b/src/main/resources/assets/titanic/textures/block/chair_cushion.png new file mode 100644 index 0000000000000000000000000000000000000000..f70454c3c6636098c9367b16b4b5bb54c4b9b0c2 GIT binary patch literal 410 zcmV;L0cHM)P)KZ|ZI^tvK=5Sn3 zlSMTEKp;6HlLU}A%A)jVd)|>}XuH}Uc7>1St|I|flsml(jY!qm2x&7V-Xa}16UkN! zp}HQV)HQ%e$0`TllSgj`*nzv6K#s6^WWz?TWXne1Y!QxT~%7U9@n zr*ElA$Uy=mXG0UR?7&_O$fxzW<;^l&OagSrtVq5lNcA5QXP&;DtOT%RWpx3aq*cs4#;_J^7vJ72iTNMOW5e{yzP89tx*M)^N`#q!L0%bLZpY}* zQ!bNc2H%k~o3_}wBWB#ls)%I!6&Lpoku0rH>BOj>R(A+{+z9mGtesbPn9$rG6?NnH zeuDdXYA3}!cz0M3?o&Lf2U=j(E}$DnSa{Nm#jp(qXMtkI-C literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/titanic/textures/block/crankshaft_metal.png b/src/main/resources/assets/titanic/textures/block/crankshaft_metal.png new file mode 100644 index 0000000000000000000000000000000000000000..87c8b096d4cfb944751062c8416d3159a05ba754 GIT binary patch literal 424 zcmV;Z0ayNsP)eIJk4{c!l~o6Tz< z3}%I$&p%y!I9&9{$7Nw+@^-uTe!2Yic07Jnk>Gm$(x0Dq{o!F=gs`WlZJ$gwg(HL^ z9gS8++JMXD`C4F&c{<%!5=;Xm3K7Cqt4lwfzI)SkK0lVENT*;nI}|}MBtG(yM@h4g zr~^9)VcYFnCBv*?W`RUQF<8rR;&rh&U4v9fz9oq|HrZ~v{~wrOq?4)G5D~>cB5G=g zzL4-IXh2bdAkwMIOsH+-V3ZU)_GTg3slX5_pfKv{9#{xa!GbO@N%sDVVTxI%FiIM4 z7P{-2v`N%CT4d2mWc0#L(e$|$z{aI-t zA+wQ+=yc4gwlt=1)ioVuV(RQH=yzjVA4)lO`mGKIt^YsYc%tvMb)6O_^ru>RL~az8n^G`D|Xl>RbBsa#@v#RmTCe*Qa%|lG5k$iXKP%RLG|F@gOf# zbrO%Wao=>cm(i=ur(VHDJYcO3S+5W_8bbDWFO~uYZ6}e2Mn0*x&(j`+qRNEzY$Zp~ zb|9_QNpCZ}2iz+-Nm#up&iQ68c=O+KtXOD`SnWHodM=@EDgXtHJCvJJJg|UtLOffW z^61@Ya8CNop}@jrBnTTKp6>3VOd;Oq55HDcJqWS@Anh=$`moi-){Ghslpv`=0U)N5 zo776|f%2pGl^eO|-PEVl^gB>@)@BE8$aMRxM+(Qt>|tSS zgo{Ev^L;)R)H1PhH25|h=PUHhqA(5QAro7u!9So4SIeRia@%D`y=guS4oR6Mq7eT) z%$wB)?Dh7nuG~UFz(c^)8#avsB*O?hfw76mE@x6cWNN}4p!xlN)}NaTr+}X@EbP#T zA|5ipGmT6s%!*ow%%R&f){+cR06G%!P1D|d%-^wK0AZJNNc|=r{0osLE}F~ZJ|r@r mh*4pOJi^(N$Is(U5BwKD2@Ln230BGg0000Ax%|0S+2P1;2arkbat&GCn*>sBgxdGOI|SkI&C-44W?AKVD$F zB_^;LnBsep)h)K3SG(A9II7PPvM~RW^1o)J>fv%iGsaQKcJmx3q*atC8SQ*C!!EK) z3WVc%R@rJ zqWASq`Oi)qKTYZ8jXOT?Jsn53Gmgsm_NoRW8+Nvlqg1wTpRDV&SJm04y-@9DH&C!h zcz;k+(uL?a@?d0rZ}+Ms&*vGkLQxqPu&DA|b5TToFu9xUK&T4MP2w-E+Ak!lXi7Bz O0000IshoUUlsXwF6Mv|)psM&pNAm=k>dFay25Ynwm1XIAHZu4^P)iU_xg0t518MRzCFBvWGKs@7#U% zoU`}2reQylhlIJdMY-Nd<$NQMlhuM;Y?kHYvw0b{c;T*^tm?&=|d z=NpkG4H_PBB~+UzmX!>fo|wNy`PV=NMP>fe+qhi;v#ag&>lP~TRJhx{Dnw&N4k~kj zchH7M4YGSxM=b~IqR^R}-AtXh+pj{{P`Z;!xXU^y?1J zga05R{T{Uf^b@Psr)v&u%E|lMW9Z?_!IL>%)7rCj&Pc3(KU&ViT1N~M4wv%kIe}c0 zh%>=y`(17c2|0C!qSKjaH-*p(ybF;|8i$EPHR;6Ib28^utXVHpJ!mEMx!$R$eRPJR zo8y%{k|JfK%8WsypcjlT&@$c^+Bof2_HBO46)0t4V+jk+amx; zC_@THp=yR8ksNi!*8Mvt*Z}i-4^=i*B5(u#I#*F>vBC+^4NDZ4woyh63<+)GNT-}3 zo+zr@F$%POzBaLEGA-G&WVV?oz`lnhIxw7&EEz?#LfA$OQBd}%65$LOFzte||33qY zXu%#S=1^tU6qi?tJNA-2mNvNwlUXy9(ka-hO(?@;F_;7}_93t>?6c?9B9bhI8EXy{ zBG%==6p$KO1Wd0ApwAa1xBvhE07*qoM6N<$f($;Wr~m)} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/titanic/textures/block/repair_panel_front.png b/src/main/resources/assets/titanic/textures/block/repair_panel_front.png new file mode 100644 index 0000000000000000000000000000000000000000..3dedf65c256561e12b3acb159596ee0d434710fe GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`g`O^sAr*1S7cQ9o_vcJ=5LXaA z%sXL9pb}@Y>4A*XvLZ62&+Wqu_psft>1MioJ|{=v3nxc!jzS#shnqafk4+mUr0ro_ zpnYVSJz95=(x#v1VkU<;clcX+Q1_q12%u3O# S52OJtXYh3Ob6Mw<&;$VPgg1x) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/titanic/textures/block/repair_panel_side.png b/src/main/resources/assets/titanic/textures/block/repair_panel_side.png new file mode 100644 index 0000000000000000000000000000000000000000..af6370366926519891eb4a24962bef0df556a1aa GIT binary patch literal 398 zcmV;90df9`P)zV=e1Ld0y@!=xMPn-RZM5{p%3hpTElEy!i(R{QmhZo837a_tUCu_iqCL z>|s{Nxn!|?VgrEAsJlyB!U4!3fq+St;EZ2F z-aiNh_QMPS7>EL_tjI4xTUmrHN4o)Vm`~a3Q;k%1&M2pzPubTB0694ndyafe=^wws sgquSEBnXm}f12@sVf;2ocTSb{2Mk%ILQHfvy8r+H07*qoM6N<$g6+Ak;Q#;t literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/titanic/textures/block/ship_hull.png b/src/main/resources/assets/titanic/textures/block/ship_hull.png new file mode 100644 index 0000000000000000000000000000000000000000..4e5ec53e598c6681cf899da766dfaf5c37d38808 GIT binary patch literal 426 zcmV;b0agBqP)^yL+Z~ad}n#vuZw{ zU*Bc1c`nQCOIhs>r8k; z{`*F|^vCnk9ZqAn_;!bnBfx033TB4MViU>D&Y*M#lK_xNMZMJvu+8&ZnXPue0OUfY zK#=v+9foXvCHc3D8_(Bey?+gm0ARojAld!5dZRM{jAE5|rXY<BnMeF1^ZuC<^%wCsMxb!jP3=0jxHNVK6aA{0Eu_?R(X8t zhQ!>}%I{wpNPy^rW+ST!ulqp6@FP4c!ALSWN0kpI73BCN0^+L_7>WAxl4P@TRQZTfc0M#YKMeS% Um(pe#aR2}S07*qoM6N<$g4Sie7ytkO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/titanic/textures/block/ships_wheel.png b/src/main/resources/assets/titanic/textures/block/ships_wheel.png new file mode 100644 index 0000000000000000000000000000000000000000..7cd26f1c0a9896cbae99dc21cd5598026ff8daa3 GIT binary patch literal 410 zcmV;L0cHM)P)M zXV3qsRQ{zhy^d&D!$J`-?>{0k1Z*b^vS}6N?3wl|2^$@xBNmxj%K=NL2Cv^jVoC5V z_Gd^$K3w)>_+zFB9RP(t5fBgRh;8{C5@|eql_6Cn$~*-e6!ZkFwI_t*It@wG26nDM z4R!G{{{>sVq2`&~*uq^NbUIbI+->2l$Vz>kqX7$(MQVuD(0Tm?%w&51-jv0rl&!3WO)QlL zHVREHSB=Txt*jPOo2LN>y>%sIwuH6WD$G+rs5cNeO(bS%g{KM(4m*>F=ZXaOb(JSg z1XBSXdC#41E>T&L-a%-!@jhU4K+4kH>$aw1-m>-fTF}E-}-JE_;N< zBQ6822e^4fAc7SmLMn*d)d0ev zr)%?0pJxcZ9^x)Lu)*9jlJ#K4Bh3~ZSda-CsfGA%u#X<9}zByl; zcN#x~YdXYAXteI#{3Wrj+ZIAk0iB#6wS{vlQr+OJ{Xv!)@k4{DC)%JP!V`Y<5bnlT z?c`99q(8(IHH>^Wf14q$Xrx1)GN>L7yIa_I)acOCCv3gC^XyM~0TBeg9L0xpfdBvi M07*qoM6N<$g5PF@d;kCd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/titanic/textures/block/steel_ingot.png b/src/main/resources/assets/titanic/textures/block/steel_ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..810bd64540d126f3c3eb7a973af756c35727c4b1 GIT binary patch literal 221 zcmV<303!d1P)* z7zKk6M8zci$A{6?qksob-~Ye!@b&-uPu~3pu^&GB@c+uq$6);I_1FKGu0Q<$_{Ase zhHTw+T@BhNGvh{6BK? z^8dppE`bd>cFJHGm8PVUR|U9LR8xTCnErdyau6+&uh9!XSe{mZG?16p#l1 X9}=z4VaTzC00000NkvXXu0mjfmBepL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/titanic/textures/block/winch_drum.png b/src/main/resources/assets/titanic/textures/block/winch_drum.png new file mode 100644 index 0000000000000000000000000000000000000000..2e8122f8f451fef54f8c3a7ae2b2a4e0d1e75013 GIT binary patch literal 339 zcmV-Z0j&OsP)5F}C*XE>zFV0WkXS><_pSU;D; z`Z7DJ&X41R`f+hq-_K9${cx|{v43x8_3v)p&R>_K`g1dFt8fSs{Cz#CtE+KK!YAR| z;-o%|_M7cq5;1H^%O<65S7RVE2GG!B+cAKyJjk!};}!$m?oB}_K^)Fclfl0R0@=~S z8Gz)#`a|hWJ=xBMB=8wCZ%mx`wIlKbOEExd-|RdG0o70X~`duC=(~x lL)0aqQ(D^{H0RzWtO38=fG<-bO9TJ_002ovPDHLkV1gCOldu2) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/titanic/textures/block/winch_frame.png b/src/main/resources/assets/titanic/textures/block/winch_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..5557050bb8906457cb0b872b99702148e227503e GIT binary patch literal 393 zcmV;40e1e0P)({#QrA>Ewe+uf-O;KuSb z(&&IafDV%8GYZiN5Hl8M1PD5pfPz>fmJV`o#qw}s9OJ-CKzG|k#m%Y@RcG zQ38)d39w6@O=lf*op6@9^W^}S>wi0tbS;vW#h!8Cgyr$M zXV3qsRQ{zhy^d&D!$J`-?>{0k1Z*b^vS}6N?3wl|2^$@xBNmxj%K=NL2Cv^jVoC5V z_Gd^$K3w)>_+zFB9RP(t5fBgRh;8{C5@|eql_6Cn$~*-e6!ZkFwI_t*It@wG26nDM z4R!G{{{>sVq2`&~*uq^NbUIbI+->2l$Vz>kqX7$(MQVuD(0Tm?%w&51-jv0rl&!3WO)QlL zHVREHSB=Txt*jPOo2LN>y>%sIwuH6WD$G+rs5cNeO(bS%g{KM(4m*>F=ZXaOb(JSg z1XBSXdC#41E>T&L-a%-!@jhU4K+4kH>$aw1-m>-fTF}E-}-JE_;N< zBQ6822e^4fAc7SmLMn*d)d0ev zr)%?0pJxcZ9^x)Lu)*9jlJ#K4Bh3~ZSda-CsfGA%u#X<9}zByl; zcN#x~YdXYAXteI#{3Wrj+ZIAk0iB#6wS{vlQr+OJ{Xv!)@k4{DC)%JP!V`Y<5bnlT z?c`99q(8(IHH>^Wf14q$Xrx1)GN>L7yIa_I)acOCCv3gC^XyM~0TBeg9L0xpfdBvi M07*qoM6N<$g5PF@d;kCd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/titanic/textures/item/steel_ingot.png b/src/main/resources/assets/titanic/textures/item/steel_ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..810bd64540d126f3c3eb7a973af756c35727c4b1 GIT binary patch literal 221 zcmV<303!d1P)* z7zKk6M8zci$A{6?qksob-~Ye!@b&-uPu~3pu^&GB@c+uq$6);I_1FKGu0Q<$_{Ase zhHTw+T@BhNGvh{6BK? z^8dppE`bd>cFJHGm8PVUR|U9LR8xTCnErdyau6+&uh9!XSe{mZG?16p#l1 X9}=z4VaTzC00000NkvXXu0mjfmBepL literal 0 HcmV?d00001 diff --git a/src/main/resources/data/titanic/forge/biome_modifier/wreck.json b/src/main/resources/data/titanic/forge/biome_modifier/wreck.json new file mode 100644 index 0000000..58a976c --- /dev/null +++ b/src/main/resources/data/titanic/forge/biome_modifier/wreck.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#minecraft:is_ocean", + "features": "titanic:wreck", + "step": "underground_structures" +} diff --git a/src/main/resources/data/titanic/loot_tables/blocks/boiler.json b/src/main/resources/data/titanic/loot_tables/blocks/boiler.json new file mode 100644 index 0000000..5d18bea --- /dev/null +++ b/src/main/resources/data/titanic/loot_tables/blocks/boiler.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { "type": "minecraft:item", "name": "titanic:boiler" } + ], + "conditions": [ { "condition": "minecraft:survives_explosion" } ] + } + ] +} diff --git a/src/main/resources/data/titanic/loot_tables/blocks/broken_porthole.json b/src/main/resources/data/titanic/loot_tables/blocks/broken_porthole.json new file mode 100644 index 0000000..7b59ea1 --- /dev/null +++ b/src/main/resources/data/titanic/loot_tables/blocks/broken_porthole.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [] +} diff --git a/src/main/resources/data/titanic/loot_tables/blocks/chair.json b/src/main/resources/data/titanic/loot_tables/blocks/chair.json new file mode 100644 index 0000000..d421764 --- /dev/null +++ b/src/main/resources/data/titanic/loot_tables/blocks/chair.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { "type": "minecraft:item", "name": "titanic:chair" } + ], + "conditions": [ { "condition": "minecraft:survives_explosion" } ] + } + ] +} diff --git a/src/main/resources/data/titanic/loot_tables/blocks/crankshaft.json b/src/main/resources/data/titanic/loot_tables/blocks/crankshaft.json new file mode 100644 index 0000000..bb3b154 --- /dev/null +++ b/src/main/resources/data/titanic/loot_tables/blocks/crankshaft.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { "type": "minecraft:item", "name": "titanic:crankshaft" } + ], + "conditions": [ { "condition": "minecraft:survives_explosion" } ] + } + ] +} diff --git a/src/main/resources/data/titanic/loot_tables/blocks/damaged_hull.json b/src/main/resources/data/titanic/loot_tables/blocks/damaged_hull.json new file mode 100644 index 0000000..7b59ea1 --- /dev/null +++ b/src/main/resources/data/titanic/loot_tables/blocks/damaged_hull.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [] +} diff --git a/src/main/resources/data/titanic/loot_tables/blocks/helm.json b/src/main/resources/data/titanic/loot_tables/blocks/helm.json new file mode 100644 index 0000000..eeac18c --- /dev/null +++ b/src/main/resources/data/titanic/loot_tables/blocks/helm.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { "type": "minecraft:item", "name": "titanic:helm" } + ], + "conditions": [ { "condition": "minecraft:survives_explosion" } ] + } + ] +} diff --git a/src/main/resources/data/titanic/loot_tables/blocks/helm_socket.json b/src/main/resources/data/titanic/loot_tables/blocks/helm_socket.json new file mode 100644 index 0000000..7b59ea1 --- /dev/null +++ b/src/main/resources/data/titanic/loot_tables/blocks/helm_socket.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [] +} diff --git a/src/main/resources/data/titanic/loot_tables/blocks/lifting_frame.json b/src/main/resources/data/titanic/loot_tables/blocks/lifting_frame.json new file mode 100644 index 0000000..2510983 --- /dev/null +++ b/src/main/resources/data/titanic/loot_tables/blocks/lifting_frame.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { "type": "minecraft:item", "name": "titanic:lifting_frame" } + ], + "conditions": [ { "condition": "minecraft:survives_explosion" } ] + } + ] +} diff --git a/src/main/resources/data/titanic/loot_tables/blocks/repair_panel.json b/src/main/resources/data/titanic/loot_tables/blocks/repair_panel.json new file mode 100644 index 0000000..9b78eff --- /dev/null +++ b/src/main/resources/data/titanic/loot_tables/blocks/repair_panel.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { "type": "minecraft:item", "name": "titanic:repair_panel" } + ], + "conditions": [ { "condition": "minecraft:survives_explosion" } ] + } + ] +} diff --git a/src/main/resources/data/titanic/loot_tables/blocks/ship_hull.json b/src/main/resources/data/titanic/loot_tables/blocks/ship_hull.json new file mode 100644 index 0000000..e8b58f3 --- /dev/null +++ b/src/main/resources/data/titanic/loot_tables/blocks/ship_hull.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { "type": "minecraft:item", "name": "titanic:ship_hull" } + ], + "conditions": [ { "condition": "minecraft:survives_explosion" } ] + } + ] +} diff --git a/src/main/resources/data/titanic/loot_tables/blocks/winch.json b/src/main/resources/data/titanic/loot_tables/blocks/winch.json new file mode 100644 index 0000000..3e071e6 --- /dev/null +++ b/src/main/resources/data/titanic/loot_tables/blocks/winch.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { "type": "minecraft:item", "name": "titanic:winch" } + ], + "conditions": [ { "condition": "minecraft:survives_explosion" } ] + } + ] +} diff --git a/src/main/resources/data/titanic/tags/blocks/ship_blocks.json b/src/main/resources/data/titanic/tags/blocks/ship_blocks.json new file mode 100644 index 0000000..66f6ad1 --- /dev/null +++ b/src/main/resources/data/titanic/tags/blocks/ship_blocks.json @@ -0,0 +1,19 @@ +{ + "values": [ + "titanic:damaged_hull", + "titanic:ship_hull", + "titanic:broken_porthole", + "titanic:helm_socket", + "titanic:helm", + "titanic:repair_panel", + "titanic:boiler", + "titanic:crankshaft", + "titanic:chair", + "minecraft:red_bed", + "minecraft:furnace", + { + "id": "farmersdelight:cooking_pot", + "required": false + } + ] +} diff --git a/src/main/resources/data/titanic/worldgen/configured_feature/wreck.json b/src/main/resources/data/titanic/worldgen/configured_feature/wreck.json new file mode 100644 index 0000000..37fcfc5 --- /dev/null +++ b/src/main/resources/data/titanic/worldgen/configured_feature/wreck.json @@ -0,0 +1,4 @@ +{ + "type": "titanic:wreck", + "config": {} +} diff --git a/src/main/resources/data/titanic/worldgen/placed_feature/wreck.json b/src/main/resources/data/titanic/worldgen/placed_feature/wreck.json new file mode 100644 index 0000000..67f1b62 --- /dev/null +++ b/src/main/resources/data/titanic/worldgen/placed_feature/wreck.json @@ -0,0 +1,19 @@ +{ + "feature": "titanic:wreck", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 600 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..eca79ae --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,8 @@ +{ + "pack": { + "description": { + "text": "${mod_id} resources" + }, + "pack_format": 15 + } +} \ No newline at end of file