From fe747833a7276f87757becc872ac59db026c9afc Mon Sep 17 00:00:00 2001
From: warjort <warjort@gmail.com>
Date: Thu, 27 May 2021 11:05:53 +0100
Subject: [PATCH] Add vanilla dusts to dustRegular

---
 .../gregtech/api/items/materialitem/MaterialMetaItem.java   | 2 +-
 src/main/java/gregtech/api/unification/ore/OrePrefix.java   | 2 ++
 src/main/java/gregtech/loaders/OreDictionaryLoader.java     | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 src/main/java/gregtech/api/items/materialitem/MaterialMetaItem.java
 mode change 100644 => 100755 src/main/java/gregtech/api/unification/ore/OrePrefix.java
 mode change 100644 => 100755 src/main/java/gregtech/loaders/OreDictionaryLoader.java

diff --git a/src/main/java/gregtech/api/items/materialitem/MaterialMetaItem.java b/src/main/java/gregtech/api/items/materialitem/MaterialMetaItem.java
old mode 100644
new mode 100755
index ab4ce2fac5..43e5d2c214
--- a/src/main/java/gregtech/api/items/materialitem/MaterialMetaItem.java
+++ b/src/main/java/gregtech/api/items/materialitem/MaterialMetaItem.java
@@ -57,7 +57,7 @@ public void registerOreDict() {
             ItemStack item = new ItemStack(this, 1, metaItem);
             OreDictUnifier.registerOre(item, prefix, material);
             if(prefix.name().equals("dust"))
-                OreDictUnifier.registerOre(item, "dustRegular", material);
+                OreDictUnifier.registerOre(item, OrePrefix.DUST_REGULAR, material);
           
             items.add(item);
         }
diff --git a/src/main/java/gregtech/api/unification/ore/OrePrefix.java b/src/main/java/gregtech/api/unification/ore/OrePrefix.java
old mode 100644
new mode 100755
index 22ff51ae64..b330c01c6a
--- a/src/main/java/gregtech/api/unification/ore/OrePrefix.java
+++ b/src/main/java/gregtech/api/unification/ore/OrePrefix.java
@@ -161,6 +161,8 @@ public enum OrePrefix {
     circuit("Circuits", -1, null, null, ENABLE_UNIFICATION | DISALLOW_RECYCLING, null), // Introduced by Calclavia
     chipset("Chipsets", -1, null, null, ENABLE_UNIFICATION | DISALLOW_RECYCLING, null); // Introduced by Buildcraft
 
+    public static final String DUST_REGULAR = "dustRegular";
+
     public static class Flags {
         public static final long ENABLE_UNIFICATION = GTUtility.createFlag(0);
         public static final long SELF_REFERENCING = GTUtility.createFlag(1);
diff --git a/src/main/java/gregtech/loaders/OreDictionaryLoader.java b/src/main/java/gregtech/loaders/OreDictionaryLoader.java
old mode 100644
new mode 100755
index e2e00bf306..02e46c8e5a
--- a/src/main/java/gregtech/loaders/OreDictionaryLoader.java
+++ b/src/main/java/gregtech/loaders/OreDictionaryLoader.java
@@ -67,13 +67,19 @@ public static void init() {
         OreDictUnifier.registerOre(new ItemStack(Items.IRON_INGOT), OrePrefix.ingot, Materials.Iron);
         OreDictUnifier.registerOre(new ItemStack(Items.PAPER), OrePrefix.plate, Materials.Paper);
         OreDictUnifier.registerOre(new ItemStack(Items.SUGAR), OrePrefix.dust, Materials.Sugar);
+        OreDictUnifier.registerOre(new ItemStack(Items.SUGAR), OrePrefix.DUST_REGULAR, Materials.Sugar);
         OreDictUnifier.registerOre(new ItemStack(Items.STICK), OrePrefix.stick, Materials.Wood);
         OreDictUnifier.registerOre(new ItemStack(Items.REDSTONE), OrePrefix.dust, Materials.Redstone);
+        OreDictUnifier.registerOre(new ItemStack(Items.REDSTONE), OrePrefix.DUST_REGULAR, Materials.Redstone);
         OreDictUnifier.registerOre(new ItemStack(Items.GUNPOWDER), OrePrefix.dust, Materials.Gunpowder);
+        OreDictUnifier.registerOre(new ItemStack(Items.GUNPOWDER), OrePrefix.DUST_REGULAR, Materials.Gunpowder);
         OreDictUnifier.registerOre(new ItemStack(Items.GLOWSTONE_DUST), OrePrefix.dust, Materials.Glowstone);
+        OreDictUnifier.registerOre(new ItemStack(Items.GLOWSTONE_DUST), OrePrefix.DUST_REGULAR, Materials.Glowstone);
         OreDictUnifier.registerOre(new ItemStack(Items.DYE, 1, 15), OrePrefix.dust, Materials.Bone);
+        OreDictUnifier.registerOre(new ItemStack(Items.DYE, 1, 15), OrePrefix.DUST_REGULAR, Materials.Bone);
         OreDictUnifier.registerOre(new ItemStack(Items.BONE), OrePrefix.stick, Materials.Bone);
         OreDictUnifier.registerOre(new ItemStack(Items.BLAZE_POWDER), OrePrefix.dust, Materials.Blaze);
+        OreDictUnifier.registerOre(new ItemStack(Items.BLAZE_POWDER), OrePrefix.DUST_REGULAR, Materials.Blaze);
         OreDictUnifier.registerOre(new ItemStack(Items.BLAZE_ROD), OrePrefix.stick, Materials.Blaze);
         OreDictUnifier.registerOre(new ItemStack(Blocks.IRON_BLOCK), OrePrefix.block, Materials.Iron);
         OreDictUnifier.registerOre(new ItemStack(Blocks.GOLD_BLOCK), OrePrefix.block, Materials.Gold);