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

Made controller rotable and added localization for the armory

Browse Source
This commit is contained in:
Buuz135 2021-12-22 12:36:14 +01:00
parent e58ff2fd94
commit ad4c4befe7
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,11 +21,11 @@ e00984d2e6551ae9bb54afe92770e8c9e51d79d6 assets/functionalstorage/blockstates/oa
d4d22c9ecc3622c578ccff9c8b38de4112a842f6 assets/functionalstorage/blockstates/spruce_1.json d4d22c9ecc3622c578ccff9c8b38de4112a842f6 assets/functionalstorage/blockstates/spruce_1.json
b14ae1d5fe1d5f8f045b057cc786c7b576844612 assets/functionalstorage/blockstates/spruce_2.json b14ae1d5fe1d5f8f045b057cc786c7b576844612 assets/functionalstorage/blockstates/spruce_2.json
a0ff8d6c8f3d10d7773039df53dd3b6a5412bc10 assets/functionalstorage/blockstates/spruce_4.json a0ff8d6c8f3d10d7773039df53dd3b6a5412bc10 assets/functionalstorage/blockstates/spruce_4.json
3232a9056ec6b919b6dbbe02eaf5d3a336730a9b assets/functionalstorage/blockstates/storage_controller.json 3b5bbc86563c91c040267865d6049c167d30f247 assets/functionalstorage/blockstates/storage_controller.json
e27f738dc4aeda4f45831ab1665a7f44a189a6eb assets/functionalstorage/blockstates/warped_1.json e27f738dc4aeda4f45831ab1665a7f44a189a6eb assets/functionalstorage/blockstates/warped_1.json
d219b51e15094f26af1f2e1c4578707c74a8892e assets/functionalstorage/blockstates/warped_2.json d219b51e15094f26af1f2e1c4578707c74a8892e assets/functionalstorage/blockstates/warped_2.json
9957ebb8beafe7cfa8634e1b19c3b9ed70a23ae5 assets/functionalstorage/blockstates/warped_4.json 9957ebb8beafe7cfa8634e1b19c3b9ed70a23ae5 assets/functionalstorage/blockstates/warped_4.json
eeb3ec65b016571323ecfe906a1b1d71300dfdb6 assets/functionalstorage/lang/en_us.json 162c85a626cc1f95965657d01349b4daac3c982f assets/functionalstorage/lang/en_us.json
f9c11e430cfeef0c24c5b10b7e6bdff04d5efa6a assets/functionalstorage/models/item/collector_upgrade.json f9c11e430cfeef0c24c5b10b7e6bdff04d5efa6a assets/functionalstorage/models/item/collector_upgrade.json
eed1ee36f7bc9269b2e0300a89c1418ac3cf8a29 assets/functionalstorage/models/item/copper_upgrade.json eed1ee36f7bc9269b2e0300a89c1418ac3cf8a29 assets/functionalstorage/models/item/copper_upgrade.json
06a823abd508e43d00013698b1b65eb1f71feecf assets/functionalstorage/models/item/diamond_upgrade.json 06a823abd508e43d00013698b1b65eb1f71feecf assets/functionalstorage/models/item/diamond_upgrade.json
@ -87,4 +87,4 @@ ff234dac4f0b0b4f83ffa92f2d2fb1074c68df43 data/functionalstorage/recipes/spruce_4
bcb281904eac23183c45786e3d703d24bba92be6 data/functionalstorage/recipes/warped_1.json bcb281904eac23183c45786e3d703d24bba92be6 data/functionalstorage/recipes/warped_1.json
8fc3f76a2c57eb4d80ce86947fabebe48fa6f692 data/functionalstorage/recipes/warped_2.json 8fc3f76a2c57eb4d80ce86947fabebe48fa6f692 data/functionalstorage/recipes/warped_2.json
7510a8ca1f1e3bb63f4c4f4add0bb6b713feaa0b data/functionalstorage/recipes/warped_4.json 7510a8ca1f1e3bb63f4c4f4add0bb6b713feaa0b data/functionalstorage/recipes/warped_4.json
db0122948639b122cb0c1df7530996e9784356b0 data/functionalstorage/tags/items/drawer.json d02963f7da0ca8877113c80cb1dd49d60069ff78 data/functionalstorage/tags/items/drawer.json

14
src/generated/resources/assets/functionalstorage/blockstates/storage_controller.json
View File

