Merge pull request #52 from repo-alt/rv3-1.7.10

Make oredictionary filter safer

Author: repo-alt

gradle.properties

@@ -1,6 +1,6 @@
 aeversion=rv3
 aechannel=beta
-aebuild=47-GTNH
+aebuild=48-GTNH
 #KEEP V6 FOR MOD SUPPORT
 aegroup=appeng
 aebasename=appliedenergistics2

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

@@ -22,14 +22,15 @@ public class GuiOreFilter extends AEBaseGui {
     private GuiTextField filter;
     public GuiOreFilter(InventoryPlayer ip, IOreFilterable obj) {
         super(new ContainerOreFilter(ip, obj));
+        this.xSize = 256;
     }
 
     @Override
     public void initGui() {
         super.initGui();
-        this.filter = new GuiTextField(this.fontRendererObj, this.guiLeft + 13, this.guiTop + 36, 150, this.fontRendererObj.FONT_HEIGHT);
+        this.filter = new GuiTextField(this.fontRendererObj, this.guiLeft + 13, this.guiTop + 36, 250, this.fontRendererObj.FONT_HEIGHT);
         this.filter.setEnableBackgroundDrawing(false);
-        this.filter.setMaxStringLength(32);
+        this.filter.setMaxStringLength(100);
         this.filter.setTextColor(0xFFFFFF);
         this.filter.setVisible(true);
         this.filter.setFocused(true);

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

@@ -16,11 +16,12 @@ public class GuiRenamer  extends AEBaseGui {
     private GuiTextField name;
     public GuiRenamer(InventoryPlayer ip, ICustomNameObject obj) {
         super(new ContainerRenamer(ip, obj));
+        this.xSize = 256;
     }
     @Override
     public void initGui() {
         super.initGui();
-        this.name = new GuiTextField(this.fontRendererObj, this.guiLeft + 13, this.guiTop + 36, 150, this.fontRendererObj.FONT_HEIGHT);
+        this.name = new GuiTextField(this.fontRendererObj, this.guiLeft + 13, this.guiTop + 36, 250, this.fontRendererObj.FONT_HEIGHT);
         this.name.setEnableBackgroundDrawing(false);
         this.name.setMaxStringLength(32);
         this.name.setTextColor(0xFFFFFF);

src/main/java/appeng/parts/automation/PartExportBus.java

@@ -154,7 +154,7 @@ else if (!oreFilterString.isEmpty())
 						filterPredicate = OreFilteredList.makeFilter(oreFilterString);
 
 					for (IAEItemStack stack : inv.getStorageList()) {
-						if (stack == null || !this.filterPredicate.test(stack))
+						if (stack == null || filterPredicate == null || !this.filterPredicate.test(stack))
 							continue;
 						this.pushItemIntoTarget(destination, energy, inv, stack);
 						if (this.itemToSend <= 0)

src/main/java/appeng/parts/automation/PartImportBus.java

@@ -211,7 +211,7 @@ protected TickRateModulation doBusWork()
 					for (ItemSlot slot : myAdaptor) {
 						if (this.itemToSend <= 0)
 							break;
-						if (slot.isExtractable() && filterPredicate.test(slot.getAEItemStack())) {
+						if (slot.isExtractable() && filterPredicate != null && filterPredicate.test(slot.getAEItemStack())) {
 							while (this.itemToSend > 0) {
 								if (this.importStuff(myAdaptor, slot.getAEItemStack(), inv, energy, fzMode))
 									break;

src/main/java/appeng/util/prioitylist/OreFilteredList.java

@@ -1,6 +1,7 @@
 package appeng.util.prioitylist;
 
 import appeng.api.storage.data.IAEItemStack;
+import appeng.core.AELog;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
@@ -35,10 +36,17 @@ public Iterable<IAEItemStack> getItems()
     }
 
     public static Predicate<IAEItemStack> makeFilter(String f) {
-        Predicate<ItemStack> matcher = makeMatcher(f);
-        if (matcher == null)
+        try {
+            Predicate<ItemStack> matcher = makeMatcher(f);
+            if (matcher == null)
+                return null;
+            return new OreListMatcher(matcher);
+        }
+        catch (Exception ex)
+        {
+            AELog.debug(ex);
             return null;
-        return new OreListMatcher(matcher);
+        }
     }
 
     private static Predicate<ItemStack> makeMatcher(String f) {
@@ -56,6 +64,8 @@ else if (!f.isEmpty()) {
 
             for (String filter : filters) {
                 filter = filter.trim();
+                if (filter.isEmpty())
+                    continue;
                 boolean negated = filter.startsWith("!");
                 if (negated)
                     filter = filter.substring(1);
@@ -71,6 +81,8 @@ else if (!f.isEmpty()) {
                 } else {
                     int endLast = f.indexOf(lastFilter) + lastFilter.length();
                     int startThis = f.indexOf(filter);
+                    if (startThis <= endLast)
+                        continue;
                     boolean or = f.substring(endLast, startThis).contains("|");
                     matcher = or ? matcher.or(test) : matcher.and(test);
                 }