fixed small ores

+fixed small ore names
+added registration for small ores
+changed some tooltips
+added mercury minerals to use with GaGreg

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>

Former-commit-id: ee0f8301e2040459d922690b505d0760946383a2

2 files changed, 44 insertions, 5 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_SmallOres.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_SmallOres.java
index f5e6cf1a50..034b2d3606 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_SmallOres.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_SmallOres.java
@@ -22,7 +22,7 @@ public class BW_MetaGenerated_SmallOres extends BW_MetaGenerated_Ores {
             if ((w.getGenerationFeatures().toGenerate & 0b1000) == 0 || ((w.getGenerationFeatures().blacklist & 0b1000) != 0))
                 return;
             GT_ModHandler.addValuableOre(this, w.getmID(), 1);
-            GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + "." + w.getmID() + ".name", OrePrefixes.oreSmall.mLocalizedMaterialPre + w.getDefaultName() + OrePrefixes.oreSmall.mLocalizedMaterialPost);
+            GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + "." + w.getmID() + ".name", "Small " + w.getDefaultName() + OrePrefixes.oreSmall.mLocalizedMaterialPost);
         }
     }
 
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
index da365a60fc..72683e7bb8 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
@@ -805,7 +805,7 @@ public class WerkstoffLoader implements Runnable {
     public static final Werkstoff PDMetallicPowder = new Werkstoff(
             Materials.Palladium.getRGBA(),
             "Palladium Metallic Powder",
-            "",
+            "??Pd??",
             new Werkstoff.Stats(),
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures(),
@@ -829,7 +829,6 @@ public class WerkstoffLoader implements Runnable {
     public static final Werkstoff PDSalt = new Werkstoff(
             Materials.Palladium.getRGBA(),
             "Palladium Salt",
-            "",
             new Werkstoff.Stats(),
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
@@ -894,6 +893,7 @@ public class WerkstoffLoader implements Runnable {
     public static final Werkstoff LeachResidue = new Werkstoff(
             new short[]{0x64, 0x46, 0x29},
             "Leach Residue",
+            "??IrOsRhRu??",
             new Werkstoff.Stats(),
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures(),
@@ -1004,7 +1004,7 @@ public class WerkstoffLoader implements Runnable {
     public static final Werkstoff IrOsLeachResidue = new Werkstoff(
             new short[]{0x64, 0x46, 0x29},
             "Rarest Metal Residue",
-            "???",
+            "??OsIr??",
             new Werkstoff.Stats(),
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures(),
@@ -1015,7 +1015,7 @@ public class WerkstoffLoader implements Runnable {
     public static final Werkstoff IrLeachResidue = new Werkstoff(
             new short[]{0x84, 0x66, 0x49},
             "Iridium Metal Residue",
-            "???",
+            "??Ir??",
             new Werkstoff.Stats(),
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures(),
@@ -1117,6 +1117,7 @@ public class WerkstoffLoader implements Runnable {
     public static final Werkstoff CrudeRhMetall = new Werkstoff(
             new short[]{0x66, 0x66, 0x66},
             "Crude Rhodium Metal",
+            "??Rh??",
             new Werkstoff.Stats(),
             Werkstoff.Types.MIXTURE,
             new Werkstoff.GenerationFeatures(),
@@ -1260,6 +1261,43 @@ public class WerkstoffLoader implements Runnable {
             new Pair<>(WerkstoffLoader.MagnetoResonaticDust,2),
             new Pair<>(Materials.Plutonium,1)
     );
+    public static final Werkstoff Atheneite = new Werkstoff(
+            new short[]{175,175,175},
+            "Atheneite",
+            subscriptNumbers("(Pd,Hg)3As"),
+            new Werkstoff.Stats().setElektrolysis(true),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures(),
+            93,
+            TextureSet.SET_SHINY,
+            new Pair<>(WerkstoffLoader.PDMetallicPowder,3),
+            new Pair<>(Materials.Mercury,3),
+            new Pair<>(Materials.Arsenic,1)
+    );
+    public static final Werkstoff Temagamite = new Werkstoff(
+            new short[]{245,245,245},
+            "Temagamite",
+            new Werkstoff.Stats().setElektrolysis(true),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures(),
+            94,
+            TextureSet.SET_ROUGH,
+            new Pair<>(WerkstoffLoader.PDMetallicPowder,3),
+            new Pair<>(Materials.Mercury,1),
+            new Pair<>(Materials.Tellurium,1)
+    );
+    public static final Werkstoff Terlinguaite = new Werkstoff(
+            new short[]{245,245,245},
+            "Terlinguaite",
+            new Werkstoff.Stats().setElektrolysis(true),
+            Werkstoff.Types.COMPOUND,
+            new Werkstoff.GenerationFeatures(),
+            95,
+            TextureSet.SET_GEM_HORIZONTAL,
+            new Pair<>(Materials.Mercury,2),
+            new Pair<>(Materials.Chlorine,1),
+            new Pair<>(Materials.Oxygen,1)
+    );
 
     public static HashMap<OrePrefixes, BW_MetaGenerated_Items> items = new HashMap<>();
     public static HashBiMap<Werkstoff, Fluid> fluids = HashBiMap.create();
@@ -1544,6 +1582,7 @@ public class WerkstoffLoader implements Runnable {
         if (FMLCommonHandler.instance().getSide().isClient())
             RenderingRegistry.registerBlockHandler(BW_Renderer_Block_Ores.INSTANCE);
         GameRegistry.registerTileEntity(BW_MetaGeneratedOreTE.class, "bw.blockoresTE");
+        GameRegistry.registerTileEntity(BW_MetaGeneratedSmallOreTE.class, "bw.blockoresSmallTE");
         WerkstoffLoader.BWOres = new BW_MetaGenerated_Ores(Material.rock, BW_MetaGeneratedOreTE.class, "bw.blockores");
         WerkstoffLoader.BWSmallOres = new BW_MetaGenerated_SmallOres(Material.rock, BW_MetaGeneratedSmallOreTE.class, "bw.blockoresSmall");
         GameRegistry.registerBlock(WerkstoffLoader.BWOres, BW_MetaGeneratedOre_Item.class, "bw.blockores.01");