@ -1,7 +1,19 @@
{ {
"variants": { "variants": {
"": { "subfacing=north": {
"model": "functionalstorage:block/storage_controller" "model": "functionalstorage:block/storage_controller"
},
"subfacing=south": {
"model": "functionalstorage:block/storage_controller",
"y": 180
},
"subfacing=west": {
"model": "functionalstorage:block/storage_controller",
"y": 270
},
"subfacing=east": {
"model": "functionalstorage:block/storage_controller",
"y": 90
} }
} }
} }

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

@ -2,6 +2,7 @@
"block.functionalstorage.acacia_1": "Acacia Drawer (1x1)", "block.functionalstorage.acacia_1": "Acacia Drawer (1x1)",
"block.functionalstorage.acacia_2": "Acacia Drawer (2x2)", "block.functionalstorage.acacia_2": "Acacia Drawer (2x2)",
"block.functionalstorage.acacia_4": "Acacia Drawer (4x4)", "block.functionalstorage.acacia_4": "Acacia Drawer (4x4)",
"block.functionalstorage.armory_cabinet": "Armory Cabinet",
"block.functionalstorage.birch_1": "Birch Drawer (1x1)", "block.functionalstorage.birch_1": "Birch Drawer (1x1)",
"block.functionalstorage.birch_2": "Birch Drawer (2x2)", "block.functionalstorage.birch_2": "Birch Drawer (2x2)",
"block.functionalstorage.birch_4": "Birch Drawer (4x4)", "block.functionalstorage.birch_4": "Birch Drawer (4x4)",

7
src/main/java/com/buuz135/functionalstorage/block/DrawerControllerBlock.java
View File

@ -5,6 +5,7 @@ import com.buuz135.functionalstorage.block.tile.DrawerControllerTile;
import com.hrznstudio.titanium.block.RotatableBlock; import com.hrznstudio.titanium.block.RotatableBlock;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.BlockEntityType;
import org.jetbrains.annotations.NotNull;
public class DrawerControllerBlock extends RotatableBlock<DrawerControllerTile> { public class DrawerControllerBlock extends RotatableBlock<DrawerControllerTile> {
@ -17,4 +18,10 @@ public class DrawerControllerBlock extends RotatableBlock<DrawerControllerTile>
public BlockEntityType.BlockEntitySupplier<?> getTileEntityFactory() { public BlockEntityType.BlockEntitySupplier<?> getTileEntityFactory() {
return (p_155268_, p_155269_) -> new DrawerControllerTile(this, p_155268_, p_155269_); return (p_155268_, p_155269_) -> new DrawerControllerTile(this, p_155268_, p_155269_);
} }
@NotNull
@Override
public RotationType getRotationType() {
return RotationType.FOUR_WAY;
}
} }

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

@ -45,5 +45,6 @@ public class FunctionalStorageLangProvider extends LanguageProvider {
this.add(FunctionalStorage.PULLING_UPGRADE.get(), WordUtils.capitalize(FunctionalStorage.PULLING_UPGRADE.get().getRegistryName().getPath().replace('_', ' ').toLowerCase()) ); this.add(FunctionalStorage.PULLING_UPGRADE.get(), WordUtils.capitalize(FunctionalStorage.PULLING_UPGRADE.get().getRegistryName().getPath().replace('_', ' ').toLowerCase()) );
this.add(FunctionalStorage.PUSHING_UPGRADE.get(), WordUtils.capitalize(FunctionalStorage.PUSHING_UPGRADE.get().getRegistryName().getPath().replace('_', ' ').toLowerCase()) ); this.add(FunctionalStorage.PUSHING_UPGRADE.get(), WordUtils.capitalize(FunctionalStorage.PUSHING_UPGRADE.get().getRegistryName().getPath().replace('_', ' ').toLowerCase()) );
this.add(FunctionalStorage.VOID_UPGRADE.get(), WordUtils.capitalize(FunctionalStorage.VOID_UPGRADE.get().getRegistryName().getPath().replace('_', ' ').toLowerCase()) ); this.add(FunctionalStorage.VOID_UPGRADE.get(), WordUtils.capitalize(FunctionalStorage.VOID_UPGRADE.get().getRegistryName().getPath().replace('_', ' ').toLowerCase()) );
this.add(FunctionalStorage.ARMORY_CABINET.get(), "Armory Cabinet");
} }
} }