Add additional optimization passes and rework I/O considerations

README.md

@@ -52,7 +52,8 @@ The folowing options are available at the toplevel (under no header):
 | `block_in_hitbox` | Allow placing blocks inside of players (hitbox logic is simplified) | true |
 | `auto_redpiler` | Use redpiler automatically | true |
 
-To change the plot size edit the constants defined in [plot/mod.rs](./crates/core/src/plot/mod.rs).
+To change the plot size edit the constants defined in [core/src/plot/mod.rs](./crates/core/src/plot/mod.rs).
+Non-I/O redstone components may be optimized away when using redpiler optimizations, prevent this by adding them to [core/build.rs](./crates/core/build.rs).
 
 ### LuckPerms
 
@@ -89,6 +90,7 @@ server_context = "global"
 | `/redpiler compile` | `/rp c` | Manually starts redpiler compilation. Available flags: --io-only --optimize --export (or in short: -I -O -E) |
 | `/redpiler reset` | `/rp r` | Stops redpiler. |
 | `/toggleautorp` | None | Toggles automatic redpiler compilation. |
+| `/toggleioonly` | None | Toggles whether to visually update non-IO redstone components. (Also forces --io-only) |
 | `/stop` | None | Stops the server. |
 
 ### Plot Ownership

crates/core/Cargo.toml

@@ -16,6 +16,11 @@ harness = false
 name = "chungus"
 harness = false
 
+[build-dependencies]
+phf = { version = "0.11", default-features = false }
+phf_codegen = "0.11"
+mchprs_blocks = { path = "../blocks" }
+
 [dependencies]
 mchprs_proc_macros = { path = "../proc_macros" }
 toml = "0.7"
@@ -46,6 +51,7 @@ once_cell = "1.14.0"
 smallvec = "1.9.0"
 petgraph = "0.6"
 rustc-hash = "1.1"
+phf = { version = "0.11", features = ["macros"] }
 redpiler_graph = { path = "../redpiler_graph" }
 mchprs_save_data = { path = "../save_data" }
 mchprs_blocks = { path = "../blocks" }

crates/core/build.rs

@@ -0,0 +1,75 @@
+use std::env;
+use std::fs::File;
+use std::io::{BufWriter, Write};
+use std::path::Path;
+
+use mchprs_blocks::blocks::Block;
+
+/// This build script generates perfect hash sets to match certain types of blocks.
+/// In non standard cases you may add components to the appropiate match statements.
+fn main() {
+    let path = Path::new(&env::var("OUT_DIR").unwrap()).join("block_filters.rs");
+    let mut file = BufWriter::new(File::create(&path).unwrap());
+
+    let mut input_set = phf_codegen::Set::<u32>::new();
+    let mut output_set = phf_codegen::Set::<u32>::new();
+    let mut changing_set = phf_codegen::Set::<u32>::new();
+
+    // Magic number, not sure how many total block states there are, but 2^16 should hopefully be enough
+    for id in 0..65536 {
+        let block = Block::from_id(id);
+
+        // Matches all blocks that should be considered as input components
+        match block {
+            Block::Lever { .. } | Block::StoneButton { .. } | Block::StonePressurePlate { .. } => {
+                input_set.entry(id);
+            }
+            _ => {}
+        }
+
+        // Matches all blocks that should be considered as output components
+        match block {
+            Block::RedstoneLamp { .. } | Block::IronTrapdoor { .. } => {
+                output_set.entry(id);
+            }
+            _ => {}
+        }
+
+        // Matches all blocks that may change state (active redstone components)
+        match block {
+            Block::RedstoneWire { .. }
+            | Block::Lever { .. }
+            | Block::StoneButton { .. }
+            | Block::RedstoneTorch { .. }
+            | Block::RedstoneWallTorch { .. }
+            | Block::RedstoneRepeater { .. }
+            | Block::RedstoneLamp { .. }
+            | Block::RedstoneComparator { .. }
+            | Block::Observer { .. }
+            | Block::StonePressurePlate { .. }
+            | Block::IronTrapdoor { .. } => {
+                changing_set.entry(id);
+            }
+            _ => {}
+        }
+    }
+
+    write!(
+        &mut file,
+        "pub static INPUT_BLOCKS: phf::Set<u32> = {};\n",
+        input_set.build()
+    )
+    .unwrap();
+    write!(
+        &mut file,
+        "pub static OUTPUT_BLOCKS: phf::Set<u32> = {};\n",
+        output_set.build()
+    )
+    .unwrap();
+    write!(
+        &mut file,
+        "pub static CHANGING_BLOCKS: phf::Set<u32> = {};\n",
+        changing_set.build()
+    )
+    .unwrap();
+}