Toolbelt

src/main/java/gregtech/api/items/IDyeableItem.java

@@ -0,0 +1,77 @@
+package gregtech.api.items;
+
+import net.minecraft.block.BlockCauldron;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.Constants;
+
+import org.jetbrains.annotations.NotNull;
+
+public interface IDyeableItem {
+
+    default boolean hasColor(ItemStack stack) {
+        NBTTagCompound nbttagcompound = stack.getTagCompound();
+        return nbttagcompound != null && nbttagcompound.hasKey("color", Constants.NBT.TAG_INT);
+    }
+
+    default int getColor(ItemStack stack) {
+        NBTTagCompound nbttagcompound = stack.getTagCompound();
+        if (nbttagcompound != null && nbttagcompound.hasKey("color", Constants.NBT.TAG_INT)) {
+            return nbttagcompound.getInteger("color");
+        }
+        return getDefaultColor(stack);
+    }
+
+    default int getDefaultColor(ItemStack stack) {
+        return 0xFFFFFF;
+    }
+
+    default void removeColor(ItemStack stack) {
+        NBTTagCompound nbttagcompound = stack.getTagCompound();
+        if (nbttagcompound != null && nbttagcompound.hasKey("color")) {
+            nbttagcompound.removeTag("color");
+        }
+    }
+
+    default void setColor(ItemStack stack, int color) {
+        NBTTagCompound nbttagcompound = stack.getTagCompound();
+        if (nbttagcompound == null) {
+            nbttagcompound = new NBTTagCompound();
+            stack.setTagCompound(nbttagcompound);
+        }
+        nbttagcompound.setInteger("color", color);
+    }
+
+    default @NotNull EnumActionResult onItemUseFirst(@NotNull EntityPlayer player, @NotNull World world,
+                                                     @NotNull BlockPos pos, @NotNull EnumFacing side, float hitX,
+                                                     float hitY, float hitZ, @NotNull EnumHand hand) {
+        ItemStack stack = player.getHeldItem(hand);
+        if (this.hasColor(stack)) {
+            IBlockState iblockstate = world.getBlockState(pos);
+            if (iblockstate.getBlock() instanceof BlockCauldron cauldron) {
+                int water = iblockstate.getValue(BlockCauldron.LEVEL);
+                if (water > 0) {
+                    this.removeColor(stack);
+                    cauldron.setWaterLevel(world, pos, iblockstate, water - 1);
+                    return EnumActionResult.SUCCESS;
+                }
+            }
+        }
+        return EnumActionResult.PASS;
+    }
+
+    /**
+     * Controls whether the dyeing recipe simply removes the dyeable item from the crafting grid,
+     * or calls {@link net.minecraftforge.common.ForgeHooks#getContainerItem(ItemStack)} on it.
+     */
+    default boolean shouldGetContainerItem() {
+        return true;
+    }
+}

src/main/java/gregtech/api/items/toolitem/IGTTool.java

@@ -5,15 +5,12 @@
 import gregtech.api.capability.GregtechCapabilities;
 import gregtech.api.capability.impl.CombinedCapabilityProvider;
 import gregtech.api.capability.impl.ElectricItem;
-import gregtech.api.gui.GuiTextures;
-import gregtech.api.gui.ModularUI;
-import gregtech.api.gui.widgets.ClickButtonWidget;
-import gregtech.api.gui.widgets.DynamicLabelWidget;
 import gregtech.api.items.gui.ItemUIFactory;
-import gregtech.api.items.gui.PlayerInventoryHolder;
 import gregtech.api.items.metaitem.ElectricStats;
 import gregtech.api.items.toolitem.aoe.AoESymmetrical;
 import gregtech.api.items.toolitem.behavior.IToolBehavior;
+import gregtech.api.mui.GTGuiTextures;
+import gregtech.api.mui.GTGuis;
 import gregtech.api.recipes.ModHandler;
 import gregtech.api.unification.OreDictUnifier;
 import gregtech.api.unification.material.Material;
@@ -63,6 +60,20 @@
 import appeng.api.implementations.items.IAEWrench;
 import buildcraft.api.tools.IToolWrench;
 import cofh.api.item.IToolHammer;
