Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-13 14:58:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feature/1.17 (#1120)

Browse Source 
* start v6

* Update classes to v6 method signatures

* change rootVersion to signify p2v6 compat

* Use 16 as toolchain version but target 11 for build output

* add minimessage as api

* Require v6 and don't attempt to "setup" hook from FAWE

* Address comments

* *address /all/ comments

* FAWE classes should only act as a delegate

* Uppercase logger

* Settings for v6-hook have moved to P2-v6, remove unneeded if statements

* Rename classes to Delegate

* add whenDone task to setCuboids

* Remove bad spaces

* Fix plot swap

* Initial work on 1.17 support

* Remove data versions from the Bukkit adapters (#1507)

* Remove data versions from the Bukkit adapters

* Don't allow saving schematics without an adapter in place on Bukkit.

* Removed confusing line

(cherry picked from commit 2056218b4a8644836b1d127105dfa289e9cdbc1c)

* More progress

* Fix chunk sending

* Repackage from com.boydti to com.fastasyncworldedit.<module> (#1119)

* Preliminary work on repackaging

* Rename build artifacts matching our pattern

* Finish up repackaging

* Fix a few field accesses and old imports

* Dirty fix for chunks container ChunkSections outside of 0-15

* Correctly read from NibbleArrays for lighting

* Fix getSections and BlockMaterial for 1.17

* Fix writing blocks to the world.
 - The issue isn't the presence of a "-1" chunk, it's the constructor for ChunkSection requiring the layer (0 to 15) rather than the y chord

* Fix more field accesses

* More work towards 1.17

* Update Upstream

a57f66f Fix watchdog, add negative y support. (1782)

* Add azalea tree to `/tool tree`

* Don't define toolchain twice

* Repackage GriefDefender

* Relocate under new namespace

* Bye bye ecma left overs

* Add 1.17 to issue templates and instructions

* Move to adventure-nbt (#918)

* Initial work for adventure-nbt

* Some more FAWE specific stuff

* Fix erroneous deprecation check

* Workflow change

* Continued merging all adventure NBT related changes

* Continued merging all adventure NBT related changes

* Made a constructor public again

This needs to be public for BlockTransformExtent.java

* Finished converting all NBT data to adventure.

* Make this compile

* Fix conflicts

Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>

* Update adapters to 1.17

* Change build prefix to 1.17

* Move more nms classes to adapters

* Move left over nms classes

* Move Spigot 1.17 class

* Remove unneeded adapter loader code
The loader will find the appropriate class now itself

* Update adapters

* Update adapters

* Lazy fix tests

* Update adapters

* Update Upstream

43da91a Remove method reflection for getMinHeight in BukkitWorld. (1796)

* Relocate adventure-nbt under proper namespace

* Add LazyCompoundTag as a non-version-specific class to be used by adapters

* Better integration between old NBT and Adventure NBT - begin fixing the issues seen recently

* Correctly NBT conversion method

* LazyCompoundTags should actually be overriding and correctly returning a CompoundBinaryTag.

* Update worldedit-adapters
Fixes #1141

* Remove unnecessary massive lag machine

* Refactor apply to applyBlock in subclasses

* applyBlock should be overriden by all subclasses.
Default apply to applyBlock

* Closes #1130 Closes #1132

* Squashed commit of the following:

commit a9bfa1a07c77083c844a0c3ba62f4bd94bed107c
Author: NotMyFault <mc.cache@web.de>
Date:   Sun Jun 27 21:53:21 2021 +0200

    [ci skip] Update gradle wrapper validation

commit aa7471f95317d28a16f62e4b200de8d0fea2fa95
Author: Matthew Miller <mnmiller1@me.com>
Date:   Sat Oct 10 15:49:13 2020 +1000

    Add ^x,y,z relative offset support to the offset parser (#1545)

    * Add ^x,y,z relative offset support to the offset parser

    * Wrap in a try-catch

    (cherry picked from commit 28bdf7ff9254bbc85bb4f5f792b303943a3930a8)

* Add `fawe.error.schematic.not.found` translation key

* Update Upstream

728a152 Skip notify if chunk section doesn't exist (1794)

* Fixed #1157

* Add a null check to prevent NPE in nbt code

* Update adapters

* Update Upstream

fbb047a Optimize legacy schematic loading (1808)

* Hurr durr I don't want to update Java

* Update Upstream

0790e6e Fix CLI Mess (1811)

* Fixes #1160

* Expose minimessage transitively thru PlotSquared

Touches #32

* [ci skip] Remove unneeded maven repository

* Steal tab completion from PlotSquared for P2 related commands

* Don't error on startup when building locally

Co-Authored-By: goldfishapp <8278196+goldfishapp@users.noreply.github.com>

* [ci skip] Update gh actions to Java 16

* Update textures to grab 1.17 jar

Co-authored-by: NotMyFault <mc.cache@web.de>
Co-authored-by: SirYwell <hannesgreule@outlook.de>
Co-authored-by: Matthew Miller <mnmiller1@me.com>
Co-authored-by: Matt <4009945+MattBDev@users.noreply.github.com>
Co-authored-by: goldfishapp <8278196+goldfishapp@users.noreply.github.com>
This commit is contained in:
dordsor21
2021-07-01 21:16:25 +01:00
committed by GitHub
parent b0c0689887
commit aa3ae63682
798 changed files with 5101 additions and 16727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
worldedit-core/src/main/java/com/sk89q/worldedit/util/TreeGenerator.java
View File

@ -93,6 +93,7 @@ public class TreeGenerator {
},
SWAMP("Swamp tree", "swamp", "swamptree"),
ACACIA("Acacia tree", "acacia"),
AZALEA("Azalea tree", "azalea"),
DARK_OAK("Dark oak tree", "darkoak"),
PINE("Pine tree", "pine") {
@Override

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/collection/Int2BaseBlockMap.java
View File

@ -50,7 +50,7 @@ class Int2BaseBlockMap extends AbstractInt2ObjectMap<BaseBlock> {
* @return the internal ID, or {@link BlockStateIdAccess#invalidId()} if not useful
*/
private static int optimizedInternalId(BaseBlock block) {
if (block.hasNbtData()) {
if (block.getNbtReference() != null) {
return BlockStateIdAccess.invalidId();
}
return BlockStateIdAccess.getBlockStateId(block.toImmutableState());

15
worldedit-core/src/main/java/com/sk89q/worldedit/util/concurrency/LazyReference.java
View File

@ -32,6 +32,17 @@ public class LazyReference<T> {
return new LazyReference<>(valueComputation);
}
/**
* Pre-computed reference, for setting a lazy reference field with a known value.
*
* @param value the value of the reference
* @param <T> the type of the value
* @return the new reference
*/
public static <T> LazyReference<T> computed(T value) {
return new LazyReference<>(value);
}
// Memory saving technique: hold the computation info in the same reference field that we'll
// put the value into, so the memory possibly retained by those parts is GC'able as soon as
// it's no longer needed.
@ -51,6 +62,10 @@ public class LazyReference<T> {
this.value = new RefInfo<>(valueComputation);
}
private LazyReference(T value) {
this.value = value;
}
// casts are safe, value is either RefInfo or T
@SuppressWarnings("unchecked")
public T getValue() {

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/PaginationBox.java
View File

@ -19,7 +19,7 @@
package com.sk89q.worldedit.util.formatting.component;
import com.boydti.fawe.config.Caption;
import com.fastasyncworldedit.core.configuration.Caption;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableList;

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/SideEffectBox.java
View File

@ -19,7 +19,7 @@
package com.sk89q.worldedit.util.formatting.component;
import com.boydti.fawe.config.Caption;
import com.fastasyncworldedit.core.configuration.Caption;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.util.SideEffect;
import com.sk89q.worldedit.util.SideEffectSet;

50
worldedit-core/src/main/java/com/sk89q/worldedit/util/nbt/NbtUtils.java Normal file
View File

@ -0,0 +1,50 @@
/*
* WorldEdit, a Minecraft world manipulation toolkit
* Copyright (C) sk89q <http://www.sk89q.com>
* Copyright (C) WorldEdit team and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.sk89q.worldedit.util.nbt;
import com.sk89q.worldedit.world.storage.InvalidFormatException;
public class NbtUtils {
/**
* Get child tag of a NBT structure.
*
* @param tag the tag to read from
* @param key the key to look for
* @param expected the expected NBT class type
* @return child tag
* @throws InvalidFormatException if the format of the items is invalid
*/
public static <T extends BinaryTag> T getChildTag(CompoundBinaryTag tag, String key, BinaryTagType<T> expected) throws InvalidFormatException {
BinaryTag childTag = tag.get(key);
if (childTag == null) {
throw new InvalidFormatException("Missing a \"" + key + "\" tag");
}
if (childTag.type().id() != expected.id()) {
throw new InvalidFormatException(key + " tag is not of tag type " + expected.toString());
}
// SAFETY: same binary tag type checked above
@SuppressWarnings("unchecked")
T childTagCast = (T) childTag;
return childTagCast;
}
}

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/ActorCallbackPaste.java
View File

@ -19,7 +19,7 @@
package com.sk89q.worldedit.util.paste;
import com.boydti.fawe.config.Caption;
import com.fastasyncworldedit.core.configuration.Caption;
import com.sk89q.worldedit.command.util.AsyncCommandBuilder;
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.util.formatting.text.TextComponent;