Fixes mouse handling for right-clicks to clear the search box and middle-click for crafting. (#4505)

Also upgrades gradle to 4.10.3

.github/workflows/branches.yml

@@ -21,6 +21,8 @@ jobs:
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - name: Clean gradle
+        run: ./gradlew clean --no-daemon
       - name: Validate no assets
         run: test ! -d ./src/generated
       - name: Generate assets
@@ -28,6 +30,6 @@ jobs:
         with:
           run: ./gradlew runData --no-daemon
       - name: Validate assets
-        run: test -d ./src/generated
+        run: test -d ./src/generated -a -f ./src/generated/resources/.cache/cache
       - name: Build with Gradle
         run: ./gradlew build --no-daemon

.github/workflows/master.yml

@@ -21,6 +21,8 @@ jobs:
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - name: Clean gradle
+        run: ./gradlew clean --no-daemon
       - name: Validate no assets
         run: test ! -d ./src/generated
       - name: Generate assets
@@ -28,6 +30,6 @@ jobs:
         with:
           run: ./gradlew runData --no-daemon
       - name: Validate assets
-        run: test -d ./src/generated
+        run: test -d ./src/generated -a -f ./src/generated/resources/.cache/cache
       - name: Build with Gradle
         run: ./gradlew build --no-daemon

.github/workflows/pull_requests.yml

@@ -21,6 +21,8 @@ jobs:
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      - name: Clean gradle
+        run: ./gradlew clean --no-daemon
       - name: Validate no assets
         run: test ! -d ./src/generated
       - name: Generate assets
@@ -28,7 +30,7 @@ jobs:
         with:
           run: ./gradlew runData --no-daemon
       - name: Validate assets
-        run: test -d ./src/generated
+        run: test -d ./src/generated -a -f ./src/generated/resources/.cache/cache
       - name: Build with Gradle
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}

.github/workflows/release.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           run: ./gradlew runData --no-daemon
       - name: Validate assets
-        run: test -d ./src/generated
+        run: test -d ./src/generated -a -f ./src/generated/resources/.cache/cache
       - name: Build with Gradle
         env:
           KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}

README.md

@@ -45,7 +45,7 @@ A Mod about Matter, Energy and using them to conquer the world..
 
 ## Downloads
 
