cha0s/FunctionalStorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added type description to the upgrades

Browse Source
This commit is contained in:
Buuz135 2021-12-25 13:56:52 +01:00
parent e9f2ebbe4c
commit e8d490df9a
7 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/generated/resources/.cache/cache
View File

@ -25,7 +25,7 @@ a50aeb3877dd4003bb3ed359fccde1f3674bc028 assets/functionalstorage/blockstates/sp
fbf8ebd85350f3b4ad0bf6faf51f9ecf0677bf5b assets/functionalstorage/blockstates/warped_1.json
bcd4b5e128d5175bea44ecae340aeec86cd5a123 assets/functionalstorage/blockstates/warped_2.json
ebc4aebffb44baa4dd507078b9fd3c74e881f4c1 assets/functionalstorage/blockstates/warped_4.json
0e4ded9ded539282f28923d99b7bb22e413bd74e assets/functionalstorage/lang/en_us.json
66ce808d5714a6fa109a05ebd3f280f84504d41f assets/functionalstorage/lang/en_us.json
68c3f6a8fe55202f83c0fcdd6c8ca10ef88019ef assets/functionalstorage/models/block/acacia_1_locked.json
c7d0376ba2a080ba12c344369ad11538899db176 assets/functionalstorage/models/block/acacia_2_locked.json
79b86baeec4aa6784aa52028d2f3bc98ddab8c14 assets/functionalstorage/models/block/acacia_4_locked.json
@ -126,7 +126,7 @@ d6b02c345edd356b8e4b7421bdd453f454c6ed7f data/functionalstorage/recipes/storage_
bcb281904eac23183c45786e3d703d24bba92be6 data/functionalstorage/recipes/warped_1.json
8fc3f76a2c57eb4d80ce86947fabebe48fa6f692 data/functionalstorage/recipes/warped_2.json
7510a8ca1f1e3bb63f4c4f4add0bb6b713feaa0b data/functionalstorage/recipes/warped_4.json
f37e620a26ceb158507c607cee6ba3b51f14c6d6 data/functionalstorage/tags/items/drawer.json
c90035bcbbce8f048618fbdd442779eb16c37cc0 data/functionalstorage/tags/items/drawer.json
12ec935226bf5a6a1493d353ef6dc6c224c256dd data/functionalstorage/tags/items/ignore_crafting_check.json
f37e620a26ceb158507c607cee6ba3b51f14c6d6 data/minecraft/tags/blocks/mineable/axe.json
c90035bcbbce8f048618fbdd442779eb16c37cc0 data/minecraft/tags/blocks/mineable/axe.json
158e42ebbf51726de4367ac4c2df824e2f119199 data/minecraft/tags/blocks/mineable/pickaxe.json

5
src/generated/resources/assets/functionalstorage/lang/en_us.json
View File

@ -59,5 +59,8 @@
"linkingtool.linkingmode.single": "Single",
"linkingtool.linkingmode.single.desc": "Links a drawer to a controller",
"linkingtool.use": "Sneak + Right Click in the air to change modes. \nRight Click in the air to change actions. \nRight click a controller to setup the tool then use it nearby drawers to link. \n\nWhile holding the tool it will show the connected drawers to the selected controller.",
"storageupgrade.desc": "Multiplies the block storage by "
"storageupgrade.desc": "Multiplies the block storage by ",
"upgrade.type": "Type: ",
"upgrade.type.storage": "Storage",
"upgrade.type.utility": "Utility"
}

18
src/generated/resources/data/functionalstorage/tags/items/drawer.json
View File

@ -9,14 +9,6 @@
"functionalstorage:dark_oak_2",
"functionalstorage:crimson_2",
"functionalstorage:warped_2",
"functionalstorage:oak_4",
"functionalstorage:spruce_4",
"functionalstorage:birch_4",
"functionalstorage:jungle_4",
"functionalstorage:acacia_4",
"functionalstorage:dark_oak_4",
"functionalstorage:crimson_4",
"functionalstorage:warped_4",
"functionalstorage:oak_1",
"functionalstorage:spruce_1",
"functionalstorage:birch_1",
@ -24,6 +16,14 @@
"functionalstorage:acacia_1",
"functionalstorage:dark_oak_1",
"functionalstorage:crimson_1",
"functionalstorage:warped_1"
"functionalstorage:warped_1",
"functionalstorage:oak_4",
"functionalstorage:spruce_4",
"functionalstorage:birch_4",
"functionalstorage:jungle_4",
"functionalstorage:acacia_4",
"functionalstorage:dark_oak_4",
"functionalstorage:crimson_4",
"functionalstorage:warped_4"
]
}

