Skip to content

remove tag #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hayanesuru merged 2 commits into from
May 16, 2026
Merged

remove tag #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
579587b
remove tag
hayanesuru May 16, 2026
d5478ff
fix build
hayanesuru May 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions generator/Datagen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,23 +151,23 @@ public static void start(final WorldStem worldStem) throws IOException, ContentV
item(b);
Files.writeString(Path.of("item.txt"), b.toString());

var access = worldStem.registries().compositeAccess();
// var access = worldStem.registries().compositeAccess();

b.setLength(0);
tags(b, access.lookupOrThrow(Registries.BLOCK));
Files.writeString(Path.of("block_tags.txt"), b.toString());
// b.setLength(0);
// tags(b, access.lookupOrThrow(Registries.BLOCK));
// Files.writeString(Path.of("block_tags.txt"), b.toString());

b.setLength(0);
tags(b, access.lookupOrThrow(Registries.ITEM));
Files.writeString(Path.of("item_tags.txt"), b.toString());
// b.setLength(0);
// tags(b, access.lookupOrThrow(Registries.ITEM));
// Files.writeString(Path.of("item_tags.txt"), b.toString());

b.setLength(0);
tags(b, access.lookupOrThrow(Registries.ENTITY_TYPE));
Files.writeString(Path.of("entity_tags.txt"), b.toString());
// b.setLength(0);
// tags(b, access.lookupOrThrow(Registries.ENTITY_TYPE));
// Files.writeString(Path.of("entity_tags.txt"), b.toString());

b.setLength(0);
tags(b, access.lookupOrThrow(Registries.GAME_EVENT));
Files.writeString(Path.of("game_event_tags.txt"), b.toString());
// b.setLength(0);
// tags(b, access.lookupOrThrow(Registries.GAME_EVENT));
// Files.writeString(Path.of("game_event_tags.txt"), b.toString());
}

