Skip to content

Commit 92d6566

Browse files
committed
added tags to items and blocks
1 parent b2a86af commit 92d6566

7 files changed

Lines changed: 32 additions & 18 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ minecraft_version=1.20.1
66
yarn_mappings=1.20.1+build.10
77
loader_version=0.16.10
88
# Mod Properties
9-
mod_version=0.4.0
9+
mod_version=0.4.1
1010
maven_group=org.windclan
1111
archives_base_name=embeddedcomputer
1212
# Dependencies

src/main/java/org/windclan/embeddedcomputer/storage/harddrive/HardDrivePeripheral.java

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,17 @@ public boolean equals(@Nullable IPeripheral other) {
3535
}
3636

3737
@LuaFunction(mainThread = true)
38-
public final boolean mount(IComputerAccess computer, @Nullable String str) {
38+
public final boolean mount(IComputerAccess computer, String str) {
3939
if (Objects.equals(str, "rom")) {
4040
return false;
4141
}
4242
mount = str;
4343
return hdd.attach(computer,str);
4444
}
4545
@LuaFunction(mainThread = true)
46-
public final boolean mount(IComputerAccess computer) {
47-
String str = "drive";
48-
if (Objects.equals(str, "rom")) {
49-
return false;
50-
}
51-
mount = str;
52-
return hdd.attach(computer,str);
53-
}
54-
55-
@LuaFunction(mainThread = true)
56-
public final boolean unmount(IComputerAccess computer, @Nullable String str) {
46+
public final boolean unmount(IComputerAccess computer, String str) {
5747
return hdd.detach(computer,str);
5848
}
59-
@LuaFunction(mainThread = true)
60-
public final boolean unmount(IComputerAccess computer) {
61-
return hdd.detach(computer,mount);
62-
}
6349
public static IPeripheral getPeripheral(BlockEntity blockEntity, Direction direction) {
6450
return new HardDrivePeripheral(blockEntity);
6551
}

src/main/resources/assets/embeddedcomputer/lang/en_us.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
"block.embeddedcomputer.hard_drive": "Hard Drive",
66
"item.embeddedcomputer.zip_disk": "Zip Disk",
77
"item.embeddedcomputer.flash_card": "Flash Card",
8-
"item.embeddedcomputer.debug_rock": "Magical Rock of Storage Debugging"
8+
"item.embeddedcomputer.debug_rock": "Magical Rock of Storage Debugging",
9+
"tag.item.embeddeccomputer.embedded_computers": "Embedded Computers",
10+
"tag.block.embeddeccomputer.embedded_computers": "Embedded Computers"
911
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"embeddedcomputer:embedded_computer",
5+
"embeddedcomputer:secure_computer"
6+
]
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
"embeddedcomputer:embedded_computer",
5+
"embeddedcomputer:secure_computer"
6+
]
7+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"values": [
3+
"embeddedcomputer:embedded_computer",
4+
"embeddedcomputer:secure_computer"
5+
]
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"values": [
3+
"embeddedcomputer:embedded_computer",
4+
"embeddedcomputer:secure_computer"
5+
]
6+
}

0 commit comments

Comments
 (0)