From 92cfb47f4fca2209bb27362da0a5b3bbc29ef838 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Mon, 25 Jul 2016 13:44:05 +0200 Subject: [PATCH] - Swapped ore generation for titanite and adamantite (nether <> end). - Fixed some generated tool textures - Fixed hardness / blast resistance of blocks --- src/main/java/com/sosnitzka/taiga/Blocks.java | 94 +++++++++--------- .../sosnitzka/taiga/proxy/ClientProxy.java | 24 ++--- .../com/sosnitzka/taiga/world/ZWorldGen.java | 7 +- .../textures/blocks/adamantite_block.png | Bin 16043 -> 16040 bytes .../taiga/textures/blocks/adamantite_ore.png | Bin 16364 -> 16325 bytes .../textures/blocks/materials/solarium.png | Bin 16354 -> 16381 bytes .../taiga/textures/blocks/rubium_block.png | Bin 16401 -> 16416 bytes .../taiga/textures/blocks/rubium_ore.png | Bin 16019 -> 16026 bytes .../taiga/textures/blocks/titanite_ore.png | Bin 16194 -> 16401 bytes .../textures/items/adamantite_nugget.png | Bin 15800 -> 15778 bytes .../taiga/textures/items/rubium_nugget.png | Bin 15808 -> 15807 bytes .../textures/items/tic/adamantite_ingot.png | Bin 15889 -> 15932 bytes .../taiga/textures/items/tic/rubium_ingot.png | Bin 15962 -> 15963 bytes 13 files changed, 63 insertions(+), 62 deletions(-) diff --git a/src/main/java/com/sosnitzka/taiga/Blocks.java b/src/main/java/com/sosnitzka/taiga/Blocks.java index 46f4c67..c95a71f 100644 --- a/src/main/java/com/sosnitzka/taiga/Blocks.java +++ b/src/main/java/com/sosnitzka/taiga/Blocks.java @@ -32,65 +32,65 @@ public class Blocks { // Ores // Group: Solide - public static Block titaniteOre = new BasicBlock("titanite_ore", Material.ROCK, 55.0f, 400.0f, TITANITE, PREFIX_ORE); - public static Block meteoriteOre = new BasicBlock("meteorite_ore", Material.ROCK, 60.0f, 500.0f, METEORITE, PREFIX_ORE); - public static Block vibraniumOre = new BasicBlock("vibranium_ore", Material.ROCK, 70.0f, 800.0f, VIBRANIUM, PREFIX_ORE); - public static Block adamantiteOre = new BasicBlock("adamantite_ore", Material.ROCK, 80.0f, 1000.0f, ADAMANTITE, PREFIX_ORE); + public static Block titaniteOre = new BasicBlock("titanite_ore", Material.ROCK, 55.0f, 40f, TITANITE, PREFIX_ORE); + public static Block meteoriteOre = new BasicBlock("meteorite_ore", Material.ROCK, 60.0f, 50f, METEORITE, PREFIX_ORE); + public static Block vibraniumOre = new BasicBlock("vibranium_ore", Material.ROCK, 70.0f, 60f, VIBRANIUM, PREFIX_ORE); + public static Block adamantiteOre = new BasicBlock("adamantite_ore", Material.ROCK, 80.0f, 70f, ADAMANTITE, PREFIX_ORE); // Group: Arcane - public static Block prometheumOre = new BasicBlock("prometheum_ore", Material.ROCK, 35.0f, 35.0f, COBALT, 0.25f, PREFIX_ORE); - public static Block rubiumOre = new BasicBlock("rubium_ore", Material.ROCK, 13.0f, 15.0f, TITANITE, PREFIX_ORE); + public static Block prometheumOre = new BasicBlock("prometheum_ore", Material.ROCK, 35.0f, 12f, COBALT, 0.4f, PREFIX_ORE); + public static Block rubiumOre = new BasicBlock("rubium_ore", Material.ROCK, 13.0f, 12f, TITANITE, PREFIX_ORE); public static Block tiberiumOre = new BlockTiberium(); - public static Block arcaniteOre = new BasicBlock("arcanite_ore", Material.ROCK, 23.0f, 25.0f, METEORITE, PREFIX_ORE); + public static Block arcaniteOre = new BasicBlock("arcanite_ore", Material.ROCK, 23.0f, 12f, METEORITE, PREFIX_ORE); // Group: Etheri - public static Block eterniteOre = new BasicBlock("eternite_ore", Material.ROCK, 24.0f, 25.0f, COBALT, PREFIX_ORE); - public static Block mythrilOre = new BasicBlock("mythril_ore", Material.ROCK, 25.0f, 25.0f, TITANITE, PREFIX_ORE); - public static Block palladiumOre = new BasicBlock("palladium_ore", Material.ROCK, 25.0f, 25.0f, METEORITE, PREFIX_ORE); - public static Block ignititeOre = new BasicBlock("ignitite_ore", Material.ROCK, 23.0f, 25.0f, VIBRANIUM, PREFIX_ORE); + public static Block eterniteOre = new BasicBlock("eternite_ore", Material.ROCK, 24.0f, 15f, COBALT, PREFIX_ORE); + public static Block mythrilOre = new BasicBlock("mythril_ore", Material.ROCK, 25.0f, 15f, TITANITE, PREFIX_ORE); + public static Block palladiumOre = new BasicBlock("palladium_ore", Material.ROCK, 25.0f, 15f, METEORITE, 0.4f, PREFIX_ORE); + public static Block ignititeOre = new BasicBlock("ignitite_ore", Material.ROCK, 23.0f, 15f, VIBRANIUM, PREFIX_ORE); // Group: Ratio - public static Block violiumOre = new BasicBlock("violium_ore", Material.ROCK, 13.0f, 13.0f, COBALT, PREFIX_ORE); - public static Block bismuthOre = new BasicBlock("bismuth_ore", Material.ROCK, 8.0f, 8.0f, OBSIDIAN, PREFIX_ORE); - public static Block mindoriteOre = new BasicBlock("mindorite_ore", Material.ROCK, 12.0f, 12.0f, TITANITE, PREFIX_ORE); - public static Block karmesineOre = new BasicBlock("karmesine_ore", Material.ROCK, 13.0f, 15.0f, METEORITE, PREFIX_ORE); + public static Block violiumOre = new BasicBlock("violium_ore", Material.ROCK, 13.0f, 10f, COBALT, PREFIX_ORE); + public static Block bismuthOre = new BasicBlock("bismuth_ore", Material.ROCK, 8.0f, 5f, OBSIDIAN, PREFIX_ORE); + public static Block mindoriteOre = new BasicBlock("mindorite_ore", Material.ROCK, 12.0f, 10f, TITANITE, PREFIX_ORE); + public static Block karmesineOre = new BasicBlock("karmesine_ore", Material.ROCK, 13.0f, 10f, METEORITE, PREFIX_ORE); // Blocks // Group: Solide - public static Block titaniteBlock = new BasicBlock("titanite_block", Material.ROCK, 55.0f, 400.0f, 5, PREFIX_BLOCK); - public static Block meteoriteBlock = new BasicBlock("meteorite_block", Material.ROCK, 60.0f, 500.0f, 6, PREFIX_BLOCK); - public static Block vibraniumBlock = new BasicBlock("vibranium_block", Material.ROCK, 70.0f, 800.0f, 7, PREFIX_BLOCK); - public static Block adamantiteBlock = new BasicBlock("adamantite_block", Material.ROCK, 80.0f, 1000.0f, 8, PREFIX_BLOCK); + public static Block titaniteBlock = new BasicBlock("titanite_block", Material.ROCK, 55.0f, 50f, 5, PREFIX_BLOCK); + public static Block meteoriteBlock = new BasicBlock("meteorite_block", Material.ROCK, 60.0f, 60f, 6, PREFIX_BLOCK); + public static Block vibraniumBlock = new BasicBlock("vibranium_block", Material.ROCK, 70.0f, 70f, 7, PREFIX_BLOCK); + public static Block adamantiteBlock = new BasicBlock("adamantite_block", Material.ROCK, 80.0f, 80f, 8, PREFIX_BLOCK); // Group: Arcane - public static Block prometheumBlock = new BasicBlock("prometheum_block", Material.ROCK, 35.0f, 35.0f, 4, 0.25f, PREFIX_BLOCK); - public static Block rubiumBlock = new BasicBlock("rubium_block", Material.ROCK, 13.0f, 15.0f, 5, PREFIX_BLOCK); - public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.ROCK, 30.0f, 30.0f, 6, 1f, PREFIX_BLOCK); - public static Block arcaniteBlock = new BasicBlock("arcanite_block", Material.ROCK, 23.0f, 25.0f, 7, PREFIX_BLOCK); + public static Block prometheumBlock = new BasicBlock("prometheum_block", Material.ROCK, 35.0f, 15f, 2, 0.5f, PREFIX_BLOCK); + public static Block rubiumBlock = new BasicBlock("rubium_block", Material.ROCK, 13.0f, 15f, 5, PREFIX_BLOCK); + public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.ROCK, 30.0f, 15f, 6, 1f, PREFIX_BLOCK); + public static Block arcaniteBlock = new BasicBlock("arcanite_block", Material.ROCK, 23.0f, 15f, 7, PREFIX_BLOCK); // Group: Etheri - public static Block eterniteBlock = new BasicBlock("eternite_block", Material.ROCK, 24.0f, 25.0f, 4, PREFIX_BLOCK); - public static Block mythrilBlock = new BasicBlock("mythril_block", Material.ROCK, 25.0f, 25.0f, 5, PREFIX_BLOCK); - public static Block palladiumBlock = new BasicBlock("palladium_block", Material.ROCK, 25.0f, 25.0f, 6, PREFIX_BLOCK); - public static Block ignititeBlock = new BasicBlock("ignitite_block", Material.ROCK, 23.0f, 25.0f, 7, PREFIX_BLOCK); + public static Block eterniteBlock = new BasicBlock("eternite_block", Material.ROCK, 24.0f, 20f, 4, PREFIX_BLOCK); + public static Block mythrilBlock = new BasicBlock("mythril_block", Material.ROCK, 25.0f, 20f, 5, PREFIX_BLOCK); + public static Block palladiumBlock = new BasicBlock("palladium_block", Material.ROCK, 25.0f, 20f, 6, 0.5f, PREFIX_BLOCK); + public static Block ignititeBlock = new BasicBlock("ignitite_block", Material.ROCK, 23.0f, 20f, 7, PREFIX_BLOCK); // Group: Ratio - public static Block violiumBlock = new BasicBlock("violium_block", Material.ROCK, 13.0f, 13.0f, 4, PREFIX_BLOCK); - public static Block bismuthBlock = new BasicBlock("bismuth_block", Material.ROCK, 8.0f, 8.0f, 5, PREFIX_BLOCK); - public static Block mindoriteBlock = new BasicBlock("mindorite_block", Material.ROCK, 12.0f, 12.0f, 2, PREFIX_BLOCK); - public static Block karmesineBlock = new BasicBlock("karmesine_block", Material.ROCK, 13.0f, 15.0f, 3, PREFIX_BLOCK); + public static Block violiumBlock = new BasicBlock("violium_block", Material.ROCK, 13.0f, 12f, 4, PREFIX_BLOCK); + public static Block bismuthBlock = new BasicBlock("bismuth_block", Material.ROCK, 8.0f, 10f, 5, PREFIX_BLOCK); + public static Block mindoriteBlock = new BasicBlock("mindorite_block", Material.ROCK, 12.0f, 12f, 2, PREFIX_BLOCK); + public static Block karmesineBlock = new BasicBlock("karmesine_block", Material.ROCK, 13.0f, 12f, 3, PREFIX_BLOCK); - public static Block imperomiteBlock = new BasicBlock("imperomite_block", Material.ROCK, 24.0f, 25.0f, 5, PREFIX_BLOCK); - public static Block fractoryteBlock = new BasicBlock("fractoryte_block", Material.ROCK, 8.0f, 8.0f, 8, PREFIX_BLOCK); - public static Block noctunyxBlock = new BasicBlock("noctunyx_block", Material.ROCK, 60.0f, 500.0f, 6, PREFIX_BLOCK); - public static Block nitroniteBlock = new BasicBlock("nitronite_block", Material.ROCK, 13.0f, 15.0f, 7, PREFIX_BLOCK); - public static Block cryptogenBlock = new BasicBlock("cryptogen_block", Material.ROCK, 23.0f, 25.0f, 6, PREFIX_BLOCK); - public static Block seismodiumBlock = new BasicBlock("seismodium_block", Material.ROCK, 30.0f, 30.0f, 7, 1f, PREFIX_BLOCK); - public static Block aegisaltBlock = new BasicBlock("aegisalt_block", Material.ROCK, 13.0f, 13.0f, 5, PREFIX_BLOCK); - public static Block ultraniteBlock = new BasicBlock("ultranite_block", Material.ROCK, 13.0f, 15.0f, 8, PREFIX_BLOCK); - public static Block bysmuidBlock = new BasicBlock("bysmuid_block", Material.ROCK, 35.0f, 35.0f, 5, 0.25f, PREFIX_BLOCK); - public static Block nucleumBlock = new BasicBlock("nucleum_block", Material.ROCK, 25.0f, 25.0f, 4, PREFIX_BLOCK); - public static Block terramiteBlock = new BasicBlock("terramite_block", Material.ROCK, 70.0f, 800.0f, 4, PREFIX_BLOCK); - public static Block solariumBlock = new BasicBlock("solarium_block", Material.ROCK, 80.0f, 1000.0f, 5, PREFIX_BLOCK); - public static Block lumixylBlock = new BasicBlock("lumixyl_block", Material.ROCK, 12.0f, 12.0f, 5, PREFIX_BLOCK); - public static Block dyoniteBlock = new BasicBlock("dyonite_block", Material.ROCK, 23.0f, 25.0f, 4, PREFIX_BLOCK); - public static Block proxideumBlock = new BasicBlock("proxideum_block", Material.ROCK, 25.0f, 25.0f, 4, PREFIX_BLOCK); - public static Block astriumBlock = new BasicBlock("astrium_block", Material.ROCK, 55.0f, 400.0f, 7, PREFIX_BLOCK); + public static Block imperomiteBlock = new BasicBlock("imperomite_block", Material.ROCK, 24.0f, 25f, 5, PREFIX_BLOCK); + public static Block fractoryteBlock = new BasicBlock("fractoryte_block", Material.ROCK, 8.0f, 15f, 8, PREFIX_BLOCK); + public static Block noctunyxBlock = new BasicBlock("noctunyx_block", Material.ROCK, 60.0f, 15f, 6, PREFIX_BLOCK); + public static Block nitroniteBlock = new BasicBlock("nitronite_block", Material.ROCK, 13.0f, 12f, 7, 0.8f, PREFIX_BLOCK); + public static Block cryptogenBlock = new BasicBlock("cryptogen_block", Material.ROCK, 23.0f, 15f, 6, PREFIX_BLOCK); + public static Block seismodiumBlock = new BasicBlock("seismodium_block", Material.ROCK, 30.0f, 25f, 7, PREFIX_BLOCK); + public static Block aegisaltBlock = new BasicBlock("aegisalt_block", Material.ROCK, 13.0f, 15f, 5, PREFIX_BLOCK); + public static Block ultraniteBlock = new BasicBlock("ultranite_block", Material.ROCK, 13.0f, 25f, 8, 0.6f, PREFIX_BLOCK); + public static Block bysmuidBlock = new BasicBlock("bysmuid_block", Material.ROCK, 35.0f, 15f, 5, PREFIX_BLOCK); + public static Block nucleumBlock = new BasicBlock("nucleum_block", Material.ROCK, 25.0f, 15f, 4, 0.85f, PREFIX_BLOCK); + public static Block terramiteBlock = new BasicBlock("terramite_block", Material.ROCK, 70.0f, 15f, 4, PREFIX_BLOCK); + public static Block solariumBlock = new BasicBlock("solarium_block", Material.ROCK, 80.0f, 25f, 5, PREFIX_BLOCK); + public static Block lumixylBlock = new BasicBlock("lumixyl_block", Material.ROCK, 12.0f, 15f, 5, 1f, PREFIX_BLOCK); + public static Block dyoniteBlock = new BasicBlock("dyonite_block", Material.ROCK, 23.0f, 15f, 4, 0.3f, PREFIX_BLOCK); + public static Block proxideumBlock = new BasicBlock("proxideum_block", Material.ROCK, 25.0f, 15f, 4, PREFIX_BLOCK); + public static Block astriumBlock = new BasicBlock("astrium_block", Material.ROCK, 55.0f, 15f, 7, PREFIX_BLOCK); /** * Registers all materials' ingots and nuggets
diff --git a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java index e22db4e..9a245cb 100644 --- a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java +++ b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java @@ -65,18 +65,18 @@ public class ClientProxy extends ServerProxy { public void setRenderInfo(final Material material) { - if (material == adamantite) specialRender(material, 0xd55cdf, 0.5f, 2.0f, 0.2f); - else if (material == solarium) specialRender(material, 0xFFDD11, 0.4f, 0.3f, 0.1f); - else if (material == proxideum) specialRender(material, 0x2d8f8b, 0.4f, 0.3f, 0.1f); - else if (material == prometheum) specialRender(material, 0x555555, 1.2f, 0.6f, 0.1f); - else if (material == tiberium) specialRender(material, 0x33ff33, 0.5f, 0.2f, 0.1f); - else if (material == bismuth) specialRender(material, 0xffffff, 0.3f, 0.0f, 0.0f); - else if (material == bysmuid) specialRender(material, 0xccccee, 0.6f, 0.2f, 0.0f); - else if (material == imperomite) specialRender(material, 0x8decaf, 1.2f, 0.5f, -0.1f); - else if (material == noctunyx) specialRender(material, 0xce70e8, 0.5f, 0.2f, 0.3f); - else if (material == nucleum) specialRender(material, 0xd9f446, 1.6f, 0.4f, 0.3f); - else if (material == dyonite) specialRender(material, 0xffe240, 0.6f, 1.8f, 0.2f); - else if (material == arcanite) specialRender(material, 0x5e5499, 0.6f, 0.8f, 0.2f); + if (material.equals(adamantite)) specialRender(material, 0xd55cdf, 0.5f, 0.6f, 0.2f); + else if (material.equals(solarium)) specialRender(material, 0xFFDD11, 0.7f, 0.3f, 0.1f); + else if (material.equals(proxideum)) specialRender(material, 0x2d8f8b, 0.4f, 0.3f, 0.1f); + else if (material.equals(meteorite)) specialRender(material, 0xaaaaaa, 0.6f, 0.8f, 0.0f); + else if (material.equals(tiberium)) specialRender(material, 0x33ff33, 0.5f, 0.2f, 0.1f); + else if (material.equals(bismuth)) specialRender(material, 0xffffff, 0.3f, 0.0f, 0.0f); + else if (material.equals(bysmuid)) specialRender(material, 0xccccee, 0.6f, 0.2f, 0.0f); + else if (material.equals(imperomite)) specialRender(material, 0x8decaf, 0.8f, 0.5f, -0.0f); + else if (material.equals(noctunyx)) specialRender(material, 0xce70e8, 0.5f, 0.2f, 0.3f); + else if (material.equals(nucleum)) specialRender(material, 0xd9f446, 1.0f, 0.4f, 0.3f); + else if (material.equals(dyonite)) specialRender(material, 0xffe240, 0.6f, 1.0f, 0.2f); + else if (material.equals(arcanite)) specialRender(material, 0x5e5499, 0.6f, 0.8f, 0.2f); else { material.setRenderInfo(new MaterialRenderInfo.BlockTexture("taiga:blocks/" + material.getIdentifier() + "_block")); } diff --git a/src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java b/src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java index bc90411..677a3e2 100644 --- a/src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java +++ b/src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java @@ -14,7 +14,8 @@ import static com.sosnitzka.taiga.Blocks.*; public class ZWorldGen implements IWorldGenerator { private void nether(Random random, int x, int z, World world) { - Generator.generateNetherOre(adamantiteOre.getDefaultState(), random, x, z, world, 30, 1, 32, 2, 8); + + Generator.generateNetherOre(titaniteOre.getDefaultState(), random, x, z, world, 30, 1, 32, 2, 12); Generator.generateNetherOre(tiberiumOre.getDefaultState(), random, x, z, world, 20, 1, 128, 7, 15); Generator.generateNetherOre(palladiumOre.getDefaultState(), random, x, z, world, 30, 32, 64, 2, 7); Generator.generateNetherOre(prometheumOre.getDefaultState(), random, x, z, world, 30, 32, 64, 2, 6); @@ -39,11 +40,11 @@ public class ZWorldGen implements IWorldGenerator { } private void end(Random random, int x, int z, World world) { - + Generator.generateEndOre(adamantiteOre.getDefaultState(), random, x, z, world, 18, 40, 65, 2, 8); Generator.generateEndOre(rubiumOre.getDefaultState(), random, x, z, world, 18, 10, 35, 2, 8); Generator.generateEndOre(ignititeOre.getDefaultState(), random, x, z, world, 18, 20, 45, 2, 8); Generator.generateEndOre(violiumOre.getDefaultState(), random, x, z, world, 18, 30, 55, 2, 8); - Generator.generateEndOre(titaniteOre.getDefaultState(), random, x, z, world, 18, 40, 65, 2, 8); + } diff --git a/src/main/resources/assets/taiga/textures/blocks/adamantite_block.png b/src/main/resources/assets/taiga/textures/blocks/adamantite_block.png index d31a6443149f5f9e03e521dcf041c4930d98da04..f67fec97a60e37299695d4293d74b9d0457091be 100644 GIT binary patch delta 627 zcmZ2oyP|f(c4jWq5JMv?BSR}Aqsa%EZIHN|*;&#URSc3-OjA-)({v3@Esb;yQ%#I@ zlTwn*bo5EO^azjgTyr<2=22G4~$>mg}m=izY9& z(XT(~>Eaktam(bQZJ$i2gu}(pd#gfi>l6IB1)3hZckl>Jdz89?W!s@N0mFr=2Us{b zh1OiWarxc6dFxhvx0|H6|K!Eq`SE{BK7U=VR(Y!C1>eMpJAJPQo@09+8P%BX1Lrbq~;>=j9Aj{=J%vy_Uu0KA$qW+^!)LYZ8si#6K+)`P&k56ea z+de7lXIjSIt6OJXK6K`Ui$Tl0v~Mfj;){PIuTb^6y?&i}-cDa>Jqvze=UJ8p#a`aC zuD+P{Y(mtbdF*B{n>0(VZP|1xd0PFVY1dWX-!y8~oPR;$=8{7aTAM3YXK(!@_V@PH z{dXrGW8S^x`4p{SiTcZyC+Dnq`aWm>dcDi>FLysmH8(6gA3N)^=<|m&vV^v3)cSDm zFZq4thfuV&o)Q=jZz^r*7Jr+i|+)5^bx^Q7|* zbz0t8&b(Oto#gBju o{#Oh57D;itR+^Om-OtD{iTUH=`Zf6q3=9kmp00i_>zopr0EZ_cM*si- delta 630 zcmZ2cySjG6c4jV<5JO8V6ALQ?^T`L9ZIHN|*;&#URnkn&ER2&aQgkg+l8tnelTFNZ zEsc}Ybj=KtlGBV+%#6%Tj5kkYy~je7%E>o5EO^azjgTyr<2=22G4~$>mM77^izhF( z(XT(^>Eaktam(ex?!1^#2DgXr-<+QLk=MHEh%zH9t07b1lAaY6TKAf!FK~Lqm?0>_ z(aAQ2NoxrQdy@6WbhTp3^!a-=4>Jk04AaQV zK_aKu-1w}!UbE&5d(Dw)w%6|%2t^45#TTCa<^Bs{b5h+@65#P3N@P3BFN*?fvK|8v9hn2ky9iKn|3$Zn7Eo8D$Jhi`eD z@qT{!6?YnKnVE|>wq({2o{V`_9@;#m_87=F;z`(%Z>FVdQ&MBb@0Cgx86#xJL diff --git a/src/main/resources/assets/taiga/textures/blocks/adamantite_ore.png b/src/main/resources/assets/taiga/textures/blocks/adamantite_ore.png index 9c12b6ae97a284e8097ddc3f6f8771835cd82ddc..eef2f58e2f62e9db44370438518b893bac29dc8c 100644 GIT binary patch delta 1117 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 delta 831 zcmexc|EPY$c4jV<5F;ZiLjx;Aqsa%EZIHN|*;x)Us+gOkC0m-Cn&}!@CY$M|SeO{; zCZ?Dh=_aNonkQQ(r`i6xlm6QK)StDEF$bH<9B_QBP(_|i7{rX9sE{-7; zw@l6?<}XTPU@x%ywKsCpZk@OS#^1io{izlx6YLWPseZiEp$a^an{FHk%{bTap+L~Xx zx@La**01uxL!h^H-QpJ)OXT#YX>iFD)fde7diefCj{0WKf5#V8H@=Sddi=~`(^`4S zO;*yo89w}RQ9Jgc)7f)z=l@wMl9h}H9t1p!eY*9dA@}_M);>Gi_i(Upx_tdoE)zq0 z(c5a5b&u}z^AvcPzuu@-u`Eo?lHq(=P3ZQjQvug+@%NilN1yV&^QY^mfbqneRo|jz zbgRGD7cO_aCfIODVD9StX-aRJo*%i$^>`c4vmmpRGhb@kVw`Ti@F@DaPJyFjm)&9Cldy}Wd@r5;?d3qw) z+`8>7yifC1$6T@abhEfMSLSv2Euyl1Z~JEk26wSb;u`ga49o7noA7SqoPbS6tc406Ww#}+oV3)du_XAF z)FfMmH^E>0C8xBmumAG-2`hWnl^=@n)1$*{x0wa9&RS}8K6BBXHF1+Gm>C`!HgA_m zV^MZ_B6jsY+ncFspZcy8>B%$BD#=e@C8|G-;YD8SH~TXSS3k*>RqhX|+n(ol<~H~8 zvUzTbT}p-QxA$$B`NLCS*}*%{W?7$4T%jQPNa5l7ucs&PJkmb(@s{=CI(^Zzn%}%C rUZWl9&-z>Ts`4$X+x~CnGc)+EnjVmHi%Xb+fq}u()z4*}Q$iB}WBYlb diff --git a/src/main/resources/assets/taiga/textures/blocks/rubium_block.png b/src/main/resources/assets/taiga/textures/blocks/rubium_block.png index 1977502d8bf9fa51692c7f7cc51c4ea9c0c89302..2caaf9c538f418fbcdacea50a372ec500cb12a10 100644 GIT binary patch delta 986 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 yY2A8rZ*$?}qmyzz?<(zBc2-l?}`|&5{#S z(oBrZbPdu{Ep!bHQ_XZOOw9~*Q%#LiO-)jg3=_>J^RectBpVv0m|Lcr>slC@rRtg{ znxyGkq!^p(8XB3Wn3)@9*=+ZTQ@EZB=39vOjVD`iHcfudIY-6JBGtse zBE>}4(lE(PH#x;5Q8y_iHBr~XFgelCG{r2*(lTZ8dM*ntNMIRQ8JJAoz}`B!o`Y+0 z1GoKTZ;m$N{Elz}EWoWePjBAO{l|bMIxdiP@_rk=dM0~M7srr_TP~CKXNx$B9A|e_ znc8c1FrjIJ(}sWx4L@GX3#?)BO;i?}cJNYEgoonJIhH5-p7@xxJ?TihYkKj{kvX$1 z4Il295Zm8a_^EkEj?6kMJ?rn=HdR!W^;g?Zd?S7VG4@uQaq&R<=7HShHaoe|BYVO>WE_RTb3;-6_7;^?J_7Gdy72 zyytJ@pVNYhnIfVL7D^%4-KBdu7xnhrK3#lT`m{gejtN_83Z7rS#;mCMiRH{8BL=@! zuNO0JHeftpZe>2{itwbgn`R90Rp0mgdRUV9ao;b?wY}?SeP*c)c~j4Frpj0TteAUO zZ!v?+^vJt!W`;Ijw*Mul?`gY9+Bz^Kqx2Nx=1-HiUwab3V1EC4p7P=DmH###wJWPx z`p@?It0{~Yg6v1{-U!^td|-2qwCAFH%PC8FeWb-V=O%c*nz(KmN^3Gd4HZoNL`$Gc8wrW_MWy3`}Y4?6&-hnw;j@l8Dcbc7uCFcdn%UYK-;N@M+@ujWq)HTXyQz3+xPFCe~`a) zr2O>{TFa$+ITz;S)+~Hekj~Sq?)j?qYs`T)u^ZPUxqE0$xyyF#)s))@T9(}UQGNE3 vecJQ~l?!Vvm~D^UK5~Coh0`T_W(JEi=W9PcZ)#v*U|{fc^>bP0l+XkKoi3TO diff --git a/src/main/resources/assets/taiga/textures/items/adamantite_nugget.png b/src/main/resources/assets/taiga/textures/items/adamantite_nugget.png index 4cbfc889508020f204f4d007ee61d6a7d3fe9fa0..f2026fb790d19895c1fc46f015ecadb9d2877709 100644 GIT binary patch delta 363 zcmdl{y{LM_c4jWq5JMv?BSR}=)5!;!ZIHN|*;&#URV<7Q%uS3EjdW8jlaqDL(@YF? zEiBEo5EO^azjgTyr<2=22G4~$>mYXNTmQG%5 zqhG(<)5S5Q;?|SNwp@n-1X}jjx*b&Gs%+Z7{3BP>*6@uVh2#!JSFmVr6lzuz;uT`~ ze9g&QnT?x!`P`eWGjEE9K9!c(cjUczh3k>3ecnC7S-k!CZkTnKe9}7d*XYuMypu;8 z9ZD=N$wvLW(PZ7+mY~GE@?eZIHN|*;&#URVo5EO^azjgTyr<2=22G4~$>mWwr8u1{WU zqhEi~)5S5Q;?|SNhFMI3BCh9u_Zf>#^hxxYCDPQT@NyI9_6dis+3w(!4xgC1gl|cw zSd$~mewC?$Doy+TuX&?%=ExzX?X~^f-(%LzkbHikaG74dz+9_6eD}l8wLGy}b~ks) z@_$dvJ2p?>c{e7MQ|Q3KOZAuDTu~`*xf>O@{>Jpg`{@PYyHY>>Nt~(tBI>3%kC{M| zlB;r#sr8X-!Lff%2%9l(JC^h+^Q+V(?nSE|rf{_uxoCEN-ag^Zago@Tw+BK_Ts;(+ q|M#O;{gmSeoqwq}*KcY)%&=YD#~{<_RviNa1B0ilpUXO@geCxw#-0fP diff --git a/src/main/resources/assets/taiga/textures/items/rubium_nugget.png b/src/main/resources/assets/taiga/textures/items/rubium_nugget.png index e926b5cd7a1e39fa6e00f16095f6457175f4f40a..581a8c915ebe718254bbce27071d8fb43606a29d 100644 GIT binary patch delta 361 zcmX?5y}x?Hc4jWq5JMv?BLgcF^T`L9ZIHN|*;z^$RZ>ljla0-cO>_;-%*=ERQcTix z6AhCRb&b+2(kv5AEt3orQ#Q|MeZxYO%E{}wtdXpkY{hwc^M39>1}yJCMNOH!-$uWF zkEe@cNX4zBAOHW`Gpo)>l#ni{KYWV+yZE`^1=T_S*(dQ;HWJ%m3#uk@$CiTFMXqFsmEt$3H9#ZFzXu!}rvYqyr2b>|c70 U@`jE&3;EH}?*eZxYO%E{}wtdXpkY{hwc^M39>1}sXV&L=1Dx6!ZP z>*?YcQgQ3aC4cUN1q{bN#_p9_f3S7?!KpEC7R|L-q@k^=YMOg$y@BWN#Tz4yr4*-3 zx^t)Q{ezEU-yR=(xU-JWKc0`_``I1xY)*$4H*Q>16fTKC#5w`;%yh2CuMJ7F51P_{C>fFt%Xw`d<iODI+M!J?sMi#n81}4e6 z7N&_Qx+WF|CQ0Ur=1G=jrkhW&++$HDLgi$B4ofa`T_dPvoB6qp8?tos^jl88Wvy4w zr0(hB7*cWT$Yg(y$%PWf?e|~5e=m2_(+9FU*V=0(76*wuJjk*6MZ$Kj=nG3*c&$o4 z-BEmXNpr#r4VF?bP9@`_=`x&u8@;CcEnUIkGS|oa`|-b(-~U-f%++DyukGhQ|NP;@ zho3o?irnrzW~RL8;tP9IxzjA6*Ji3uFm^dJ`$v83^!nyo-F2)BS|0tGs`0gmow@n? z)F3Yo#cgr|w?5=L&06&Tl`jVq+XUu20=-{_=hv_D3JW{3hx5pVo7M-{#LZc~{#8hh z>o2|dW?={00G3k+cotk;z;xB6_e@FG@tf=wT6&79bM4C4Rm^CW9^G#^(Pxsmit#_rl5Cma2oupBw}tmso%_8# zZ_lnR`drhFEB%A@TSI zt9LJxib~rY7EDcV4ZO3g*|8^XiRo+M`VdQ@P6h*kop=9!c=zDPx=sD-KUv?~l7ywCq*$WXrjqGkKxx$7Ai7#KWV{an^LB{Ts5xtKiz delta 683 zcmdl}GqGlZCF6{ZR<+DrCLxBVR>nqFriPREG20+>8CmA4q?n|p7#o_V>Lw+cnCYe^ znWX9_85pMOTAG+x8ll> z-2OiL+(Vw{8iI+o7b5hh1Z5{(kr&IJtXZFRXZ6hYAGg+@JU{2Bx9bY0PcBYeTPFp1 z{k3frH8{#OBPrL!b(2z%82eQD?ZGJuRX?t)bm=yp6;eLK_B}jqP7QOjgG2;VScB(* zTHJYqGVip9PKL!7>HqI){R`IX9GmYIub_KLRp?u*OyGft+YwJXmn=HC;Yf*d n(yv#G?w|U8|N4(whWo0gHspzg^B!biU|{fc^>bP0l+XkK>^mcK diff --git a/src/main/resources/assets/taiga/textures/items/tic/rubium_ingot.png b/src/main/resources/assets/taiga/textures/items/tic/rubium_ingot.png index c7baace32540b0e5948505500bc0aea5312a4a84..b9711f5369f0bf47dacba92a043b0d3991564179 100644 GIT binary patch delta 739 zcmcarbGv547G_>^T_e*FLnA9A11nR@$p@J&(L~r;=Bij47+RQGTAJvlCR?WHrWu+T z>spwbBt*(}R-+>oVV?!HfxUs&tc>wCI5 zhE&`-GWovuB7U&-Z@NBN&b?A0h)KWd!A{FL&x;=v^f4T9)Zyc~ z@UrCplMNp=_612QmbL#|^In=u>^4XE6XW`&A)Br}PkcUc`q^z^Edtfde^SHtxEgId z7PhVGcw!iHJ=34UvbeLxuivPpO{;fo@mnseFRDISjkQ1I)VUKXKF1X&wUm1sto(F$ z^{11jUAI0?S>WroSxne+a-V=xhiSFl?d$J8<*G5tPfJwei{oWm_Vd#l-H+_fDtTrb zZ@qNWtv{g>SwA;p;oKD)=UnWOIZ`xt=8+35x4&g=bNiFizgPX9X~!!m#Y->K4hOcT znF;BwQ>l5*xv;P9*=#xC9aj#|o*daxQK@+H;q^8AzkcLsD_(k-w(z5wyzcXe!WW#e zwI^z3ci))m*YusO!z9LGZEo7dDW{8rIh7)prhop&5Pw&$UM%nH=6TZ{uUtH^X0!C# zz0+S*s&j8GGmF|4FjY#d`&GxZ7_|bO*_=Ohlqxs&%(#0l$Xom1FS%=HjG~IIZ}Ez+ zN>WQ(=U^P!DPhDZ?|)d?lSlh%&+V+T=_kDIPqaMgxM$I{2^%|lgV~-fu?p#KypY-H z5oWb-lgzPA+#gPfZMotx#raYGEbRh;6K9jZ9!Xqw$>>8gm*h3?A6{##+y8|aoIbHB s>4EFId4GRxxiaPc^dI;4e>~2Rcr`GS!T#fY1_lNOPgg&ebxsLQ0MoQekN^Mx delta 736 zcmcazbE{^<7G_>kT|@H_LrW`T3o8TD$p@J&(L~r;=BlJ6n;R!5CZ^~b8>E=)CZ?HK z>RP0ko9h}R8(SDAS(qgnrWkBK!SaTMD3z1tIIOslEZr>2b=;68i@n%?@(XMIdOc4U z$B>F!MaglzbGsV`0L$M|3@0>Y?2j96h9yWKcIbD;k|9L9^=lLhtx1F>I zT2f_`Qr~W@6Zcy2uAD-QvEzt>T zO!A49boW=kDF<0Ni+fa?U6z=hsrZ?EBP8FS|&k&D@)lwC9lB#v*eHWz7NVzIu*W2xpYX5Jxv(6OB z86oDzLHCZ9%$2P7JnnA!ar>vxzDIlWoU}|I>`6#iwn}>SF5doYMVnsociifWNj*}x pwDff85W=5RsnKw7YjkDgy%pgQu&X%Q~loCIA!uMW6rx