Advanced Clipboard: Complete

Author: armele

build.gradle

@@ -123,7 +123,15 @@ dependencies {
     compileOnly name: 'minecolonies-0.0.11-1.21.1alpha'  // use the actual filename without .jar
     localRuntime files('../Minecolonies/build/libs/minecolonies-1.21.1-ALPHA.jar')
 
-    compileOnly 'com.ldtteam:blockui:1.0.192-1.21.1-snapshot'  // use the actual filename without .jar
+    compileOnly name: 'blockui-1.0.199-1.21.1-snapshot'  // use the actual filename without .jar
+    localRuntime files('../Minecolonies/build/libs/blockui-1.0.199-1.21.1-snapshot')    
+
+    compileOnly name: 'structurize-1.0.773-1.21.1-snapshot'  // use the actual filename without .jar
+    localRuntime files('../Minecolonies/build/libs/structurize-1.0.773-1.21.1-snapshot')    
+
+    compileOnly name: 'domum-ornamentum-1.0.213-snapshot-main'  // use the actual filename without .jar
+    localRuntime files('../Minecolonies/build/libs/domum-ornamentum-1.0.213-snapshot-maint')    
+
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.

src/main/java/com/deathfrog/mctradepost/gui/AdvancedWindowClipBoard.java

@@ -112,6 +112,41 @@ protected boolean isPlayerRequest(final IRequest<?> request)
         return isPlayer;
     }
 
+    protected void addToFilteredRequests(IRequestManager manager, ArrayList<IRequest<?>> filteredRequests, IRequest<?> request)
+    {
+        if (isPlayerRequest(request)) {
+            filteredRequests.add(request);
+        }
+
+        if (request.hasChildren()) {
+            
+            for (final Object o : request.getChildren())
+            {
+                if (o instanceof IToken<?>)
+                {
+                    final IToken<?> iToken = (IToken<?>) o;
+                    final IRequest<?> childRequest = manager.getRequestForToken(iToken);
+
+                    if (childRequest != null)
+                    {
+                        addToFilteredRequests(manager, filteredRequests, childRequest);
+                    }
+                }
+            }
+        }
+    }
+
+    protected ArrayList<IRequest<?>> filterRequests(IRequestManager manager, IBuildingView buildingView, ArrayList<IRequest<?>> requests)
+    {
+        final ArrayList<IRequest<?>> filteredRequests = Lists.newArrayList();
+
+        requests.forEach(request -> {
+            addToFilteredRequests(manager, filteredRequests, request);
+        });
+
+        return filteredRequests;
+    }
+
     @Override
     public ImmutableList<IRequest<?>> getOpenRequestsFromBuilding(final IBuildingView building)
     {
@@ -161,7 +196,9 @@ public ImmutableList<IRequest<?>> getOpenRequestsFromBuilding(final IBuildingVie
 
             // Advanced clipboard functionality - only show requests to be fulfilled by the player
             if (playerOnly) {
-                requests.removeIf(req -> !isPlayerRequest(req));
+                final ArrayList<IRequest<?>> filteredRequests = filterRequests(requestManager, building, requests);
+                requests.clear();
+                requests.addAll(filteredRequests);
             }
 
             final BlockPos playerPos = Minecraft.getInstance().player.blockPosition();

src/main/java/com/deathfrog/mctradepost/item/AdvancedClipboardItem.java

@@ -5,16 +5,22 @@
 import com.deathfrog.mctradepost.gui.AdvancedWindowClipBoard;
 import com.minecolonies.api.colony.IColonyView;
 import com.minecolonies.api.items.component.ColonyId;
+import com.minecolonies.api.util.MessageUtils;
 import com.minecolonies.api.util.constant.TranslationConstants;
 import com.minecolonies.core.items.ItemClipboard;
+import com.minecolonies.core.tileentities.TileEntityColonyBuilding;
 
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
+
+import static com.minecolonies.api.util.constant.TranslationConstants.COM_MINECOLONIES_CLIPBOARD_COLONY_SET;
 
 public class AdvancedClipboardItem extends ItemClipboard {
 
@@ -48,6 +54,32 @@ public InteractionResultHolder<ItemStack> use(
         return new InteractionResultHolder<>(InteractionResult.SUCCESS, clipboard);
     }   
 
+    @Override
+    @NotNull
+    public InteractionResult useOn(final UseOnContext ctx)
+    {
+        final ItemStack clipboard = ctx.getPlayer().getItemInHand(ctx.getHand());
+
+        final BlockEntity entity = ctx.getLevel().getBlockEntity(ctx.getClickedPos());
+
+        if (entity instanceof TileEntityColonyBuilding buildingEntity)
+        {
+            buildingEntity.writeColonyToItemStack(clipboard);
+
+            if (!ctx.getLevel().isClientSide)
+            {
+                MessageUtils.format(COM_MINECOLONIES_CLIPBOARD_COLONY_SET, buildingEntity.getColony().getName()).sendTo(ctx.getPlayer());
+            }
+        }
+        else if (ctx.getLevel().isClientSide)
+        {
+            openWindow(clipboard, ctx.getLevel(), ctx.getPlayer());
+        }
+
+        return InteractionResult.SUCCESS;
+    }
+
+
     /**
      * Opens the clipboard window if there is a valid colony linked
      * @param stack the item

src/main/resources/assets/mctradepost/gui/advancedwindowclipboard.xml

@@ -5,7 +5,7 @@
     <text size="158 11" pos="16 28" textalign="MIDDLE" color="black"
            label="$(com.minecolonies.coremod.gui.citizen.requests)"/>
     <button id="important" size="14 15" pos="150 23" color="red" label="!" tooltip="$(com.minecolonies.coremod.gui.request.hideshow)" source="minecolonies:textures/gui/builderhut/builder_button_mini.png"/>
-    <button id="playeronly" size="14 15" pos="130 23" color="red" label="P" tooltip="View only requests expected to be fulfilled by a player." source="minecolonies:textures/gui/builderhut/builder_button_mini.png"/>
+    <button id="playeronly" size="14 15" pos="135 23" color="red" label="P" tooltip="View only requests expected to be fulfilled by a player." source="minecolonies:textures/gui/builderhut/builder_button_mini.png"/>
     <list id="requests" size="158 184" pos="16 44">
         <box id="requestx" size="100% 40" linewidth="1">
             <layout source="minecolonies:gui/layouthuts/layoutrequeststree.xml"/>

…radepost/recipes/advanced_clipboard.json …tradepost/recipe/advanced_clipboard.jsonsrc/main/resources/data/mctradepost/recipes/advanced_clipboard.json renamed to src/main/resources/data/mctradepost/recipe/advanced_clipboard.json src/main/resources/data/mctradepost/recipes/advanced_clipboard.json renamed to src/main/resources/data/mctradepost/recipe/advanced_clipboard.json

@@ -1,18 +1,20 @@
 {
     "type": "minecraft:crafting_shaped",
-    "pattern": [
-      "WPW",
-      "LBL",
-      " W "
-    ],
+    "category": "equipment",
     "key": {
       "W": { "item": "minecraft:paper" },
       "P": { "item": "minecraft:iron_ingot" },
       "L": { "item": "minecraft:leather" },
       "B": { "item": "minecolonies:clipboard" }
     },
+    "pattern": [
+      "WPW",
+      "LBL",
+      " W "
+    ],
     "result": {
-      "item": "mctradepost:advanced_clipboard"
+      "count": 1,
+      "id": "mctradepost:advanced_clipboard"
     }
 }