diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 77546e3..f915f17 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -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 -f512312328df3c1ec3ed6d1e14e2c1c57f015b78 assets/functionalstorage/lang/en_us.json +0e4ded9ded539282f28923d99b7bb22e413bd74e 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 @@ -112,5 +112,5 @@ ff234dac4f0b0b4f83ffa92f2d2fb1074c68df43 data/functionalstorage/recipes/spruce_4 bcb281904eac23183c45786e3d703d24bba92be6 data/functionalstorage/recipes/warped_1.json 8fc3f76a2c57eb4d80ce86947fabebe48fa6f692 data/functionalstorage/recipes/warped_2.json 7510a8ca1f1e3bb63f4c4f4add0bb6b713feaa0b data/functionalstorage/recipes/warped_4.json -d02963f7da0ca8877113c80cb1dd49d60069ff78 data/functionalstorage/tags/items/drawer.json +7f1584dd07594822d6db4ec38642d19047a7c73a data/functionalstorage/tags/items/drawer.json 12ec935226bf5a6a1493d353ef6dc6c224c256dd data/functionalstorage/tags/items/ignore_crafting_check.json diff --git a/src/generated/resources/assets/functionalstorage/lang/en_us.json b/src/generated/resources/assets/functionalstorage/lang/en_us.json index 712b53e..d82f6d8 100644 --- a/src/generated/resources/assets/functionalstorage/lang/en_us.json +++ b/src/generated/resources/assets/functionalstorage/lang/en_us.json @@ -31,6 +31,7 @@ "configurationtool.configmode.toggle_numbers": "Hide/Show Amounts", "configurationtool.configmode.toggle_render": "Hide/Show Item Renders", "configurationtool.configmode.toggle_upgrades": "Hide/Show Upgrade Renders", + "configurationtool.use": "Sneak + Right Click in the air to change modes. Right click a drawer to toggle the option.", "item.functionalstorage.collector_upgrade": "Collector Upgrade", "item.functionalstorage.configuration_tool": "Configuration Tool", "item.functionalstorage.copper_upgrade": "Copper Upgrade", diff --git a/src/generated/resources/data/functionalstorage/tags/items/drawer.json b/src/generated/resources/data/functionalstorage/tags/items/drawer.json index 15ef931..dc8f9bf 100644 --- a/src/generated/resources/data/functionalstorage/tags/items/drawer.json +++ b/src/generated/resources/data/functionalstorage/tags/items/drawer.json @@ -9,14 +9,6 @@ "functionalstorage:dark_oak_4", "functionalstorage:crimson_4", "functionalstorage:warped_4", - "functionalstorage:oak_2", - "functionalstorage:spruce_2", - "functionalstorage:birch_2", - "functionalstorage:jungle_2", - "functionalstorage:acacia_2", - "functionalstorage:dark_oak_2", - "functionalstorage:crimson_2", - "functionalstorage:warped_2", "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_2", + "functionalstorage:spruce_2", + "functionalstorage:birch_2", + "functionalstorage:jungle_2", + "functionalstorage:acacia_2", + "functionalstorage:dark_oak_2", + "functionalstorage:crimson_2", + "functionalstorage:warped_2" ] } \ No newline at end of file diff --git a/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerControllerTile.java b/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerControllerTile.java index 2bfb7f1..1cdf247 100644 --- a/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerControllerTile.java +++ b/src/main/java/com/buuz135/functionalstorage/block/tile/DrawerControllerTile.java @@ -28,7 +28,7 @@ import java.util.List; public class DrawerControllerTile extends ControllableDrawerTile{ - //TODO Not sync nbt + //TODO Allow insertion of items @Save private ConnectedDrawers connectedDrawers; diff --git a/src/main/java/com/buuz135/functionalstorage/data/FunctionalStorageLangProvider.java b/src/main/java/com/buuz135/functionalstorage/data/FunctionalStorageLangProvider.java index d57ae9d..64b08d8 100644 --- a/src/main/java/com/buuz135/functionalstorage/data/FunctionalStorageLangProvider.java +++ b/src/main/java/com/buuz135/functionalstorage/data/FunctionalStorageLangProvider.java @@ -57,5 +57,6 @@ public class FunctionalStorageLangProvider extends LanguageProvider { this.add("configurationtool.configmode.toggle_numbers", "Hide/Show Amounts"); 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."); } } diff --git a/src/main/java/com/buuz135/functionalstorage/item/ConfigurationToolItem.java b/src/main/java/com/buuz135/functionalstorage/item/ConfigurationToolItem.java index 8ba507f..e8e0992 100644 --- a/src/main/java/com/buuz135/functionalstorage/item/ConfigurationToolItem.java +++ b/src/main/java/com/buuz135/functionalstorage/item/ConfigurationToolItem.java @@ -97,7 +97,8 @@ public class ConfigurationToolItem extends BasicItem { if (key == null){ tooltip.add(new TranslatableComponent("configurationtool.configmode").withStyle(ChatFormatting.YELLOW) .append(new TranslatableComponent("configurationtool.configmode." + linkingMode.name().toLowerCase(Locale.ROOT) ).withStyle(Style.EMPTY.withColor(linkingMode.getColor())))); - + tooltip.add(new TextComponent("").withStyle(ChatFormatting.GRAY)); + tooltip.add(new TranslatableComponent("configurationtool.use").withStyle(ChatFormatting.GRAY)); } } }