From d9021d06a784b4ee5cc657b8842e7c009201cbb0 Mon Sep 17 00:00:00 2001 From: VascoUP Date: Mon, 10 Oct 2016 11:49:47 +0100 Subject: [PATCH 1/3] Added ESOF-docs --- gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From 340473251887dd3d2749875c2d3eb72fa1e90a7d Mon Sep 17 00:00:00 2001 From: VascoUP Date: Mon, 5 Dec 2016 11:54:57 +0000 Subject: [PATCH 2/3] First branch commit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 79b7db08..4981155f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ + BetterStorage ============= From 2f0f565750b1eec7fab03ceccf27e8e22b3bffcf Mon Sep 17 00:00:00 2001 From: VascoUP Date: Sat, 17 Dec 2016 16:31:05 +0000 Subject: [PATCH 3/3] Added crafting recipe and fixed a few bugs --- .../mcft/copy/betterstorage/addon/Addon.java | 32 ++++++++++++++----- .../addon/thaumcraft/ThaumcraftAddon.java | 1 + .../betterstorage/config/GlobalConfig.java | 26 ++++++++------- .../content/BetterStorageEntities.java | 2 +- .../content/BetterStorageItems.java | 5 ++- .../content/BetterStorageTileEntities.java | 2 +- .../content/BetterStorageTiles.java | 28 +++++++++------- .../copy/betterstorage/misc/Constants.java | 1 + .../mcft/copy/betterstorage/misc/Recipes.java | 9 +++++- .../copy/betterstorage/misc/Resources.java | 23 ++++++------- .../copy/betterstorage/proxy/ClientProxy.java | 2 +- .../copy/betterstorage/tile/TileLocker.java | 8 +++-- .../tile/TileReinforcedLocker.java | 8 +++-- .../betterstorage/tile/crate/CrateItems.java | 3 +- .../tile/crate/CratePileMap.java | 8 +++-- .../tile/crate/TileEntityCrate.java | 4 ++- .../tile/entity/TileEntityContainer.java | 28 ++++++++++------ .../entity/TileEntityCraftingStation.java | 17 +++++++--- .../tile/entity/TileEntityPresent.java | 6 +++- .../entity/TileEntityReinforcedChest.java | 8 +++-- .../assets/betterstorage/lang/da_DK.lang | 2 ++ .../assets/betterstorage/lang/de_DE.lang | 2 ++ .../assets/betterstorage/lang/en_US.lang | 3 ++ .../assets/betterstorage/lang/fi_FI.lang | 2 ++ .../assets/betterstorage/lang/fr_CA.lang | 2 ++ .../assets/betterstorage/lang/fr_FR.lang | 2 ++ .../assets/betterstorage/lang/nl_NL.lang | 3 ++ .../assets/betterstorage/lang/pt_BR.lang | 2 ++ .../assets/betterstorage/lang/ru_RU.lang | 2 ++ .../assets/betterstorage/lang/sk_SK.lang | 2 ++ .../assets/betterstorage/lang/zh_CN.lang | 2 ++ .../assets/betterstorage/lang/zh_TW.lang | 2 ++ 32 files changed, 173 insertions(+), 74 deletions(-) diff --git a/src/main/java/net/mcft/copy/betterstorage/addon/Addon.java b/src/main/java/net/mcft/copy/betterstorage/addon/Addon.java index 7ccfe4fb..bda89adc 100644 --- a/src/main/java/net/mcft/copy/betterstorage/addon/Addon.java +++ b/src/main/java/net/mcft/copy/betterstorage/addon/Addon.java @@ -56,21 +56,37 @@ public Addon(String modName) { addons.add(this); } - public void setupConfig() { } + public void setupConfig() { + // To be overwritten + } - public void initializeItems() { } + public void initializeItems() { + // To be overwritten + } - public void initializeBlocks() { } + public void initializeBlocks() { + // To be overwritten + } - public void addRecipes() { } + public void addRecipes() { + // To be overwritten + } - public void registerEntities() { } + public void registerEntities() { + // To be overwritten + } - public void registerTileEntities() { } + public void registerTileEntities() { + // To be overwritten + } @SideOnly(Side.CLIENT) - public void registerRenderers() { } + public void registerRenderers() { + // To be overwritten + } - public void postInitialize() { } + public void postInitialize() { + // To be overwritten + } } diff --git a/src/main/java/net/mcft/copy/betterstorage/addon/thaumcraft/ThaumcraftAddon.java b/src/main/java/net/mcft/copy/betterstorage/addon/thaumcraft/ThaumcraftAddon.java index 1c3d96e6..00806df8 100644 --- a/src/main/java/net/mcft/copy/betterstorage/addon/thaumcraft/ThaumcraftAddon.java +++ b/src/main/java/net/mcft/copy/betterstorage/addon/thaumcraft/ThaumcraftAddon.java @@ -110,6 +110,7 @@ private void addItemAspects() { addAspectsFor(BetterStorageTiles.craftingStation, -1, true, Aspect.CRAFT, 6, Aspect.MECHANISM, 4); addAspectsFor(BetterStorageItems.itemBackpack, -1, true, Aspect.VOID, 4, Aspect.EXCHANGE, 6); + addAspectsFor(BetterStorageItems.itemCardboardBackpack, -1, true, Aspect.VOID, 4, Aspect.EXCHANGE, 6); addAspectsFor(BetterStorageItems.itemEnderBackpack, -1, true, Aspect.DARKNESS, 8, Aspect.VOID, 4, Aspect.EXCHANGE, 8, Aspect.TRAVEL, 4, Aspect.ELDRITCH, 4, Aspect.MAGIC, 4); diff --git a/src/main/java/net/mcft/copy/betterstorage/config/GlobalConfig.java b/src/main/java/net/mcft/copy/betterstorage/config/GlobalConfig.java index fc27f6a4..e06e41b9 100644 --- a/src/main/java/net/mcft/copy/betterstorage/config/GlobalConfig.java +++ b/src/main/java/net/mcft/copy/betterstorage/config/GlobalConfig.java @@ -15,18 +15,19 @@ public class GlobalConfig extends Config { public static IntegerSetting stationAutocraftDelaySetting; // Tiles - public static final String crateEnabled = "tile.crate"; - public static final String reinforcedChestEnabled = "tile.reinforcedChest"; - public static final String lockerEnabled = "tile.locker"; - public static final String armorStandEnabled = "tile.armorStand"; - public static final String backpackEnabled = "tile.backpack"; - public static final String enderBackpackEnabled = "tile.enderBackpack"; - public static final String cardboardBoxEnabled = "tile.cardboardBox"; - public static final String reinforcedLockerEnabled = "tile.reinforcedLocker"; - public static final String craftingStationEnabled = "tile.craftingStation"; - public static final String flintBlockEnabled = "tile.flintBlock"; - public static final String lockableDoorEnabled = "tile.lockableDoor"; - public static final String presentEnabled = "tile.present"; + public static final String crateEnabled = "tile.crate"; + public static final String reinforcedChestEnabled = "tile.reinforcedChest"; + public static final String lockerEnabled = "tile.locker"; + public static final String armorStandEnabled = "tile.armorStand"; + public static final String backpackEnabled = "tile.backpack"; + public static final String enderBackpackEnabled = "tile.enderBackpack"; + public static final String cardboardBackpackEnabled = "tile.cardboardBackpack"; + public static final String cardboardBoxEnabled = "tile.cardboardBox"; + public static final String reinforcedLockerEnabled = "tile.reinforcedLocker"; + public static final String craftingStationEnabled = "tile.craftingStation"; + public static final String flintBlockEnabled = "tile.flintBlock"; + public static final String lockableDoorEnabled = "tile.lockableDoor"; + public static final String presentEnabled = "tile.present"; // Items public static final String keyEnabled = "item.key"; @@ -94,6 +95,7 @@ public GlobalConfig(File file) { new BooleanSetting(this, armorStandEnabled, true, "tile.betterstorage.armorStand.name").setHasComment(false).setRequiresMcRestart(true); new BooleanSetting(this, backpackEnabled, true, "tile.betterstorage.backpack.name").setHasComment(false).setRequiresMcRestart(true); new BooleanSetting(this, enderBackpackEnabled, true, "tile.betterstorage.enderBackpack.name").setHasComment(false).setRequiresMcRestart(true); + new BooleanSetting(this, cardboardBackpackEnabled, true, "tile.betterstorage.cardboardBackpack.name").setHasComment(false).setRequiresMcRestart(true); new BooleanSetting(this, cardboardBoxEnabled, true, "tile.betterstorage.cardboardBox.name").setHasComment(false).setRequiresMcRestart(true); new BooleanSetting(this, reinforcedLockerEnabled, true, "tile.betterstorage.reinforcedLocker.name").setHasComment(false).setRequiresMcRestart(true); new BooleanSetting(this, craftingStationEnabled, true, "tile.betterstorage.craftingStation.name").setHasComment(false).setRequiresMcRestart(true); diff --git a/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageEntities.java b/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageEntities.java index 8949e0aa..76a72590 100644 --- a/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageEntities.java +++ b/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageEntities.java @@ -15,7 +15,7 @@ public static void register() { EntityRegistry.registerModEntity(EntityFrienderman.class, "Frienderman", 1, BetterStorage.instance, 64, 4, true); EntityRegistry.registerModEntity(EntityCluckington.class, "Cluckington", 2, BetterStorage.instance, 64, 4, true); - Addon.registerEntitesAll(); + //Addon.registerEntitesAll(); } diff --git a/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageItems.java b/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageItems.java index 5c70cd65..516fc4d0 100644 --- a/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageItems.java +++ b/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageItems.java @@ -6,6 +6,7 @@ import net.mcft.copy.betterstorage.item.ItemBackpack; import net.mcft.copy.betterstorage.item.ItemBucketSlime; import net.mcft.copy.betterstorage.item.ItemDrinkingHelmet; +import net.mcft.copy.betterstorage.item.ItemCardboardBackpack; import net.mcft.copy.betterstorage.item.ItemEnderBackpack; import net.mcft.copy.betterstorage.item.ItemPresentBook; import net.mcft.copy.betterstorage.item.cardboard.ItemCardboardArmor; @@ -34,6 +35,7 @@ public final class BetterStorageItems { public static ItemPresentBook presentBook; public static ItemBackpack itemBackpack; + public static ItemCardboardBackpack itemCardboardBackpack; public static ItemEnderBackpack itemEnderBackpack; public static ItemCardboardArmor cardboardHelmet; @@ -63,6 +65,7 @@ public static void initialize() { presentBook = new ItemPresentBook(); itemBackpack = MiscUtils.conditionalNew(ItemBackpack.class, GlobalConfig.backpackEnabled); + itemCardboardBackpack = MiscUtils.conditionalNew(ItemCardboardBackpack.class, GlobalConfig.cardboardBackpackEnabled); itemEnderBackpack = MiscUtils.conditionalNew(ItemEnderBackpack.class, GlobalConfig.enderBackpackEnabled); cardboardHelmet = conditionalNewArmor(GlobalConfig.cardboardHelmetEnabled, 0); @@ -89,7 +92,7 @@ public static void initialize() { if (cardboardSheet != null) OreDictionary.registerOre("sheetCardboard", cardboardSheet); - Addon.initializeItemsAll(); + //Addon.initializeItemsAll(); } private static ItemCardboardArmor conditionalNewArmor(String configName, int armorType) { diff --git a/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageTileEntities.java b/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageTileEntities.java index eb2e307a..43f40d29 100644 --- a/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageTileEntities.java +++ b/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageTileEntities.java @@ -31,7 +31,7 @@ public static void register() { GameRegistry.registerTileEntity(TileEntityPresent.class, Constants.containerPresent); GameRegistry.registerTileEntity(TileEntityLockableDoor.class, Constants.lockableDoor); - Addon.registerTileEntitesAll(); + //Addon.registerTileEntitesAll(); } diff --git a/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageTiles.java b/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageTiles.java index 379b7c34..5ecd6650 100644 --- a/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageTiles.java +++ b/src/main/java/net/mcft/copy/betterstorage/content/BetterStorageTiles.java @@ -3,6 +3,7 @@ import net.mcft.copy.betterstorage.addon.Addon; import net.mcft.copy.betterstorage.config.GlobalConfig; import net.mcft.copy.betterstorage.tile.TileBackpack; +import net.mcft.copy.betterstorage.tile.TileCardboardBackpack; import net.mcft.copy.betterstorage.tile.TileCardboardBox; import net.mcft.copy.betterstorage.tile.TileCraftingStation; import net.mcft.copy.betterstorage.tile.TileEnderBackpack; @@ -24,6 +25,7 @@ public final class BetterStorageTiles { public static TileArmorStand armorStand; public static TileBackpack backpack; public static TileEnderBackpack enderBackpack; + public static TileCardboardBackpack cardboardBackpack; public static TileCardboardBox cardboardBox; public static TileReinforcedLocker reinforcedLocker; public static TileCraftingStation craftingStation; @@ -35,20 +37,22 @@ private BetterStorageTiles() { } public static void initialize() { - crate = MiscUtils.conditionalNew(TileCrate.class, GlobalConfig.crateEnabled); - reinforcedChest = MiscUtils.conditionalNew(TileReinforcedChest.class, GlobalConfig.reinforcedChestEnabled); - locker = MiscUtils.conditionalNew(TileLocker.class, GlobalConfig.lockerEnabled); - armorStand = MiscUtils.conditionalNew(TileArmorStand.class, GlobalConfig.armorStandEnabled); - backpack = MiscUtils.conditionalNew(TileBackpack.class, GlobalConfig.backpackEnabled); - enderBackpack = MiscUtils.conditionalNew(TileEnderBackpack.class, GlobalConfig.enderBackpackEnabled); - cardboardBox = MiscUtils.conditionalNew(TileCardboardBox.class, GlobalConfig.cardboardBoxEnabled); - reinforcedLocker = MiscUtils.conditionalNew(TileReinforcedLocker.class, GlobalConfig.reinforcedLockerEnabled); - craftingStation = MiscUtils.conditionalNew(TileCraftingStation.class, GlobalConfig.craftingStationEnabled); - flintBlock = MiscUtils.conditionalNew(TileFlintBlock.class, GlobalConfig.flintBlockEnabled); - lockableDoor = MiscUtils.conditionalNew(TileLockableDoor.class, GlobalConfig.lockableDoorEnabled); - present = MiscUtils.conditionalNew(TilePresent.class, GlobalConfig.presentEnabled); + crate = MiscUtils.conditionalNew(TileCrate.class, GlobalConfig.crateEnabled); + reinforcedChest = MiscUtils.conditionalNew(TileReinforcedChest.class, GlobalConfig.reinforcedChestEnabled); + locker = MiscUtils.conditionalNew(TileLocker.class, GlobalConfig.lockerEnabled); + armorStand = MiscUtils.conditionalNew(TileArmorStand.class, GlobalConfig.armorStandEnabled); + backpack = MiscUtils.conditionalNew(TileBackpack.class, GlobalConfig.backpackEnabled); + enderBackpack = MiscUtils.conditionalNew(TileEnderBackpack.class, GlobalConfig.enderBackpackEnabled); + cardboardBackpack = MiscUtils.conditionalNew(TileCardboardBackpack.class, GlobalConfig.cardboardBackpackEnabled); + cardboardBox = MiscUtils.conditionalNew(TileCardboardBox.class, GlobalConfig.cardboardBoxEnabled); + reinforcedLocker = MiscUtils.conditionalNew(TileReinforcedLocker.class, GlobalConfig.reinforcedLockerEnabled); + craftingStation = MiscUtils.conditionalNew(TileCraftingStation.class, GlobalConfig.craftingStationEnabled); + flintBlock = MiscUtils.conditionalNew(TileFlintBlock.class, GlobalConfig.flintBlockEnabled); + lockableDoor = MiscUtils.conditionalNew(TileLockableDoor.class, GlobalConfig.lockableDoorEnabled); + present = MiscUtils.conditionalNew(TilePresent.class, GlobalConfig.presentEnabled); Addon.initializeTilesAll(); + Addon.addRecipesAll(); } diff --git a/src/main/java/net/mcft/copy/betterstorage/misc/Constants.java b/src/main/java/net/mcft/copy/betterstorage/misc/Constants.java index 29e27a1d..f8a6a367 100644 --- a/src/main/java/net/mcft/copy/betterstorage/misc/Constants.java +++ b/src/main/java/net/mcft/copy/betterstorage/misc/Constants.java @@ -15,6 +15,7 @@ public final class Constants { public static final String containerArmorStand = "container." + modId + ".armorStand"; public static final String containerBackpack = "container." + modId + ".backpack"; public static final String containerEnderBackpack = "container." + modId + ".enderBackpack"; + public static final String containerCardboardBackpack = "container." + modId + ".cardboardBackpack"; public static final String containerCardboardBox = "container." + modId + ".cardboardBox"; public static final String containerCraftingStation = "container." + modId + ".craftingStation"; public static final String containerPresent = "container." + modId + ".present"; diff --git a/src/main/java/net/mcft/copy/betterstorage/misc/Recipes.java b/src/main/java/net/mcft/copy/betterstorage/misc/Recipes.java index a7353d1c..8b6a5718 100644 --- a/src/main/java/net/mcft/copy/betterstorage/misc/Recipes.java +++ b/src/main/java/net/mcft/copy/betterstorage/misc/Recipes.java @@ -36,7 +36,7 @@ public static void add() { addCardboardRecipes(); GameRegistry.addRecipe(new DyeRecipe()); - Addon.addRecipesAll(); + //Addon.addRecipesAll(); } @@ -264,6 +264,13 @@ private static void addCardboardRecipes() { '/', Items.stick)); } + if (BetterStorageItems.itemCardboardBackpack != null) { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BetterStorageItems.itemCardboardBackpack), + " o ", + "ooo", + "ooo", 'o', "sheetCardboard")); + } + if (BetterStorageItems.anyCardboardItemsEnabled) { // Crafting Station: Add cardboard enchantment recipe BetterStorageCrafting.addStationRecipe(new CardboardEnchantmentRecipe()); diff --git a/src/main/java/net/mcft/copy/betterstorage/misc/Resources.java b/src/main/java/net/mcft/copy/betterstorage/misc/Resources.java index 57b99ad1..2ab8a264 100644 --- a/src/main/java/net/mcft/copy/betterstorage/misc/Resources.java +++ b/src/main/java/net/mcft/copy/betterstorage/misc/Resources.java @@ -14,17 +14,18 @@ public final class Resources { public static final ResourceLocation containerReinforcedChest = new BetterStorageResource("textures/gui/reinforcedChest.png"); public static final ResourceLocation containerCraftingStation = new BetterStorageResource("textures/gui/craftingStation.png"); - public static final ResourceLocation textureLocker = new BetterStorageResource("textures/models/locker/wood.png"); - public static final ResourceLocation textureLockerLarge = new BetterStorageResource("textures/models/locker_large/wood.png"); - public static final ResourceLocation textureArmorStand = new BetterStorageResource("textures/models/armorstand.png"); - public static final ResourceLocation textureBackpack = new BetterStorageResource("textures/models/backpack.png"); - public static final ResourceLocation textureBackpackOverlay = new BetterStorageResource("textures/models/backpack_overlay.png"); - public static final ResourceLocation textureEnderBackpack = new BetterStorageResource("textures/models/enderBackpack.png"); - public static final ResourceLocation textureDrinkingHelmet = new BetterStorageResource("textures/models/drinkingHelmet.png"); - public static final ResourceLocation textureCardboardArmor = new BetterStorageResource("textures/models/cardboardArmor.png"); - public static final ResourceLocation textureCardboardLeggins = new BetterStorageResource("textures/models/cardboardArmor_leggings.png"); - public static final ResourceLocation textureCluckOverlay = new BetterStorageResource("textures/models/cluck.png"); - public static final ResourceLocation texturePresentOverlay = new BetterStorageResource("textures/models/present_overlay.png"); + public static final ResourceLocation textureLocker = new BetterStorageResource("textures/models/locker/wood.png"); + public static final ResourceLocation textureLockerLarge = new BetterStorageResource("textures/models/locker_large/wood.png"); + public static final ResourceLocation textureArmorStand = new BetterStorageResource("textures/models/armorstand.png"); + public static final ResourceLocation textureBackpack = new BetterStorageResource("textures/models/backpack.png"); + public static final ResourceLocation textureBackpackOverlay = new BetterStorageResource("textures/models/backpack_overlay.png"); + public static final ResourceLocation textureEnderBackpack = new BetterStorageResource("textures/models/enderBackpack.png"); + public static final ResourceLocation textureCardboardBackpack = new BetterStorageResource("textures/models/cardboardBackpack.png"); + public static final ResourceLocation textureDrinkingHelmet = new BetterStorageResource("textures/models/drinkingHelmet.png"); + public static final ResourceLocation textureCardboardArmor = new BetterStorageResource("textures/models/cardboardArmor.png"); + public static final ResourceLocation textureCardboardLeggins = new BetterStorageResource("textures/models/cardboardArmor_leggings.png"); + public static final ResourceLocation textureCluckOverlay = new BetterStorageResource("textures/models/cluck.png"); + public static final ResourceLocation texturePresentOverlay = new BetterStorageResource("textures/models/present_overlay.png"); public static final ResourceLocation modelLocker = new BetterStorageResource("models/locker.obj"); public static final ResourceLocation modelLockerLarge = new BetterStorageResource("models/locker_large.obj"); diff --git a/src/main/java/net/mcft/copy/betterstorage/proxy/ClientProxy.java b/src/main/java/net/mcft/copy/betterstorage/proxy/ClientProxy.java index 505de09c..b7254bca 100644 --- a/src/main/java/net/mcft/copy/betterstorage/proxy/ClientProxy.java +++ b/src/main/java/net/mcft/copy/betterstorage/proxy/ClientProxy.java @@ -126,7 +126,7 @@ private void registerRenderers() { lockableDoorRenderId = registerTileEntityRenderer(TileEntityLockableDoor.class, new TileEntityLockableDoorRenderer()); presentRenderId = registerTileEntityRenderer(TileEntityPresent.class, new TileEntityPresentRenderer()); RenderingRegistry.registerBlockHandler(new TileLockableDoorRenderingHandler()); - Addon.registerRenderersAll(); + //Addon.registerRenderersAll(); } diff --git a/src/main/java/net/mcft/copy/betterstorage/tile/TileLocker.java b/src/main/java/net/mcft/copy/betterstorage/tile/TileLocker.java index 1f81461f..e1ac3c88 100644 --- a/src/main/java/net/mcft/copy/betterstorage/tile/TileLocker.java +++ b/src/main/java/net/mcft/copy/betterstorage/tile/TileLocker.java @@ -47,8 +47,12 @@ public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirecti @Override public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { - float minX = 0, minY = 0, minZ = 0; - float maxX = 1, maxY = 1, maxZ = 1; + float minX = 0; + float minY = 0; + float minZ = 0; + float maxX = 1; + float maxY = 1; + float maxZ = 1; switch (WorldUtils.get(world, x, y, z, TileEntityLocker.class).getOrientation()) { case EAST: maxX -= 1.0F / 16; break; case WEST: minX += 1.0F / 16; break; diff --git a/src/main/java/net/mcft/copy/betterstorage/tile/TileReinforcedLocker.java b/src/main/java/net/mcft/copy/betterstorage/tile/TileReinforcedLocker.java index 1794dfda..f3f73b56 100644 --- a/src/main/java/net/mcft/copy/betterstorage/tile/TileReinforcedLocker.java +++ b/src/main/java/net/mcft/copy/betterstorage/tile/TileReinforcedLocker.java @@ -57,8 +57,12 @@ public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirecti @Override public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { - float minX = 0, minY = 0, minZ = 0; - float maxX = 1, maxY = 1, maxZ = 1; + float minX = 0; + float minY = 0; + float minZ = 0; + float maxX = 1; + float maxY = 1; + float maxZ = 1; switch (WorldUtils.get(world, x, y, z, TileEntityLocker.class).getOrientation()) { case EAST: maxX -= 1.0F / 16; break; case WEST: minX += 1.0F / 16; break; diff --git a/src/main/java/net/mcft/copy/betterstorage/tile/crate/CrateItems.java b/src/main/java/net/mcft/copy/betterstorage/tile/crate/CrateItems.java index 0a4fa2f1..0093036c 100644 --- a/src/main/java/net/mcft/copy/betterstorage/tile/crate/CrateItems.java +++ b/src/main/java/net/mcft/copy/betterstorage/tile/crate/CrateItems.java @@ -42,7 +42,8 @@ public int get(ItemIdentifier item) { * and marks the weighted map as dirty if necessary. */ public void set(ItemIdentifier item, int amount) { ItemStack stack = itemsMap.get(item); - int stacksBefore, stacksAfter; + int stacksBefore; + int stacksAfter; if (stack != null) { if (amount == stack.stackSize) return; stacksBefore = StackUtils.calcNumStacks(stack); diff --git a/src/main/java/net/mcft/copy/betterstorage/tile/crate/CratePileMap.java b/src/main/java/net/mcft/copy/betterstorage/tile/crate/CratePileMap.java index c34be02d..2723289d 100644 --- a/src/main/java/net/mcft/copy/betterstorage/tile/crate/CratePileMap.java +++ b/src/main/java/net/mcft/copy/betterstorage/tile/crate/CratePileMap.java @@ -90,8 +90,12 @@ public void set(int x, int y, int z, boolean value) { if (region.contains(x, y, z)) { internalSet(x - mapRegion.minX, y - mapRegion.minY * 8, z - mapRegion.minZ, value); if (!value) { - int minX = region.minX, minY = region.minY, minZ = region.minZ; - int maxX = region.maxX, maxY = region.maxY, maxZ = region.maxZ; + int minX = region.minX; + int minY = region.minY; + int minZ = region.minZ; + int maxX = region.maxX; + int maxY = region.maxY; + int maxZ = region.maxZ; if ((x == minX) && checkCuboid(minX, minY, minZ, minX, maxY, maxZ)) region.minX += 1; if ((y == minY) && checkCuboid(minX, minY, minZ, maxX, minY, maxZ)) region.minY += 1; if ((z == minZ) && checkCuboid(minX, minY, minZ, maxX, maxY, minZ)) region.minZ += 1; diff --git a/src/main/java/net/mcft/copy/betterstorage/tile/crate/TileEntityCrate.java b/src/main/java/net/mcft/copy/betterstorage/tile/crate/TileEntityCrate.java index 2baa2207..a7a675c7 100644 --- a/src/main/java/net/mcft/copy/betterstorage/tile/crate/TileEntityCrate.java +++ b/src/main/java/net/mcft/copy/betterstorage/tile/crate/TileEntityCrate.java @@ -67,7 +67,9 @@ private void setPileData(CratePileData data, boolean addCrate) { /** Destroys all crates above, and makes sure when piles split, * each pile gets their own CratePileData object. */ private void checkPileConnections(CratePileData data) { - int x = xCoord, y = yCoord, z = zCoord; + int x = xCoord; + int y = yCoord; + int z = zCoord; // Destroy all crates above. TileEntityCrate crateAbove = WorldUtils.get(worldObj, x, y + 1, z, TileEntityCrate.class); diff --git a/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityContainer.java b/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityContainer.java index 416a124f..f08301b0 100644 --- a/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityContainer.java +++ b/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityContainer.java @@ -36,6 +36,12 @@ public abstract class TileEntityContainer extends TileEntity { public float lidAngle = 0; public float prevLidAngle = 0; + // Comparator related + + private boolean compAccessedOnLoad = false; + private boolean compAccessed = false; + private boolean compContentsChanged = false; + /** The amount of columns in the container. */ public int getColumns() { return 9; } /** The amount of rows in the container. */ @@ -151,7 +157,9 @@ public void dropContents() { * Sets things like the material taken from the stack.
* Only gets called if an ItemRendererContainer is registered.*/ @SideOnly(Side.CLIENT) - public void onBlockRenderAsItem(ItemStack stack) { } + public void onBlockRenderAsItem(ItemStack stack) { + // Do something if necessary + } // Redstone related @@ -176,23 +184,25 @@ protected void checkForRedstoneChange() { } /** Called when redstone power going to this block changes. */ - protected void onRedstonePowerChanged(int previousPower, int currentPower) { } + protected void onRedstonePowerChanged(int previousPower, int currentPower) { + //Might be used in the future + } /** Called when redstone power going to this block activates. */ - protected void onRedstoneActivated() { } + protected void onRedstoneActivated() { + //Might be used in the future + } /** Called when redstone power going to this block deactivates. */ - protected void onRedstoneDeactivated() { } + protected void onRedstoneDeactivated() { + //Might be used in the future + } /** Returns the strong redstone signal power going into this block. */ protected int getStrongRedstoneSignal() { return worldObj.getBlockPowerInput(xCoord, yCoord, zCoord); } /** Returns the weak redstone signal power going into this block. */ protected int getWeakRedstoneSignal() { return worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord); } - + // Comparator related - private boolean compAccessedOnLoad = false; - private boolean compAccessed = false; - private boolean compContentsChanged = false; - protected boolean hasComparatorAccessed() { return compAccessed; } protected boolean hasContentsChanged() { return compContentsChanged; } diff --git a/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityCraftingStation.java b/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityCraftingStation.java index 54a7453f..8468c6bb 100644 --- a/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityCraftingStation.java +++ b/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityCraftingStation.java @@ -23,6 +23,12 @@ public class TileEntityCraftingStation extends TileEntityContainer private InventoryCraftingStation stationInventory; + + // ISidedInventory implementation + + private static int[] slotsAny = { 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }; + private static int[] slotsBottom = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; + @Override protected int getSizeContents() { return 18; } @@ -94,15 +100,16 @@ public boolean isUseableByPlayer(EntityPlayer player) { @Override public void markDirty() { stationInventory.markDirty(); } @Override - public void openInventory() { } + public void openInventory() { + // Do something when inventory opens + } @Override - public void closeInventory() { } + public void closeInventory() { + // Do something when inventory closes + } // ISidedInventory implementation - private static int[] slotsAny = { 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }; - private static int[] slotsBottom = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; - @Override public int[] getAccessibleSlotsFromSide(int side) { return ((side == 0) ? slotsBottom : slotsAny); } @Override diff --git a/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityPresent.java b/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityPresent.java index 3034bd58..52e06e10 100644 --- a/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityPresent.java +++ b/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityPresent.java @@ -49,6 +49,8 @@ protected ItemStack getItemDropped() { protected void onItemDropped(ItemStack stack) { super.onItemDropped(stack); NBTTagCompound compound = stack.getTagCompound(); + if(compound==null) + return ; compound.setByte(TAG_COLOR_INNER, (byte)colorInner); compound.setByte(TAG_COLOR_OUTER, (byte)colorOuter); compound.setBoolean(TAG_SKOJANZA_MODE, skojanzaMode); @@ -144,7 +146,9 @@ public boolean onBlockActivated(EntityPlayer player, int side, float hitX, float } @Override - public void dropContents() { } + public void dropContents() { + // Do something when contents when dropping contents + } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityReinforcedChest.java b/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityReinforcedChest.java index dcbb837c..140fc927 100644 --- a/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityReinforcedChest.java +++ b/src/main/java/net/mcft/copy/betterstorage/tile/entity/TileEntityReinforcedChest.java @@ -11,6 +11,11 @@ import cpw.mods.fml.relauncher.SideOnly; public class TileEntityReinforcedChest extends TileEntityLockable { + + // TileEntityConnactable stuff + + private static ForgeDirection[] neighbors = { ForgeDirection.EAST, ForgeDirection.NORTH, + ForgeDirection.WEST, ForgeDirection.SOUTH }; @Override @SideOnly(Side.CLIENT) @@ -38,9 +43,6 @@ public void setAttachmentPosition() { // TileEntityConnactable stuff - private static ForgeDirection[] neighbors = { ForgeDirection.EAST, ForgeDirection.NORTH, - ForgeDirection.WEST, ForgeDirection.SOUTH }; - @Override protected String getConnectableName() { return Constants.containerReinforcedChest; } diff --git a/src/main/resources/assets/betterstorage/lang/da_DK.lang b/src/main/resources/assets/betterstorage/lang/da_DK.lang index 05a71c65..ba950fab 100644 --- a/src/main/resources/assets/betterstorage/lang/da_DK.lang +++ b/src/main/resources/assets/betterstorage/lang/da_DK.lang @@ -4,6 +4,7 @@ container.betterstorage.backpack=Rygsæk container.betterstorage.cardboardBox=Papkasse container.betterstorage.crate=Kasse container.betterstorage.enderBackpack=Ender-taske +container.betterstorage.cardboardBackpack=Pap Rygsæk container.betterstorage.keyring=Nøglering container.betterstorage.locker=Pengeskab container.betterstorage.lockerLarge=Stort Pengeskab @@ -77,6 +78,7 @@ tile.betterstorage.backpack.name=Taske tile.betterstorage.cardboardBox.name=Papkasse tile.betterstorage.crate.name=Kasse tile.betterstorage.enderBackpack.name=Ender-taske +tile.betterstorage.cardboardBackpack=Pap Rygsæk tile.betterstorage.flintBlock.name=Flintblok tile.betterstorage.locker.name=Pengeskab tile.betterstorage.reinforcedChest.name=Sikret Kiste diff --git a/src/main/resources/assets/betterstorage/lang/de_DE.lang b/src/main/resources/assets/betterstorage/lang/de_DE.lang index 57ad59bb..30a2bef6 100644 --- a/src/main/resources/assets/betterstorage/lang/de_DE.lang +++ b/src/main/resources/assets/betterstorage/lang/de_DE.lang @@ -4,6 +4,7 @@ container.betterstorage.backpack=Rucksack container.betterstorage.cardboardBox=Pappkarton container.betterstorage.crate=Lagerkiste container.betterstorage.enderBackpack=Ender-Rucksack +container.betterstorage.cardboardBackpack=Rucksack aus Karton container.betterstorage.keyring=Schlüsselbund container.betterstorage.locker=Schließfach container.betterstorage.lockerLarge=Großes Schließfach @@ -77,6 +78,7 @@ tile.betterstorage.backpack.name=Rucksack tile.betterstorage.cardboardBox.name=Pappkarton tile.betterstorage.crate.name=Lagerkiste tile.betterstorage.enderBackpack.name=Ender-Rucksack +tile.betterstorage.cardboardBackpack=Ender-Rucksack tile.betterstorage.flintBlock.name=Feuersteinblock tile.betterstorage.locker.name=Schließfach tile.betterstorage.reinforcedChest.name=Verstärkte Truhe diff --git a/src/main/resources/assets/betterstorage/lang/en_US.lang b/src/main/resources/assets/betterstorage/lang/en_US.lang index 1be657fc..556b4ad7 100644 --- a/src/main/resources/assets/betterstorage/lang/en_US.lang +++ b/src/main/resources/assets/betterstorage/lang/en_US.lang @@ -4,6 +4,7 @@ container.betterstorage.backpack=Backpack container.betterstorage.cardboardBox=Cardboard Box container.betterstorage.crate=Storage Crate container.betterstorage.enderBackpack=Ender Backpack +container.betterstorage.cardboardBackpack=Cardboard Backpack container.betterstorage.keyring=Keyring container.betterstorage.locker=Locker container.betterstorage.lockerLarge=Large Locker @@ -29,6 +30,7 @@ entity.betterstorage.Frienderman.name=Enderman # Items item.betterstorage.bucketSlime.name=Slime in a Bucket +item.betterstorage.cardboardBackpack.name=Cardboard Backpack item.betterstorage.cardboardAxe.name=Cardboard Axe item.betterstorage.cardboardBoots.name=Cardboard Boots item.betterstorage.cardboardChestplate.name=Cardboard Chestplate @@ -77,6 +79,7 @@ tile.betterstorage.backpack.name=Backpack tile.betterstorage.cardboardBox.name=Cardboard Box tile.betterstorage.crate.name=Storage Crate tile.betterstorage.enderBackpack.name=Ender Backpack +tile.betterstorage.cardboardBackpack=Cardboard Backpack tile.betterstorage.flintBlock.name=Block of Flint tile.betterstorage.locker.name=Locker tile.betterstorage.reinforcedChest.name=Reinforced Chest diff --git a/src/main/resources/assets/betterstorage/lang/fi_FI.lang b/src/main/resources/assets/betterstorage/lang/fi_FI.lang index 0164d57c..8e76fc89 100644 --- a/src/main/resources/assets/betterstorage/lang/fi_FI.lang +++ b/src/main/resources/assets/betterstorage/lang/fi_FI.lang @@ -3,6 +3,7 @@ container.betterstorage.backpack=Reppu container.betterstorage.cardboardBox=Pahvilaatikko container.betterstorage.crate=Säilytyslaatikko container.betterstorage.enderBackpack=Äärireppu +container.betterstorage.cardboardBackpack=Pahvi Reppu container.betterstorage.keyring=Avaimenperä container.betterstorage.locker=Lokero container.betterstorage.lockerLarge=Iso Lokero @@ -67,6 +68,7 @@ tile.betterstorage.backpack.name=Reppu tile.betterstorage.cardboardBox.name=Pahvilaatikko tile.betterstorage.crate.name=Säilytyslaatikko tile.betterstorage.enderBackpack.name=Äärireppu +tile.betterstorage.cardboardBackpack=Pahvi Reppu tile.betterstorage.locker.name=Lokero tile.betterstorage.reinforcedChest.name=Vahvistettu Arkku tile.betterstorage.reinforcedChest.name.full=Vahvistettu %MATERIAL% Arkku diff --git a/src/main/resources/assets/betterstorage/lang/fr_CA.lang b/src/main/resources/assets/betterstorage/lang/fr_CA.lang index c717308e..d11d0692 100644 --- a/src/main/resources/assets/betterstorage/lang/fr_CA.lang +++ b/src/main/resources/assets/betterstorage/lang/fr_CA.lang @@ -4,6 +4,7 @@ container.betterstorage.backpack=Sac à dos container.betterstorage.cardboardBox=Boîte en carton container.betterstorage.crate=Caisse de stockage container.betterstorage.enderBackpack=Sac à dos des limbes +container.betterstorage.cardboardBackpack=Sac à Dos en Carton container.betterstorage.keyring=Porte-clés container.betterstorage.locker=Casier container.betterstorage.lockerLarge=Grand casier @@ -77,6 +78,7 @@ tile.betterstorage.backpack.name=Sac à dos tile.betterstorage.cardboardBox.name=Boîte en carton tile.betterstorage.crate.name=Caisse de stockage tile.betterstorage.enderBackpack.name=Sac à dos des limbes +tile.betterstorage.cardboardBackpack=Sac à Dos en Carton tile.betterstorage.flintBlock.name=Bloc de silex tile.betterstorage.locker.name=Casier tile.betterstorage.reinforcedChest.name=Coffre renforcé diff --git a/src/main/resources/assets/betterstorage/lang/fr_FR.lang b/src/main/resources/assets/betterstorage/lang/fr_FR.lang index c1e39aaf..ad17e07c 100644 --- a/src/main/resources/assets/betterstorage/lang/fr_FR.lang +++ b/src/main/resources/assets/betterstorage/lang/fr_FR.lang @@ -4,6 +4,7 @@ container.betterstorage.backpack=Sac à Dos container.betterstorage.cardboardBox=Boite en carton container.betterstorage.crate=Caisse de stockage container.betterstorage.enderBackpack=Sac à Dos de l'Ender +container.betterstorage.cardboardBackpack=Sac à Dos en Carton container.betterstorage.keyring=Porte-clés container.betterstorage.locker=Casier container.betterstorage.lockerLarge=Grand Casier @@ -77,6 +78,7 @@ tile.betterstorage.backpack.name=Sac à dos tile.betterstorage.cardboardBox.name=Boîte en carton tile.betterstorage.crate.name=Caisse de stockage tile.betterstorage.enderBackpack.name=Sac à Dos de l'Ender +tile.betterstorage.cardboardBackpack=Sac à Dos en Carton tile.betterstorage.flintBlock.name=Bloc de silex tile.betterstorage.locker.name=Casier tile.betterstorage.reinforcedChest.name=Coffre renforcé diff --git a/src/main/resources/assets/betterstorage/lang/nl_NL.lang b/src/main/resources/assets/betterstorage/lang/nl_NL.lang index be349934..2306447f 100644 --- a/src/main/resources/assets/betterstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/betterstorage/lang/nl_NL.lang @@ -3,6 +3,7 @@ container.betterstorage.backpack=Rugzak container.betterstorage.cardboardBox=Kartonnen Doos container.betterstorage.crate=Opbergkist container.betterstorage.enderBackpack=Ender Rugzak +container.betterstorage.cardboardBackpack=Karton Rugzak container.betterstorage.keyring=Sleutelring container.betterstorage.locker=Locker container.betterstorage.lockerLarge=Grote Locker @@ -51,6 +52,8 @@ tile.betterstorage.backpack.name=Rugzak tile.betterstorage.cardboardBox.name=Kartonnen Doos tile.betterstorage.crate.name=Opbergkist tile.betterstorage.enderBackpack.name=Ender Rugzak +tile.betterstorage.cardboardBackpack=Karton Rugzak +tile.betterstorage.cardboardBackpack.name=Karton Rugzak tile.betterstorage.locker.name=Locker tile.betterstorage.reinforcedChest.name=Verstevigde Kist tile.betterstorage.reinforcedChest.name.full=Verstevigde %MATERIAL% Chest diff --git a/src/main/resources/assets/betterstorage/lang/pt_BR.lang b/src/main/resources/assets/betterstorage/lang/pt_BR.lang index 9cfa35e6..44c1b00c 100644 --- a/src/main/resources/assets/betterstorage/lang/pt_BR.lang +++ b/src/main/resources/assets/betterstorage/lang/pt_BR.lang @@ -4,6 +4,7 @@ container.betterstorage.backpack=Mochila container.betterstorage.cardboardBox=Caixa de Papelão container.betterstorage.crate=Caixote container.betterstorage.enderBackpack=Mochila do ´Ender´ +container.betterstorage.cardboardBackpack=Mochila de Cartão container.betterstorage.keyring=Chaveiro container.betterstorage.locker=Armário container.betterstorage.lockerLarge=Armário Grande @@ -77,6 +78,7 @@ tile.betterstorage.backpack.name=Mochila tile.betterstorage.cardboardBox.name=Caixa de Papelão tile.betterstorage.crate.name=Caixote tile.betterstorage.enderBackpack.name=Mochila do ´Ender´ +tile.betterstorage.cardboardBackpack=Mochila de Cartão tile.betterstorage.flintBlock.name=Bloco de Pederneira tile.betterstorage.locker.name=Armário tile.betterstorage.reinforcedChest.name=Baú Reforçado diff --git a/src/main/resources/assets/betterstorage/lang/ru_RU.lang b/src/main/resources/assets/betterstorage/lang/ru_RU.lang index 75e813f5..49aa860d 100644 --- a/src/main/resources/assets/betterstorage/lang/ru_RU.lang +++ b/src/main/resources/assets/betterstorage/lang/ru_RU.lang @@ -4,6 +4,7 @@ container.betterstorage.backpack=Рюкзак container.betterstorage.cardboardBox=Картонная коробка container.betterstorage.crate=Ящик для хранения container.betterstorage.enderBackpack=Рюкзак Края +container.betterstorage.cardboardBackpack=Картон Рюкзак container.betterstorage.keyring=Связка ключей container.betterstorage.locker=Шкаф container.betterstorage.lockerLarge=Большой шкаф @@ -77,6 +78,7 @@ tile.betterstorage.backpack.name=Рюкзак tile.betterstorage.cardboardBox.name=Картонная коробка tile.betterstorage.crate.name=Ящик для хранения tile.betterstorage.enderBackpack.name=Рюкзак Края +tile.betterstorage.cardboardBackpack=Картон Рюкзак tile.betterstorage.flintBlock.name=Кремниевый блок tile.betterstorage.locker.name=Шкаф tile.betterstorage.reinforcedChest.name=Укреплённый сундук diff --git a/src/main/resources/assets/betterstorage/lang/sk_SK.lang b/src/main/resources/assets/betterstorage/lang/sk_SK.lang index f48188a5..5aa3f10d 100644 --- a/src/main/resources/assets/betterstorage/lang/sk_SK.lang +++ b/src/main/resources/assets/betterstorage/lang/sk_SK.lang @@ -7,6 +7,7 @@ container.betterstorage.backpack=Batoh container.betterstorage.cardboardBox=Kartónová krabica container.betterstorage.crate=Skladovacia krabica container.betterstorage.enderBackpack=Batoh z konca +container.betterstorage.cardboardBackpack=Kartón Batoh container.betterstorage.keyring=Prívesok na kľúče container.betterstorage.locker=Skrinka container.betterstorage.lockerLarge=Veľká skrinka @@ -81,6 +82,7 @@ tile.betterstorage.backpack.name=Batoh tile.betterstorage.cardboardBox.name=Kartónová krabica tile.betterstorage.crate.name=Skladovacia krabica tile.betterstorage.enderBackpack.name=Enderový batoh +tile.betterstorage.cardboardBackpack=Kartón Batoh tile.betterstorage.flintBlock.name=Kocka flintu tile.betterstorage.locker.name=Skrinka tile.betterstorage.reinforcedChest.name=Vystužená truhlica diff --git a/src/main/resources/assets/betterstorage/lang/zh_CN.lang b/src/main/resources/assets/betterstorage/lang/zh_CN.lang index 81089dbd..ca50c1d5 100644 --- a/src/main/resources/assets/betterstorage/lang/zh_CN.lang +++ b/src/main/resources/assets/betterstorage/lang/zh_CN.lang @@ -4,6 +4,7 @@ container.betterstorage.backpack=背包 container.betterstorage.cardboardBox=纸箱 container.betterstorage.crate=仓储货箱 container.betterstorage.enderBackpack=末影背包 +container.betterstorage.cardboardBackpack=纸板箱 container.betterstorage.keyring=钥匙链 container.betterstorage.locker=柜子 container.betterstorage.lockerLarge=大型柜子 @@ -77,6 +78,7 @@ tile.betterstorage.backpack.name=背包 tile.betterstorage.cardboardBox.name=纸箱 tile.betterstorage.crate.name=货箱 tile.betterstorage.enderBackpack.name=末影背包 +tile.betterstorage.cardboardBackpack=纸板箱 tile.betterstorage.flintBlock.name=燧石块 tile.betterstorage.locker.name=柜子 tile.betterstorage.reinforcedChest.name=强化箱子 diff --git a/src/main/resources/assets/betterstorage/lang/zh_TW.lang b/src/main/resources/assets/betterstorage/lang/zh_TW.lang index 9f295277..f4fcfdc2 100644 --- a/src/main/resources/assets/betterstorage/lang/zh_TW.lang +++ b/src/main/resources/assets/betterstorage/lang/zh_TW.lang @@ -4,6 +4,7 @@ container.betterstorage.backpack=背包 container.betterstorage.cardboardBox=紙箱 container.betterstorage.crate=倉儲貨箱 container.betterstorage.enderBackpack=末影背包 +container.betterstorage.cardboardBackpack=紙板箱 container.betterstorage.keyring=鑰匙鏈 container.betterstorage.locker=柜子 container.betterstorage.lockerLarge=大型柜子 @@ -77,6 +78,7 @@ tile.betterstorage.backpack.name=背包 tile.betterstorage.cardboardBox.name=紙箱 tile.betterstorage.crate.name=貨箱 tile.betterstorage.enderBackpack.name=末影背包 +tile.betterstorage.cardboardBackpack=紙板箱 tile.betterstorage.flintBlock.name=燧石塊 tile.betterstorage.locker.name=柜子 tile.betterstorage.reinforcedChest.name=強化箱子