virt-mirrors/Sit
1
0
Fork 1
mirror of https://github.com/Oth3r/Sit.git synced 2025-09-20 00:13:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '1.21.1' into 1.20.6

Browse source 
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/screen/ConfigScreen.java
#	src/main/java/one/oth3r/sit/screen/UnderConstructionScreen.java
#	src/main/java/one/oth3r/sit/utl/Utl.java
This commit is contained in:
Oth3r 2025-05-20 12:48:01 -05:00
commit f2cba71afa
65 changed files with 960 additions and 526 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/one/oth3r/sit/file/CustomBlock.java
View file

@ -9,6 +9,7 @@ import net.minecraft.util.Identifier;
import one.oth3r.sit.utl.Utl;
import java.util.ArrayList;
import java.util.Objects;
public class CustomBlock {
@ -104,4 +105,16 @@ public class CustomBlock {
// not returning true in the loop because there might be a (!) not tag that the block might fall into, after the block was already in another tag
return tagCheck;
}
@Override
public boolean equals(Object o) {
if (o == null || getClass() != o.getClass()) return false;
CustomBlock that = (CustomBlock) o;
return Objects.equals(blockIds, that.blockIds) && Objects.equals(blockTags, that.blockTags) && Objects.equals(blockStates, that.blockStates);
}
@Override
public int hashCode() {
return Objects.hash(blockIds, blockTags, blockStates);
}
}