From f913cec2fc4eaea61425258c1c7aa6a61210f4ed Mon Sep 17 00:00:00 2001 From: Snowball_233 Date: Sat, 17 Jun 2023 11:23:56 +0800 Subject: [PATCH 1/4] Update BaseBlock.java --- .../com/sk89q/worldedit/blocks/BaseBlock.java | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java b/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java index cc8bcf0..d8f99e3 100644 --- a/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java +++ b/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java @@ -63,7 +63,7 @@ public class BaseBlock extends Block implements TileEntityBlock { * reasons), which coincides with the number of possible IDs that official * Minecraft supports as of version 1.7. */ - public static final int MAX_ID = 4095; + public static final int MAX_ID = Integer.MAX_VALUE; /** * Indicates the maximum data value (inclusive) that can be used. A future @@ -93,7 +93,7 @@ public BaseBlock(int id) { /** * Construct a block with the given ID and data value. * - * @param id ID value + * @param id ID value * @param data data value * @see #setId(int) * @see #setData(int) @@ -106,8 +106,8 @@ public BaseBlock(int id, int data) { /** * Construct a block with the given ID, data value and NBT data structure. * - * @param id ID value - * @param data data value + * @param id ID value + * @param data data value * @param nbtData NBT data, which may be null */ public BaseBlock(int id, int data, @Nullable CompoundTag nbtData) { @@ -125,6 +125,14 @@ public BaseBlock(BaseBlock other) { this(other.getId(), other.getData(), other.getNbtData()); } + /** + * @deprecated Use {@link Blocks#containsFuzzy(Collection, BaseBlock)} + */ + @Deprecated + public static boolean containsFuzzy(Collection collection, BaseBlock o) { + return Blocks.containsFuzzy(collection, o); + } + /** * Get the ID of the block. * @@ -135,6 +143,16 @@ public int getId() { return id; } + /** + * Set the block ID. + * + * @param id block id (between 0 and {@link #MAX_ID}). + */ + @Override + public void setId(int id) { + internalSetId(id); + } + /** * Set the block ID. * @@ -154,23 +172,23 @@ protected final void internalSetId(int id) { } /** - * Set the block ID. + * Get the block's data value. * - * @param id block id (between 0 and {@link #MAX_ID}). + * @return data value (0-15) */ @Override - public void setId(int id) { - internalSetId(id); + public int getData() { + return data; } /** - * Get the block's data value. + * Set the block's data value. * - * @return data value (0-15) + * @param data block data value (between 0 and {@link #MAX_DATA}). */ @Override - public int getData() { - return data; + public void setData(int data) { + internalSetData(data); } /** @@ -192,20 +210,10 @@ protected final void internalSetData(int data) { this.data = (short) data; } - /** - * Set the block's data value. - * - * @param data block data value (between 0 and {@link #MAX_DATA}). - */ - @Override - public void setData(int data) { - internalSetData(data); - } - /** * Set both the block's ID and data value. * - * @param id ID value + * @param id ID value * @param data data value * @see #setId(int) * @see #setData(int) @@ -239,7 +247,7 @@ public String getNbtId() { return ""; } Tag idTag = nbtData.getValue().get("id"); - if (idTag != null && idTag instanceof StringTag) { + if (idTag instanceof StringTag) { return ((StringTag) idTag).getValue(); } else { return ""; @@ -259,7 +267,7 @@ public void setNbtData(@Nullable CompoundTag nbtData) { /** * Get the type of block. - * + * * @return the type */ public int getType() { @@ -268,7 +276,7 @@ public int getType() { /** * Set the type of block. - * + * * @param type the type to set */ public void setType(int type) { @@ -299,7 +307,7 @@ public int rotate90() { /** * Rotate this block -90 degrees. - * + * * @return new data value * @deprecated Use {@link BlockData#rotate90Reverse(int, int)} */ @@ -326,7 +334,7 @@ public int cycleData(int increment) { /** * Flip this block. - * + * * @return this block * @deprecated Use {@link BlockData#flip(int, int)} */ @@ -338,7 +346,7 @@ public BaseBlock flip() { /** * Flip this block. - * + * * @param direction direction to flip in * @return this block * @deprecated Use {@link BlockData#flip(int, int, FlipDirection)} @@ -366,7 +374,7 @@ public boolean equals(Object o) { /** * Checks if the type is the same, and if data is the same if only data != -1. - * + * * @param o other block * @return true if equal */ @@ -387,14 +395,6 @@ public boolean inIterable(Iterable iter) { return false; } - /** - * @deprecated Use {@link Blocks#containsFuzzy(Collection, BaseBlock)} - */ - @Deprecated - public static boolean containsFuzzy(Collection collection, BaseBlock o) { - return Blocks.containsFuzzy(collection, o); - } - @Override public int hashCode() { int ret = getId() << 3; From df573513d6a4ef5a543b9434bba3773c6b3d406c Mon Sep 17 00:00:00 2001 From: Snowball_233 <97330394+SnowballXueQiu@users.noreply.github.com> Date: Sat, 17 Jun 2023 11:28:28 +0800 Subject: [PATCH 2/4] Create gradle.yml --- .github/workflows/gradle.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/gradle.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..3dbc8dd --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,34 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. +# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle + +name: Java CI with Gradle + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +permissions: + contents: read + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + - name: Build with Gradle + uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 + with: + arguments: build From dcb9832f50d78f5c50789b7dd6e68f3b1b302aa3 Mon Sep 17 00:00:00 2001 From: Hail122 <75189571+linstar-fxt@users.noreply.github.com> Date: Sat, 17 Jun 2023 22:10:04 +0800 Subject: [PATCH 3/4] Update build.gradle --- build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 8d65107..8ecfe64 100644 --- a/build.gradle +++ b/build.gradle @@ -9,9 +9,10 @@ version '6.1.9-0.3-SNAPSHOT' repositories { mavenLocal() mavenCentral() + maven { url "https://repo.minebench.de/" } + maven { url "https://nexus.velocitypowered.com/repository/maven-public/" } maven { url "https://github.com/mohist-community/maven/raw/master" } maven { url "http://repo.bukkit.org/content/groups/public" } - maven { url "http://maven.sk89q.com/repo/" } maven { url "http://repo.maven.apache.org/maven2" } } @@ -37,6 +38,4 @@ shadowJar { include(dependency('com.sk89q.lib:jlibnoise:1.0.0')) include(dependency('com.google.code.gson:gson:2.2.4')) } - - relocate('com.google.gson', 'com.sk89q.worldedit.internal.gson') } From 1415af5ca10906238979975c08bab0f90d3b339d Mon Sep 17 00:00:00 2001 From: Snowball_233 <97330394+SnowballXueQiu@users.noreply.github.com> Date: Sat, 1 Jul 2023 14:57:16 +0800 Subject: [PATCH 4/4] Create LICENSE --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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 + + http://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.