Fix color applicator model orientation and allow switching colors by …

…right-clicking. (#7742)

guidebook/items-blocks-machines/color_applicator.md

@@ -22,7 +22,7 @@ Its energy can be recharged in a <ItemLink id="charger" />.
 Color applicators act like [storage cells](storage_cells.md), and their paint storage can most easily be filled by sticking
 the applicator in the storage cell slot in a <ItemLink id="chest" />
 
-To use a color applicator, right click to apply, and shift-scroll to cycle through the stored paintballs and dyes.
+Right-click a target to apply the selected color. To change colors, use your scroll wheel while hold shift, or right-click without a target.
 
 ## Upgrades
 

src/generated/resources/assets/ae2/models/item/color_applicator.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld",
   "overrides": [
     {
       "model": "ae2:item/color_applicator_colored",

src/generated/resources/assets/ae2/models/item/color_applicator_colored.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld",
   "textures": {
     "layer0": "ae2:item/color_applicator",
     "layer1": "ae2:item/color_applicator_tip_dark",

src/main/java/appeng/datagen/providers/models/ItemModelProvider.java

@@ -178,12 +178,12 @@ private void registerHandheld() {
 
         // The color applicator uses a separate model when colored
         var coloredColorApplicator = withExistingParent(AEItems.COLOR_APPLICATOR.id().getPath() + "_colored",
-                "item/generated")
+                "item/handheld")
                         .texture("layer0", makeId("item/color_applicator"))
                         .texture("layer1", makeId("item/color_applicator_tip_dark"))
                         .texture("layer2", makeId("item/color_applicator_tip_medium"))
                         .texture("layer3", makeId("item/color_applicator_tip_bright"));
-        withExistingParent(AEItems.COLOR_APPLICATOR.id().getPath(), "item/generated")
+        withExistingParent(AEItems.COLOR_APPLICATOR.id().getPath(), "item/handheld")
                 .texture("layer0", makeId("item/color_applicator"))
                 // Use different model when colored
                 .override()

src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java

@@ -41,6 +41,7 @@
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
+import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.animal.Sheep;
 import net.minecraft.world.entity.player.Player;
@@ -135,6 +136,17 @@ public double getChargeRate(ItemStack stack) {
         return 80d + 80d * Upgrades.getEnergyCardMultiplier(getUpgrades(stack));
     }
 
+    @Override
+    public InteractionResultHolder<ItemStack> use(Level level, Player player, InteractionHand usedHand) {
+        var stack = player.getItemInHand(usedHand);
+
+        cycleColors(stack, getColor(stack), 1);
+        if (level.isClientSide) {
+            player.displayClientMessage(stack.getHoverName(), true);
+        }
+        return InteractionResultHolder.fail(stack);
+    }
+
     @Override
     public InteractionResult useOn(UseOnContext context) {
         Level level = context.getLevel();
@@ -205,6 +217,10 @@ public InteractionResult useOn(UseOnContext context) {
 
         if (p != null && InteractionUtil.isInAlternateUseMode(p)) {
             this.cycleColors(is, paintBall, 1);
+            if (level.isClientSide) {
+                p.displayClientMessage(is.getHoverName(), true);
+            }
+            return InteractionResult.CONSUME;
         }
 
         return InteractionResult.FAIL;