Detach Ore Prefixes from Meta Items

src/main/java/gregtech/api/items/metaitem/StandardMetaItem.java

@@ -2,6 +2,10 @@
 
 public class StandardMetaItem extends MetaItem<MetaItem<?>.MetaValueItem> {
 
+    public StandardMetaItem() {
+        super((short) 0);
+    }
+
     public StandardMetaItem(short metaItemOffset) {
         super(metaItemOffset);
     }

src/main/java/gregtech/api/pipenet/block/material/BlockMaterialPipe.java

@@ -7,9 +7,16 @@
 import gregtech.api.pipenet.tile.IPipeTile;
 import gregtech.api.pipenet.tile.TileEntityPipeBase;
 import gregtech.api.unification.material.type.Material;
+import gregtech.api.unification.ore.OrePrefix;
 import net.minecraft.item.ItemStack;
 
-public abstract class BlockMaterialPipe<PipeType extends Enum<PipeType> & IPipeType<NodeDataType>, NodeDataType, WorldPipeNetType extends WorldPipeNet<NodeDataType, ? extends PipeNet<NodeDataType>>> extends BlockPipe<PipeType, NodeDataType, WorldPipeNetType> {
+public abstract class BlockMaterialPipe<PipeType extends Enum<PipeType> & IPipeType<NodeDataType> & IMaterialPipeType<NodeDataType>, NodeDataType, WorldPipeNetType extends WorldPipeNet<NodeDataType, ? extends PipeNet<NodeDataType>>> extends BlockPipe<PipeType, NodeDataType, WorldPipeNetType> {
+
+    protected final PipeType pipeType;
+
+    public BlockMaterialPipe(PipeType pipeType) {
+        this.pipeType = pipeType;
+    }
 
     @Override
     public NodeDataType createProperties(IPipeTile<PipeType, NodeDataType> pipeTile) {
@@ -23,42 +30,41 @@ public NodeDataType createProperties(IPipeTile<PipeType, NodeDataType> pipeTile)
 
     @Override
     public NodeDataType createItemProperties(ItemStack itemStack) {
-        PipeType pipeType = getItemPipeType(itemStack);
         Material material = getItemMaterial(itemStack);
         if (pipeType == null || material == null) {
             return getFallbackType();
         }
         return createProperties(pipeType, material);
     }
 
-    public ItemStack getItem(PipeType pipeType, Material material) {
-        if (pipeType == null || material == null) {
-            return ItemStack.EMPTY;
-        }
+    public ItemStack getItem(Material material) {
+        if (material == null) return ItemStack.EMPTY;
         int materialId = Material.MATERIAL_REGISTRY.getIDForObject(material);
-        return new ItemStack(this, 1, pipeType.ordinal() * 1000 + materialId);
-    }
-
-    @Override
-    public PipeType getItemPipeType(ItemStack itemStack) {
-        return getPipeTypeClass().getEnumConstants()[itemStack.getMetadata() / 1000];
+        return new ItemStack(this, 1, materialId);
     }
 
     public Material getItemMaterial(ItemStack itemStack) {
-        return Material.MATERIAL_REGISTRY.getObjectById(itemStack.getMetadata() % 1000);
+        return Material.MATERIAL_REGISTRY.getObjectById(itemStack.getMetadata());
     }
 
     @Override
     public void setTileEntityData(TileEntityPipeBase<PipeType, NodeDataType> pipeTile, ItemStack itemStack) {
-        ((TileEntityMaterialPipeBase<PipeType, NodeDataType>) pipeTile).setPipeData(this, getItemPipeType(itemStack), getItemMaterial(itemStack));
+        ((TileEntityMaterialPipeBase<PipeType, NodeDataType>) pipeTile).setPipeData(this, pipeType, getItemMaterial(itemStack));
     }
 
     @Override
     public ItemStack getDropItem(IPipeTile<PipeType, NodeDataType> pipeTile) {
         Material material = ((IMaterialPipeTile<PipeType, NodeDataType>) pipeTile).getPipeMaterial();
-        return getItem(pipeTile.getPipeType(), material);
+        return getItem(material);
     }
 
     protected abstract NodeDataType createProperties(PipeType pipeType, Material material);
 
+    public OrePrefix getPrefix() {
+        return pipeType.getOrePrefix();
+    }
+
+    public PipeType getItemPipeType(ItemStack is) {
+        return pipeType;
+    }
 }

src/main/java/gregtech/api/unification/OreDictUnifier.java

@@ -3,7 +3,10 @@
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Joiner;
 import gregtech.api.unification.material.IMaterial;
-import gregtech.api.unification.material.type.*;
+import gregtech.api.unification.material.type.DustMaterial;
+import gregtech.api.unification.material.type.IngotMaterial;
+import gregtech.api.unification.material.type.MarkerMaterial;
+import gregtech.api.unification.material.type.Material;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.api.unification.stack.*;
 import gregtech.api.util.CustomModPriorityComparator;
@@ -132,10 +135,6 @@ public static void onItemRegistration(OreRegisterEvent event) {
                 String possibleMaterialName = Joiner.on("").join(splits.subList(i + 1, splits.size())); //BasalticMineralSand
                 String underscoreName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, possibleMaterialName); //basaltic_mineral_sand
                 IMaterial<?> possibleMaterial = Material.MATERIAL_REGISTRY.getObject(underscoreName); //Materials.BasalticSand
-                if (possibleMaterial == null) {
-                    //if we didn't found real material, try using simple material registry
-                    possibleMaterial = SimpleDustMaterial.MATERIAL_REGISTRY.getObject(underscoreName);
-                }
                 if (possibleMaterial == null) {
                     //if we didn't found real material, try using marker material registry
                     possibleMaterial = markerMaterialRegistry.get(underscoreName);
@@ -263,21 +262,8 @@ else if ((materialAmount * 9) >= M)
         return ItemStack.EMPTY;
     }
 
-    public static ItemStack getDust(SimpleDustMaterial material, long materialAmount) {
-        if (materialAmount <= 0)
-            return ItemStack.EMPTY;
-        if (materialAmount % M == 0 || materialAmount >= M * 16)
-            return get(OrePrefix.dust, material, (int) (materialAmount / M));
-        else if ((materialAmount * 4) % M == 0 || materialAmount >= M * 8)
-            return get(OrePrefix.dustSmall, material, (int) ((materialAmount * 4) / M));
-        else if ((materialAmount * 9) >= M)
-            return get(OrePrefix.dustTiny, material, (int) ((materialAmount * 9) / M));
-        return ItemStack.EMPTY;
-    }
 
     public static ItemStack getDust(MaterialStack materialStack) {
-        if (materialStack.material.getMaterialClass() == SimpleDustMaterial.class)
-            return getDust((SimpleDustMaterial) materialStack.material, materialStack.amount);
         return getDust((DustMaterial) materialStack.material, materialStack.amount);
     }
 

src/main/java/gregtech/api/unification/crafttweaker/CTMaterialRegistry.java

@@ -17,7 +17,7 @@
 @ZenRegister
 public class CTMaterialRegistry {
 
-    static int baseID = 450;
+    static int baseID = 32000;
 
     @ZenMethod
     @Nullable

src/main/java/gregtech/api/unification/material/MarkerMaterials.java

@@ -95,7 +95,7 @@ public static class Tier {
         public static Material Elite = new MarkerMaterial("elite");
         public static Material Master = new MarkerMaterial("master");
         public static Material Ultimate = new MarkerMaterial("ultimate");
-        public static Material Superconductor = new Material(369, "superconductor", 0xFFFFFF, MaterialIconSet.NONE, of(), 0L, null) {
+        public static Material Superconductor = new Material(386, "superconductor", 0xFFFFFF, MaterialIconSet.NONE, of(), 0L, null) {
         };
         public static Material Infinite = new MarkerMaterial("infinite");