e3644f2d2b
I redone where the items/blocsks are stored and how the configs are handled to clean up it and give space. You can change the config line to AWWayofTime if you want to keep the compatibility with old configs. Now you reference the blocks from the ModBlocks and Items from the ModItems.
54 lines
1.2 KiB
Java
54 lines
1.2 KiB
Java
package thaumcraft.api.research;
|
|
|
|
import net.minecraft.entity.Entity;
|
|
|
|
public class ScanResult {
|
|
public byte type = 0; //1=blocks,2=entities,3=phenomena
|
|
public int blockId;
|
|
public int blockMeta;
|
|
public Entity entity;
|
|
public String phenomena;
|
|
|
|
public ScanResult(byte type, int blockId, int blockMeta, Entity entity,
|
|
String phenomena)
|
|
{
|
|
super();
|
|
this.type = type;
|
|
this.blockId = blockId;
|
|
this.blockMeta = blockMeta;
|
|
this.entity = entity;
|
|
this.phenomena = phenomena;
|
|
}
|
|
|
|
@Override
|
|
public boolean equals(Object obj)
|
|
{
|
|
if (obj instanceof ScanResult)
|
|
{
|
|
ScanResult sr = (ScanResult) obj;
|
|
|
|
if (type != sr.type)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
if (type == 1
|
|
&& (blockId != sr.blockId || blockMeta != sr.blockMeta))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
if (type == 2 && entity.entityId != sr.entity.entityId)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
if (type == 3 && !phenomena.equals(sr.phenomena))
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
}
|