From 6525c614195302a4fbad0386627e602bb59c7a3c Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Mon, 25 May 2026 02:43:41 -0500 Subject: [PATCH 01/15] Remove unnecessary `@SuppressWarnings` & reorganize comments. --- .../structurelib/GuiEditRegistryConfig.java | 1 - .../structurelib/SortedRegistry.java | 1 - .../structurelib/block/BlockHint.java | 5 +-- .../structurelib/item/ItemBlockHint.java | 21 +++++----- .../item/ItemConstructableTrigger.java | 39 +++++++++---------- .../item/ItemFrontRotationTool.java | 19 +++++---- .../structurelib/util/MiscUtils.java | 1 - 7 files changed, 40 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/GuiEditRegistryConfig.java b/src/main/java/com/gtnewhorizon/structurelib/GuiEditRegistryConfig.java index 95f721d7..768b41b7 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/GuiEditRegistryConfig.java +++ b/src/main/java/com/gtnewhorizon/structurelib/GuiEditRegistryConfig.java @@ -112,7 +112,6 @@ public GuiEditRegistryConfig(GuiScreen parentScreen, IConfigElement disabled, IC /** * Adds the buttons (and other controls) to the screen in question. */ - @SuppressWarnings("unchecked") @Override public void initGui() { Keyboard.enableRepeatEvents(true); diff --git a/src/main/java/com/gtnewhorizon/structurelib/SortedRegistry.java b/src/main/java/com/gtnewhorizon/structurelib/SortedRegistry.java index fa0acd41..4a50ceb1 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/SortedRegistry.java +++ b/src/main/java/com/gtnewhorizon/structurelib/SortedRegistry.java @@ -75,7 +75,6 @@ public static SortedRegistry getRegistry(String name) { } static void cleanup(MinecraftServer server) { - @SuppressWarnings("unchecked") List players = server.getConfigurationManager().playerEntityList; Set onlinePlayerIDs = players.stream().map(EntityPlayerMP::getUniqueID).collect(Collectors.toSet()); int removed = 0; diff --git a/src/main/java/com/gtnewhorizon/structurelib/block/BlockHint.java b/src/main/java/com/gtnewhorizon/structurelib/block/BlockHint.java index 8f8dc11c..9729b59f 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/block/BlockHint.java +++ b/src/main/java/com/gtnewhorizon/structurelib/block/BlockHint.java @@ -65,10 +65,9 @@ public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, in } @Override - @SuppressWarnings("unchecked") - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (int i = 0; i <= 15; i++) { - aList.add(new ItemStack(aItem, 1, i)); + list.add(new ItemStack(item, 1, i)); } } } diff --git a/src/main/java/com/gtnewhorizon/structurelib/item/ItemBlockHint.java b/src/main/java/com/gtnewhorizon/structurelib/item/ItemBlockHint.java index c9869a5a..3bb929a5 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/item/ItemBlockHint.java +++ b/src/main/java/com/gtnewhorizon/structurelib/item/ItemBlockHint.java @@ -21,10 +21,9 @@ public ItemBlockHint(Block p_i45328_1_) { } @Override - @SuppressWarnings("unchecked") - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { - aList.add(translateToLocal("structurelib.blockhint.desc.0")); // Helps while building - switch (aStack.getItemDamage()) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean adv) { + tooltip.add(translateToLocal("structurelib.blockhint.desc.0")); // Helps while building + switch (stack.getItemDamage()) { case 0: case 1: case 2: @@ -37,35 +36,35 @@ public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, b case 9: case 10: case 11: - aList.add( + tooltip.add( EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("structurelib.blockhint.desc.1")); // Placeholder for a certain // group. break; case 12: - aList.add( + tooltip.add( EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("structurelib.blockhint.desc.2")); // General placeholder. break; case 13: - aList.add( + tooltip.add( EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("structurelib.blockhint.desc.3")); // Make sure it contains Air // material. break; case 14: - aList.add( + tooltip.add( EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("structurelib.blockhint.desc.4")); // Make sure it does not contain // Air material. break; case 15: - aList.add(EnumChatFormatting.BLUE + translateToLocal("structurelib.blockhint.desc.5")); // ERROR, what + tooltip.add(EnumChatFormatting.BLUE + translateToLocal("structurelib.blockhint.desc.5")); // ERROR, what // did u expect? break; default: // WTF? - aList.add("Damn son where did you get that!?"); - aList.add(EnumChatFormatting.BLUE + "From outer space... I guess..."); + tooltip.add("Damn son where did you get that!?"); + tooltip.add(EnumChatFormatting.BLUE + "From outer space... I guess..."); } } diff --git a/src/main/java/com/gtnewhorizon/structurelib/item/ItemConstructableTrigger.java b/src/main/java/com/gtnewhorizon/structurelib/item/ItemConstructableTrigger.java index b2e37020..07800de1 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/item/ItemConstructableTrigger.java +++ b/src/main/java/com/gtnewhorizon/structurelib/item/ItemConstructableTrigger.java @@ -45,31 +45,30 @@ public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, return ConstructableUtility.handle(stack, player, world, x, y, z, side); } - @SuppressWarnings("unchecked") @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean adv) { if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - aList.add( + tooltip.add( translateToLocalFormatted( "item.structurelib.constructableTrigger.desc.lshift.0", - ChannelDataAccessor.countChannelData(aStack))); - ChannelDataAccessor.iterateChannelData(aStack).map(e -> e.getKey() + ": " + e.getValue()) - .forEach(aList::add); + ChannelDataAccessor.countChannelData(stack))); + ChannelDataAccessor.iterateChannelData(stack).map(e -> e.getKey() + ": " + e.getValue()) + .forEach(tooltip::add); } else { - aList.add(translateToLocal("item.structurelib.constructableTrigger.desc.0")); // Triggers Constructable - // Interface - aList.add(BLUE + translateToLocal("item.structurelib.constructableTrigger.desc.1")); // Shows multiblock - // construction - // details, - aList.add(BLUE + translateToLocal("item.structurelib.constructableTrigger.desc.2")); // just Use on a - // multiblock - // controller. - aList.add(BLUE + translateToLocal("item.structurelib.constructableTrigger.desc.3")); // (Sneak Use in - // creative to build) - aList.add(BLUE + translateToLocal("item.structurelib.constructableTrigger.desc.4")); // Quantity affects - // tier/mode/type - if (ChannelDataAccessor.hasSubChannel(aStack)) - aList.add(translateToLocal("item.structurelib.constructableTrigger.desc.5")); + // Tooltip text: + // Triggers Constructable Interface + // Shows multiblock construction details, + // just Use on a multiblock controller. + // (Sneak Use in creative to build) + // Quantity affects tier/mode/type + + tooltip.add(translateToLocal("item.structurelib.constructableTrigger.desc.0")); + tooltip.add(BLUE + translateToLocal("item.structurelib.constructableTrigger.desc.1")); + tooltip.add(BLUE + translateToLocal("item.structurelib.constructableTrigger.desc.2")); + tooltip.add(BLUE + translateToLocal("item.structurelib.constructableTrigger.desc.3")); + tooltip.add(BLUE + translateToLocal("item.structurelib.constructableTrigger.desc.4")); + if (ChannelDataAccessor.hasSubChannel(stack)) + tooltip.add(translateToLocal("item.structurelib.constructableTrigger.desc.5")); } } } diff --git a/src/main/java/com/gtnewhorizon/structurelib/item/ItemFrontRotationTool.java b/src/main/java/com/gtnewhorizon/structurelib/item/ItemFrontRotationTool.java index 60181b57..2ef79a1e 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/item/ItemFrontRotationTool.java +++ b/src/main/java/com/gtnewhorizon/structurelib/item/ItemFrontRotationTool.java @@ -34,15 +34,14 @@ public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) { - aList.add(translateToLocal("item.structurelib.frontRotationTool.desc.0")); // Triggers Front Rotation Interface - aList.add(EnumChatFormatting.BLUE + translateToLocal("item.structurelib.frontRotationTool.desc.1")); // Rotates - // only the - // front - // panel, - aList.add(EnumChatFormatting.BLUE + translateToLocal("item.structurelib.frontRotationTool.desc.2")); // which - // allows - // structure - // rotation. + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean adv) { + // Tooltip Text: + // Triggers Front Rotation Interface + // Rotates only the front panel, + // which allows structure rotation. + + tooltip.add(translateToLocal("item.structurelib.frontRotationTool.desc.0")); + tooltip.add(EnumChatFormatting.BLUE + translateToLocal("item.structurelib.frontRotationTool.desc.1")); + tooltip.add(EnumChatFormatting.BLUE + translateToLocal("item.structurelib.frontRotationTool.desc.2")); } } diff --git a/src/main/java/com/gtnewhorizon/structurelib/util/MiscUtils.java b/src/main/java/com/gtnewhorizon/structurelib/util/MiscUtils.java index 6740e8e0..ffc80cf6 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/util/MiscUtils.java +++ b/src/main/java/com/gtnewhorizon/structurelib/util/MiscUtils.java @@ -11,7 +11,6 @@ public class MiscUtils { private MiscUtils() {} - @SuppressWarnings("unchecked") public static Set getTagKeys(NBTTagCompound tag) { return tag.func_150296_c(); } From ab907306107b77cbdb52c5038d34be3d4f7dd5f9 Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Mon, 25 May 2026 02:56:49 -0500 Subject: [PATCH 02/15] More generic cleanup --- .../structurelib/GuiEditRegistryConfig.java | 13 ++++--------- .../structurelib/structure/StructureUtility.java | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/GuiEditRegistryConfig.java b/src/main/java/com/gtnewhorizon/structurelib/GuiEditRegistryConfig.java index 768b41b7..062a3db5 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/GuiEditRegistryConfig.java +++ b/src/main/java/com/gtnewhorizon/structurelib/GuiEditRegistryConfig.java @@ -318,21 +318,16 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) { for (EntriesList list : lists) { list.drawScreenPost(mouseX, mouseY, partialTicks); } - if (this.undoHoverChecker.checkHover(mouseX, mouseY)) this.drawToolTip( + if (this.undoHoverChecker.checkHover(mouseX, mouseY)) this.func_146283_a( this.mc.fontRenderer.listFormattedStringToWidth(I18n.format("fml.configgui.tooltip.undoAll"), 300), mouseX, mouseY); - if (this.resetHoverChecker.checkHover(mouseX, mouseY)) this.drawToolTip( + if (this.resetHoverChecker.checkHover(mouseX, mouseY)) this.func_146283_a( this.mc.fontRenderer.listFormattedStringToWidth(I18n.format("fml.configgui.tooltip.resetAll"), 300), mouseX, mouseY); } - @SuppressWarnings("rawtypes") - public void drawToolTip(List stringList, int x, int y) { - this.func_146283_a(stringList, x, y); - } - private class EntriesList extends GuiListExtended { final String heading; @@ -570,13 +565,13 @@ private void drawLabel(int y, int slotHeight) { void drawToolTip(int mouseX, int mouseY) { // ensure checkHover() is always called, or the hover threshold might fail under certain corner cases if (hoverCheckerText.checkHover(mouseX, mouseY)) { - GuiEditRegistryConfig.this.drawToolTip( + GuiEditRegistryConfig.this.func_146283_a( mc.fontRenderer.listFormattedStringToWidth(tooltip, entriesList.getListWidth()), mouseX, mouseY); } if (hoverCheckerBtnDrag.checkHover(mouseX, mouseY) && !isDragging) { - GuiEditRegistryConfig.this.drawToolTip( + GuiEditRegistryConfig.this.func_146283_a( mc.fontRenderer.listFormattedStringToWidth( I18n.format("structurelib.configgui.drag.tooltip"), entriesList.getListWidth()), diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java index f4832571..c87d903d 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java @@ -2811,7 +2811,7 @@ public static IStructureElementDeferred partitionBy(Function key if (keyExtractor == null || map == null) { throw new IllegalArgumentException(); } - return defer(keyExtractorCheck.andThen(map::get), keyExtractor.>andThen(map::get)); + return defer(keyExtractorCheck.andThen(map::get), keyExtractor.andThen(map::get)); } /** From 45ad5f334cb5b00e5e723cbca29d89e694793501 Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Mon, 25 May 2026 03:16:15 -0500 Subject: [PATCH 03/15] Fix copyright header --- .../com/gtnewhorizon/structurelib/util/InventoryUtility.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/util/InventoryUtility.java b/src/main/java/com/gtnewhorizon/structurelib/util/InventoryUtility.java index 5d37bc57..3179c4e8 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/util/InventoryUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/util/InventoryUtility.java @@ -9,7 +9,7 @@ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. *

- * You should have received a copy of the GNU Lesser General Public License along with Foobar; if not, write to the Free + * You should have received a copy of the GNU Lesser General Public License along with StructureLib; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ package com.gtnewhorizon.structurelib.util; From b5b340473990988956525f4a1ec82dc4e0394511 Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Mon, 25 May 2026 03:22:36 -0500 Subject: [PATCH 04/15] Fun fact: The LGPL is a set of exceptions to the GPL. You need to provide a copy of the GPL alongside the LGPL document. See section 4b of the LGPL document: "Accompany the Combined Work with a copy of the GNU GPL and this license document" --- LICENSE | 674 ++++++++++++++++++++++++++++++++++ LICENSE.txt => LICENSE.LESSER | 0 2 files changed, 674 insertions(+) create mode 100644 LICENSE rename LICENSE.txt => LICENSE.LESSER (100%) diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/LICENSE.txt b/LICENSE.LESSER similarity index 100% rename from LICENSE.txt rename to LICENSE.LESSER From a7181d79b728b785aa22d2f9b91adb55d92ebfd6 Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Wed, 27 May 2026 02:49:14 -0500 Subject: [PATCH 05/15] Remove unused class --- .../util/ItemStackArrayIterable.java | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 src/main/java/com/gtnewhorizon/structurelib/util/ItemStackArrayIterable.java diff --git a/src/main/java/com/gtnewhorizon/structurelib/util/ItemStackArrayIterable.java b/src/main/java/com/gtnewhorizon/structurelib/util/ItemStackArrayIterable.java deleted file mode 100644 index fb30a1cc..00000000 --- a/src/main/java/com/gtnewhorizon/structurelib/util/ItemStackArrayIterable.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gtnewhorizon.structurelib.util; - -import java.util.Iterator; - -import net.minecraft.item.ItemStack; - -public class ItemStackArrayIterable implements Iterable { - - private final ItemStack[] stacks; - - public ItemStackArrayIterable(ItemStack[] stacks) { - this.stacks = stacks; - } - - public ItemStack[] getStacks() { - return stacks; - } - - @Override - public Iterator iterator() { - return new Iterator() { - - private int ptr = 0; - - @Override - public boolean hasNext() { - return ptr < stacks.length; - } - - @Override - public ItemStack next() { - return stacks[ptr++]; - } - - @Override - public void remove() { - stacks[ptr - 1] = null; - } - }; - } -} From bffaf7adac7036628d870c3b82378dab28c4ad30 Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Wed, 27 May 2026 02:51:15 -0500 Subject: [PATCH 06/15] Introduce enhanced instanceof --- .../java/com/gtnewhorizon/structurelib/ClientProxy.java | 4 +--- .../gtnewhorizon/structurelib/GuiEditRegistryConfig.java | 3 +-- .../alignment/constructable/ConstructableUtility.java | 3 +-- .../structurelib/command/CommandConfigureChannels.java | 4 +--- .../structurelib/command/CommandRegistryDebug.java | 4 +--- .../structurelib/structure/ChatThrottleKey.java | 4 +--- .../structurelib/structure/StructureUtility.java | 6 ++---- .../java/com/gtnewhorizon/structurelib/util/Vec3Impl.java | 3 +-- 8 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java b/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java index 7fdf3bfe..c63c55da 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java +++ b/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java @@ -346,9 +346,7 @@ public HintParticleInfo(World w, int x, int y, int z, IIcon[] icons, short[] tin @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof HintParticleInfo)) return false; - - HintParticleInfo that = (HintParticleInfo) o; + if (!(o instanceof HintParticleInfo that)) return false; return x == that.x && y == that.y && z == that.z; } diff --git a/src/main/java/com/gtnewhorizon/structurelib/GuiEditRegistryConfig.java b/src/main/java/com/gtnewhorizon/structurelib/GuiEditRegistryConfig.java index 062a3db5..1a3b8473 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/GuiEditRegistryConfig.java +++ b/src/main/java/com/gtnewhorizon/structurelib/GuiEditRegistryConfig.java @@ -184,8 +184,7 @@ public void initGui() { */ @Override public void onGuiClosed() { - if (this.configID != null && this.parentScreen instanceof GuiConfig) { - GuiConfig parentGuiConfig = (GuiConfig) this.parentScreen; + if (this.configID != null && this.parentScreen instanceof GuiConfig parentGuiConfig) { parentGuiConfig.needsRefresh = true; parentGuiConfig.initGui(); } diff --git a/src/main/java/com/gtnewhorizon/structurelib/alignment/constructable/ConstructableUtility.java b/src/main/java/com/gtnewhorizon/structurelib/alignment/constructable/ConstructableUtility.java index 92bd596f..9b42ad71 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/alignment/constructable/ConstructableUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/alignment/constructable/ConstructableUtility.java @@ -70,8 +70,7 @@ else if (tTileEntity instanceof IConstructable) { if (constructable == null) return false; - if (aPlayer instanceof EntityPlayerMP) { - EntityPlayerMP playerMP = (EntityPlayerMP) aPlayer; + if (aPlayer instanceof EntityPlayerMP playerMP) { // server side and sneaking (already checked above) // do construct if (aPlayer.capabilities.isCreativeMode) { diff --git a/src/main/java/com/gtnewhorizon/structurelib/command/CommandConfigureChannels.java b/src/main/java/com/gtnewhorizon/structurelib/command/CommandConfigureChannels.java index 9efa48b4..8fde0d7d 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/command/CommandConfigureChannels.java +++ b/src/main/java/com/gtnewhorizon/structurelib/command/CommandConfigureChannels.java @@ -45,9 +45,7 @@ public List addTabCompletionOptions(ICommandSender p_71516_1_, String[] public void processCommand(ICommandSender sender, String[] args) { if (args.length == 0) throw new WrongUsageException(getCommandUsage(sender)); - if (!(sender instanceof EntityPlayerMP)) throw new WrongUsageException("must be a player"); - - EntityPlayerMP player = (EntityPlayerMP) sender; + if (!(sender instanceof EntityPlayerMP player)) throw new WrongUsageException("must be a player"); ItemStack heldItem = player.getHeldItem(); if (heldItem == null || !(heldItem.getItem() instanceof ItemConstructableTrigger)) { diff --git a/src/main/java/com/gtnewhorizon/structurelib/command/CommandRegistryDebug.java b/src/main/java/com/gtnewhorizon/structurelib/command/CommandRegistryDebug.java index 0a2ebd73..c948a191 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/command/CommandRegistryDebug.java +++ b/src/main/java/com/gtnewhorizon/structurelib/command/CommandRegistryDebug.java @@ -39,9 +39,7 @@ public List addTabCompletionOptions(ICommandSender p_71516_1_, String[] public void processCommand(ICommandSender sender, String[] args) { if (args.length != 1) throw new WrongUsageException(getCommandUsage(sender)); - if (!(sender instanceof EntityPlayerMP)) throw new WrongUsageException("must be a player"); - - EntityPlayerMP player = (EntityPlayerMP) sender; + if (!(sender instanceof EntityPlayerMP player)) throw new WrongUsageException("must be a player"); SortedRegistry registry = SortedRegistry.getRegistry(args[0]); if (registry == null) throw new WrongUsageException("registry not found"); diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/ChatThrottleKey.java b/src/main/java/com/gtnewhorizon/structurelib/structure/ChatThrottleKey.java index 1dacccbc..dca09fa7 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/ChatThrottleKey.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/ChatThrottleKey.java @@ -14,9 +14,7 @@ public NoExplicitChannel(String subchannel) { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof NoExplicitChannel)) return false; - - NoExplicitChannel that = (NoExplicitChannel) o; + if (!(o instanceof NoExplicitChannel that)) return false; return subchannel.equals(that.subchannel); } diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java index c87d903d..631b54d2 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java @@ -344,8 +344,7 @@ public static PlaceResult survivalPlaceBlock(Block block, int meta, World world, new ChatComponentTranslation("structurelib.autoplace.missing_block", stack.func_151000_E())); return PlaceResult.REJECT; } - if (block instanceof ICustomBlockSetting) { - ICustomBlockSetting blockCustom = (ICustomBlockSetting) block; + if (block instanceof ICustomBlockSetting blockCustom) { blockCustom.setBlock(world, x, y, z, meta); } else if (!stack.copy() .tryPlaceItemIntoWorld(actor, world, x, y, z, ForgeDirection.UP.ordinal(), 0.5f, 0.5f, 0.5f)) { @@ -770,8 +769,7 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { Pair hint = getHint(trigger); if (hint == null) return false; - if (hint.getKey() instanceof ICustomBlockSetting) { - ICustomBlockSetting block = (ICustomBlockSetting) hint.getKey(); + if (hint.getKey() instanceof ICustomBlockSetting block) { block.setBlock(world, x, y, z, hint.getValue()); } else { world.setBlock(x, y, z, hint.getKey(), hint.getValue(), 2); diff --git a/src/main/java/com/gtnewhorizon/structurelib/util/Vec3Impl.java b/src/main/java/com/gtnewhorizon/structurelib/util/Vec3Impl.java index a7edf155..0d9dca4f 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/util/Vec3Impl.java +++ b/src/main/java/com/gtnewhorizon/structurelib/util/Vec3Impl.java @@ -141,8 +141,7 @@ public Vec3Impl abs() { public boolean equals(Object o) { if (this == o) { return true; - } else if (o instanceof Vec3Impl) { - Vec3Impl vec3i = (Vec3Impl) o; + } else if (o instanceof Vec3Impl vec3i) { return val0 == vec3i.val0 && val1 == vec3i.val1 && val2 == vec3i.val2; } return false; From 66d209169958f071ce26da80e97e3ead7b0e2015 Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Wed, 27 May 2026 02:59:41 -0500 Subject: [PATCH 07/15] Remove unnecessary copyright headers. Everything is covered under the general LPGL license terms in the README, I think. --- .../com/gtnewhorizon/structurelib/ClientProxy.java | 2 -- .../structurelib/util/InventoryUtility.java | 14 -------------- 2 files changed, 16 deletions(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java b/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java index c63c55da..d2acb607 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java +++ b/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java @@ -395,8 +395,6 @@ public void draw(Tessellator tes, double eyeX, double eyeY, double eyeZ, int eye double worldY = y + 0.25; double worldZ = z + 0.25; - // this rendering code is independently written by glee8e on July 10th, 2023 - // and is released as part of StructureLib under LGPL terms, just like everything else in this project // cube is a very special model. its facings can be rendered correctly by viewer distance without using // surface normals and view vector // here we do a 2 pass render. diff --git a/src/main/java/com/gtnewhorizon/structurelib/util/InventoryUtility.java b/src/main/java/com/gtnewhorizon/structurelib/util/InventoryUtility.java index 3179c4e8..a067df89 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/util/InventoryUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/util/InventoryUtility.java @@ -1,17 +1,3 @@ -/** - * Copyright (c) 2022, glee8e This file is part of StructureLib. - *

- * StructureLib is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General - * Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any - * later version. - *

- * StructureLib 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 Lesser General Public License for more - * details. - *

- * You should have received a copy of the GNU Lesser General Public License along with StructureLib; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ package com.gtnewhorizon.structurelib.util; import java.util.Arrays; From 11961c9b18af8ac2a3498a2ee845a22cecb326bf Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Wed, 27 May 2026 03:01:48 -0500 Subject: [PATCH 08/15] Apply spotless --- .../structurelib/item/ItemBlockHint.java | 19 ++++++++++--------- .../item/ItemConstructableTrigger.java | 10 +++++----- .../item/ItemFrontRotationTool.java | 6 +++--- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/item/ItemBlockHint.java b/src/main/java/com/gtnewhorizon/structurelib/item/ItemBlockHint.java index 3bb929a5..9b24886f 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/item/ItemBlockHint.java +++ b/src/main/java/com/gtnewhorizon/structurelib/item/ItemBlockHint.java @@ -36,31 +36,32 @@ public void addInformation(ItemStack stack, EntityPlayer player, List to case 9: case 10: case 11: + // Placeholder for a certain group. tooltip.add( EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD - + translateToLocal("structurelib.blockhint.desc.1")); // Placeholder for a certain - // group. + + translateToLocal("structurelib.blockhint.desc.1")); break; case 12: + // General placeholder. tooltip.add( EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD - + translateToLocal("structurelib.blockhint.desc.2")); // General placeholder. + + translateToLocal("structurelib.blockhint.desc.2")); break; case 13: + // Make sure it contains Air material. tooltip.add( EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD - + translateToLocal("structurelib.blockhint.desc.3")); // Make sure it contains Air - // material. + + translateToLocal("structurelib.blockhint.desc.3")); break; case 14: + // Make sure it does not contain Air material. tooltip.add( EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD - + translateToLocal("structurelib.blockhint.desc.4")); // Make sure it does not contain - // Air material. + + translateToLocal("structurelib.blockhint.desc.4")); break; case 15: - tooltip.add(EnumChatFormatting.BLUE + translateToLocal("structurelib.blockhint.desc.5")); // ERROR, what - // did u expect? + // ERROR, what did u expect? + tooltip.add(EnumChatFormatting.BLUE + translateToLocal("structurelib.blockhint.desc.5")); break; default: // WTF? tooltip.add("Damn son where did you get that!?"); diff --git a/src/main/java/com/gtnewhorizon/structurelib/item/ItemConstructableTrigger.java b/src/main/java/com/gtnewhorizon/structurelib/item/ItemConstructableTrigger.java index 07800de1..47d75026 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/item/ItemConstructableTrigger.java +++ b/src/main/java/com/gtnewhorizon/structurelib/item/ItemConstructableTrigger.java @@ -56,11 +56,11 @@ public void addInformation(ItemStack stack, EntityPlayer player, List to .forEach(tooltip::add); } else { // Tooltip text: - // Triggers Constructable Interface - // Shows multiblock construction details, - // just Use on a multiblock controller. - // (Sneak Use in creative to build) - // Quantity affects tier/mode/type + // Triggers Constructable Interface + // Shows multiblock construction details, + // just Use on a multiblock controller. + // (Sneak Use in creative to build) + // Quantity affects tier/mode/type tooltip.add(translateToLocal("item.structurelib.constructableTrigger.desc.0")); tooltip.add(BLUE + translateToLocal("item.structurelib.constructableTrigger.desc.1")); diff --git a/src/main/java/com/gtnewhorizon/structurelib/item/ItemFrontRotationTool.java b/src/main/java/com/gtnewhorizon/structurelib/item/ItemFrontRotationTool.java index 2ef79a1e..b74466b0 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/item/ItemFrontRotationTool.java +++ b/src/main/java/com/gtnewhorizon/structurelib/item/ItemFrontRotationTool.java @@ -36,9 +36,9 @@ public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean adv) { // Tooltip Text: - // Triggers Front Rotation Interface - // Rotates only the front panel, - // which allows structure rotation. + // Triggers Front Rotation Interface + // Rotates only the front panel, + // which allows structure rotation. tooltip.add(translateToLocal("item.structurelib.frontRotationTool.desc.0")); tooltip.add(EnumChatFormatting.BLUE + translateToLocal("item.structurelib.frontRotationTool.desc.1")); From 4272975e9d749e23dc9d380b63c207c7d83b4fa4 Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Wed, 27 May 2026 04:29:03 -0500 Subject: [PATCH 09/15] Make `IStructureElement` contravariant. --- .../structure/IStructureDefinition.java | 4 +-- .../structure/IStructureElement.java | 5 +++- .../structure/IStructureWalker.java | 16 +++++----- .../structure/StructureDefinition.java | 30 +++++++++---------- .../structure/StructureUtility.java | 4 +-- .../SurvivalBuildStructureWalker.java | 2 +- 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureDefinition.java b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureDefinition.java index c95f8172..4cafa677 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureDefinition.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureDefinition.java @@ -67,7 +67,7 @@ public interface IStructureDefinition { * @throws java.util.NoSuchElementException if the given structure piece is not found and the moon phase perfectly * matches */ - IStructureElement[] getStructureFor(String name); + IStructureElement[] getStructureFor(String name); boolean isContainedInStructure(String name, int offsetA, int offsetB, int offsetC); @@ -356,7 +356,7 @@ default void iterate(String piece, World world, ExtendedFacing extendedFacing, i * @return true if iteration completed successfully. * @param type of context object. */ - static boolean iterate(T object, ItemStack trigger, IStructureElement[] elements, World world, + static boolean iterate(T object, ItemStack trigger, IStructureElement[] elements, World world, ExtendedFacing extendedFacing, int basePositionX, int basePositionY, int basePositionZ, int basePositionA, int basePositionB, int basePositionC, boolean hintsOnly, Boolean checkBlocksIfNotNullForceCheckAllIfTrue) { if (!world.isRemote && hintsOnly) { diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElement.java b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElement.java index f6ed4c71..ac6a8f7a 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElement.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElement.java @@ -28,6 +28,9 @@ /** * Use StructureUtility to instantiate. These are the building blocks for your {@link IStructureDefinition}. It * represents what a particular element can be and how this particular element should be autoplaced. + * + * @param Type of the context object. {@link IStructureElement} is contravariant over T, so parameters and fields of + * type {@link IStructureElement} should be declared as {@code IStructureElement} */ public interface IStructureElement { @@ -213,7 +216,7 @@ default PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, It * Forget the messed up class dependency graph for now. this is just so convenient. */ default IStructureElementNoPlacement noPlacement() { - return new IStructureElementNoPlacement() { + return new IStructureElementNoPlacement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureWalker.java b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureWalker.java index d0856684..ac958e91 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureWalker.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureWalker.java @@ -21,23 +21,23 @@ public interface IStructureWalker { * @param c The relative C position of the element in structure-local coordinates (pre transform) * @return False to stop iterating, true to continue. */ - boolean visit(IStructureElement element, World world, int x, int y, int z, int a, int b, int c); + boolean visit(IStructureElement element, World world, int x, int y, int z, int a, int b, int c); - default boolean blockNotLoaded(IStructureElement element, World world, int x, int y, int z, int a, int b, + default boolean blockNotLoaded(IStructureElement element, World world, int x, int y, int z, int a, int b, int c) { return false; } static IStructureWalker ignoreBlockUnloaded(IStructureWalker walker) { - return new IStructureWalker() { + return new IStructureWalker<>() { @Override - public boolean visit(IStructureElement element, World world, int x, int y, int z, int a, int b, int c) { + public boolean visit(IStructureElement element, World world, int x, int y, int z, int a, int b, int c) { return walker.visit(element, world, x, y, z, a, b, c); } @Override - public boolean blockNotLoaded(IStructureElement element, World world, int x, int y, int z, int a, int b, + public boolean blockNotLoaded(IStructureElement element, World world, int x, int y, int z, int a, int b, int c) { return walker.visit(element, world, x, y, z, a, b, c); } @@ -45,15 +45,15 @@ public boolean blockNotLoaded(IStructureElement element, World world, int x, } static IStructureWalker skipBlockUnloaded(IStructureWalker walker) { - return new IStructureWalker() { + return new IStructureWalker<>() { @Override - public boolean visit(IStructureElement element, World world, int x, int y, int z, int a, int b, int c) { + public boolean visit(IStructureElement element, World world, int x, int y, int z, int a, int b, int c) { return walker.visit(element, world, x, y, z, a, b, c); } @Override - public boolean blockNotLoaded(IStructureElement element, World world, int x, int y, int z, int a, int b, + public boolean blockNotLoaded(IStructureElement element, World world, int x, int y, int z, int a, int b, int c) { return true; } diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureDefinition.java b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureDefinition.java index 6b97a344..c4e9ac02 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureDefinition.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureDefinition.java @@ -16,17 +16,17 @@ public class StructureDefinition implements IStructureDefinition { - private final Map> elements; + private final Map> elements; private final Map shapes; - private final Map[]> structures; + private final Map[]> structures; private final Map> occupiedSpaces; public static Builder builder() { return new Builder<>(); } - private StructureDefinition(Map> elements, Map shapes, - Map[]> structures, Map> occupiedSpaces) { + private StructureDefinition(Map> elements, Map shapes, + Map[]> structures, Map> occupiedSpaces) { this.elements = elements; this.shapes = shapes; this.structures = structures; @@ -40,7 +40,7 @@ public static class Builder { private static final char C = '\uC000'; private char d = '\uD000'; private final Map navigates; - private final Map> elements; + private final Map> elements; private final Map shapes; private final Map> occupiedSpaces; @@ -51,7 +51,7 @@ private Builder() { occupiedSpaces = new HashMap<>(); } - public Map> getElements() { + public Map> getElements() { return elements; } @@ -181,18 +181,18 @@ public Builder addShape(String name, String[][] structurePiece) { * @deprecated use the unboxed version */ @Deprecated - public Builder addElement(Character name, IStructureElement structurePiece) { + public Builder addElement(Character name, IStructureElement structurePiece) { elements.putIfAbsent(name, structurePiece); return this; } - public Builder addElement(char name, IStructureElement structurePiece) { + public Builder addElement(char name, IStructureElement structurePiece) { elements.putIfAbsent(name, structurePiece); return this; } public IStructureDefinition build() { - Map[]> structures = compileStructureMap(); + Map[]> structures = compileStructureMap(); return new StructureDefinition<>( new HashMap<>(elements), new HashMap<>(shapes), @@ -201,7 +201,7 @@ public IStructureDefinition build() { } @SuppressWarnings("unchecked") - private Map[]> compileElementSetMap() { + private Map[]> compileElementSetMap() { Set missing = findMissing(); if (missing.isEmpty()) { return shapes.entrySet().stream().collect( @@ -217,7 +217,7 @@ private Map[]> compileElementSetMap() { } @SuppressWarnings("unchecked") - private Map[]> compileStructureMap() { + private Map[]> compileStructureMap() { Set missing = findMissing(); if (missing.isEmpty()) { return shapes.entrySet().stream().collect( @@ -238,7 +238,7 @@ private Set findMissing() { } } - public Map> getElements() { + public Map> getElements() { return elements; } @@ -246,13 +246,13 @@ public Map getShapes() { return shapes; } - public Map[]> getStructures() { + public Map[]> getStructures() { return structures; } @Override - public IStructureElement[] getStructureFor(String name) { - IStructureElement[] elements = structures.get(name); + public IStructureElement[] getStructureFor(String name) { + IStructureElement[] elements = structures.get(name); if (elements == null) throw new NoSuchElementException(name); return elements; } diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java index 631b54d2..2eeb74e9 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java @@ -3324,7 +3324,7 @@ public static String getPseudoJavaCode(World world, ExtendedFacing extendedFacin return (builder.toString().replaceAll("\"\"", "E")); } - static boolean iterateV2(IStructureElement[] elements, World world, ExtendedFacing extendedFacing, + static boolean iterateV2(IStructureElement[] elements, World world, ExtendedFacing extendedFacing, int basePositionX, int basePositionY, int basePositionZ, int basePositionA, int basePositionB, int basePositionC, IStructureWalker predicate, String iterateType) { // change base position to base offset @@ -3335,7 +3335,7 @@ static boolean iterateV2(IStructureElement[] elements, World world, Exten int[] abc = new int[] { basePositionA, basePositionB, basePositionC }; int[] xyz = new int[3]; - for (IStructureElement element : elements) { + for (IStructureElement element : elements) { if (element.isNavigating()) { abc[0] = (element.resetA() ? basePositionA : abc[0]) + element.getStepA(); abc[1] = (element.resetB() ? basePositionB : abc[1]) + element.getStepB(); diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/SurvivalBuildStructureWalker.java b/src/main/java/com/gtnewhorizon/structurelib/structure/SurvivalBuildStructureWalker.java index 02b61922..d2b4c9b0 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/SurvivalBuildStructureWalker.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/SurvivalBuildStructureWalker.java @@ -37,7 +37,7 @@ public SurvivalBuildStructureWalker(T object, ItemStack trigger, int elementBudg } @Override - public boolean visit(IStructureElement element, World world, int x, int y, int z, int a, int b, int c) { + public boolean visit(IStructureElement element, World world, int x, int y, int z, int a, int b, int c) { env.offsetABC[0] = a; env.offsetABC[1] = b; env.offsetABC[2] = c; From e1f001a7cce07d32c967af9916e85ea50ec86bc1 Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Thu, 28 May 2026 01:08:27 -0500 Subject: [PATCH 10/15] Apply variance to `StructureUtility`. Bleargh, give me JEP 300 any day. --- .../structure/IStructureElementChain.java | 18 +- .../structure/LazyStructureElement.java | 8 +- .../structure/StructureUtility.java | 462 +++++++++--------- 3 files changed, 241 insertions(+), 247 deletions(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElementChain.java b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElementChain.java index 87218270..0bd08c32 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElementChain.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElementChain.java @@ -21,11 +21,11 @@ */ public interface IStructureElementChain extends IStructureElement { - IStructureElement[] fallbacks(); + IStructureElement[] fallbacks(); @Override default boolean check(T t, World world, int x, int y, int z) { - for (IStructureElement fallback : fallbacks()) { + for (IStructureElement fallback : fallbacks()) { if (fallback.check(t, world, x, y, z)) { return true; } @@ -35,7 +35,7 @@ default boolean check(T t, World world, int x, int y, int z) { @Override default boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { - for (IStructureElement fallback : fallbacks()) { + for (IStructureElement fallback : fallbacks()) { if (fallback.couldBeValid(t, world, x, y, z, trigger)) { return true; } @@ -45,7 +45,7 @@ default boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack tr @Override default boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { - for (IStructureElement fallback : fallbacks()) { + for (IStructureElement fallback : fallbacks()) { if (fallback.spawnHint(t, world, x, y, z, trigger)) { return true; } @@ -55,7 +55,7 @@ default boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigg @Override default boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { - for (IStructureElement fallback : fallbacks()) { + for (IStructureElement fallback : fallbacks()) { if (fallback.placeBlock(t, world, x, y, z, trigger)) { return true; } @@ -67,7 +67,7 @@ default boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trig @Override default List getDescription(T context) { Set descriptions = new LinkedHashSet<>(); - for (IStructureElement fallback : fallbacks()) { + for (IStructureElement fallback : fallbacks()) { List desc = fallback.getDescription(context); if (desc != null) { descriptions.addAll(desc); @@ -82,7 +82,7 @@ default BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, It AutoPlaceEnvironment env) { Predicate predicate = null; List> is = new ArrayList<>(); - for (IStructureElement fallback : fallbacks()) { + for (IStructureElement fallback : fallbacks()) { BlocksToPlace e = fallback.getBlocksToPlace(t, world, x, y, z, trigger, env); if (e == null) continue; if (predicate == null) predicate = e.getPredicate(); @@ -99,7 +99,7 @@ default PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, It EntityPlayerMP actor, Consumer chatter) { boolean haveSkip = false; List bufferedNoise = new ArrayList<>(); - for (IStructureElement fallback : fallbacks()) { + for (IStructureElement fallback : fallbacks()) { PlaceResult result = fallback.survivalPlaceBlock(t, world, x, y, z, trigger, s, actor, bufferedNoise::add); switch (result) { case REJECT: @@ -122,7 +122,7 @@ default PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, It AutoPlaceEnvironment env) { boolean haveSkip = false; List bufferedNoise = new ArrayList<>(); - for (IStructureElement fallback : fallbacks()) { + for (IStructureElement fallback : fallbacks()) { PlaceResult result = fallback .survivalPlaceBlock(t, world, x, y, z, trigger, env.withChatter(bufferedNoise::add)); switch (result) { diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/LazyStructureElement.java b/src/main/java/com/gtnewhorizon/structurelib/structure/LazyStructureElement.java index 042acc9a..042d0c4b 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/LazyStructureElement.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/LazyStructureElement.java @@ -13,14 +13,14 @@ class LazyStructureElement implements IStructureElementDeferred { - private Function> to; - private IStructureElement elem; + private Function> to; + private IStructureElement elem; - public LazyStructureElement(Function> to) { + public LazyStructureElement(Function> to) { this.to = to; } - private IStructureElement get(T t) { + private IStructureElement get(T t) { if (to != null) { elem = to.apply(t); to = null; diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java index 2eeb74e9..c0b3fe74 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java @@ -3,6 +3,7 @@ import static com.gtnewhorizon.structurelib.StructureLib.LOGGER; import static com.gtnewhorizon.structurelib.StructureLib.PANIC_MODE; import static java.lang.Integer.MIN_VALUE; +import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; import java.util.Arrays; import java.util.Collection; @@ -45,6 +46,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; @@ -152,8 +154,7 @@ public class StructureUtility { @SuppressWarnings("rawtypes") private static final Map STEP = new HashMap<>(); - @SuppressWarnings("rawtypes") - private static final IStructureElement AIR = new StructureElement_Bridge() { + private static final IStructureElement AIR = new StructureElement_Bridge<>() { @Override public boolean check(Object t, World world, int x, int y, int z) { @@ -188,8 +189,7 @@ public PlaceResult survivalPlaceBlock(Object o, World world, int x, int y, int z } }; - @SuppressWarnings("rawtypes") - private static final IStructureElement NOT_AIR = new StructureElement_Bridge() { + private static final IStructureElement NOT_AIR = new StructureElement_Bridge<>() { @Override public boolean check(Object t, World world, int x, int y, int z) { @@ -232,8 +232,7 @@ public PlaceResult survivalPlaceBlock(Object o, World world, int x, int y, int z } }; - @SuppressWarnings("rawtypes") - private static final IStructureElement ERROR = new StructureElement_Bridge() { + private static final IStructureElement ERROR = new StructureElement_Bridge<>() { @Override public boolean check(Object t, World world, int x, int y, int z) { @@ -463,8 +462,7 @@ public static PlaceResult survivalPlaceBlock(ItemStack stack, NBTMode nbtMode, N * don't need to call this yourselves. Use {@code -} in shape to automatically use this. Provided nontheless in case * you want this as a fallback to something else. */ - @SuppressWarnings("unchecked") - public static IStructureElement isAir() { + public static IStructureElement isAir() { return AIR; } @@ -473,8 +471,7 @@ public static IStructureElement isAir() { * usually don't need to call this yourselves. Use {@code +} in shape to automatically use this. Provided nontheless * in case you want this as a fallback to something else. */ - @SuppressWarnings("unchecked") - public static IStructureElement notAir() { + public static IStructureElement notAir() { return NOT_AIR; } @@ -482,8 +479,7 @@ public static IStructureElement notAir() { * Check returns false. Placement is always handled by this and does nothing. Makes little to no use it in fallback * chain. */ - @SuppressWarnings("unchecked") - public static IStructureElement error() { + public static IStructureElement error() { return ERROR; } @@ -493,22 +489,22 @@ public static IStructureElement error() { * Spawn a hint with given amount of dots. Check always returns: true. Only useful as a fallback, e.g. * {@link #ofBlockUnlocalizedName(String, String, int, IStructureElement)} */ - public static IStructureElementNoPlacement ofHint(int dots) { + public static IStructureElementNoPlacement ofHint(int dots) { int meta = dots - 1; - return new IStructureElementNoPlacement() { + return new IStructureElementNoPlacement<>() { @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { return true; } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, StructureLibAPI.getBlockHint(), meta); return false; } @@ -519,21 +515,21 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge * Spawn a hint with given textures. Check always returns: true. Only useful as a fallback, e.g. * {@link #ofBlockUnlocalizedName(String, String, int, IStructureElement)} */ - public static IStructureElementNoPlacement ofHintDeferred(Supplier icons) { - return new IStructureElementNoPlacement() { + public static IStructureElementNoPlacement ofHintDeferred(Supplier icons) { + return new IStructureElementNoPlacement<>() { @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { return true; } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, icons.get()); return false; } @@ -544,21 +540,21 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge * Spawn a hint with given amount of textures and tint. Check always returns: true. Only useful as a fallback, e.g. * {@link #ofBlockUnlocalizedName(String, String, int, IStructureElement)} */ - public static IStructureElementNoPlacement ofHintDeferred(Supplier icons, short[] RGBa) { - return new IStructureElementNoPlacement() { + public static IStructureElementNoPlacement ofHintDeferred(Supplier icons, short[] RGBa) { + return new IStructureElementNoPlacement<>() { @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { return true; } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticleTinted(world, x, y, z, icons.get(), RGBa); return false; } @@ -580,8 +576,8 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge * * @see #ofBlocksTiered(ITierConverter, Object, BiConsumer, Function) */ - public static IStructureElementCheckOnly ofBlocksTiered(ITierConverter tierExtractor, - @Nullable TIER notSet, BiConsumer setter, Function getter) { + public static IStructureElementCheckOnly ofBlocksTiered(ITierConverter tierExtractor, + @Nullable TIER notSet, BiConsumer setter, Function getter) { if (tierExtractor == null) throw new IllegalArgumentException(); if (setter == null) throw new IllegalArgumentException(); if (getter == null) throw new IllegalArgumentException(); @@ -703,9 +699,9 @@ public static IStructureElementCheckOnly ofBlocksTiered(ITierConver * @param getter a function to retrieve the current tier from context object * @param setter a function to set the current tier into context object */ - public static IStructureElement ofBlocksTiered(ITierConverter tierExtractor, - @Nullable List> allKnownTiers, @Nullable TIER notSet, BiConsumer setter, - Function getter) { + public static IStructureElement ofBlocksTiered(ITierConverter tierExtractor, + @Nullable List> allKnownTiers, @Nullable TIER notSet, BiConsumer setter, + Function getter) { List descriptions = null; if (allKnownTiers != null) { descriptions = new java.util.ArrayList<>(); @@ -726,13 +722,13 @@ public static IStructureElement ofBlocksTiered(ITierConverter * @param description the description lang keys to attach to this element, or null for no description * @see #ofBlocksTiered(ITierConverter, List, Object, BiConsumer, Function) */ - public static IStructureElement ofBlocksTiered(ITierConverter tierExtractor, - @Nullable List> allKnownTiers, @Nullable TIER notSet, BiConsumer setter, - Function getter, @Nullable List description) { + public static IStructureElement ofBlocksTiered(ITierConverter tierExtractor, + @Nullable List> allKnownTiers, @Nullable TIER notSet, BiConsumer setter, + Function getter, @Nullable List description) { List> hints = allKnownTiers == null ? Collections.emptyList() : allKnownTiers; if (hints.stream().anyMatch(Objects::isNull)) throw new IllegalArgumentException(); IStructureElementCheckOnly check = ofBlocksTiered(tierExtractor, notSet, setter, getter); - return new StructureElement_Bridge() { + return new StructureElement_Bridge<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -836,7 +832,7 @@ public List getDescription(T context) { * While no immediate error will be thrown, client code should ensure said mod is loaded and said mod is present, * otherwise bad things will happen later! */ - public static IStructureElement ofBlockUnlocalizedName(String modid, String unlocalizedName, int meta) { + public static IStructureElement ofBlockUnlocalizedName(String modid, String unlocalizedName, int meta) { return ofBlockUnlocalizedName(modid, unlocalizedName, meta, false); } @@ -851,13 +847,13 @@ public static IStructureElement ofBlockUnlocalizedName(String modid, Stri *

* Will place block or hint using the given meta if wildcard is true. */ - public static IStructureElement ofBlockUnlocalizedName(String modid, String registryName, int meta, + public static IStructureElement ofBlockUnlocalizedName(String modid, String registryName, int meta, boolean wildcard) { if (StringUtils.isBlank(registryName)) throw new IllegalArgumentException(); if (meta < 0) throw new IllegalArgumentException(); if (meta > 15) throw new IllegalArgumentException(); if (StringUtils.isBlank(modid)) throw new IllegalArgumentException(); - return new StructureElement_Bridge() { + return new StructureElement_Bridge<>() { private Block block; @@ -867,24 +863,24 @@ private Block getBlock() { } @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { return world.getBlock(x, y, z) == getBlock() && (wildcard || world.getBlockMetadata(x, y, z) == meta); } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { if (getBlock() == null) return error().spawnHint(t, world, x, y, z, trigger); StructureLibAPI.hintParticle(world, x, y, z, getBlock(), meta); return true; } @Override - public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean placeBlock(Object t, World world, int x, int y, int z, ItemStack trigger) { if (getBlock() == null) return error().placeBlock(t, world, x, y, z, trigger); world.setBlock(x, y, z, getBlock(), meta, 2); return true; @@ -892,14 +888,14 @@ public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigg @Nullable @Override - public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger, + public BlocksToPlace getBlocksToPlace(Object t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { if (getBlock() == null) return error().getBlocksToPlace(t, world, x, y, z, trigger, env); return BlocksToPlace.create(getBlock(), meta); } @Override - public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger, + public PlaceResult survivalPlaceBlock(Object t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { if (check(t, world, x, y, z)) return PlaceResult.SKIP; if (getBlock() == null) return PlaceResult.REJECT; @@ -929,13 +925,13 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite * form an OR relationship even if the mod is loaded and the block exists in registry. */ public static IStructureElement ofBlockUnlocalizedName(String modid, String unlocalizedName, int meta, - IStructureElement fallback) { + IStructureElement fallback) { if (StringUtils.isBlank(unlocalizedName)) throw new IllegalArgumentException(); if (meta < 0) throw new IllegalArgumentException(); if (meta > 15) throw new IllegalArgumentException(); if (StringUtils.isBlank(modid)) throw new IllegalArgumentException(); if (fallback == null) throw new IllegalArgumentException(); - return new IStructureElement() { + return new IStructureElement<>() { private Block block; private boolean initialized; @@ -1018,31 +1014,31 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite *

* Does not have autoplace. * - * @param blocsMap Accepted (block, meta) pairs. + * @param blocksMap Accepted (block, meta) pairs. * @param hintBlock hint block to use * @param hintMeta hint meta to use * @see #ofBlocksMapHint(Map, Block, int) */ - public static IStructureElementNoPlacement ofBlocksFlatHint(Map blocsMap, Block hintBlock, + public static IStructureElementNoPlacement ofBlocksFlatHint(Map blocksMap, Block hintBlock, int hintMeta) { - if (blocsMap == null || blocsMap.isEmpty() || hintBlock == null) { + if (blocksMap == null || blocksMap.isEmpty() || hintBlock == null) { throw new IllegalArgumentException(); } - return new IStructureElementNoPlacement() { + return new IStructureElementNoPlacement<>() { @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { Block worldBlock = world.getBlock(x, y, z); - return blocsMap.getOrDefault(worldBlock, MIN_VALUE) == worldBlock.getDamageValue(world, x, y, z); + return blocksMap.getOrDefault(worldBlock, MIN_VALUE) == worldBlock.getDamageValue(world, x, y, z); } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, hintBlock, hintMeta); return true; } @@ -1054,37 +1050,37 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge *

* Does not have autoplace. * - * @param blocsMap Accepted (block, meta) pairs. + * @param blocksMap Accepted (block, meta) pairs. * @param hintBlock hint block to use * @param hintMeta hint meta to use * @see #ofBlocksFlatHint(Map, Block, int) */ - public static IStructureElementNoPlacement ofBlocksMapHint(Map> blocsMap, + public static IStructureElementNoPlacement ofBlocksMapHint(Map> blocksMap, Block hintBlock, int hintMeta) { - if (blocsMap == null || blocsMap.isEmpty() || hintBlock == null) { + if (blocksMap == null || blocksMap.isEmpty() || hintBlock == null) { throw new IllegalArgumentException(); } - for (Collection value : blocsMap.values()) { + for (Collection value : blocksMap.values()) { if (value.isEmpty()) { throw new IllegalArgumentException(); } } - return new IStructureElementNoPlacement() { + return new IStructureElementNoPlacement<>() { @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { Block worldBlock = world.getBlock(x, y, z); - return blocsMap.getOrDefault(worldBlock, Collections.emptySet()) + return defaultIfNull(blocksMap.get(worldBlock), Collections.emptySet()) .contains(worldBlock.getDamageValue(world, x, y, z)); } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, hintBlock, hintMeta); return true; } @@ -1094,26 +1090,26 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge /** * Accept one (block, meta). Spawn hint particles using an alternative block and meta. Not very useful... */ - public static IStructureElementNoPlacement ofBlockHint(Block block, int meta, Block hintBlock, + public static IStructureElementNoPlacement ofBlockHint(Block block, int meta, Block hintBlock, int hintMeta) { if (block == null || hintBlock == null) { throw new IllegalArgumentException(); } - return new IStructureElementNoPlacement() { + return new IStructureElementNoPlacement<>() { @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { Block worldBlock = world.getBlock(x, y, z); return block == worldBlock && meta == worldBlock.getDamageValue(world, x, y, z); } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, hintBlock, hintMeta); return true; } @@ -1124,7 +1120,7 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge * Accept one (block, meta). Same as {@link #ofBlock(Block, int)}, except it explicitly turns off creative/survival * build. */ - public static IStructureElementNoPlacement ofBlockHint(Block block, int meta) { + public static IStructureElementNoPlacement ofBlockHint(Block block, int meta) { return ofBlockHint(block, meta, block, meta); } @@ -1133,12 +1129,12 @@ public static IStructureElementNoPlacement ofBlockHint(Block block, int m *

* Useful when your logic is very complex. Does not support autoplace. */ - public static IStructureElementNoPlacement ofBlockAdderHint(IBlockAdder iBlockAdder, Block hintBlock, + public static IStructureElementNoPlacement ofBlockAdderHint(IBlockAdder iBlockAdder, Block hintBlock, int hintMeta) { if (iBlockAdder == null || hintBlock == null) { throw new IllegalArgumentException(); } - return new IStructureElementNoPlacement() { + return new IStructureElementNoPlacement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -1165,52 +1161,52 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge * Accept a set of blocks. Less cumbersome to use than {@link #ofBlocksMap(Map, Block, int)} when for any accepted * block type we accept only one meta for each. * - * @param blocsMap Accepted (block, meta) pairs. + * @param blocksMap Accepted (block, meta) pairs. * @param defaultBlock default block to place/spawn hint * @param defaultMeta default meta to place/spawn hint * @see #ofBlocksMapHint(Map, Block, int) */ - public static IStructureElement ofBlocksFlat(Map blocsMap, Block defaultBlock, + public static IStructureElement ofBlocksFlat(Map blocksMap, Block defaultBlock, int defaultMeta) { - if (blocsMap == null || blocsMap.isEmpty() || defaultBlock == null) { + if (blocksMap == null || blocksMap.isEmpty() || defaultBlock == null) { throw new IllegalArgumentException(); } if (defaultBlock instanceof ICustomBlockSetting) { - return new IStructureElement() { + return new IStructureElement<>() { private BlocksToPlace blocksToPlace; @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { Block worldBlock = world.getBlock(x, y, z); - return blocsMap.getOrDefault(worldBlock, MIN_VALUE) == worldBlock.getDamageValue(world, x, y, z); + return blocksMap.getOrDefault(worldBlock, MIN_VALUE) == worldBlock.getDamageValue(world, x, y, z); } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean placeBlock(Object t, World world, int x, int y, int z, ItemStack trigger) { ((ICustomBlockSetting) defaultBlock).setBlock(world, x, y, z, defaultMeta); return true; } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, defaultBlock, defaultMeta); return true; } @Nullable @Override - public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger, + public BlocksToPlace getBlocksToPlace(Object t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { if (blocksToPlace == null) { ImmutableList.Builder blocks = ImmutableList.builder(); Predicate predicate = s -> true; - for (Entry e : blocsMap.entrySet()) { + for (Entry e : blocksMap.entrySet()) { Item i = Item.getItemFromBlock(e.getKey()); int meta = e.getValue(); if (i instanceof ISpecialItemBlock) @@ -1225,40 +1221,40 @@ public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, Ite } }; } else { - return new IStructureElement() { + return new IStructureElement<>() { private BlocksToPlace blocksToPlace; @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { Block worldBlock = world.getBlock(x, y, z); - return blocsMap.getOrDefault(worldBlock, MIN_VALUE) == worldBlock.getDamageValue(world, x, y, z); + return blocksMap.getOrDefault(worldBlock, MIN_VALUE) == worldBlock.getDamageValue(world, x, y, z); } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean placeBlock(Object t, World world, int x, int y, int z, ItemStack trigger) { world.setBlock(x, y, z, defaultBlock, defaultMeta, 2); return true; } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, defaultBlock, defaultMeta); return true; } @Override - public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger, + public BlocksToPlace getBlocksToPlace(Object t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { if (blocksToPlace == null) { ImmutableList.Builder blocks = ImmutableList.builder(); Predicate predicate = s -> true; - for (Entry e : blocsMap.entrySet()) { + for (Entry e : blocksMap.entrySet()) { Item i = Item.getItemFromBlock(e.getKey()); int meta = e.getValue(); if (i instanceof ISpecialItemBlock) @@ -1283,7 +1279,7 @@ public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, Ite * @param defaultMeta default meta to place/spawn hint * @see #ofBlocksMapHint(Map, Block, int) */ - public static IStructureElement ofBlocksMap(Map> blocsMap, Block defaultBlock, + public static IStructureElement ofBlocksMap(Map> blocsMap, Block defaultBlock, int defaultMeta) { if (blocsMap == null || blocsMap.isEmpty() || defaultBlock == null) { throw new IllegalArgumentException(); @@ -1294,41 +1290,41 @@ public static IStructureElement ofBlocksMap(Map() { + return new IStructureElement<>() { private BlocksToPlace blocksToPlace; @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { Block worldBlock = world.getBlock(x, y, z); - return blocsMap.getOrDefault(worldBlock, Collections.emptySet()) + return defaultIfNull(blocsMap.get(worldBlock), Collections.emptySet()) .contains(worldBlock.getDamageValue(world, x, y, z)); } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean placeBlock(Object t, World world, int x, int y, int z, ItemStack trigger) { ((ICustomBlockSetting) defaultBlock).setBlock(world, x, y, z, defaultMeta); return true; } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, defaultBlock, defaultMeta); return true; } @Override - public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger, + public BlocksToPlace getBlocksToPlace(Object t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { if (blocksToPlace == null) { ImmutableList.Builder blocks = ImmutableList.builder(); Predicate predicate = s -> true; - for (Entry> e : blocsMap.entrySet()) { + for (Entry> e : blocsMap.entrySet()) { Item i = Item.getItemFromBlock(e.getKey()); for (int meta : e.getValue()) { if (i instanceof ISpecialItemBlock) @@ -1344,41 +1340,41 @@ public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, Ite } }; } else { - return new IStructureElement() { + return new IStructureElement<>() { private BlocksToPlace blocksToPlace; @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { Block worldBlock = world.getBlock(x, y, z); - return blocsMap.getOrDefault(worldBlock, Collections.emptySet()) + return defaultIfNull(blocsMap.get(worldBlock), Collections.emptySet()) .contains(worldBlock.getDamageValue(world, x, y, z)); } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean placeBlock(Object t, World world, int x, int y, int z, ItemStack trigger) { world.setBlock(x, y, z, defaultBlock, defaultMeta, 2); return true; } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, defaultBlock, defaultMeta); return true; } @Override - public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger, + public BlocksToPlace getBlocksToPlace(Object t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { if (blocksToPlace == null) { ImmutableList.Builder blocks = ImmutableList.builder(); Predicate predicate = s -> true; - for (Entry> e : blocsMap.entrySet()) { + for (Entry> e : blocsMap.entrySet()) { Item i = Item.getItemFromBlock(e.getKey()); for (int meta : e.getValue()) { if (i instanceof ISpecialItemBlock) @@ -1404,7 +1400,7 @@ public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, Ite * @param defaultBlock hint block * @param defaultMeta hint meta */ - public static IStructureElement ofBlock(Block block, int meta, Block defaultBlock, int defaultMeta) { + public static IStructureElement ofBlock(Block block, int meta, Block defaultBlock, int defaultMeta) { if (block == null || defaultBlock == null) { throw new IllegalArgumentException(); } @@ -1417,50 +1413,50 @@ public static IStructureElement ofBlock(Block block, int meta, Block defa } } if (block instanceof ICustomBlockSetting) { - return new IStructureElement() { + return new IStructureElement<>() { @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { Block worldBlock = world.getBlock(x, y, z); return block == worldBlock && meta == worldBlock.getDamageValue(world, x, y, z); } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean placeBlock(Object t, World world, int x, int y, int z, ItemStack trigger) { ((ICustomBlockSetting) defaultBlock).setBlock(world, x, y, z, defaultMeta); return true; } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, defaultBlock, defaultMeta); return true; } @Override - public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger, + public BlocksToPlace getBlocksToPlace(Object t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { return BlocksToPlace.create(block, meta); } @Nullable @Override - public List getDescription(T context) { + public List getDescription(Object context) { Item item = Item.getItemFromBlock(block); if (item == null) return null; return Collections.singletonList(new ItemStack(item, 1, meta).getUnlocalizedName() + ".name"); } }; } else { - return new IStructureElement() { + return new IStructureElement<>() { @Override - public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger, + public PlaceResult survivalPlaceBlock(Object t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { BlocksToPlace e = getBlocksToPlace(t, world, x, y, z, trigger, env); IItemSource source = env.getSource(); @@ -1507,37 +1503,37 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite } @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { Block worldBlock = world.getBlock(x, y, z); return block == worldBlock && meta == worldBlock.getDamageValue(world, x, y, z); } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean placeBlock(Object t, World world, int x, int y, int z, ItemStack trigger) { world.setBlock(x, y, z, defaultBlock, defaultMeta, 2); return true; } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, defaultBlock, defaultMeta); return true; } @Override - public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger, + public BlocksToPlace getBlocksToPlace(Object t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { return BlocksToPlace.create(block, meta); } @Nullable @Override - public List getDescription(T context) { + public List getDescription(Object context) { Item item = Item.getItemFromBlock(block); if (item == null) return null; return Collections.singletonList(new ItemStack(item, 1, meta).getUnlocalizedName() + ".name"); @@ -1549,37 +1545,37 @@ public List getDescription(T context) { /** * Same as {@link #ofBlock(Block, int, Block, int)} but ignores target meta id */ - public static IStructureElement ofBlockAnyMeta(Block block, Block defaultBlock, int defaultMeta) { + public static IStructureElement ofBlockAnyMeta(Block block, Block defaultBlock, int defaultMeta) { if (block == null || defaultBlock == null) { throw new IllegalArgumentException(); } if (block instanceof ICustomBlockSetting) { - return new IStructureElement() { + return new IStructureElement<>() { @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { return block == world.getBlock(x, y, z); } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean placeBlock(Object t, World world, int x, int y, int z, ItemStack trigger) { ((ICustomBlockSetting) defaultBlock).setBlock(world, x, y, z, defaultMeta); return true; } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, defaultBlock, defaultMeta); return true; } @Override - public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger, + public BlocksToPlace getBlocksToPlace(Object t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { // there is getSubItems on ItemBlock, but it's client only return BlocksToPlace.create(defaultBlock, defaultMeta); @@ -1587,39 +1583,39 @@ public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, Ite @Nullable @Override - public List getDescription(T context) { + public List getDescription(Object context) { Item item = Item.getItemFromBlock(block); if (item == null) return null; return Collections.singletonList(new ItemStack(item, 1, 0).getUnlocalizedName() + ".name"); } }; } else { - return new IStructureElement() { + return new IStructureElement<>() { @Override - public boolean check(T t, World world, int x, int y, int z) { + public boolean check(Object t, World world, int x, int y, int z) { return block == world.getBlock(x, y, z); } @Override - public boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return check(t, world, x, y, z); } @Override - public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean placeBlock(Object t, World world, int x, int y, int z, ItemStack trigger) { world.setBlock(x, y, z, defaultBlock, defaultMeta, 2); return true; } @Override - public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, defaultBlock, defaultMeta); return true; } @Override - public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger, + public BlocksToPlace getBlocksToPlace(Object t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { // there is getSubItems on ItemBlock, but it's client only return BlocksToPlace.create(defaultBlock, defaultMeta); @@ -1627,7 +1623,7 @@ public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, Ite @Nullable @Override - public List getDescription(T context) { + public List getDescription(Object context) { Item item = Item.getItemFromBlock(block); if (item == null) return null; return Collections.singletonList(new ItemStack(item, 1, 0).getUnlocalizedName() + ".name"); @@ -1639,21 +1635,21 @@ public List getDescription(T context) { /** * Accept a single block with a fixed meta. Most primitive form of structure. */ - public static IStructureElement ofBlock(Block block, int meta) { + public static IStructureElement ofBlock(Block block, int meta) { return ofBlock(block, meta, block, meta); } /** * Accept a single block, but accept any meta. */ - public static IStructureElement ofBlockAnyMeta(Block block) { + public static IStructureElement ofBlockAnyMeta(Block block) { return ofBlockAnyMeta(block, block, 0); } /** * Accept a single block, but accept any meta. Spawn hint/autoplace using given meta. */ - public static IStructureElement ofBlockAnyMeta(Block block, int defaultMeta) { + public static IStructureElement ofBlockAnyMeta(Block block, int defaultMeta) { return ofBlockAnyMeta(block, block, defaultMeta); } @@ -1666,13 +1662,13 @@ public static IStructureElement ofBlockAnyMeta(Block block, int defaultMe *

* Useful when your logic is very complex. */ - public static IStructureElement ofBlockAdder(IBlockAdder iBlockAdder, Block defaultBlock, + public static IStructureElement ofBlockAdder(IBlockAdder iBlockAdder, Block defaultBlock, int defaultMeta) { if (iBlockAdder == null || defaultBlock == null) { throw new IllegalArgumentException(); } if (defaultBlock instanceof ICustomBlockSetting) { - return new StructureElement_Bridge() { + return new StructureElement_Bridge<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -1718,7 +1714,7 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite } }; } else { - return new StructureElement_Bridge() { + return new StructureElement_Bridge<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -1766,7 +1762,7 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite } } - public static IStructureElement ofBlockAdder(IBlockAdder iBlockAdder, int dots) { + public static IStructureElement ofBlockAdder(IBlockAdder iBlockAdder, int dots) { return ofBlockAdder(iBlockAdder, StructureLibAPI.getBlockHint(), dots - 1); } @@ -1774,12 +1770,12 @@ public static IStructureElement ofBlockAdder(IBlockAdder iBlockAdder, * Try to add a structure element with a tile entity. Note that tile adder will be called with a null argument at * locations without tile entity. */ - public static IStructureElementNoPlacement ofTileAdder(ITileAdder iTileAdder, Block hintBlock, + public static IStructureElementNoPlacement ofTileAdder(ITileAdder iTileAdder, Block hintBlock, int hintMeta) { if (iTileAdder == null || hintBlock == null) { throw new IllegalArgumentException(); } - return new IStructureElementNoPlacement() { + return new IStructureElementNoPlacement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -1807,17 +1803,17 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge * Try to add a structure element with a particular type of tile entity. Note that tile adder will not be called at * locations without a tile entity. */ - public static IStructureElementNoPlacement ofSpecificTileAdder(BiPredicate iTileAdder, - Class tileClass, Block hintBlock, int hintMeta) { + public static IStructureElementNoPlacement ofSpecificTileAdder(BiPredicate iTileAdder, + Class tileClass, Block hintBlock, int hintMeta) { if (iTileAdder == null || hintBlock == null || tileClass == null) { throw new IllegalArgumentException(); } - return new IStructureElementNoPlacement() { + return new IStructureElementNoPlacement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { TileEntity tileEntity = world.getTileEntity(x, y, z); - // This used to check if it's a GT tile. Since this is now an standalone mod we no longer do this + // This used to check if it's a GT tile. Since this is now a standalone mod we no longer do this return tileClass.isInstance(tileEntity) && iTileAdder.test(t, tileClass.cast(tileEntity)); } @@ -1848,9 +1844,8 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge * @param onCheckPass side effect * @param element downstream */ - public static , T> IStructureElement onElementPass(Consumer onCheckPass, - B element) { - return new IStructureElement() { + public static IStructureElement onElementPass(Consumer onCheckPass, IStructureElement element) { + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -1911,9 +1906,8 @@ public List getDescription(T context) { * @param description the description to use, or null to clear any existing description * @param element the element to wrap */ - public static , T> IStructureElement withDescription( - @Nullable List description, B element) { - return new IStructureElement() { + public static IStructureElement withDescription(@Nullable List description, IStructureElement element) { + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -1969,9 +1963,8 @@ public List getDescription(T context) { * @param onFail side effect * @param element downstream */ - public static , T> IStructureElement onElementFail(Consumer onFail, - B element) { - return new IStructureElement() { + public static IStructureElement onElementFail(Consumer onFail, IStructureElement element) { + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -2032,8 +2025,7 @@ public List getDescription(T context) { *

* Return SKIP when survival auto place if given predicate returns false. */ - public static IStructureElement onlyIf(Predicate predicate, - IStructureElement downstream) { + public static IStructureElement onlyIf(Predicate predicate, IStructureElement downstream) { return onlyIf(predicate, downstream, PlaceResult.SKIP); } @@ -2042,9 +2034,9 @@ public static IStructureElement onlyIf(Predicate predicate, * * @param placeResultWhenDisabled value to return for survival auto place when predicate returns false */ - public static IStructureElement onlyIf(Predicate predicate, - IStructureElement downstream, PlaceResult placeResultWhenDisabled) { - return new IStructureElement() { + public static IStructureElement onlyIf(Predicate predicate, IStructureElement downstream, + PlaceResult placeResultWhenDisabled) { + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -2118,11 +2110,11 @@ public List getDescription(T context) { * will finally return false. */ @SafeVarargs - public static IStructureElementChain ofChain(IStructureElement... elementChain) { + public static IStructureElementChain ofChain(IStructureElement... elementChain) { if (elementChain == null || elementChain.length == 0) { throw new IllegalArgumentException(); } - for (IStructureElement iStructureElement : elementChain) { + for (IStructureElement iStructureElement : elementChain) { if (iStructureElement == null) { throw new IllegalArgumentException(); } @@ -2138,7 +2130,7 @@ public static IStructureElementChain ofChain(IStructureElement... elem * @see #ofChain(IStructureElement[]) */ @SuppressWarnings("unchecked") - public static IStructureElementChain ofChain(List> elementChain) { + public static IStructureElementChain ofChain(List> elementChain) { return ofChain(elementChain.toArray(new IStructureElement[0])); } @@ -2152,8 +2144,9 @@ public static IStructureElementChain ofChain(List> e * @param existing context object type */ public static > IStructureElement withContext( - IStructureElement elem) { - return new IStructureElement() { + IStructureElement elem) { + + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -2212,7 +2205,7 @@ public List getDescription(T context) { * context object (e.g. GT5 multiblock controller), e.g. hatch texture index to use. Use `lazy` if the data you * access will remain constant across different context object. */ - public static IStructureElementDeferred lazy(Supplier> to) { + public static IStructureElementDeferred lazy(Supplier> to) { if (to == null) { throw new IllegalArgumentException(); } @@ -2230,7 +2223,7 @@ public static IStructureElementDeferred lazy(Supplier IStructureElementDeferred lazy(Function> to) { + public static IStructureElementDeferred lazy(Function> to) { if (to == null) { throw new IllegalArgumentException(); } @@ -2247,11 +2240,11 @@ public static IStructureElementDeferred lazy(Function IStructureElementDeferred defer(Supplier> to) { + public static IStructureElementDeferred defer(Supplier> to) { if (to == null) { throw new IllegalArgumentException(); } - return new IStructureElementDeferred() { + return new IStructureElementDeferred<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -2305,11 +2298,11 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite * * @param to downstream element supplier */ - public static IStructureElementDeferred defer(Function> to) { + public static IStructureElementDeferred defer(Function> to) { if (to == null) { throw new IllegalArgumentException(); } - return new IStructureElementDeferred() { + return new IStructureElementDeferred<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -2363,8 +2356,8 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite * @deprecated renamed to partitionBy */ @Deprecated - public static IStructureElementDeferred defer(Function keyExtractor, - Map> map) { + public static IStructureElementDeferred defer(Function keyExtractor, + Map> map) { return partitionBy(keyExtractor, map); } @@ -2381,8 +2374,8 @@ public static IStructureElementDeferred defer(Function keyExtrac * @param keyExtractor extract a key from the context object * @param map all possible structure element */ - public static IStructureElementDeferred partitionBy(Function keyExtractor, - Map> map) { + public static IStructureElementDeferred partitionBy(Function keyExtractor, + Map> map) { if (keyExtractor == null || map == null) { throw new IllegalArgumentException(); } @@ -2405,8 +2398,8 @@ public static IStructureElementDeferred partitionBy(Function key * @deprecated renamed to partitionBy */ @Deprecated - public static IStructureElementDeferred defer(Function keyExtractor, - Map> map, IStructureElement defaultElem) { + public static IStructureElementDeferred defer(Function keyExtractor, + Map> map, IStructureElement defaultElem) { return partitionBy(keyExtractor, map, defaultElem); } @@ -2424,12 +2417,12 @@ public static IStructureElementDeferred defer(Function keyExtrac * @param map all possible structure element * @param defaultElem element to use when keyExtractor returns a value not found in given map */ - public static IStructureElementDeferred partitionBy(Function keyExtractor, - Map> map, IStructureElement defaultElem) { + public static IStructureElementDeferred partitionBy(Function keyExtractor, + Map> map, IStructureElement defaultElem) { if (keyExtractor == null || map == null) { throw new IllegalArgumentException(); } - return defer(keyExtractor.andThen(key -> map.getOrDefault(key, defaultElem))); + return defer(keyExtractor.andThen(key -> defaultIfNull(map.get(key), defaultElem))); } /** @@ -2447,8 +2440,8 @@ public static IStructureElementDeferred partitionBy(Function key */ @SafeVarargs @Deprecated - public static IStructureElementDeferred defer(Function keyExtractor, - IStructureElement... array) { + public static IStructureElementDeferred defer(Function keyExtractor, + IStructureElement... array) { return partitionBy(keyExtractor, array); } @@ -2465,8 +2458,8 @@ public static IStructureElementDeferred defer(Function keyExt * @param array all possible structure element */ @SafeVarargs - public static IStructureElementDeferred partitionBy(Function keyExtractor, - IStructureElement... array) { + public static IStructureElementDeferred partitionBy(Function keyExtractor, + IStructureElement... array) { if (keyExtractor == null || array == null) { throw new IllegalArgumentException(); } @@ -2487,8 +2480,8 @@ public static IStructureElementDeferred partitionBy(Function * @deprecated renamed to partitionBy */ @Deprecated - public static IStructureElementDeferred defer(Function keyExtractor, - List> array) { + public static IStructureElementDeferred defer(Function keyExtractor, + List> array) { return partitionBy(keyExtractor, array); } @@ -2505,8 +2498,8 @@ public static IStructureElementDeferred defer(Function keyExt * @param array all possible structure element */ @SuppressWarnings("unchecked") - public static IStructureElementDeferred partitionBy(Function keyExtractor, - List> array) { + public static IStructureElementDeferred partitionBy(Function keyExtractor, + List> array) { return partitionBy(keyExtractor, array.toArray(new IStructureElement[0])); } @@ -2522,11 +2515,11 @@ public static IStructureElementDeferred partitionBy(Function * * @param to downstream element supplier */ - public static IStructureElementDeferred defer(BiFunction> to) { + public static IStructureElementDeferred defer(BiFunction> to) { if (to == null) { throw new IllegalArgumentException(); } - return new IStructureElementDeferred() { + return new IStructureElementDeferred<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -2586,8 +2579,8 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite * @deprecated renamed to partitionBy */ @Deprecated - public static IStructureElementDeferred defer(BiFunction keyExtractor, - Map> map) { + public static IStructureElementDeferred defer(BiFunction keyExtractor, + Map> map) { return partitionBy(keyExtractor, map); } @@ -2606,8 +2599,8 @@ public static IStructureElementDeferred defer(BiFunction IStructureElementDeferred partitionBy(BiFunction keyExtractor, - Map> map) { + public static IStructureElementDeferred partitionBy(BiFunction keyExtractor, + Map> map) { if (keyExtractor == null || map == null) { throw new IllegalArgumentException(); } @@ -2632,8 +2625,8 @@ public static IStructureElementDeferred partitionBy(BiFunction IStructureElementDeferred defer(BiFunction keyExtractor, - Map> map, IStructureElement defaultElem) { + public static IStructureElementDeferred defer(BiFunction keyExtractor, + Map> map, IStructureElement defaultElem) { return partitionBy(keyExtractor, map, defaultElem); } @@ -2653,12 +2646,12 @@ public static IStructureElementDeferred defer(BiFunction IStructureElementDeferred partitionBy(BiFunction keyExtractor, - Map> map, IStructureElement defaultElem) { + public static IStructureElementDeferred partitionBy(BiFunction keyExtractor, + Map> map, IStructureElement defaultElem) { if (keyExtractor == null || map == null) { throw new IllegalArgumentException(); } - return defer(keyExtractor.andThen(key -> map.getOrDefault(key, defaultElem))); + return defer(keyExtractor.andThen(key -> defaultIfNull(map.get(key), defaultElem))); } /** @@ -2676,8 +2669,8 @@ public static IStructureElementDeferred partitionBy(BiFunction IStructureElementDeferred defer(BiFunction keyExtractor, - IStructureElement... array) { + public static IStructureElementDeferred defer(BiFunction keyExtractor, + IStructureElement... array) { if (keyExtractor == null || array == null) { throw new IllegalArgumentException(); } @@ -2698,8 +2691,8 @@ public static IStructureElementDeferred defer(BiFunction IStructureElementDeferred defer(BiFunction keyExtractor, - List> array) { + public static IStructureElementDeferred defer(BiFunction keyExtractor, + List> array) { return defer(keyExtractor.andThen(array::get)); } @@ -2718,12 +2711,12 @@ public static IStructureElementDeferred defer(BiFunction IStructureElementDeferred defer(Function> toCheck, - BiFunction> to) { + public static IStructureElementDeferred defer(Function> toCheck, + BiFunction> to) { if (to == null) { throw new IllegalArgumentException(); } - return new IStructureElementDeferred() { + return new IStructureElementDeferred<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -2780,8 +2773,8 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite * @deprecated renamed to partitionBy */ @Deprecated - public static IStructureElementDeferred defer(Function keyExtractorCheck, - BiFunction keyExtractor, Map> map) { + public static IStructureElementDeferred defer(Function keyExtractorCheck, + BiFunction keyExtractor, Map> map) { return partitionBy(keyExtractorCheck, keyExtractor, map); } @@ -2804,8 +2797,8 @@ public static IStructureElementDeferred defer(Function keyExtrac * @param keyExtractor extract a key from the context object and trigger item * @param map all possible structure element */ - public static IStructureElementDeferred partitionBy(Function keyExtractorCheck, - BiFunction keyExtractor, Map> map) { + public static IStructureElementDeferred partitionBy(Function keyExtractorCheck, + BiFunction keyExtractor, Map> map) { if (keyExtractor == null || map == null) { throw new IllegalArgumentException(); } @@ -2832,9 +2825,9 @@ public static IStructureElementDeferred partitionBy(Function key * @deprecated renamed to partitionBy */ @Deprecated - public static IStructureElementDeferred defer(Function keyExtractorCheck, - BiFunction keyExtractor, Map> map, - IStructureElement defaultElem) { + public static IStructureElementDeferred defer(Function keyExtractorCheck, + BiFunction keyExtractor, Map> map, + IStructureElement defaultElem) { return partitionBy(keyExtractorCheck, keyExtractor, map, defaultElem); } @@ -2856,15 +2849,16 @@ public static IStructureElementDeferred defer(Function keyExtrac * @param keyExtractor extract a key from the context object and trigger item * @param map all possible structure element */ - public static IStructureElementDeferred partitionBy(Function keyExtractorCheck, - BiFunction keyExtractor, Map> map, - IStructureElement defaultElem) { + public static IStructureElementDeferred partitionBy(Function keyExtractorCheck, + BiFunction keyExtractor, Map> map, + IStructureElement defaultElem) { if (keyExtractor == null || map == null) { throw new IllegalArgumentException(); } + return defer( - keyExtractorCheck.andThen(k -> map.getOrDefault(k, defaultElem)), - keyExtractor.andThen(k -> map.getOrDefault(k, defaultElem))); + keyExtractorCheck.andThen(k -> defaultIfNull(map.get(k), defaultElem)), + keyExtractor.andThen(k -> defaultIfNull(map.get(k), defaultElem))); } /** @@ -2888,8 +2882,8 @@ public static IStructureElementDeferred partitionBy(Function key */ @SafeVarargs @Deprecated - public static IStructureElementDeferred defer(Function keyExtractorCheck, - BiFunction keyExtractor, IStructureElement... array) { + public static IStructureElementDeferred defer(Function keyExtractorCheck, + BiFunction keyExtractor, IStructureElement... array) { return partitionBy(keyExtractorCheck, keyExtractor, array); } @@ -2912,8 +2906,8 @@ public static IStructureElementDeferred defer(Function keyExt * @param array all possible structure element */ @SafeVarargs - public static IStructureElementDeferred partitionBy(Function keyExtractorCheck, - BiFunction keyExtractor, IStructureElement... array) { + public static IStructureElementDeferred partitionBy(Function keyExtractorCheck, + BiFunction keyExtractor, IStructureElement... array) { if (keyExtractor == null || array == null) { throw new IllegalArgumentException(); } @@ -2938,8 +2932,8 @@ public static IStructureElementDeferred partitionBy(Function * @deprecated renamed to partitionBy */ @Deprecated - public static IStructureElementDeferred defer(Function keyExtractorCheck, - BiFunction keyExtractor, List> array) { + public static IStructureElementDeferred defer(Function keyExtractorCheck, + BiFunction keyExtractor, List> array) { return partitionBy(keyExtractorCheck, keyExtractor, array); } @@ -2960,8 +2954,8 @@ public static IStructureElementDeferred defer(Function keyExt * @param array all possible structure element */ @SuppressWarnings("unchecked") - public static IStructureElementDeferred partitionBy(Function keyExtractorCheck, - BiFunction keyExtractor, List> array) { + public static IStructureElementDeferred partitionBy(Function keyExtractorCheck, + BiFunction keyExtractor, List> array) { return partitionBy(keyExtractorCheck, keyExtractor, array.toArray(new IStructureElement[0])); } @@ -2972,8 +2966,8 @@ public static IStructureElementDeferred partitionBy(Function /** * See channels.md in docs folder */ - public static IStructureElement withChannel(String channel, IStructureElement backing) { - return new IStructureElement() { + public static IStructureElement withChannel(String channel, IStructureElement backing) { + return new IStructureElement<>() { public boolean check(T t, World world, int x, int y, int z) { return backing.check(t, world, x, y, z); From c690cc15c120534313e6006dc4693115f2d8e532 Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Thu, 28 May 2026 23:02:02 -0500 Subject: [PATCH 11/15] Fix minor error --- .../gtnewhorizon/structurelib/structure/StructureUtility.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java index c0b3fe74..ceef1765 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java @@ -2143,7 +2143,7 @@ public static IStructureElementChain ofChain(List extended context type * @param existing context object type */ - public static > IStructureElement withContext( + public static > IStructureElement withContext( IStructureElement elem) { return new IStructureElement<>() { From fd233e20e0eb6ca03fc4eb4b5d301730467a24ba Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Thu, 28 May 2026 23:04:03 -0500 Subject: [PATCH 12/15] Apply spotless --- .../structure/IStructureElement.java | 2 +- .../structure/IStructureWalker.java | 14 +-- .../structure/StructureUtility.java | 95 +++++++++++-------- 3 files changed, 64 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElement.java b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElement.java index ac6a8f7a..b72d1a20 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElement.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElement.java @@ -30,7 +30,7 @@ * represents what a particular element can be and how this particular element should be autoplaced. * * @param Type of the context object. {@link IStructureElement} is contravariant over T, so parameters and fields of - * type {@link IStructureElement} should be declared as {@code IStructureElement} + * type {@link IStructureElement} should be declared as {@code IStructureElement} */ public interface IStructureElement { diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureWalker.java b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureWalker.java index ac958e91..d81ba74a 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureWalker.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureWalker.java @@ -32,13 +32,14 @@ static IStructureWalker ignoreBlockUnloaded(IStructureWalker walker) { return new IStructureWalker<>() { @Override - public boolean visit(IStructureElement element, World world, int x, int y, int z, int a, int b, int c) { + public boolean visit(IStructureElement element, World world, int x, int y, int z, int a, int b, + int c) { return walker.visit(element, world, x, y, z, a, b, c); } @Override - public boolean blockNotLoaded(IStructureElement element, World world, int x, int y, int z, int a, int b, - int c) { + public boolean blockNotLoaded(IStructureElement element, World world, int x, int y, int z, int a, + int b, int c) { return walker.visit(element, world, x, y, z, a, b, c); } }; @@ -48,13 +49,14 @@ static IStructureWalker skipBlockUnloaded(IStructureWalker walker) { return new IStructureWalker<>() { @Override - public boolean visit(IStructureElement element, World world, int x, int y, int z, int a, int b, int c) { + public boolean visit(IStructureElement element, World world, int x, int y, int z, int a, int b, + int c) { return walker.visit(element, world, x, y, z, a, b, c); } @Override - public boolean blockNotLoaded(IStructureElement element, World world, int x, int y, int z, int a, int b, - int c) { + public boolean blockNotLoaded(IStructureElement element, World world, int x, int y, int z, int a, + int b, int c) { return true; } }; diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java index ceef1765..7fbeb882 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java @@ -46,7 +46,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; @@ -577,7 +576,8 @@ public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack t * @see #ofBlocksTiered(ITierConverter, Object, BiConsumer, Function) */ public static IStructureElementCheckOnly ofBlocksTiered(ITierConverter tierExtractor, - @Nullable TIER notSet, BiConsumer setter, Function getter) { + @Nullable TIER notSet, BiConsumer setter, + Function getter) { if (tierExtractor == null) throw new IllegalArgumentException(); if (setter == null) throw new IllegalArgumentException(); if (getter == null) throw new IllegalArgumentException(); @@ -700,8 +700,8 @@ public static IStructureElementCheckOnly ofBlocksTiered(ITierConver * @param setter a function to set the current tier into context object */ public static IStructureElement ofBlocksTiered(ITierConverter tierExtractor, - @Nullable List> allKnownTiers, @Nullable TIER notSet, BiConsumer setter, - Function getter) { + @Nullable List> allKnownTiers, @Nullable TIER notSet, + BiConsumer setter, Function getter) { List descriptions = null; if (allKnownTiers != null) { descriptions = new java.util.ArrayList<>(); @@ -723,8 +723,9 @@ public static IStructureElement ofBlocksTiered(ITierConverter IStructureElement ofBlocksTiered(ITierConverter tierExtractor, - @Nullable List> allKnownTiers, @Nullable TIER notSet, BiConsumer setter, - Function getter, @Nullable List description) { + @Nullable List> allKnownTiers, @Nullable TIER notSet, + BiConsumer setter, Function getter, + @Nullable List description) { List> hints = allKnownTiers == null ? Collections.emptyList() : allKnownTiers; if (hints.stream().anyMatch(Objects::isNull)) throw new IllegalArgumentException(); IStructureElementCheckOnly check = ofBlocksTiered(tierExtractor, notSet, setter, getter); @@ -1014,7 +1015,7 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite *

* Does not have autoplace. * - * @param blocksMap Accepted (block, meta) pairs. + * @param blocksMap Accepted (block, meta) pairs. * @param hintBlock hint block to use * @param hintMeta hint meta to use * @see #ofBlocksMapHint(Map, Block, int) @@ -1050,13 +1051,13 @@ public boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack t *

* Does not have autoplace. * - * @param blocksMap Accepted (block, meta) pairs. + * @param blocksMap Accepted (block, meta) pairs. * @param hintBlock hint block to use * @param hintMeta hint meta to use * @see #ofBlocksFlatHint(Map, Block, int) */ - public static IStructureElementNoPlacement ofBlocksMapHint(Map> blocksMap, - Block hintBlock, int hintMeta) { + public static IStructureElementNoPlacement ofBlocksMapHint( + Map> blocksMap, Block hintBlock, int hintMeta) { if (blocksMap == null || blocksMap.isEmpty() || hintBlock == null) { throw new IllegalArgumentException(); } @@ -1129,8 +1130,8 @@ public static IStructureElementNoPlacement ofBlockHint(Block block, int *

* Useful when your logic is very complex. Does not support autoplace. */ - public static IStructureElementNoPlacement ofBlockAdderHint(IBlockAdder iBlockAdder, Block hintBlock, - int hintMeta) { + public static IStructureElementNoPlacement ofBlockAdderHint(IBlockAdder iBlockAdder, + Block hintBlock, int hintMeta) { if (iBlockAdder == null || hintBlock == null) { throw new IllegalArgumentException(); } @@ -1161,7 +1162,7 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge * Accept a set of blocks. Less cumbersome to use than {@link #ofBlocksMap(Map, Block, int)} when for any accepted * block type we accept only one meta for each. * - * @param blocksMap Accepted (block, meta) pairs. + * @param blocksMap Accepted (block, meta) pairs. * @param defaultBlock default block to place/spawn hint * @param defaultMeta default meta to place/spawn hint * @see #ofBlocksMapHint(Map, Block, int) @@ -1279,8 +1280,8 @@ public BlocksToPlace getBlocksToPlace(Object t, World world, int x, int y, int z * @param defaultMeta default meta to place/spawn hint * @see #ofBlocksMapHint(Map, Block, int) */ - public static IStructureElement ofBlocksMap(Map> blocsMap, Block defaultBlock, - int defaultMeta) { + public static IStructureElement ofBlocksMap(Map> blocsMap, + Block defaultBlock, int defaultMeta) { if (blocsMap == null || blocsMap.isEmpty() || defaultBlock == null) { throw new IllegalArgumentException(); } @@ -1803,8 +1804,8 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge * Try to add a structure element with a particular type of tile entity. Note that tile adder will not be called at * locations without a tile entity. */ - public static IStructureElementNoPlacement ofSpecificTileAdder(BiPredicate iTileAdder, - Class tileClass, Block hintBlock, int hintMeta) { + public static IStructureElementNoPlacement ofSpecificTileAdder( + BiPredicate iTileAdder, Class tileClass, Block hintBlock, int hintMeta) { if (iTileAdder == null || hintBlock == null || tileClass == null) { throw new IllegalArgumentException(); } @@ -1844,7 +1845,8 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge * @param onCheckPass side effect * @param element downstream */ - public static IStructureElement onElementPass(Consumer onCheckPass, IStructureElement element) { + public static IStructureElement onElementPass(Consumer onCheckPass, + IStructureElement element) { return new IStructureElement<>() { @Override @@ -1906,7 +1908,8 @@ public List getDescription(T context) { * @param description the description to use, or null to clear any existing description * @param element the element to wrap */ - public static IStructureElement withDescription(@Nullable List description, IStructureElement element) { + public static IStructureElement withDescription(@Nullable List description, + IStructureElement element) { return new IStructureElement<>() { @Override @@ -1963,7 +1966,8 @@ public List getDescription(T context) { * @param onFail side effect * @param element downstream */ - public static IStructureElement onElementFail(Consumer onFail, IStructureElement element) { + public static IStructureElement onElementFail(Consumer onFail, + IStructureElement element) { return new IStructureElement<>() { @Override @@ -2025,7 +2029,8 @@ public List getDescription(T context) { *

* Return SKIP when survival auto place if given predicate returns false. */ - public static IStructureElement onlyIf(Predicate predicate, IStructureElement downstream) { + public static IStructureElement onlyIf(Predicate predicate, + IStructureElement downstream) { return onlyIf(predicate, downstream, PlaceResult.SKIP); } @@ -2034,8 +2039,8 @@ public static IStructureElement onlyIf(Predicate predicate, IS * * @param placeResultWhenDisabled value to return for survival auto place when predicate returns false */ - public static IStructureElement onlyIf(Predicate predicate, IStructureElement downstream, - PlaceResult placeResultWhenDisabled) { + public static IStructureElement onlyIf(Predicate predicate, + IStructureElement downstream, PlaceResult placeResultWhenDisabled) { return new IStructureElement<>() { @Override @@ -2223,7 +2228,8 @@ public static IStructureElementDeferred lazy(Supplier IStructureElementDeferred lazy(Function> to) { + public static IStructureElementDeferred lazy( + Function> to) { if (to == null) { throw new IllegalArgumentException(); } @@ -2298,7 +2304,8 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite * * @param to downstream element supplier */ - public static IStructureElementDeferred defer(Function> to) { + public static IStructureElementDeferred defer( + Function> to) { if (to == null) { throw new IllegalArgumentException(); } @@ -2515,7 +2522,8 @@ public static IStructureElementDeferred partitionBy(Function IStructureElementDeferred defer(BiFunction> to) { + public static IStructureElementDeferred defer( + BiFunction> to) { if (to == null) { throw new IllegalArgumentException(); } @@ -2599,7 +2607,8 @@ public static IStructureElementDeferred defer(BiFunction IStructureElementDeferred partitionBy(BiFunction keyExtractor, + public static IStructureElementDeferred partitionBy( + BiFunction keyExtractor, Map> map) { if (keyExtractor == null || map == null) { throw new IllegalArgumentException(); @@ -2646,7 +2655,8 @@ public static IStructureElementDeferred defer(BiFunction IStructureElementDeferred partitionBy(BiFunction keyExtractor, + public static IStructureElementDeferred partitionBy( + BiFunction keyExtractor, Map> map, IStructureElement defaultElem) { if (keyExtractor == null || map == null) { throw new IllegalArgumentException(); @@ -2711,7 +2721,8 @@ public static IStructureElementDeferred defer(BiFunction IStructureElementDeferred defer(Function> toCheck, + public static IStructureElementDeferred defer( + Function> toCheck, BiFunction> to) { if (to == null) { throw new IllegalArgumentException(); @@ -2774,7 +2785,8 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite */ @Deprecated public static IStructureElementDeferred defer(Function keyExtractorCheck, - BiFunction keyExtractor, Map> map) { + BiFunction keyExtractor, + Map> map) { return partitionBy(keyExtractorCheck, keyExtractor, map); } @@ -2798,7 +2810,8 @@ public static IStructureElementDeferred defer(Function IStructureElementDeferred partitionBy(Function keyExtractorCheck, - BiFunction keyExtractor, Map> map) { + BiFunction keyExtractor, + Map> map) { if (keyExtractor == null || map == null) { throw new IllegalArgumentException(); } @@ -2826,8 +2839,8 @@ public static IStructureElementDeferred partitionBy(Function IStructureElementDeferred defer(Function keyExtractorCheck, - BiFunction keyExtractor, Map> map, - IStructureElement defaultElem) { + BiFunction keyExtractor, + Map> map, IStructureElement defaultElem) { return partitionBy(keyExtractorCheck, keyExtractor, map, defaultElem); } @@ -2850,8 +2863,8 @@ public static IStructureElementDeferred defer(Function IStructureElementDeferred partitionBy(Function keyExtractorCheck, - BiFunction keyExtractor, Map> map, - IStructureElement defaultElem) { + BiFunction keyExtractor, + Map> map, IStructureElement defaultElem) { if (keyExtractor == null || map == null) { throw new IllegalArgumentException(); } @@ -2933,7 +2946,8 @@ public static IStructureElementDeferred partitionBy(Function IStructureElementDeferred defer(Function keyExtractorCheck, - BiFunction keyExtractor, List> array) { + BiFunction keyExtractor, + List> array) { return partitionBy(keyExtractorCheck, keyExtractor, array); } @@ -2955,7 +2969,8 @@ public static IStructureElementDeferred defer(Function IStructureElementDeferred partitionBy(Function keyExtractorCheck, - BiFunction keyExtractor, List> array) { + BiFunction keyExtractor, + List> array) { return partitionBy(keyExtractorCheck, keyExtractor, array.toArray(new IStructureElement[0])); } @@ -3068,7 +3083,7 @@ public static IStructureNavigate step(Vec3Impl step) { } private static IStructureNavigate stepA(int a, int b, int c) { - return new IStructureNavigate() { + return new IStructureNavigate<>() { @Override public int getStepA() { @@ -3088,7 +3103,7 @@ public int getStepC() { } private static IStructureNavigate stepB(int a, int b, int c) { - return new IStructureNavigate() { + return new IStructureNavigate<>() { @Override public int getStepA() { @@ -3113,7 +3128,7 @@ public boolean resetA() { } private static IStructureNavigate stepC(int a, int b, int c) { - return new IStructureNavigate() { + return new IStructureNavigate<>() { @Override public int getStepA() { From a7cb2592ff773a237755339e10299d9c28fa9d86 Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Thu, 28 May 2026 23:20:17 -0500 Subject: [PATCH 13/15] Mark internal functions as internal --- .../gtnewhorizon/structurelib/structure/StructureUtility.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java index 7fbeb882..66b6f702 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java @@ -3059,7 +3059,7 @@ public List getDescription(T context) { /** * Used internally, to generate skips for structure definitions */ - public static IStructureNavigate step(int a, int b, int c) { + static IStructureNavigate step(int a, int b, int c) { return step(new Vec3Impl(a, b, c)); } @@ -3067,7 +3067,7 @@ public static IStructureNavigate step(int a, int b, int c) { * Used internally, to generate skips for structure definitions */ @SuppressWarnings("unchecked") - public static IStructureNavigate step(Vec3Impl step) { + static IStructureNavigate step(Vec3Impl step) { if (step == null || step.get0() < 0 || step.get1() < 0 || step.get2() < 0) { throw new IllegalArgumentException(); } From 5eb2fc79afe20759255bd45f41975fc1b192fae2 Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Thu, 28 May 2026 23:22:17 -0500 Subject: [PATCH 14/15] Un-generic-ify `IStructureNavigate` --- .../structure/IStructureNavigate.java | 14 +++++++------- .../structure/StructureUtility.java | 18 ++++++++---------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureNavigate.java b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureNavigate.java index 602a4993..83d66f72 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureNavigate.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureNavigate.java @@ -10,36 +10,36 @@ /** * Use StructureUtility to instantiate */ -interface IStructureNavigate extends IStructureElement { +interface IStructureNavigate extends IStructureElement { @Override - default boolean check(T t, World world, int x, int y, int z) { + default boolean check(Object t, World world, int x, int y, int z) { return true; } @Override - default boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + default boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return true; } @Override - default boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + default boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { return true; } @Override - default boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { + default boolean placeBlock(Object t, World world, int x, int y, int z, ItemStack trigger) { return true; } @Override - default PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger, IItemSource s, + default PlaceResult survivalPlaceBlock(Object t, World world, int x, int y, int z, ItemStack trigger, IItemSource s, EntityPlayerMP actor, Consumer chatter) { return PlaceResult.SKIP; } @Override - default PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger, + default PlaceResult survivalPlaceBlock(Object t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { return PlaceResult.SKIP; } diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java index 66b6f702..e5862b46 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java @@ -150,7 +150,6 @@ public class StructureUtility { private static final String NICE_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz=|!@#$%&()[]{};:<>/?_,.*^'`"; - @SuppressWarnings("rawtypes") private static final Map STEP = new HashMap<>(); private static final IStructureElement AIR = new StructureElement_Bridge<>() { @@ -3059,15 +3058,14 @@ public List getDescription(T context) { /** * Used internally, to generate skips for structure definitions */ - static IStructureNavigate step(int a, int b, int c) { + static IStructureNavigate step(int a, int b, int c) { return step(new Vec3Impl(a, b, c)); } /** * Used internally, to generate skips for structure definitions */ - @SuppressWarnings("unchecked") - static IStructureNavigate step(Vec3Impl step) { + static IStructureNavigate step(Vec3Impl step) { if (step == null || step.get0() < 0 || step.get1() < 0 || step.get2() < 0) { throw new IllegalArgumentException(); } @@ -3082,8 +3080,8 @@ static IStructureNavigate step(Vec3Impl step) { }); } - private static IStructureNavigate stepA(int a, int b, int c) { - return new IStructureNavigate<>() { + private static IStructureNavigate stepA(int a, int b, int c) { + return new IStructureNavigate() { @Override public int getStepA() { @@ -3102,8 +3100,8 @@ public int getStepC() { }; } - private static IStructureNavigate stepB(int a, int b, int c) { - return new IStructureNavigate<>() { + private static IStructureNavigate stepB(int a, int b, int c) { + return new IStructureNavigate() { @Override public int getStepA() { @@ -3127,8 +3125,8 @@ public boolean resetA() { }; } - private static IStructureNavigate stepC(int a, int b, int c) { - return new IStructureNavigate<>() { + private static IStructureNavigate stepC(int a, int b, int c) { + return new IStructureNavigate() { @Override public int getStepA() { From 4c51137b51c682a4236c130f974a4b992220d2c7 Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Thu, 28 May 2026 23:33:53 -0500 Subject: [PATCH 15/15] Delete duplicate copy of class --- .../structurelib/util/SortedRegistry.java | 64 ------------------- 1 file changed, 64 deletions(-) delete mode 100644 src/main/java/com/gtnewhorizon/structurelib/util/SortedRegistry.java diff --git a/src/main/java/com/gtnewhorizon/structurelib/util/SortedRegistry.java b/src/main/java/com/gtnewhorizon/structurelib/util/SortedRegistry.java deleted file mode 100644 index aeb2f8c8..00000000 --- a/src/main/java/com/gtnewhorizon/structurelib/util/SortedRegistry.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.gtnewhorizon.structurelib.util; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.NavigableMap; -import java.util.Spliterator; -import java.util.TreeMap; -import java.util.function.Consumer; - -public class SortedRegistry implements Iterable { - - private final NavigableMap store = new TreeMap<>(); - /** - * Store stuff in an array for faster iteration access than a red black tree - */ - private List baked = Collections.emptyList(); - - public void register(String key, V val) { - if (key == null || val == null) throw new NullPointerException(); - V old = store.putIfAbsent(key, val); - if (old != null) { - throw new IllegalArgumentException("Duplicate key: " + key); - } - // TODO allow a user to edit the order with a configuration file - baked = new ArrayList<>(store.values()); - } - - public int size() { - return store.size(); - } - - public boolean isEmpty() { - return store.isEmpty(); - } - - public boolean containsKey(String key) { - return store.containsKey(key); - } - - public boolean containsValue(V value) { - return store.containsValue(value); - } - - public V get(String key) { - return store.get(key); - } - - @Override - public Iterator iterator() { - return baked.iterator(); - } - - @Override - public void forEach(Consumer action) { - baked.forEach(action); - } - - @Override - public Spliterator spliterator() { - return baked.spliterator(); - } -}