18
src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
View File

@ -9,14 +9,6 @@
"functionalstorage:dark_oak_2",
"functionalstorage:crimson_2",
"functionalstorage:warped_2",
"functionalstorage:oak_4",
"functionalstorage:spruce_4",
"functionalstorage:birch_4",
"functionalstorage:jungle_4",
"functionalstorage:acacia_4",
"functionalstorage:dark_oak_4",
"functionalstorage:crimson_4",
"functionalstorage:warped_4",
"functionalstorage:oak_1",
"functionalstorage:spruce_1",
"functionalstorage:birch_1",
@ -24,6 +16,14 @@
"functionalstorage:acacia_1",
"functionalstorage:dark_oak_1",
"functionalstorage:crimson_1",
"functionalstorage:warped_1"
"functionalstorage:warped_1",
"functionalstorage:oak_4",
"functionalstorage:spruce_4",
"functionalstorage:birch_4",
"functionalstorage:jungle_4",
"functionalstorage:acacia_4",
"functionalstorage:dark_oak_4",
"functionalstorage:crimson_4",
"functionalstorage:warped_4"
]
}

2
src/main/java/com/buuz135/functionalstorage/block/tile/ArmoryCabinetTile.java
View File

@ -21,8 +21,6 @@ import javax.annotation.Nullable;
public class ArmoryCabinetTile extends ActiveTile<ArmoryCabinetTile> {
//TODO Not sync nbt
@Save
public ArmoryCabinetInventoryHandler handler;
private final LazyOptional<IItemHandler> lazyStorage;

3
src/main/java/com/buuz135/functionalstorage/data/FunctionalStorageLangProvider.java
View File

@ -58,5 +58,8 @@ public class FunctionalStorageLangProvider extends LanguageProvider {
this.add("configurationtool.configmode.toggle_render", "Hide/Show Item Renders");
this.add("configurationtool.configmode.toggle_upgrades", "Hide/Show Upgrade Renders");
this.add("configurationtool.use", "Sneak + Right Click in the air to change modes. Right click a drawer to toggle the option.");
this.add("upgrade.type", "Type: ");
this.add("upgrade.type.storage", "Storage");
this.add("upgrade.type.utility", "Utility");
}
}

6
src/main/java/com/buuz135/functionalstorage/item/UpgradeItem.java
View File

@ -26,8 +26,6 @@ import java.util.Locale;
public class UpgradeItem extends BasicItem {
//TODO Add tooltip to show its type
private final Type type;
public UpgradeItem(Properties properties, Type type) {
@ -79,13 +77,15 @@ public class UpgradeItem extends BasicItem {
@Override
public void addTooltipDetails(@Nullable BasicItem.Key key, ItemStack stack, List<Component> tooltip, boolean advanced) {
super.addTooltipDetails(key, stack, tooltip, advanced);
tooltip.add(new TranslatableComponent("upgrade.type").withStyle(ChatFormatting.YELLOW).append(new TranslatableComponent("upgrade.type." + getType().name().toLowerCase(Locale.ROOT)).withStyle(ChatFormatting.WHITE)));
if (!stack.hasTag()) return;
Item item = stack.getItem();
if (item.equals(FunctionalStorage.PULLING_UPGRADE.get()) || item.equals(FunctionalStorage.PUSHING_UPGRADE.get()) || item.equals(FunctionalStorage.COLLECTOR_UPGRADE.get())){
tooltip.add(new TranslatableComponent("item.utility.direction").withStyle(ChatFormatting.GRAY).append(WordUtils.capitalize(stack.getTag().getString("Direction").toLowerCase(Locale.ROOT))));
tooltip.add(new TranslatableComponent("item.utility.direction").withStyle(ChatFormatting.YELLOW).append(new TranslatableComponent(WordUtils.capitalize(stack.getTag().getString("Direction").toLowerCase(Locale.ROOT))).withStyle(ChatFormatting.WHITE)));
tooltip.add(new TextComponent(""));
tooltip.add(new TranslatableComponent("item.utility.direction.desc").withStyle(ChatFormatting.GRAY));
}
}
@Override