Skip to content
This repository has been archived by the owner on Jun 29, 2023. It is now read-only.

Minecraft 1.18.1 support #552

Merged
merged 19 commits into from
Dec 23, 2021
Merged

Minecraft 1.18.1 support #552

merged 19 commits into from
Dec 23, 2021

Conversation

datatags
Copy link
Collaborator

@datatags datatags commented Nov 24, 2021

What is the purpose of this pull request?

  1. Adds Minecraft 1.18.1 support
  2. Required upgrade to Gradle 7.3.2 (for Java 17, required by MC 1.18)
  3. Minor code cleanup; fixes misc. bugs; adds misc. features
  4. WorldGuard support! Support for worldguard regions #554

How do your changes address the purpose?

  1. Added and semi-tested v1_18_R1 module
  2. Upgraded Gradle wrapper; changed usage of compile to implementation (may benefit from further optimization)
  3. Misc, see changes list.
  4. Added two flags, uc-cosmetics and uc-treasurechest. WG API changes substantially between versions 6.2 and 7.0, so subprojects v1_12_R1 and v1_13_R2 host compatibility classes for those.

Changes

Category as per purpose list is in parenthesis

  • (1) Add v1_18_R1 module
  • (3) Removed PathfinderUtil
  • (2) Upgraded Gradle
  • (1) Tested mounts
  • (1) Tested pets
  • (1) Tested morphs (waiting on LibsDisguises and ProtocolLib) It's been announced on the LD discord that a working 1.18 build will be a while (i.e. not till 2022) so I'm not gonna worry about it for now
  • (1) Make any required changes for 1.18 full release
  • (1) Make any required changes for 1.18.1 release
  • (3) Adjusted EntityUtil in v1_16_R3 module to fix Clearing pathfinders throws exception on Airplane #553
  • (4) Added WorldGuard support (flags uc-cosmetics and uc-treasurechest)
  • (3) Adjusted morphs to show player name
  • (3) Changed Disabled-Commands config option so it blocks commands when any cosmetic is equipped, and added permission check (ultracosmetics.bypassdisabledcommands)
  • (3) Added a warning if NMS changed without changing NMS revision (by checking CraftMagicNumbers#getMappingsVersion())
  • (3) Replaced all references to ServerVersion.v1_8_R1 with ServerVersion.earliest() to prepare for potentially removing v1_8_R1 module
  • (3) Replaced many instances of ServerVersion#compare(ServerVersion) with a new method, ServerVersion#isAtLeast(ServerVersion) for better readability.
  • (1) Use existing methods in Brain to remove memories to prevent error when removing villagers
  • (3) Add null check on interact listener, apparently a PlayerInteractEvent is triggered when a player logs out while on a pressure plate?
  • (3) When looking for players currently opening treasure chests, make sure Bukkit knows about them (Bukkit.getPlayer(UUID)) before using as an UltraPlayer. This prevents attempting to make an UltraPlayer from a player NPC.

@datatags
Copy link
Collaborator Author

datatags commented Dec 5, 2021

Gonna go ahead and mark this ready for review, who knows when a 1.18 LD build will be available.

Edit: guess it's probably gonna be early 2022

@datatags datatags marked this pull request as ready for review December 5, 2021 02:31
@datatags datatags changed the title Minecraft 1.18 support Minecraft 1.18.1 support Dec 10, 2021
@datatags
Copy link
Collaborator Author

datatags commented Dec 18, 2021

In this last commit I removed some modules that bStats showed literally nobody was using. These modules include:

  • v1_8_R1
  • v1_8_R2
  • v1_9_R1
  • v1_9_R2
  • v1_10_R1
  • v1_11_R1
  • v1_13_R1

This reduces the jar size by 25% and vastly speeds up both compiling prep and actual compliation. Also updated Gradle.

@iSach iSach merged commit c2a7cc2 into iSach:master Dec 23, 2021
@datatags
Copy link
Collaborator Author

Hey @iSach, thanks for merging this. I've been trying to contact you on Discord if you have some time, I have some questions for you. Thanks!

@iSach
Copy link
Owner

iSach commented Dec 27, 2021

Hey @iSach, thanks for merging this. I've been trying to contact you on Discord if you have some time, I have some questions for you. Thanks!

Hey sure I apologize for the long delays. I have a very little time to dedicate to my projects, but I'll try to upload at least this update with all your changes. Thanks a lot for your contributions!

I accepted your friend request on Discord

@iSach
Copy link
Owner

iSach commented Dec 27, 2021

I tested all the cosmetics.
Only issue I found was: Snowman pet leaves snow on ground.

@datatags
Copy link
Collaborator Author

I tested all the cosmetics. Only issue I found was: Snowman pet leaves snow on ground.

Ok, should I go ahead and fix it or are you working on it?

@datatags datatags mentioned this pull request Dec 27, 2021
3 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clearing pathfinders throws exception on Airplane
2 participants