-Downloads can be found on [CurseForge](http://www.curse.com/mc-mods/minecraft/223794-applied-energistics-2) or on the [official website](http://ae-mod.info/Downloads/).
+Downloads can be found on [CurseForge](https://www.curseforge.com/minecraft/mc-mods/applied-energistics-2) or on the [official website](http://ae-mod.info/Downloads/).
 
 ## Installation
 

gradle/scripts/dependencies.gradle

@@ -23,51 +23,6 @@ repositories {
         name 'modmaven'
         url "https://modmaven.k-4u.nl/"
     }
-
-    maven {
-        name "Mobius"
-        url "http://mobiusstrip.eu/maven"
-    }
-
-    maven {
-        name = "JEI repo"
-        url "http://dvs1.progwml6.com/files/maven"
-    }
-
-    maven {
-        name = "Tesla repo"
-        url "http://maven.mcmoddev.com"
-    }
-
-    maven {
-        name = "IC2 repo"
-        url = "http://maven.ic2.player.to"
-    }
-
-    maven {
-        name = "CoFH Maven"
-        url = "http://maven.covers1624.net"
-    }
-
-    maven { // TheOneProbe
-        name 'tterrag maven'
-        url "http://maven.tterrag.com/"
-    }
-
-    maven {
-        name 'mcjty'
-        url "http://maven.k-4u.nl/"
-    }
-
-   	maven { // CraftTweaker
-        name 'jared maven'
-        url "http://maven.blamejared.com/"
-    }
-
-    maven {
-		name = "CurseForge"
-		url = "https://minecraft.curseforge.com/api/maven/"
-	}
 }
 
 dependencies {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java

@@ -295,12 +295,15 @@ public class MEMonitorableScreen<T extends MEMonitorableContainer> extends AEBas
     @Override
     public boolean mouseClicked(final double xCoord, final double yCoord, final int btn) {
         if (this.searchField.mouseClicked(xCoord, yCoord, btn)) {
-            if (btn == 1 && this.searchField.isMouseOver(xCoord, yCoord)) {
-                this.searchField.setText("");
-                this.repo.setSearchString("");
-                this.repo.updateView();
-                this.setScrollBar();
-            }
+            return true;
+        }
+
+        // Right-clicking on the search field should clear it
+        if (this.searchField.isMouseOver(xCoord, yCoord) && btn == 1) {
+            this.searchField.setText("");
+            this.repo.setSearchString("");
+            this.repo.updateView();
+            this.setScrollBar();
             return true;
         }
 

src/main/java/appeng/client/gui/widgets/AETextField.java

@@ -58,20 +58,6 @@ public class AETextField extends TextFieldWidget {
         this._fontPad = (int) fontRenderer.getCharWidth('_');
     }
 
-    @Override
-    public boolean mouseClicked(final double xPos, final double yPos, final int button) {
-        if (!super.mouseClicked(xPos, yPos, button)) {
-            return false;
-        }
-
-        final boolean requiresFocus = this.isMouseOver(xPos, yPos);
-        if (!this.isFocused()) {
-            this.setFocused2(requiresFocus);
-        }
-
-        return true;
-    }
-
     public void selectAll() {
         this.setCursorPosition(0);
         this.setSelectionPos(this.getMaxStringLength());

src/main/java/appeng/client/gui/widgets/NumberBox.java

@@ -37,7 +37,7 @@ public class NumberBox extends TextFieldWidget {
             final Class<?> type, LongConsumer changeListener) {
         super(fontRenderer, x, y, width, height, "0");
         this.setText("0");
-        setResponder(this::onTextChanged);
+        setResponder(this::handleTextChanged);
         this.lastValue = 0;
         this.changeListener = changeListener;
         if (type == int.class || type == Integer.class) {
@@ -47,7 +47,11 @@ public class NumberBox extends TextFieldWidget {
         }
     }
 
-    private void onTextChanged(String text) {
+    // NOTE: This method MUST NOT BE NAMED like a method in the superclass because
+    // of a ForgeGradle remapping bug
+    // since it'll not remap this method's name, but it will remap the name of the
+    // method reference above.
+    private void handleTextChanged(String text) {
         if (text.isEmpty()) {
             setText("0"); // Will call onTextChanged recursively
             return;

src/main/java/appeng/core/AEConfig.java

@@ -96,7 +96,7 @@ public final class AEConfig {
     private boolean useColoredCraftingStatus;
     private boolean disableColoredCableRecipesInJEI;
     private int craftingCalculationTimePerTick;
-    private PowerUnits selectedPowerUnit;
+    private PowerUnits selectedPowerUnit = PowerUnits.AE;
 
     // GUI Buttons
     private final int[] craftByStacks = new int[4];

src/main/java/appeng/core/AppEng.java

@@ -44,7 +44,6 @@ import net.minecraftforge.client.model.geometry.IModelGeometry;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.ModDimension;
 import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.CrashReportExtender;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.client.registry.RenderingRegistry;
@@ -79,7 +78,6 @@ import appeng.client.render.model.MemoryCardModel;
 import appeng.client.render.model.SkyCompassModel;
 import appeng.client.render.model.UVLModelLoader;
 import appeng.client.render.spatial.SpatialPylonModel;
-import appeng.core.crash.ModCrashEnhancement;
 import appeng.core.features.registries.PartModels;
 import appeng.core.stats.AdvancementTriggers;
 import appeng.core.sync.network.NetworkHandler;
@@ -117,8 +115,6 @@ public final class AppEng {
 
         proxy = DistExecutor.safeRunForDist(() -> ClientHelper::new, () -> ServerHelper::new);
 
-        CrashReportExtender.registerCrashCallable(new ModCrashEnhancement());
-
         CreativeTab.init();
         new FacadeItemGroup(); // This call has a side-effect (adding it to the creative screen)
 

src/main/java/appeng/core/crash/ModCrashEnhancement.java

@@ -1,38 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 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 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 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 Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.core.crash;
-
-import net.minecraftforge.fml.common.ICrashCallable;
-import net.minecraftforge.versions.forge.ForgeVersion;
-
-import appeng.core.AEConfig;
-
-public class ModCrashEnhancement implements ICrashCallable {
-
-    @Override
-    public String getLabel() {
-        return "AE2 Version";
-    }
-
-    @Override
-    public String call() throws Exception {
-        return AEConfig.CHANNEL + ' ' + AEConfig.VERSION + " for Forge " + ForgeVersion.getVersion();
-    }
-
-}

src/main/java/appeng/core/sync/BasePacket.java

@@ -32,6 +32,15 @@ import appeng.core.sync.network.INetworkInfo;
 import appeng.core.sync.network.NetworkHandler;
 
 public abstract class BasePacket {
+
+    /**
+     * Sadly {@link PacketBuffer#readString()} gets inlined by Proguard which means
+     * it's not available on the Server. This field has the default string length
+     * that is used for writeString, which then also should be used for readString
+     * when it has no special length requirements.
+     */
+    public static final int MAX_STRING_LENGTH = 32767;
+
     private PacketBuffer p;
 
     public void serverPacketData(final INetworkInfo manager, final PlayerEntity player) {

src/main/java/appeng/core/sync/packets/ConfigValuePacket.java

@@ -57,8 +57,8 @@ public class ConfigValuePacket extends BasePacket {
     private final String Value;
 
     public ConfigValuePacket(final PacketBuffer stream) {
-        this.Name = stream.readString();
-        this.Value = stream.readString();
+        this.Name = stream.readString(MAX_STRING_LENGTH);
+        this.Value = stream.readString(MAX_STRING_LENGTH);
     }
 
     // api

src/main/java/appeng/datagen/AE2DataGenerators.java

@@ -1,4 +1,4 @@
-package appeng.forge.data;
+package appeng.datagen;
 
 import net.minecraft.data.DataGenerator;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -6,8 +6,8 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
 
 import appeng.core.AppEng;
-import appeng.forge.data.providers.loot.BlockDropProvider;
-import appeng.forge.data.providers.recipes.SlabStairRecipes;
+import appeng.datagen.providers.loot.BlockDropProvider;
+import appeng.datagen.providers.recipes.SlabStairRecipes;
 
 @Mod.EventBusSubscriber(modid = AppEng.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class AE2DataGenerators {

src/main/java/appeng/datagen/providers/IAE2DataProvider.java

@@ -1,4 +1,4 @@
-package appeng.forge.data.providers;
+package appeng.datagen.providers;
 
 import net.minecraft.data.IDataProvider;
 

src/main/java/appeng/datagen/providers/loot/BlockDropProvider.java

@@ -1,4 +1,4 @@
-package appeng.forge.data.providers.loot;
+package appeng.datagen.providers.loot;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -33,7 +33,7 @@ import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
 import net.minecraftforge.registries.ForgeRegistries;
 
 import appeng.core.AppEng;
-import appeng.forge.data.providers.IAE2DataProvider;
+import appeng.datagen.providers.IAE2DataProvider;
 
 public class BlockDropProvider extends BlockLootTables implements IAE2DataProvider {
     private Map<Block, Function<Block, LootTable.Builder>> overrides = ImmutableMap.<Block, Function<Block, LootTable.Builder>>builder()

src/main/java/appeng/datagen/providers/recipes/SlabStairRecipes.java

@@ -1,4 +1,4 @@
-package appeng.forge.data.providers.recipes;
+package appeng.datagen.providers.recipes;
 
 import java.util.function.Consumer;
 
@@ -15,7 +15,7 @@ import net.minecraft.util.ResourceLocation;
 
 import appeng.api.definitions.IBlockDefinition;
 import appeng.core.AppEng;
-import appeng.forge.data.providers.IAE2DataProvider;
+import appeng.datagen.providers.IAE2DataProvider;
 
 public class SlabStairRecipes extends RecipeProvider implements IAE2DataProvider {
 

src/main/java/appeng/debug/ChunkLoaderTileEntity.java

@@ -46,6 +46,8 @@ public class ChunkLoaderTileEntity extends AEBaseTileEntity implements ITickable
 
     @Override
     public void remove() {
+        super.remove();
+
         World world = getWorld();
         if (world instanceof ServerWorld) {
             ChunkPos chunkPos = new ChunkPos(getPos());

src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java

@@ -266,12 +266,15 @@ public class FluidTerminalScreen extends AEBaseMEScreen<FluidTerminalContainer>
     @Override
     public boolean mouseClicked(final double xCoord, final double yCoord, final int btn) {
         if (this.searchField.mouseClicked(xCoord, yCoord, btn)) {
-            if (btn == 1 && this.searchField.isMouseOver(xCoord, yCoord)) {
-                this.searchField.setText("");
-                this.repo.setSearchString("");
-                this.repo.updateView();
-                this.setScrollBar();
-            }
+            return true;
+        }
+
+        // Right-clicking on the search field should clear it
+        if (this.searchField.isMouseOver(xCoord, yCoord) && btn == 1) {
+            this.searchField.setText("");
+            this.repo.setSearchString("");
+            this.repo.updateView();
+            this.setScrollBar();
             return true;
         }
 
@@ -332,4 +335,5 @@ public class FluidTerminalScreen extends AEBaseMEScreen<FluidTerminalContainer>
     protected String getBackground() {
         return "guis/terminal.png";
     }
+
 }

src/main/java/appeng/helpers/CraftingPatternDetails.java

@@ -109,7 +109,7 @@ public class CraftingPatternDetails implements ICraftingPatternDetails, Comparab
             this.standardRecipe = null;
             this.correctOutput = ItemStack.EMPTY;
 
-            for (int x = 0; x < 3; x++) {
+            for (int x = 0; x < products.size(); x++) {
                 final IAEItemStack ais = products.get(x);
                 final ItemStack gs = ais.createItemStack();
 

src/main/java/appeng/items/misc/EncodedPatternItem.java

@@ -226,7 +226,9 @@ public class EncodedPatternItem extends AEBaseItem {
         final CompoundNBT tag = itemStack.getTag();
         Preconditions.checkArgument(tag != null, "itemStack missing a NBT tag");
 
-        return new ResourceLocation(tag.getString(NBT_RECIPE_ID));
+        return tag.contains(NBT_RECIPE_ID, Constants.NBT.TAG_STRING)
+                ? new ResourceLocation(tag.getString(NBT_RECIPE_ID))
+                : null;
     }
 
     public List<IAEItemStack> getIngredients(ItemStack itemStack) {

src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java

@@ -72,10 +72,12 @@ public class QuartzCuttingKnifeItem extends AEBaseItem implements IGuiItem {
 
     @Override
     public ItemStack getContainerItem(final ItemStack itemStack) {
-        ItemStack copy = itemStack.copy();
-        copy.setDamage(itemStack.getDamage() + 1);
-
-        return copy;
+        ItemStack damagedStack = itemStack.copy();
+        if (damagedStack.attemptDamageItem(1, random, null)) {
+            return ItemStack.EMPTY;
+        } else {
+            return damagedStack;
+        }
     }
 
     @Override

src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java

@@ -21,6 +21,7 @@ import net.minecraftforge.registries.ForgeRegistryEntry;
 
 import appeng.core.AEConfig;
 import appeng.core.AppEng;
+import appeng.core.sync.BasePacket;
 
 public class GrinderRecipeSerializer extends ForgeRegistryEntry<IRecipeSerializer<?>>
         implements IRecipeSerializer<GrinderRecipe> {
@@ -70,7 +71,7 @@ public class GrinderRecipeSerializer extends ForgeRegistryEntry<IRecipeSerialize
     @Override
     public GrinderRecipe read(ResourceLocation recipeId, PacketBuffer buffer) {
 
-        String group = buffer.readString();
+        String group = buffer.readString(BasePacket.MAX_STRING_LENGTH);
         Ingredient ingredient = Ingredient.read(buffer);
         int ingredientCount = buffer.readVarInt();
         ItemStack result = buffer.readItemStack();

src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java

@@ -15,6 +15,7 @@ import net.minecraftforge.registries.ForgeRegistryEntry;
 
 import appeng.api.features.InscriberProcessType;
 import appeng.core.AppEng;
+import appeng.core.sync.BasePacket;
 
 public class InscriberRecipeSerializer extends ForgeRegistryEntry<IRecipeSerializer<?>>
         implements IRecipeSerializer<InscriberRecipe> {
@@ -67,7 +68,7 @@ public class InscriberRecipeSerializer extends ForgeRegistryEntry<IRecipeSeriali
     @Nullable
     @Override
     public InscriberRecipe read(ResourceLocation recipeId, PacketBuffer buffer) {
-        String group = buffer.readString();
+        String group = buffer.readString(BasePacket.MAX_STRING_LENGTH);
         Ingredient middle = Ingredient.read(buffer);
         ItemStack result = buffer.readItemStack();
         Ingredient top = Ingredient.read(buffer);

src/main/java/appeng/tile/storage/DriveTileEntity.java

@@ -65,6 +65,7 @@ import appeng.block.storage.DriveSlotsState;
 import appeng.client.render.model.DriveModelData;
 import appeng.container.implementations.DriveContainer;
 import appeng.core.Api;
+import appeng.core.sync.BasePacket;
 import appeng.helpers.IPriorityHost;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MachineSource;
@@ -188,7 +189,7 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD
         int uniqueStrCount = data.readByte();
         String[] uniqueStrs = new String[uniqueStrCount];
         for (int i = 0; i < uniqueStrCount; i++) {
-            uniqueStrs[i] = data.readString();
+            uniqueStrs[i] = data.readString(BasePacket.MAX_STRING_LENGTH);
         }
 
         boolean changed = false;