From 5da586120ed053ce2b326b6cc758ff377cdcd375 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Sat, 7 Mar 2020 01:00:39 +0100 Subject: Fixed Materials + Fixed some GTNH small ores not having weight + fixed tooltip on Platinum Metallic Powder Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: ba15b8225fb1ccac85e788a2034f4e0dcbb7b817 --- .../bartworks/system/material/WerkstoffLoader.java | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'src') 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 3b1079cb83..6f6267021a 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 @@ -740,14 +740,15 @@ public class WerkstoffLoader implements Runnable { public static final Werkstoff PTMetallicPowder = new Werkstoff( Materials.Platinum.getRGBA(), "Platinum Metallic Powder", - "", + "??PtPdIrOsRhRu??", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures(), 47, - TextureSet.SET_METALLIC + TextureSet.SET_METALLIC, //No Byproducts - //No Ingredients + new Pair<>(Materials.Platinum,1), + new Pair<>(Materials.Stone,2) ); public static final Werkstoff AquaRegia = new Werkstoff( new short[]{0xff,0xb1,0x32}, @@ -795,7 +796,6 @@ public class WerkstoffLoader implements Runnable { 51, TextureSet.SET_METALLIC //No Byproducts - //No Ingredients ); public static final Werkstoff PDAmmonia = new Werkstoff( Materials.Palladium.getRGBA(), @@ -817,9 +817,10 @@ public class WerkstoffLoader implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures(), 53, - TextureSet.SET_METALLIC + TextureSet.SET_METALLIC, //No Byproducts - //No Ingredients + new Pair<>(Materials.Palladium,1), + new Pair<>(Materials.Stone,2) ); public static final Werkstoff PDRawPowder = new Werkstoff( Materials.Palladium.getRGBA(), @@ -1016,8 +1017,10 @@ public class WerkstoffLoader implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures(), 69, - TextureSet.SET_ROUGH + TextureSet.SET_ROUGH, //No Byproducts + new Pair<>(Materials.Osmiridium,1), + new Pair<>(Materials.Stone,2) ); public static final Werkstoff IrLeachResidue = new Werkstoff( new short[]{0x84, 0x66, 0x49}, @@ -1027,7 +1030,9 @@ public class WerkstoffLoader implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures(), 70, - TextureSet.SET_ROUGH + TextureSet.SET_ROUGH, + new Pair<>(Materials.Iridium,1), + new Pair<>(Materials.Stone,2) //No Byproducts ); public static final Werkstoff PGSDResidue = new Werkstoff( @@ -1129,7 +1134,9 @@ public class WerkstoffLoader implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures(), 79, - TextureSet.SET_DULL + TextureSet.SET_DULL, + new Pair<>(Rhodium,1), + new Pair<>(Materials.Stone,1) ); public static final Werkstoff RHSalt = new Werkstoff( new short[]{0x84, 0x84, 0x84}, -- cgit