Cleaned code. Added nugget icons. Fixed some textures. TODO: metal texture rendering

src/main/java/com/sosnitzka/taiga/TAIGA.java

@@ -93,12 +93,12 @@ public class TAIGA {
      * @param craft      Can craft parts in part builder
      * @param cast       Can craft parts by casting with fluid (smeltery)
      */
+
     private void registerTinkerMaterial(String oreSuffix, Material material, Fluid fluid, int headDura, float headSpeed, float headAttack, float handleMod, int handleDura, int extra, int headLevel, boolean craft, boolean cast) {
         TinkerRegistry.addMaterialStats(material, new HeadMaterialStats(headDura, headSpeed, headAttack, headLevel));
         TinkerRegistry.addMaterialStats(material, new HandleMaterialStats(handleMod, handleDura));
         TinkerRegistry.addMaterialStats(material, new ExtraMaterialStats(extra));
 
-        System.out.println(material.getRepresentativeItem());
         Item item = null;
         Field[] items = Items.class.getDeclaredFields();
         for (Field i : items) {
@@ -113,12 +113,9 @@ public class TAIGA {
             }
         }
 
-
         material.setFluid(fluid).setCraftable(craft).setCastable(cast).addItem(item, 1, Material.VALUE_Ingot);
         material.setRepresentativeItem(item);
 
-        System.out.println(material.getRepresentativeItem());
-
         proxy.setRenderInfo(material);
         MaterialIntegration integration = new MaterialIntegration(material, fluid, oreSuffix);
         integration.integrate();
@@ -136,7 +133,6 @@ public class TAIGA {
         registerTinkerMaterial("Prometheum", prometheum, prometheumFluid, 539, 3.6f, 6.60f, 0.90f, 0, 150, TITANITE, false, true);
         registerTinkerMaterial("Arcanite", arcanite, arcaniteFluid, 698, 4.3f, 7.88f, 0.85f, -50, 150, METEORITE, false, true);
         // SOLIDE ORES
-
         registerTinkerMaterial("Titanite", titanite, titaniteFluid, 811, 4.8f, 6.40f, 1.00f, -50, 150, TITANITE, false, true);
         registerTinkerMaterial("Meteorite", meteorite, meteoriteFluid, 823, 6.1f, 6.83f, 1.20f, -50, 200, METEORITE, false, true);
         registerTinkerMaterial("Vibranium", vibranium, vibraniumFluid, 917, 7.45f, 7.17f, 1.15f, 50, 150, VIBRANIUM, false, true);

src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java

@@ -64,26 +64,24 @@ public class ClientProxy extends ServerProxy {
     }
 
     public void setRenderInfo(final Material material) {
-        /* if (material != bismuth) {
-            material.setRenderInfo(new MaterialRenderInfo.Metal(fluid.getColor(), 0.4f, 0.2f, 0f));
-        }  else bismuth.setRenderInfo(new MaterialRenderInfo.BlockTexture("taiga:blocks/bismuth_block")); */
 
-        if (material == adamantite) renderTo(material, 0xd55cdf, 0.5f, 0.8f, 0.2f);
+        if (material == adamantite) specialRender(material, 0xd55cdf, 0.5f, 2.0f, 0.2f);
-        else if (material == solarium) renderTo(material, 0xffff00, 0.6f, 1.8f, 0.0f);
+        else if (material == solarium) specialRender(material, 0xffff00, 0.3f, 1.0f, 0.0f);
-        else if (material == proxideum) renderTo(material, 0x2d8f8b, 0.4f, 0.3f, 0.1f);
+        else if (material == proxideum) specialRender(material, 0x2d8f8b, 0.4f, 0.3f, 0.1f);
-        else if (material == tiberium) renderTo(material, 0x33ff33, 0.5f, 0.2f, 0.1f);
+        else if (material == tiberium) specialRender(material, 0x33ff33, 0.5f, 0.2f, 0.1f);
-        else if (material == bismuth) renderTo(material, 0xffffff, 0.4f, 0.2f, 0.0f);
+        else if (material == bismuth) specialRender(material, 0xffffff, 0.3f, 0.0f, 0.0f);
-        else if (material == dyonite) renderTo(material, 0xffe240, 0.6f, 0.8f, 0.2f);
+        else if (material == dyonite) specialRender(material, 0xffe240, 0.6f, 1.8f, 0.2f);
+        else if (material == arcanite) specialRender(material, 0xBBBBBB, 0.6f, 1.8f, 0.2f); // TODO: Fix Textures
         else {
-            material.setRenderInfo(new MaterialRenderInfo.BlockTexture("taiga:blocks/" + material.getFluid().getName() + "_block"));
+            material.setRenderInfo(new MaterialRenderInfo.BlockTexture("taiga:blocks/" + material.getIdentifier() + "_block"));
         }
     }
 
-    private void renderTo(Material material, final int f, final float shine, final float brightness, final float hueshift) {
+    private void specialRender(final Material material, final int f, final float shine, final float brightness, final float hueshift) {
         material.setRenderInfo(new MaterialRenderInfo.AbstractMaterialRenderInfo() {
             @Override
             public TextureAtlasSprite getTexture(TextureAtlasSprite baseTexture, String location) {
-                return new MetalTextureTexture("taiga:blocks/materials/adamantite", baseTexture, location, f, shine, brightness, hueshift);
+                return new MetalTextureTexture("taiga:blocks/materials/" + material.getIdentifier(), baseTexture, location, f, shine, brightness, hueshift);
             }
         });
     }

src/main/resources/assets/taiga/lang/de_DE.lang

@@ -127,6 +127,39 @@ item.dyonite_ingot.name=Dyonitbarren
 item.proxideum_ingot.name=Proxideumbarren
 item.astrium_ingot.name=Astriumbarren
 
+item.titanite_nugget.name=Titanitklumpen
+item.meteorite_nugget.name=Meteoritklumpen
+item.vibranium_nugget.name=Vibraniumklumpen
+item.adamantite_nugget.name=Adamantitklumpen
+item.prometheum_nugget.name=Prometheumklumpen
+item.rubium_nugget.name=Rubiumklumpen
+item.tiberium_nugget.name=Tiberiumklumpen
+item.arcanite_nugget.name=Arcanitklumpen
+item.eternite_nugget.name=Eternitklumpen
+item.mythril_nugget.name=Mythrilklumpen
+item.palladium_nugget.name=Palladiumklumpen
+item.ignitite_nugget.name=Ignititklumpen
+item.violium_nugget.name=Violiumklumpen
+item.bismuth_nugget.name=Bismuthklumpen
+item.mindorite_nugget.name=Mindoritklumpen
+item.karmesine_nugget.name=Karmesinklumpen
+item.imperomite_nugget.name=Imperomitklumpen
+item.fractoryte_nugget.name=Fractorytklumpen
+item.noctunyx_nugget.name=Noctunyxklumpen
+item.nitronite_nugget.name=Nitronitklumpen
+item.cryptogen_nugget.name=Cryptogenklumpen
+item.seismodium_nugget.name=Seismodiumklumpen
+item.aegisalt_nugget.name=Aegisaltklumpen
+item.ultranite_nugget.name=Ultranitklumpen
+item.bysmuid_nugget.name=Bysmuidklumpen
+item.nucleum_nugget.name=Nucleumklumpen
+item.terramite_nugget.name=Terramitklumpen
+item.solarium_nugget.name=Solariumklumpen
+item.lumixyl_nugget.name=Lumixylklumpen
+item.dyonite_nugget.name=Dyonitklumpen
+item.proxideum_nugget.name=Proxideumklumpen
+item.astrium_nugget.name=Astriumklumpen
+
 fluid.tconstruct.arcanite.name=Arcanit
 fluid.tconstruct.tiberium.name=Tiberium
 fluid.tconstruct.prometheum.name=Prometheum

src/main/resources/assets/taiga/lang/en_US.lang

@@ -167,6 +167,39 @@ item.dyonite_ingot.name=Dyonite Ingot
 item.proxideum_ingot.name=Proxideum Ingot
 item.astrium_ingot.name=Astrium Ingot
 
+item.titanite_nugget.name=Titanite Nugget
+item.meteorite_nugget.name=Meteorite Nugget
+item.vibranium_nugget.name=Vibranium Nugget
+item.adamantite_nugget.name=Adamantite Nugget
+item.prometheum_nugget.name=Prometheum Nugget
+item.rubium_nugget.name=Rubium Nugget
+item.tiberium_nugget.name=Tiberium Nugget
+item.arcanite_nugget.name=Arcanite Nugget
+item.eternite_nugget.name=Eternite Nugget
+item.mythril_nugget.name=Mythril Nugget
+item.palladium_nugget.name=Palladium Nugget
+item.ignitite_nugget.name=Ignitite Nugget
+item.violium_nugget.name=Violium Nugget
+item.bismuth_nugget.name=Bismuth Nugget
+item.mindorite_nugget.name=Mindorite Nugget
+item.karmesine_nugget.name=Karmesine Nugget
+item.imperomite_nugget.name=Imperomite Nugget
+item.fractoryte_nugget.name=Fractoryte Nugget
+item.noctunyx_nugget.name=Noctunyx Nugget
+item.nitronite_nugget.name=Nitronite Nugget
+item.cryptogen_nugget.name=Cryptogen Nugget
+item.seismodium_nugget.name=Seismodium Nugget
+item.aegisalt_nugget.name=Aegisalt Nugget
+item.ultranite_nugget.name=Ultranite Nugget
+item.bysmuid_nugget.name=Bysmuid Nugget
+item.nucleum_nugget.name=Nucleum Nugget
+item.terramite_nugget.name=Terramite Nugget
+item.solarium_nugget.name=Solarium Nugget
+item.lumixyl_nugget.name=Lumixyl Nugget
+item.dyonite_nugget.name=Dyonite Nugget
+item.proxideum_nugget.name=Proxideum Nugget
+item.astrium_nugget.name=Astrium Nugget
+
 modifier.analysing.name=Analysing
 modifier.analysing.desc=§oI know what you are!§r\nKill them, get all their knowledge, ignore loot.
 modifier.arcane.name=Arcane