From 03ecce51ccd5fd646cb0207bfc3f4f8aa17b165e Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 6 Jan 2018 22:33:29 +0100 Subject: [PATCH] Fix #1937 Backpacks do not hold previously defined items --- .../java/forestry/core/config/LocalizedConfiguration.java | 4 +++- src/main/java/forestry/storage/ModuleBackpacks.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/core/config/LocalizedConfiguration.java b/src/main/java/forestry/core/config/LocalizedConfiguration.java index 578788cdb..7bcb2c0ea 100644 --- a/src/main/java/forestry/core/config/LocalizedConfiguration.java +++ b/src/main/java/forestry/core/config/LocalizedConfiguration.java @@ -13,6 +13,8 @@ package forestry.core.config; import java.io.File; import java.util.Arrays; +import org.apache.commons.lang3.text.WordUtils; + import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; @@ -149,7 +151,7 @@ public class LocalizedConfiguration extends Configuration { public void addCategoryCommentLocalized(String category){ String langKey = "for.config." + category + '.' + "category_comment"; - setCategoryComment(category, Translator.translateToLocal(langKey)); + setCategoryComment(category, WordUtils.wrap(Translator.translateToLocal(langKey),100)); } } diff --git a/src/main/java/forestry/storage/ModuleBackpacks.java b/src/main/java/forestry/storage/ModuleBackpacks.java index acec6461e..1db1adaf5 100644 --- a/src/main/java/forestry/storage/ModuleBackpacks.java +++ b/src/main/java/forestry/storage/ModuleBackpacks.java @@ -376,7 +376,7 @@ public class ModuleBackpacks extends BlankForestryModule { if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) { BlockRegistryApiculture beeBlocks = ModuleApiculture.getBlocks(); - backpackAcceptedItemDefaults.put(BackpackManager.BUILDER_UID, getItemStrings(Arrays.asList( + backpackAcceptedItemDefaults.get(BackpackManager.BUILDER_UID).addAll(getItemStrings(Arrays.asList( new ItemStack(beeBlocks.candle, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(beeBlocks.stump, 1, OreDictionary.WILDCARD_VALUE) )));