From 2ab8613bec66fc757009132341f40accde3cdf19 Mon Sep 17 00:00:00 2001 From: Ethryan <3237986+Ethryan@users.noreply.github.com> Date: Sun, 26 May 2024 12:48:21 +0200 Subject: [PATCH] Adding a Coin Bag for all those coins. (#71) --- src/main/java/forestry/plugins/PluginStorage.java | 15 +++++++++++++-- .../storage/items/ItemRegistryStorage.java | 10 ++++++++++ .../resources/assets/forestry/lang/en_US.lang | 3 +++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index 5c065292b..c1b82c682 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -96,6 +96,7 @@ public class PluginStorage extends ForestryPlugin { private final ArrayList hunterItems = new ArrayList<>(); private final ArrayList adventurerItems = new ArrayList<>(); private final ArrayList builderItems = new ArrayList<>(); + private final ArrayList coinItems = new ArrayList<>(); public static ItemRegistryStorage items; @@ -108,7 +109,7 @@ public class PluginStorage extends ForestryPlugin { BackpackManager.backpackInterface = new BackpackInterface(); - BackpackManager.backpackItems = new ArrayList[6]; + BackpackManager.backpackItems = new ArrayList[7]; BackpackManager.backpackItems[0] = minerItems; BackpackManager.backpackItems[1] = diggerItems; @@ -116,6 +117,7 @@ public class PluginStorage extends ForestryPlugin { BackpackManager.backpackItems[3] = hunterItems; BackpackManager.backpackItems[4] = adventurerItems; BackpackManager.backpackItems[5] = builderItems; + BackpackManager.backpackItems[6] = coinItems; BackpackDefinition definition; @@ -146,18 +148,22 @@ public class PluginStorage extends ForestryPlugin { definition = new BackpackDefinition("builder", new Color(0xdd3a3a).getRGB()); BackpackManager.definitions.put(definition.getKey(), definition); + + definition = new BackpackDefinition("coin", new Color(0xffd700).getRGB()); + BackpackManager.definitions.put(definition.getKey(), definition); } @Override @SuppressWarnings({ "unchecked" }) protected void disabledSetupAPI() { - BackpackManager.backpackItems = new ArrayList[6]; + BackpackManager.backpackItems = new ArrayList[7]; BackpackManager.backpackItems[0] = minerItems; BackpackManager.backpackItems[1] = diggerItems; BackpackManager.backpackItems[2] = foresterItems; BackpackManager.backpackItems[3] = hunterItems; BackpackManager.backpackItems[4] = adventurerItems; BackpackManager.backpackItems[5] = builderItems; + BackpackManager.backpackItems[6] = coinItems; } @Override @@ -182,6 +188,7 @@ public class PluginStorage extends ForestryPlugin { handleBackpackConfig(config, "hunter"); handleBackpackConfig(config, "adventurer"); handleBackpackConfig(config, "builder"); + handleBackpackConfig(config, "coin"); config.save(); @@ -219,6 +226,7 @@ public class PluginStorage extends ForestryPlugin { final BackpackDefinition adventurer = (BackpackDefinition) BackpackManager.definitions.get("adventurer"); final BackpackDefinition builder = (BackpackDefinition) BackpackManager.definitions.get("builder"); final BackpackDefinition hunter = (BackpackDefinition) BackpackManager.definitions.get("hunter"); + final BackpackDefinition coin = (BackpackDefinition) BackpackManager.definitions.get("coin"); miner.addValidItems(minerItems); digger.addValidItems(diggerItems); @@ -226,6 +234,7 @@ public class PluginStorage extends ForestryPlugin { hunter.addValidItems(hunterItems); adventurer.addValidItems(adventurerItems); builder.addValidItems(builderItems); + coin.addValidItems(coinItems); final Pattern minerOreDictPattern = Pattern .compile("(ore|dust|gem|ingot|nugget|crushed|cluster|denseore)[A-Z].*"); @@ -521,6 +530,7 @@ public class PluginStorage extends ForestryPlugin { addBackpackRecipe(items.hunterBackpack, Items.feather); addBackpackRecipe(items.adventurerBackpack, Items.bone); addBackpackRecipe(items.builderBackpack, Items.clay_ball); + addBackpackRecipe(items.coinBackpack, "ingotGold"); // / CARPENTER if (PluginManager.Module.FACTORY.isEnabled()) { @@ -543,6 +553,7 @@ public class PluginStorage extends ForestryPlugin { addT2BackpackRecipe(items.hunterBackpack, items.hunterBackpackT2); addT2BackpackRecipe(items.adventurerBackpack, items.adventurerBackpackT2); addT2BackpackRecipe(items.builderBackpack, items.builderBackpackT2); + addT2BackpackRecipe(items.coinBackpack, items.coinBackpackT2); } } diff --git a/src/main/java/forestry/storage/items/ItemRegistryStorage.java b/src/main/java/forestry/storage/items/ItemRegistryStorage.java index 2299cba20..04a69d953 100644 --- a/src/main/java/forestry/storage/items/ItemRegistryStorage.java +++ b/src/main/java/forestry/storage/items/ItemRegistryStorage.java @@ -37,6 +37,8 @@ public class ItemRegistryStorage extends ItemRegistry { public final Item adventurerBackpackT2; public final Item builderBackpack; public final Item builderBackpackT2; + public final Item coinBackpack; + public final Item coinBackpackT2; public ItemRegistryStorage() { // CRATE @@ -113,5 +115,13 @@ public class ItemRegistryStorage extends ItemRegistry { builderBackpackT2 = registerItem( BackpackManager.backpackInterface.addBackpack(definition, EnumBackpackType.T2), "builderBagT2"); + + definition = BackpackManager.definitions.get("coin"); + coinBackpack = registerItem( + BackpackManager.backpackInterface.addBackpack(definition, EnumBackpackType.T1), + "coinBag"); + coinBackpackT2 = registerItem( + BackpackManager.backpackInterface.addBackpack(definition, EnumBackpackType.T2), + "coinBagT2"); } } diff --git a/src/main/resources/assets/forestry/lang/en_US.lang b/src/main/resources/assets/forestry/lang/en_US.lang index ee6b85589..5bd28700f 100644 --- a/src/main/resources/assets/forestry/lang/en_US.lang +++ b/src/main/resources/assets/forestry/lang/en_US.lang @@ -470,6 +470,9 @@ item.for.adventurerBagT2.name=Adventurer's Woven Backpack item.for.ambrosia.name=Ambrosia item.for.apatite.name=Apatite +item.for.coinBag.name=Coiner's Backpack +item.for.coinBagT2.name=Coiner's Woven Backpack + item.for.apiaristBag.name=Apiarist's Backpack item.for.apiaristBoots.name=Apiarist's Shoes item.for.apiaristChest.name=Apiarist's Shirt