Skip to content

Commit

Permalink
Drawer tape (relocate drawers with contents)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaquadro
jaquadro committed Sep 7, 2015
1 parent 81ec6ad commit 6dc10af
Show file tree
Hide file tree
Showing 31 changed files with 725 additions and 263 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {

apply plugin: 'forge'

version = "1.7.10-1.5.15"
version = "1.7.10-1.6.0"
group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "StorageDrawers"

Expand Down
Binary file removed packs/Forestry/resources/assets/storagedrawersforestry/textures/blocks/TextureBuilder.exe
View file
Binary file not shown.
41 changes: 23 additions & 18 deletions resources/assets/storagedrawers/lang/en_US.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,26 @@ storageDrawers.container.unboundSlave=Unbound Slave
storagedrawers.msg.maxUpgrades=This drawer cannot accept any more upgrades.

# Items
item.upgradeTemplate.name=Upgrade Template
item.upgrade.iron.name=Storage Upgrade (II)
item.upgrade.gold.name=Storage Upgrade (III)
item.upgrade.obsidian.name=Storage Upgrade (IV)
item.upgrade.diamond.name=Storage Upgrade (V)
item.upgrade.emerald.name=Storage Upgrade (VI)
item.upgradeStatus.level1.name=Status Upgrade (I)
item.upgradeStatus.level1.description=Shows full storage
item.upgradeStatus.level2.name=Status Upgrade (II)
item.upgradeStatus.level2.description=Shows fill level
item.upgradeLock.name=Drawer Key
item.upgradeLock.description=Locks and unlocks drawers
item.upgradeVoid.name=Void Upgrade
item.upgradeVoid.description=Destroys excess items
item.upgradeSorting.name=Sorting Upgrade
item.upgradeSorting.description=For Refined Relocation
item.shroudKey.name=Concealment Key
item.shroudKey.description=Show or hide item labels
item.storagedrawers.upgradeTemplate.name=Upgrade Template
item.storagedrawers.upgrade.iron.name=Storage Upgrade (II)
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.upgradeStatus.level1.name=Status Upgrade (I)
item.storagedrawers.upgradeStatus.level1.description=Shows full storage
item.storagedrawers.upgradeStatus.level2.name=Status Upgrade (II)
item.storagedrawers.upgradeStatus.level2.description=Shows fill level
item.storagedrawers.upgradeLock.name=Drawer Key
item.storagedrawers.upgradeLock.description=Locks and unlocks drawers
item.storagedrawers.upgradeVoid.name=Void Upgrade
item.storagedrawers.upgradeVoid.description=Destroys excess items
item.storagedrawers.upgradeSorting.name=Sorting Upgrade
item.storagedrawers.upgradeSorting.description=For Refined Relocation
item.storagedrawers.shroudKey.name=Concealment Key
item.storagedrawers.shroudKey.description=Show or hide item labels
item.storagedrawers.tape.name=Packing Tape
item.storagedrawers.tape.description=Seals drawers for moving

# Blocks
tile.fullDrawers1.oak.name=Oak Drawer
Expand Down Expand Up @@ -77,6 +79,7 @@ tile.trim.acacia.name=Acacia Trim
tile.trim.big_oak.name=Dark Oak Trim

storageDrawers.drawers.description=Holds %d stacks per drawer
storageDrawers.drawers.sealed=Contents sealed within
storageDrawers.upgrade.description=Increases storage to %d times base value
storageDrawers.controller.description=Interact with a bank of connected drawers
storageDrawers.controllerSlave.description=Extra attach points for controllers
Expand Down Expand Up @@ -147,6 +150,8 @@ storageDrawers.config.prop.invertShift=Invert Shift
storageDrawers.config.prop.invertShift.tooltip=Inverts click and shift+click behavior.
storageDrawers.config.prop.enableDebugLogging=Enable Debug Logging
storageDrawers.config.prop.enableDebugLogging.tooltip=Prints extra information to the logs.
storageDrawers.config.prop.enableTape=Enable Tape
storageDrawers.config.prop.enableTape.tooltip=For moving drawers with contents.

storageDrawers.config.addons=Addons
storageDrawers.config.addons.tooltip=Configure global addon pack settings.
Expand Down
28 changes: 14 additions & 14 deletions resources/assets/storagedrawers/lang/es_AR.lang
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
itemGroup.storageDrawers=Storage Drawers

# Items
item.upgradeTemplate.name=Plantilla de Mejora
item.upgrade.iron.name=Mejora para Cajonera (II)
item.upgrade.gold.name=Mejora para Cajonera (III)
item.upgrade.obsidian.name=Mejora para Cajonera (IV)
item.upgrade.diamond.name=Mejora para Cajonera (V)
item.upgrade.emerald.name=Mejora para Cajonera (VI)
item.upgradeStatus.level1.name=Status Mejora (I)
item.upgradeStatus.level1.description=Muestra que el cajón está lleno
item.upgradeStatus.level2.name=Status Mejora (II)
item.upgradeStatus.level2.description=Muestra que el cajón está casi lleno
item.upgradeStatus.level3.name=Status Mejora (III)
item.upgradeStatus.level3.description=Muestra el nivel de llenado
item.upgradeLock.name=Lock Upgrade
item.upgradeLock.description=Keep associated items when empty
item.storagedrawers.upgradeTemplate.name=Plantilla de Mejora
item.storagedrawers.upgrade.iron.name=Mejora para Cajonera (II)
item.storagedrawers.upgrade.gold.name=Mejora para Cajonera (III)
item.storagedrawers.upgrade.obsidian.name=Mejora para Cajonera (IV)
item.storagedrawers.upgrade.diamond.name=Mejora para Cajonera (V)
item.storagedrawers.upgrade.emerald.name=Mejora para Cajonera (VI)
item.storagedrawers.upgradeStatus.level1.name=Status Mejora (I)
item.storagedrawers.upgradeStatus.level1.description=Muestra que el cajón está lleno
item.storagedrawers.upgradeStatus.level2.name=Status Mejora (II)
item.storagedrawers.upgradeStatus.level2.description=Muestra que el cajón está casi lleno
item.storagedrawers.upgradeStatus.level3.name=Status Mejora (III)
item.storagedrawers.upgradeStatus.level3.description=Muestra el nivel de llenado
item.storagedrawers.upgradeLock.name=Lock Upgrade
item.storagedrawers.upgradeLock.description=Keep associated items when empty

# Blocks
tile.fullDrawers2.oak.name=Cajonera de Roble 1x2
Expand Down
36 changes: 18 additions & 18 deletions resources/assets/storagedrawers/lang/fr_FR.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ storageDrawers.container.unboundSlave=Esclave non liée
storagedrawers.msg.maxUpgrades=Ce tiroir ne peuvent pas accepter davantage d'améliorations.

# Items
item.upgradeTemplate.name=Modèle d'amélioration
item.upgrade.iron.name=Amélioration stockage (II)
item.upgrade.gold.name=Amélioration stockage (III)
item.upgrade.obsidian.name=Amélioration stockage (IV)
item.upgrade.diamond.name=Amélioration stockage (V)
item.upgrade.emerald.name=Amélioration stockage (VI)
item.upgradeStatus.level1.name=Amélioration statut (I)
item.upgradeStatus.level1.description=Montre si le stockage est plein
item.upgradeStatus.level2.name=Amélioration statut (II)
item.upgradeStatus.level2.description=Montre le niveau de remplissage
item.upgradeLock.name=Amélioration verrou
item.upgradeLock.description=Conserve les éléments associés lorsqu'il est vide
item.upgradeVoid.name=Amélioration cavité
item.upgradeVoid.description=Détruit les objets en excès
item.upgradeSorting.name=Amélioration triage
item.upgradeSorting.description=Pour Refined Relocation
item.shroudKey.name=Clé de dissimulation
item.shroudKey.description=Montrer ou cacher les étiquettes d'objet
item.storagedrawers.upgradeTemplate.name=Modèle d'amélioration
item.storagedrawers.upgrade.iron.name=Amélioration stockage (II)
item.storagedrawers.upgrade.gold.name=Amélioration stockage (III)
item.storagedrawers.upgrade.obsidian.name=Amélioration stockage (IV)
item.storagedrawers.upgrade.diamond.name=Amélioration stockage (V)
item.storagedrawers.upgrade.emerald.name=Amélioration stockage (VI)
item.storagedrawers.upgradeStatus.level1.name=Amélioration statut (I)
item.storagedrawers.upgradeStatus.level1.description=Montre si le stockage est plein
item.storagedrawers.upgradeStatus.level2.name=Amélioration statut (II)
item.storagedrawers.upgradeStatus.level2.description=Montre le niveau de remplissage
item.storagedrawers.upgradeLock.name=Amélioration verrou
item.storagedrawers.upgradeLock.description=Conserve les éléments associés lorsqu'il est vide
item.storagedrawers.upgradeVoid.name=Amélioration cavité
item.storagedrawers.upgradeVoid.description=Détruit les objets en excès
item.storagedrawers.upgradeSorting.name=Amélioration triage
item.storagedrawers.upgradeSorting.description=Pour Refined Relocation
item.storagedrawers.shroudKey.name=Clé de dissimulation
item.storagedrawers.shroudKey.description=Montrer ou cacher les étiquettes d'objet

# Blocks
tile.fullDrawers1.oak.name=Tiroir de chêne
Expand Down
28 changes: 14 additions & 14 deletions resources/assets/storagedrawers/lang/he_IL.lang
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
itemGroup.storageDrawers=מגירות אכסון

# Items
item.upgradeTemplate.name=Upgrade Template
item.upgrade.iron.name=שדרוג למגירה (2)
item.upgrade.gold.name=שדרוג למגירה (3)
item.upgrade.obsidian.name=שדרוג למגירה (4)
item.upgrade.diamond.name=שדרוג למגירה (5)
item.upgrade.emerald.name=שדרוג למגירה (6)
item.upgradeStatus.level1.name=Status Upgrade (I)
item.upgradeStatus.level1.description=Shows full storage
item.upgradeStatus.level2.name=Status Upgrade (II)
item.upgradeStatus.level2.description=Shows near-full storage
item.upgradeStatus.level3.name=Status Upgrade (III)
item.upgradeStatus.level3.description=Shows fill level
item.upgradeLock.name=Lock Upgrade
item.upgradeLock.description=Keep associated items when empty
item.storagedrawers.upgradeTemplate.name=Upgrade Template
item.storagedrawers.upgrade.iron.name=שדרוג למגירה (2)
item.storagedrawers.upgrade.gold.name=שדרוג למגירה (3)
item.storagedrawers.upgrade.obsidian.name=שדרוג למגירה (4)
item.storagedrawers.upgrade.diamond.name=שדרוג למגירה (5)
item.storagedrawers.upgrade.emerald.name=שדרוג למגירה (6)
item.storagedrawers.upgradeStatus.level1.name=Status Upgrade (I)
item.storagedrawers.upgradeStatus.level1.description=Shows full storage
item.storagedrawers.upgradeStatus.level2.name=Status Upgrade (II)
item.storagedrawers.upgradeStatus.level2.description=Shows near-full storage
item.storagedrawers.upgradeStatus.level3.name=Status Upgrade (III)
item.storagedrawers.upgradeStatus.level3.description=Shows fill level
item.storagedrawers.upgradeLock.name=Lock Upgrade
item.storagedrawers.upgradeLock.description=Keep associated items when empty

# Blocks
tile.fullDrawers2.oak.name=מגירות אלון 1x2
Expand Down
28 changes: 14 additions & 14 deletions resources/assets/storagedrawers/lang/ko_KR.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
itemGroup.storageDrawers=스토리지 드로워즈[Storage Drawers]

# Items
item.upgradeTemplate.name=업데이트 견본
item.upgrade.iron.name=서랍 업그레이드 (II)
item.upgrade.gold.name=서랍 업그레이드 (III)
item.upgrade.obsidian.name=서랍 업그레이드 (IV)
item.upgrade.diamond.name=서랍 업그레이드 (V)
item.upgrade.emerald.name=서랍 업그레이드 (VI)
item.upgradeStatus.level1.name=동상 업그레이드 (I)
item.upgradeStatus.level1.description=전제 스토리지 표시
item.upgradeStatus.level2.name=동상 업그레이드 (II)
item.upgradeStatus.level2.description=대부분의 스토리지 표시
item.upgradeStatus.level3.name=동상 업그레이드 (III)
item.upgradeStatus.level3.description=레벨 표시
item.upgradeLock.name=Lock Upgrade
item.upgradeLock.description=Keep associated items when empty
item.storagedrawers.upgradeTemplate.name=업데이트 견본
item.storagedrawers.upgrade.iron.name=서랍 업그레이드 (II)
item.storagedrawers.upgrade.gold.name=서랍 업그레이드 (III)
item.storagedrawers.upgrade.obsidian.name=서랍 업그레이드 (IV)
item.storagedrawers.upgrade.diamond.name=서랍 업그레이드 (V)
item.storagedrawers.upgrade.emerald.name=서랍 업그레이드 (VI)
item.storagedrawers.upgradeStatus.level1.name=동상 업그레이드 (I)
item.storagedrawers.upgradeStatus.level1.description=전제 스토리지 표시
item.storagedrawers.upgradeStatus.level2.name=동상 업그레이드 (II)
item.storagedrawers.upgradeStatus.level2.description=대부분의 스토리지 표시
item.storagedrawers.upgradeStatus.level3.name=동상 업그레이드 (III)
item.storagedrawers.upgradeStatus.level3.description=레벨 표시
item.storagedrawers.upgradeLock.name=Lock Upgrade
item.storagedrawers.upgradeLock.description=Keep associated items when empty

# Blocks
tile.fullDrawers2.oak.name=참나무 서랍 1x2
Expand Down
28 changes: 14 additions & 14 deletions resources/assets/storagedrawers/lang/pl_PL.lang
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
itemGroup.storageDrawers=Storage Drawers

# Items
item.upgradeTemplate.name=Szablon ulepszenia
item.upgrade.iron.name=Ulepszenie składowania (II)
item.upgrade.gold.name=Ulepszenie składowania (III)
item.upgrade.obsidian.name=Ulepszenie składowania (IV)
item.upgrade.diamond.name=Ulepszenie składowania (V)
item.upgrade.emerald.name=Ulepszenie składowania (VI)
item.upgradeStatus.level1.name=Ulepszenie statusu (I)
item.upgradeStatus.level1.description=Pokazuje pełny skład
item.upgradeStatus.level2.name=Ulepszenie statusu (II)
item.upgradeStatus.level2.description=Pokazuje prawie pełny skład
item.upgradeStatus.level3.name=Ulepszenie statusu (III)
item.upgradeStatus.level3.description=Pokazuje poziom wypełnienia
item.upgradeLock.name=Ulepszenie blokady
item.upgradeLock.description=Zatrzymuje przypisany przedmiot gdy puste
item.storagedrawers.upgradeTemplate.name=Szablon ulepszenia
item.storagedrawers.upgrade.iron.name=Ulepszenie składowania (II)
item.storagedrawers.upgrade.gold.name=Ulepszenie składowania (III)
item.storagedrawers.upgrade.obsidian.name=Ulepszenie składowania (IV)
item.storagedrawers.upgrade.diamond.name=Ulepszenie składowania (V)
item.storagedrawers.upgrade.emerald.name=Ulepszenie składowania (VI)
item.storagedrawers.upgradeStatus.level1.name=Ulepszenie statusu (I)
item.storagedrawers.upgradeStatus.level1.description=Pokazuje pełny skład
item.storagedrawers.upgradeStatus.level2.name=Ulepszenie statusu (II)
item.storagedrawers.upgradeStatus.level2.description=Pokazuje prawie pełny skład
item.storagedrawers.upgradeStatus.level3.name=Ulepszenie statusu (III)
item.storagedrawers.upgradeStatus.level3.description=Pokazuje poziom wypełnienia
item.storagedrawers.upgradeLock.name=Ulepszenie blokady
item.storagedrawers.upgradeLock.description=Zatrzymuje przypisany przedmiot gdy puste

# Blocks
tile.fullDrawers2.oak.name=Dębowe szuflady 1x2
Expand Down
32 changes: 16 additions & 16 deletions resources/assets/storagedrawers/lang/ru_RU.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ itemGroup.storageDrawers=Storage Drawers
itemGroup.storageDrawersSorting=Storage Drawers - Сортировка

# Items
item.upgradeTemplate.name=Шаблон улучшения
item.upgrade.iron.name=Улучшение хранилища (II)
item.upgrade.gold.name=Улучшение хранилища (III)
item.upgrade.obsidian.name=Улучшение хранилища (IV)
item.upgrade.diamond.name=Улучшение хранилища (V)
item.upgrade.emerald.name=Улучшение хранилища (VI)
item.upgradeStatus.level1.name=Улучшение «Индикатор» (I)
item.upgradeStatus.level1.description=Показывает, когда ящик заполнен
item.upgradeStatus.level2.name=Улучшение «Индикатор» (II)
item.upgradeStatus.level2.description=Показывает уровень заполнения
item.upgradeLock.name=Ключ от ящика
item.upgradeLock.description=Закрывает и открывает ящики
item.upgradeVoid.name=Пустотное улучшение
item.upgradeVoid.description=Уничтожает лишние предметы
item.upgradeSorting.name=Сортирующее улучшение
item.upgradeSorting.description=Для модификации Refined Relocation
item.storagedrawers.upgradeTemplate.name=Шаблон улучшения
item.storagedrawers.upgrade.iron.name=Улучшение хранилища (II)
item.storagedrawers.upgrade.gold.name=Улучшение хранилища (III)
item.storagedrawers.upgrade.obsidian.name=Улучшение хранилища (IV)
item.storagedrawers.upgrade.diamond.name=Улучшение хранилища (V)
item.storagedrawers.upgrade.emerald.name=Улучшение хранилища (VI)
item.storagedrawers.upgradeStatus.level1.name=Улучшение «Индикатор» (I)
item.storagedrawers.upgradeStatus.level1.description=Показывает, когда ящик заполнен
item.storagedrawers.upgradeStatus.level2.name=Улучшение «Индикатор» (II)
item.storagedrawers.upgradeStatus.level2.description=Показывает уровень заполнения
item.storagedrawers.upgradeLock.name=Ключ от ящика
item.storagedrawers.upgradeLock.description=Закрывает и открывает ящики
item.storagedrawers.upgradeVoid.name=Пустотное улучшение
item.storagedrawers.upgradeVoid.description=Уничтожает лишние предметы
item.storagedrawers.upgradeSorting.name=Сортирующее улучшение
item.storagedrawers.upgradeSorting.description=Для модификации Refined Relocation

# Blocks
tile.fullDrawers1.oak.name=Ящик из дуба
Expand Down
36 changes: 18 additions & 18 deletions resources/assets/storagedrawers/lang/zh_CN.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ storageDrawers.container.unboundSlave=未连接的传动方块
storagedrawers.msg.maxUpgrades=这个抽屉已无法容纳更多的升级组件.

# 物件
item.upgradeTemplate.name=升级模板
item.upgrade.iron.name=抽屉容量升级 (II)
item.upgrade.gold.name=抽屉容量升级 (III)
item.upgrade.obsidian.name=抽屉容量升级 (IV)
item.upgrade.diamond.name=抽屉容量升级 (V)
item.upgrade.emerald.name=抽屉容量升级 (VI)
item.upgradeStatus.level1.name=状态显示升级 (I)
item.upgradeStatus.level1.description=抽屉装满时亮起提示灯.
item.upgradeStatus.level2.name=状态显示升级 (II)
item.upgradeStatus.level2.description=显示抽屉容量等级.
item.upgradeLock.name=抽屉钥匙
item.upgradeLock.description=给抽屉上锁或解锁.
item.upgradeVoid.name=清空升级
item.upgradeVoid.description=销毁存储超过上限的物品.
item.upgradeSorting.name=分拣升级
item.upgradeSorting.description=将抽屉升级为分拣抽屉.
item.shroudKey.name=屏蔽钥匙
item.shroudKey.description=设定隐藏或显示抽屉上的物品图标.
item.storagedrawers.upgradeTemplate.name=升级模板
item.storagedrawers.upgrade.iron.name=抽屉容量升级 (II)
item.storagedrawers.upgrade.gold.name=抽屉容量升级 (III)
item.storagedrawers.upgrade.obsidian.name=抽屉容量升级 (IV)
item.storagedrawers.upgrade.diamond.name=抽屉容量升级 (V)
item.storagedrawers.upgrade.emerald.name=抽屉容量升级 (VI)
item.storagedrawers.upgradeStatus.level1.name=状态显示升级 (I)
item.storagedrawers.upgradeStatus.level1.description=抽屉装满时亮起提示灯.
item.storagedrawers.upgradeStatus.level2.name=状态显示升级 (II)
item.storagedrawers.upgradeStatus.level2.description=显示抽屉容量等级.
item.storagedrawers.upgradeLock.name=抽屉钥匙
item.storagedrawers.upgradeLock.description=给抽屉上锁或解锁.
item.storagedrawers.upgradeVoid.name=清空升级
item.storagedrawers.upgradeVoid.description=销毁存储超过上限的物品.
item.storagedrawers.upgradeSorting.name=分拣升级
item.storagedrawers.upgradeSorting.description=将抽屉升级为分拣抽屉.
item.storagedrawers.shroudKey.name=屏蔽钥匙
item.storagedrawers.shroudKey.description=设定隐藏或显示抽屉上的物品图标.

# 方块
tile.fullDrawers1.oak.name=橡木抽屉
Expand Down
Binary file added resources/assets/storagedrawers/textures/blocks/tape.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/assets/storagedrawers/textures/items/tape_roll.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.jaquadro.minecraft.storagedrawers.api.storage.attribute;

public interface ISealable
{
/**
* Gets whether or not the drawer has the sealed attribute.
* A sealed drawer cannot be interacted with, and when broken will retain all of its items and upgrades.
*/
boolean isSealed ();

/**
* Sets whether or not the drawer is currently sealed.
* @return false if the operation is not supported, true otherwise.
*/
boolean setIsSealed (boolean state);
}
Loading

0 comments on commit 6dc10af

Please sign in to comment.