Add two new Tiers of Drawer upgrades. Ruby and Tanzanite (#21)

* update bs+gradle+deps

* add two new tiers of Drawer upgrades

* add recipes

* sa

* fix recipe

* fix wildcard imports

src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java

@@ -1013,7 +1013,8 @@ public void registerBlockIcons(IIconRegister register) {
 
         iconTaped = register.registerIcon(StorageDrawers.MOD_ID + ":tape");
 
-        String[] overlays = new String[] { null, null, "iron", "gold", "obsidian", "diamond", "emerald" };
+        String[] overlays = new String[] { null, null, "iron", "gold", "obsidian", "diamond", "emerald", "ruby",
+                "tanzanite" };
 
         iconOverlay = new IIcon[overlays.length];
         iconOverlayH = new IIcon[overlays.length];

src/main/java/com/jaquadro/minecraft/storagedrawers/config/ConfigManager.java

@@ -93,6 +93,8 @@ public static class ConfigCache {
         public int level4Mult;
         public int level5Mult;
         public int level6Mult;
+        public int level7Mult;
+        public int level8Mult;
 
         public boolean addonSeparateVanilla;
         public boolean addonShowNEI;
@@ -441,6 +443,10 @@ public void syncConfig() {
                 .setLanguageKey(LANG_PREFIX + "upgrades.level5Mult").setRequiresWorldRestart(true).getInt();
         cache.level6Mult = config.get(sectionUpgrades.getQualifiedName(), "level6Mult", 13)
                 .setLanguageKey(LANG_PREFIX + "upgrades.level6Mult").setRequiresWorldRestart(true).getInt();
+        cache.level7Mult = config.get(sectionUpgrades.getQualifiedName(), "level7Mult", 21)
+                .setLanguageKey(LANG_PREFIX + "upgrades.level7Mult").setRequiresWorldRestart(true).getInt();
+        cache.level8Mult = config.get(sectionUpgrades.getQualifiedName(), "level8Mult", 34)
+                .setLanguageKey(LANG_PREFIX + "upgrades.level8Mult").setRequiresWorldRestart(true).getInt();
 
         cache.addonShowNEI = config.get(sectionAddons.getQualifiedName(), "showBlocksInNEI", true)
                 .setLanguageKey(LANG_PREFIX + "addons.showNEI").setRequiresWorldRestart(true).getBoolean();
@@ -506,6 +512,10 @@ public int getStorageUpgradeMultiplier(int level) {
                 return cache.level5Mult;
             case 6:
                 return cache.level6Mult;
+            case 7:
+                return cache.level7Mult;
+            case 8:
+                return cache.level8Mult;
             default:
                 return 1;
         }

src/main/java/com/jaquadro/minecraft/storagedrawers/integration/gtnh/ModRecipes.java

@@ -33,6 +33,7 @@ public class ModRecipes {
     private static final String ORE_drawerBasic = "drawerBasic";
     private static final String ORE_fenceWood = "fenceWood";
     private static final String ORE_plateAluminium = "plateAluminium";
+    private static final String ORE_plateBronze = "plateBronze";
     private static final String ORE_plateDiamond = "plateDiamond";
     private static final String ORE_plateDenseObsidian = "plateDenseObsidian";
     private static final String ORE_plateEnderEye = "plateEnderEye";
@@ -41,10 +42,13 @@ public class ModRecipes {
     private static final String ORE_plateIron = "plateIron";
     private static final String ORE_plateObsidian = "plateObsidian";
     private static final String ORE_plateRedstone = "plateRedstone";
+    private static final String ORE_plateRubber = "plateRubber";
+    private static final String ORE_plateRuby = "plateRuby";
     private static final String ORE_plateStainlessSteel = "plateStainlessSteel";
     private static final String ORE_plateSteel = "plateSteel";
+    private static final String ORE_plateTantalum = "plateTantalum";
+    private static final String ORE_plateTanzanite = "plateTanzanite";
     private static final String ORE_plateTitanium = "plateTitanium";
-    private static final String ORE_plateRubber = "plateRubber";
     private static final String ORE_screwSteel = "screwSteel";
     private static final String ORE_slabWood = "slabWood";
     private static final String ORE_stickDiamond = "stickDiamond";
@@ -53,6 +57,8 @@ public class ModRecipes {
     private static final String ORE_stickIron = "stickIron";
     private static final String ORE_stickObsidian = "stickObsidian";
     private static final String ORE_stickRubber = "stickRubber";
+    private static final String ORE_stickRuby = "stickRuby";
+    private static final String ORE_stickTanzanite = "stickTanzanite";
     private static final String ORE_stickWood = "stickWood";
     private static final String ORE_stoneConcrete = "stoneConcrete";
     private static final String NAME_blockCarpentersBlock = "blockCarpentersBlock";
@@ -546,7 +552,7 @@ private static void storageUpgradeRecipes() {
                         'u',
                         upgradeTemplate,
                         't',
-                        ORE_plateSteel));
+                        ORE_plateBronze));
 
         // Upgarde Obsidian
         GameRegistry.addRecipe(
@@ -560,7 +566,7 @@ private static void storageUpgradeRecipes() {
                         'u',
                         upgradeTemplate,
                         't',
-                        ORE_plateAluminium));
+                        ORE_plateSteel));
 
         // Upgarde Diamond
         GameRegistry.addRecipe(
@@ -574,7 +580,7 @@ private static void storageUpgradeRecipes() {
                         'u',
                         upgradeTemplate,
                         't',
-                        ORE_plateStainlessSteel));
+                        ORE_plateAluminium));
 
         // Upgarde Emerald
         GameRegistry.addRecipe(
@@ -588,6 +594,34 @@ private static void storageUpgradeRecipes() {
                         'u',
                         upgradeTemplate,
                         't',
+                        ORE_plateTantalum));
+
+        // Upgarde Ruby
+        GameRegistry.addRecipe(
+                new ShapedOreRecipe(
+                        new ItemStack(ModItems.upgrade, 1, 7),
+                        new String[] { "pup", "utu", "psp" },
+                        'p',
+                        ORE_plateRuby,
+                        's',
+                        ORE_stickRuby,
+                        'u',
+                        upgradeTemplate,
+                        't',
+                        ORE_plateStainlessSteel));
+
+        // Upgarde Tanzanite
+        GameRegistry.addRecipe(
+                new ShapedOreRecipe(
+                        new ItemStack(ModItems.upgrade, 1, 8),
+                        new String[] { "pup", "utu", "psp" },
+                        'p',
+                        ORE_plateTanzanite,
+                        's',
+                        ORE_stickTanzanite,
+                        'u',
+                        upgradeTemplate,
+                        't',
                         ORE_plateTitanium));
 
         GameRegistry.addRecipe(

src/main/java/com/jaquadro/minecraft/storagedrawers/item/ItemUpgrade.java

@@ -20,7 +20,7 @@
 public class ItemUpgrade extends Item {
 
     public static final String[] iconNames = new String[] { null, null, "iron", "gold", "obsidian", "diamond",
-            "emerald" };
+            "emerald", "ruby", "tanzanite" };
 
     @SideOnly(Side.CLIENT)
     private IIcon[] icons;

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

@@ -129,6 +129,8 @@ storageDrawers.config.upgrades.level3Mult=Speichermultiplikator (III)
 storageDrawers.config.upgrades.level4Mult=Speichermultiplikator (IV)
 storageDrawers.config.upgrades.level5Mult=Speichermultiplikator (V)
 storageDrawers.config.upgrades.level6Mult=Speichermultiplikator (VI)
+storageDrawers.config.upgrades.level6Mult=Speichermultiplikator (VII)
+storageDrawers.config.upgrades.level6Mult=Speichermultiplikator (VIII)
 
 storageDrawers.config.prop.itemRenderType=Itemrendertyp
 storageDrawers.config.prop.itemRenderType.tooltip=Rendere Items in 3D oder flach (2D).

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

@@ -17,6 +17,8 @@ item.storagedrawers.upgrade.gold.name=Storage Upgrade (III)
 item.storagedrawers.upgrade.obsidian.name=Storage Upgrade (IV)
 item.storagedrawers.upgrade.diamond.name=Storage Upgrade (V)
 item.storagedrawers.upgrade.emerald.name=Storage Upgrade (VI)
+item.storagedrawers.upgrade.ruby.name=Storage Upgrade (VII)
+item.storagedrawers.upgrade.tanzanite.name=Storage Upgrade (VIII)
 item.storagedrawers.upgradeStatus.level1.name=Status Upgrade (I)
 item.storagedrawers.upgradeStatus.level1.description=Shows full storage
 item.storagedrawers.upgradeStatus.level2.name=Status Upgrade (II)