private static <E> void tags(final StringBuilder b, final Registry<E> registryLookup) {
Expand Down
190 changes: 0 additions & 190 deletions haya_data/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,6 @@ fn main() {
let pac = read(&mut data, path.join("packet.txt"));
let pac = ent.end..ent.end + pac;

let blt = read(&mut data, path.join("block_tags.txt"));
let blt = pac.end..pac.end + blt;

let itt = read(&mut data, path.join("item_tags.txt"));
let itt = blt.end..blt.end + itt;

let ett = read(&mut data, path.join("entity_tags.txt"));
let ett = itt.end..itt.end + ett;

let gat = read(&mut data, path.join("game_event_tags.txt"));
let gat = ett.end..ett.end + gat;

let data = core::str::from_utf8(&data).unwrap();
let block_names = registries(&mut w, &data[reg], &mut gen_hash);
registries(&mut w, &data[pac], &mut gen_hash);
Expand All @@ -105,11 +93,6 @@ fn main() {
let (bs_repr, bl_props, bs_size) = block_state(&mut w, &data[blo], &mut gen_hash, &block_names);
fluid_state(&mut w, &data[flu], bs_repr, &bl_props, &bs_size);

block_tags(&mut w, &data[blt]);
item_tags(&mut w, &data[itt]);
entity_tags(&mut w, &data[ett]);
game_event_tags(&mut w, &data[gat]);

std::fs::write(out.join("data.rs"), w).unwrap();
}

Expand Down Expand Up @@ -311,126 +294,6 @@ fn fluid_state(
*w += ";\n";
}

fn block_tags(w: &mut String, data: &str) {
let mut iter = data.split('\n');
*w += "impl block {\n";
while let Some(tag) = iter.next() {
let tag = tag.trim_ascii();
if tag.is_empty() {
break;
}
let list = iter.next().unwrap();
*w += "#[inline]\n#[must_use]\npub const fn is_";
let mut last_end = 0;
for (start, part) in tag.match_indices(['.', '/']) {
*w += unsafe { tag.get_unchecked(last_end..start) };
w.push('_');
last_end = start + part.len();
}
*w += unsafe { tag.get_unchecked(last_end..tag.len()) };
*w += "(self) -> bool {\n";
if list.split_ascii_whitespace().next().is_some() {
*w += "matches!(self as raw_block,\n";
list_match_or(w, hex_line(list));
*w += "\n)";
} else {
*w += "false";
}
*w += "\n}\n";
}
*w += "}\n";
}

fn item_tags(w: &mut String, data: &str) {
let mut iter = data.split('\n');
*w += "impl item {\n";
while let Some(tag) = iter.next() {
let tag = tag.trim_ascii();
if tag.is_empty() {
break;
}
let list = iter.next().unwrap();
*w += "#[inline]\n#[must_use]\npub const fn is_";
let mut last_end = 0;
for (start, part) in tag.match_indices(['.', '/']) {
*w += unsafe { tag.get_unchecked(last_end..start) };
w.push('_');
last_end = start + part.len();
}
*w += unsafe { tag.get_unchecked(last_end..tag.len()) };
*w += "(self) -> bool {\n";
if list.split_ascii_whitespace().next().is_some() {
*w += "matches!(self as raw_item,\n";
list_match_or(w, hex_line(list));
*w += "\n)";
} else {
*w += "false";
}
*w += "\n}\n";
}
*w += "}\n";
}

fn entity_tags(w: &mut String, data: &str) {
let mut iter = data.split('\n');
*w += "impl entity_type {\n";
while let Some(tag) = iter.next() {
let tag = tag.trim_ascii();
if tag.is_empty() {
break;
}
let list = iter.next().unwrap();
*w += "#[inline]\n#[must_use]\npub const fn is_";
let mut last_end = 0;
for (start, part) in tag.match_indices(['.', '/']) {
*w += unsafe { tag.get_unchecked(last_end..start) };
w.push('_');
last_end = start + part.len();
}
*w += unsafe { tag.get_unchecked(last_end..tag.len()) };
*w += "(self) -> bool {\n";
if list.split_ascii_whitespace().next().is_some() {
*w += "matches!(self as raw_entity_type,\n";
list_match_or(w, hex_line(list));
*w += "\n)";
} else {
*w += "false";
}
*w += "\n}\n";
}
*w += "}\n";
}

fn game_event_tags(w: &mut String, data: &str) {
let mut iter = data.split('\n');
*w += "impl game_event {\n";
while let Some(tag) = iter.next() {
let tag = tag.trim_ascii();
if tag.is_empty() {
break;
}
let list = iter.next().unwrap();
*w += "#[inline]\n#[must_use]\npub const fn is_";
let mut last_end = 0;
for (start, part) in tag.match_indices(['.', '/']) {
*w += unsafe { tag.get_unchecked(last_end..start) };
w.push('_');
last_end = start + part.len();
}
*w += unsafe { tag.get_unchecked(last_end..tag.len()) };
*w += "(self) -> bool {\n";
if list.split_ascii_whitespace().next().is_some() {
*w += "matches!(self as raw_game_event,\n";
list_match_or(w, hex_line(list));
*w += "\n)";
} else {
*w += "false";
}
*w += "\n}\n";
}
*w += "}\n";
}

fn block_state(
w: &mut String,
data: &str,
Expand Down Expand Up @@ -1671,45 +1534,8 @@ fn list(w: &mut String, mut iter: impl Iterator<Item = impl Format>) {
w.push(']');
}

fn list_match_or(w: &mut String, mut iter: impl Iterator<Item = impl Format> + Clone) {
let iter1 = iter.clone();
let first = iter.next();
let first = match first {
Some(x) => x,
None => {
unimplemented!();
}
};
if iter1.is_sorted_by(|a, b| a.is_next(b))
&& let Some(last) = iter.clone().last()
{
first.format(w);
*w += "..=";
last.format(w);
return;
}

let mut c = 0usize;
first.format(w);
for x in iter {
w.push(' ');
w.push('|');
c += 1;
if c == 8 {
w.push('\n');
c = 0;
} else {
w.push(' ');
}
x.format(w);
}
}

trait Format {
fn format(&self, w: &mut String);
fn is_next(&self, _: &Self) -> bool {
false
}
}

impl Format for str {
Expand All @@ -1722,40 +1548,24 @@ impl Format for usize {
fn format(&self, w: &mut String) {
write(w, *self);
}

fn is_next(&self, other: &Self) -> bool {
self.wrapping_add(1) == *other
}
}

impl Format for u8 {
fn format(&self, w: &mut String) {
write(w, *self);
}

fn is_next(&self, other: &Self) -> bool {
self.wrapping_add(1) == *other
}
}

impl Format for u32 {
fn format(&self, w: &mut String) {
write(w, *self);
}

fn is_next(&self, other: &Self) -> bool {
self.wrapping_add(1) == *other
}
}

impl Format for u64 {
fn format(&self, w: &mut String) {
write(w, *self);
}

fn is_next(&self, other: &Self) -> bool {
self.wrapping_add(1) == *other
}
}

impl Format for f32 {
Expand Down
Loading