xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

cyclotron recipe fix, hashCode implementation for ODStacks

Browse Source
This commit is contained in:
Boblet 2022-08-24 10:41:42 +02:00
parent a5f4726244
commit f57a6f35a4
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/com/hbm/inventory/RecipesCommon.java
View File

@ -202,21 +202,21 @@ public class RecipesCommon {
@Override
public boolean equals(Object obj) {
if (this == obj)
if(this == obj)
return true;
if (obj == null)
if(obj == null)
return false;
if (getClass() != obj.getClass())
if(getClass() != obj.getClass())
return false;
ComparableStack other = (ComparableStack) obj;
if (item == null) {
if (other.item != null)
if(item == null) {
if(other.item != null)
return false;
} else if (!item.equals(other.item))
} else if(!item.equals(other.item))
return false;
if (meta != OreDictionary.WILDCARD_VALUE && other.meta != OreDictionary.WILDCARD_VALUE && meta != other.meta)
if(meta != OreDictionary.WILDCARD_VALUE && other.meta != OreDictionary.WILDCARD_VALUE && meta != other.meta)
return false;
if (stacksize != other.stacksize)
if(stacksize != other.stacksize)
return false;
return true;
}
@ -330,7 +330,7 @@ public class RecipesCommon {
}
public static class OreDictStack extends AStack {
public String name;
public OreDictStack(String name) {
@ -410,6 +410,35 @@ public class RecipesCommon {
return ores;
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + this.stacksize;
return result;
}
@Override
public boolean equals(Object obj) {
if(this == obj)
return true;
if(obj == null)
return false;
if(getClass() != obj.getClass())
return false;
OreDictStack other = (OreDictStack) obj;
if(name == null) {
if(other.name != null)
return false;
} else if(!name.equals(other.name)) {
return false;
}
if(this.stacksize != other.stacksize)
return false;
return true;
}
}
public static class MetaBlock {

2
src/main/java/com/hbm/inventory/recipes/CyclotronRecipes.java
View File

@ -119,7 +119,7 @@ public class CyclotronRecipes extends SerializableRecipe {
for(Entry<Pair<ComparableStack, AStack>, Pair<ItemStack, Integer>> entry : recipes.entrySet()) {
if(entry.getKey().getKey().isApplicable(boxStack) && entry.getKey().getValue().isApplicable(comp)) {
return new Object[] { entry.getValue().getKey(), entry.getValue().getValue() };
return new Object[] { entry.getValue().getKey().copy(), entry.getValue().getValue() };
}
}