mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-09-01 01:57:55 +00:00
Add redstone relay block (#2002)
- Move redstone methods out of the IAPIEnvironment, and into a new RedstoneAccess. We similarly move the implementation from Environment into a new RedstoneState class. The interface is possibly a little redundant (interfaces with a single implementation are always a little suspect), but it's nice to keep the consumer/producer interfaces separate. - Abstract most redstone API methods into a separate shared class, that can be used by both the rs API and the new redstone relay. - Add the new redstone relay block. The docs are probably a little lacking here, but I really struggled to write anything which wasn't just "look, it's the same as the redstone API".
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
"computercraft:printed_page": "Printed Page",
|
||||
"computercraft:printed_pages": "Printed Pages",
|
||||
"computercraft:printer": "Printer",
|
||||
"computercraft:redstone_relay": "Redstone Relay",
|
||||
"computercraft:speaker": "Speaker",
|
||||
"computercraft:treasure_disk": "Floppy Disk",
|
||||
"computercraft:turtle_advanced": "Advanced Turtle",
|
||||
@@ -48,6 +49,7 @@
|
||||
"minecraft:purple_dye": "Purple Dye",
|
||||
"minecraft:red_dye": "Red Dye",
|
||||
"minecraft:redstone": "Redstone Dust",
|
||||
"minecraft:stick": "Stick",
|
||||
"minecraft:stone": "Stone",
|
||||
"minecraft:string": "String",
|
||||
"minecraft:white_dye": "White Dye",
|
||||
@@ -90,7 +92,7 @@
|
||||
["minecraft:gold_ingot"],
|
||||
["minecraft:gold_ingot"],
|
||||
["minecraft:gold_ingot"],
|
||||
["computercraft:computer_advanced"],
|
||||
["computercraft:computer_normal"],
|
||||
["minecraft:gold_ingot"],
|
||||
["minecraft:gold_ingot"],
|
||||
null,
|
||||
@@ -281,6 +283,21 @@
|
||||
"output": "computercraft:printer",
|
||||
"count": 1
|
||||
},
|
||||
"computercraft:redstone_relay": {
|
||||
"inputs": [
|
||||
["minecraft:stone"],
|
||||
["minecraft:redstone"],
|
||||
["minecraft:stone"],
|
||||
["minecraft:redstone"],
|
||||
["computercraft:wired_modem"],
|
||||
["minecraft:redstone"],
|
||||
["minecraft:stone"],
|
||||
["minecraft:redstone"],
|
||||
["minecraft:stone"]
|
||||
],
|
||||
"output": "computercraft:redstone_relay",
|
||||
"count": 1
|
||||
},
|
||||
"computercraft:speaker": {
|
||||
"inputs": [
|
||||
["minecraft:stone"],
|
||||
@@ -311,13 +328,43 @@
|
||||
"output": "computercraft:turtle_advanced",
|
||||
"count": 1
|
||||
},
|
||||
"computercraft:turtle_advanced_overlays/turtle_rainbow_overlay": {
|
||||
"inputs": [
|
||||
["minecraft:red_dye"],
|
||||
["minecraft:orange_dye"],
|
||||
["minecraft:yellow_dye"],
|
||||
["minecraft:green_dye"],
|
||||
["minecraft:blue_dye"],
|
||||
["minecraft:purple_dye"],
|
||||
["minecraft:stick"],
|
||||
["computercraft:turtle_advanced"],
|
||||
null
|
||||
],
|
||||
"output": "computercraft:turtle_advanced",
|
||||
"count": 1
|
||||
},
|
||||
"computercraft:turtle_advanced_overlays/turtle_trans_overlay": {
|
||||
"inputs": [
|
||||
["minecraft:light_blue_dye"],
|
||||
["minecraft:pink_dye"],
|
||||
["minecraft:white_dye"],
|
||||
["minecraft:stick"],
|
||||
["computercraft:turtle_advanced"],
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null
|
||||
],
|
||||
"output": "computercraft:turtle_advanced",
|
||||
"count": 1
|
||||
},
|
||||
"computercraft:turtle_advanced_upgrade": {
|
||||
"inputs": [
|
||||
["minecraft:gold_ingot"],
|
||||
["minecraft:gold_ingot"],
|
||||
["minecraft:gold_ingot"],
|
||||
["minecraft:gold_ingot"],
|
||||
["computercraft:computer_advanced"],
|
||||
["computercraft:turtle_normal"],
|
||||
["minecraft:gold_ingot"],
|
||||
null,
|
||||
["minecraft:gold_block"],
|
||||
@@ -341,6 +388,36 @@
|
||||
"output": "computercraft:turtle_normal",
|
||||
"count": 1
|
||||
},
|
||||
"computercraft:turtle_normal_overlays/turtle_rainbow_overlay": {
|
||||
"inputs": [
|
||||
["minecraft:red_dye"],
|
||||
["minecraft:orange_dye"],
|
||||
["minecraft:yellow_dye"],
|
||||
["minecraft:green_dye"],
|
||||
["minecraft:blue_dye"],
|
||||
["minecraft:purple_dye"],
|
||||
["minecraft:stick"],
|
||||
["computercraft:turtle_normal"],
|
||||
null
|
||||
],
|
||||
"output": "computercraft:turtle_normal",
|
||||
"count": 1
|
||||
},
|
||||
"computercraft:turtle_normal_overlays/turtle_trans_overlay": {
|
||||
"inputs": [
|
||||
["minecraft:light_blue_dye"],
|
||||
["minecraft:pink_dye"],
|
||||
["minecraft:white_dye"],
|
||||
["minecraft:stick"],
|
||||
["computercraft:turtle_normal"],
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null
|
||||
],
|
||||
"output": "computercraft:turtle_normal",
|
||||
"count": 1
|
||||
},
|
||||
"computercraft:wired_modem": {
|
||||
"inputs": [
|
||||
["minecraft:stone"],
|
||||
@@ -397,4 +474,4 @@
|
||||
"count": 1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Binary file not shown.
After Width: | Height: | Size: 1.6 KiB |
BIN
projects/web/src/htmlTransform/export/items/minecraft/stick.png
Normal file
BIN
projects/web/src/htmlTransform/export/items/minecraft/stick.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 154 B |
@@ -8,6 +8,9 @@ package cc.tweaked.web.stub;
|
||||
* A no-op stub for {@link java.util.concurrent.locks.ReentrantLock}.
|
||||
*/
|
||||
public class ReentrantLock {
|
||||
public void lock() {
|
||||
}
|
||||
|
||||
public boolean tryLock() {
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user