+import com.cleanroommc.modularui.api.drawable.IDrawable;
+import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.api.widget.IWidget;
+import com.cleanroommc.modularui.api.widget.Interactable;
+import com.cleanroommc.modularui.factory.HandGuiData;
+import com.cleanroommc.modularui.factory.ItemGuiFactory;
+import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.utils.Alignment;
+import com.cleanroommc.modularui.value.sync.IntSyncValue;
+import com.cleanroommc.modularui.value.sync.PanelSyncManager;
+import com.cleanroommc.modularui.widgets.ButtonWidget;
+import com.cleanroommc.modularui.widgets.TextWidget;
+import com.cleanroommc.modularui.widgets.layout.Column;
+import com.cleanroommc.modularui.widgets.layout.Row;
 import com.enderio.core.common.interfaces.IOverlayRenderAware;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -636,7 +647,11 @@ default AoESymmetrical getAoEDefinition(ItemStack stack) {
     default EnumActionResult definition$onItemUseFirst(@NotNull EntityPlayer player, @NotNull World world,
                                                        @NotNull BlockPos pos, @NotNull EnumFacing facing, float hitX,
                                                        float hitY, float hitZ, @NotNull EnumHand hand) {
-        for (IToolBehavior behavior : getToolStats().getBehaviors()) {
+        ItemStack stack = toolbeltPassthrough(player.getHeldItem(hand));
+        List<IToolBehavior> behaviors;
+        if (stack.getItem() instanceof IGTTool tool) behaviors = tool.getToolStats().getBehaviors();
+        else return EnumActionResult.PASS;
+        for (IToolBehavior behavior : behaviors) {
             if (behavior.onItemUseFirst(player, world, pos, facing, hitX, hitY, hitZ, hand) ==
                     EnumActionResult.SUCCESS) {
                 return EnumActionResult.SUCCESS;
@@ -648,8 +663,14 @@ default AoESymmetrical getAoEDefinition(ItemStack stack) {
 
     default EnumActionResult definition$onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand,
                                                   EnumFacing facing, float hitX, float hitY, float hitZ) {
-        for (IToolBehavior behavior : getToolStats().getBehaviors()) {
-            if (behavior.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ) == EnumActionResult.SUCCESS) {
+        ItemStack stack = toolbeltPassthrough(player.getHeldItem(hand));
+        List<IToolBehavior> behaviors;
+        if (stack.getItem() instanceof IGTTool tool) behaviors = tool.getToolStats().getBehaviors();
+        else return EnumActionResult.PASS;
+
+        for (IToolBehavior behavior : behaviors) {
+            if (behavior.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ) ==
+                    EnumActionResult.SUCCESS) {
                 return EnumActionResult.SUCCESS;
             }
         }
@@ -659,20 +680,25 @@ default AoESymmetrical getAoEDefinition(ItemStack stack) {
 
     default ActionResult<ItemStack> definition$onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
         ItemStack stack = player.getHeldItem(hand);
+        ItemStack original = stack;
+        stack = toolbeltPassthrough(stack);
         if (!world.isRemote) {
             // TODO: relocate to keybind action when keybind PR happens
             if (player.isSneaking() && getMaxAoEDefinition(stack) != AoESymmetrical.none()) {
-                PlayerInventoryHolder.openHandItemUI(player, hand);
-                return ActionResult.newResult(EnumActionResult.SUCCESS, stack);
+                ItemGuiFactory.open((EntityPlayerMP) player, hand);
+                return ActionResult.newResult(EnumActionResult.SUCCESS, original);
             }
         }
+        List<IToolBehavior> behaviors;
+        if (stack.getItem() instanceof IGTTool tool) behaviors = tool.getToolStats().getBehaviors();
+        else return ActionResult.newResult(EnumActionResult.PASS, original);
 
-        for (IToolBehavior behavior : getToolStats().getBehaviors()) {
+        for (IToolBehavior behavior : behaviors) {
             if (behavior.onItemRightClick(world, player, hand).getType() == EnumActionResult.SUCCESS) {
-                return ActionResult.newResult(EnumActionResult.SUCCESS, stack);
+                return ActionResult.newResult(EnumActionResult.SUCCESS, original);
             }
         }
-        return ActionResult.newResult(EnumActionResult.PASS, stack);
+        return ActionResult.newResult(EnumActionResult.PASS, original);
     }
 
     default void definition$getSubItems(@NotNull NonNullList<ItemStack> items) {
@@ -878,6 +904,7 @@ default ModelResourceLocation getModelLocation() {
 
     // Sound Playing
     default void playCraftingSound(EntityPlayer player, ItemStack stack) {
+        stack = toolbeltPassthrough(stack);
         // player null check for things like auto-crafters
         if (ConfigHolder.client.toolCraftingSounds && getSound() != null && player != null) {
             if (canPlaySound(stack)) {
@@ -903,45 +930,79 @@ default void playSound(EntityPlayer player) {
         }
     }
 
-    default ModularUI createUI(PlayerInventoryHolder holder, EntityPlayer entityPlayer) {
-        NBTTagCompound tag = getBehaviorsTag(holder.getCurrentItem());
-        AoESymmetrical defaultDefinition = getMaxAoEDefinition(holder.getCurrentItem());
-        return ModularUI.builder(GuiTextures.BORDERED_BACKGROUND, 120, 80)
-                .label(6, 10, "item.gt.tool.aoe.columns")
-                .label(49, 10, "item.gt.tool.aoe.rows")
-                .label(79, 10, "item.gt.tool.aoe.layers")
-                .widget(new ClickButtonWidget(15, 24, 20, 20, "+", data -> {
-                    AoESymmetrical.increaseColumn(tag, defaultDefinition);
-                    holder.markAsDirty();
-                }))
-                .widget(new ClickButtonWidget(15, 44, 20, 20, "-", data -> {
-                    AoESymmetrical.decreaseColumn(tag, defaultDefinition);
-                    holder.markAsDirty();
-                }))
-                .widget(new ClickButtonWidget(50, 24, 20, 20, "+", data -> {
-                    AoESymmetrical.increaseRow(tag, defaultDefinition);
-                    holder.markAsDirty();
-                }))
-                .widget(new ClickButtonWidget(50, 44, 20, 20, "-", data -> {
-                    AoESymmetrical.decreaseRow(tag, defaultDefinition);
-                    holder.markAsDirty();
-                }))
-                .widget(new ClickButtonWidget(85, 24, 20, 20, "+", data -> {
-                    AoESymmetrical.increaseLayer(tag, defaultDefinition);
-                    holder.markAsDirty();
-                }))
-                .widget(new ClickButtonWidget(85, 44, 20, 20, "-", data -> {
-                    AoESymmetrical.decreaseLayer(tag, defaultDefinition);
-                    holder.markAsDirty();
-                }))
-                .widget(new DynamicLabelWidget(23, 65, () -> Integer.toString(
-                        1 + 2 * AoESymmetrical.getColumn(getBehaviorsTag(holder.getCurrentItem()), defaultDefinition))))
-                .widget(new DynamicLabelWidget(58, 65, () -> Integer.toString(
-                        1 + 2 * AoESymmetrical.getRow(getBehaviorsTag(holder.getCurrentItem()), defaultDefinition))))
-                .widget(new DynamicLabelWidget(93, 65,
-                        () -> Integer.toString(1 +
-                                AoESymmetrical.getLayer(getBehaviorsTag(holder.getCurrentItem()), defaultDefinition))))
-                .build(holder, entityPlayer);
+    IDrawable PLUS = IKey.str("+").asIcon().marginLeft(1);
+    IDrawable MINUS = IKey.str("-").asIcon().marginLeft(1);
+
+    @Override
+    default ModularPanel buildUI(HandGuiData guiData, PanelSyncManager manager) {
+        final var usedStack = guiData.getUsedItemStack();
+        final var behaviorsTag = getBehaviorsTag(usedStack);
+        final var defaultDefinition = getMaxAoEDefinition(usedStack);
+
+        var columnValue = new IntSyncValue(
+                () -> AoESymmetrical.getColumn(behaviorsTag, defaultDefinition),
+                i -> AoESymmetrical.setColumn(behaviorsTag, i, defaultDefinition));
+        var rowValue = new IntSyncValue(
+                () -> AoESymmetrical.getRow(behaviorsTag, defaultDefinition),
+                i -> AoESymmetrical.setRow(behaviorsTag, i, defaultDefinition));
+        var layerValue = new IntSyncValue(
+                () -> AoESymmetrical.getLayer(behaviorsTag, defaultDefinition),
+                i -> AoESymmetrical.setLayer(behaviorsTag, i, defaultDefinition));
+
+        manager.syncValue("row_value", rowValue);
+        manager.syncValue("column_value", columnValue);
+        manager.syncValue("layer_value", layerValue);
+
+        return GTGuis.createPanel(usedStack.getTranslationKey(), 120, 80)
+                .child(new Row()
+                        .widthRel(1f)
+                        .margin(4, 0)
+                        .alignY(0.5f)
+                        .coverChildrenHeight()
+                        .mainAxisAlignment(Alignment.MainAxis.SPACE_BETWEEN)
+                        .child(createColumn(columnValue, "columns", true))
+                        .child(createColumn(rowValue, "rows", true))
+                        .child(createColumn(layerValue, "layers", false)));
+    }
+
+    default Column createColumn(IntSyncValue syncValue, String lang, boolean shouldDouble) {
+        final var display = IKey.dynamic(
+                () -> String.valueOf(1 + (shouldDouble ? 2 * syncValue.getIntValue() : syncValue.getIntValue())));
+
+        IWidget increaseButton = new ButtonWidget<>()
+                .size(9, 18)
+                .background(GTGuiTextures.MC_BUTTON)
+                .overlay(PLUS)
+                .disableHoverBackground()
+                .onMousePressed(data -> {
+                    syncValue.setIntValue(syncValue.getIntValue() + 1, true, true);
+                    Interactable.playButtonClickSound();
+                    return true;
+                });
+
+        IWidget decreaseButton = new ButtonWidget<>()
+                .size(9, 18)
+                .background(GTGuiTextures.MC_BUTTON)
+                .overlay(MINUS)
+                .disableHoverBackground()
+                .onMousePressed(data -> {
+                    syncValue.setIntValue(syncValue.getIntValue() - 1, true, true);
+                    Interactable.playButtonClickSound();
+                    return true;
+                });
+
+        return new Column()
+                .coverChildren()
+                .child(new TextWidget(IKey.lang("item.gt.tool.aoe." + lang))
+                        .marginBottom(5))
+                .child(new Row()
+                        .coverChildren()
+                        .marginBottom(5)
+                        .child(increaseButton)
+                        .child(decreaseButton))
+                .child(new TextWidget(display)
+                        .alignment(Alignment.Center)
+                        .widthRel(1f));
     }
 
     Set<String> getToolClasses(ItemStack stack);