Anvilcraft/ModTweaker
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed MAJOR bugs in the thaumcraft aspect system. Hope this fixes things.

Browse source
This commit is contained in:
unknown 2015-01-23 14:01:10 -06:00
parent fac954f5b9
commit c66ecdcf29
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/modtweaker/mods/thaumcraft/ThaumcraftHelper.java
View file

@ -29,29 +29,34 @@ public class ThaumcraftHelper {
}
public static AspectList parseAspects(AspectList list, String str) {
if (list == null) list = new AspectList();
AspectList output=new AspectList();
if (list != null)
output.add(list);
if (str == null || str.equals("")) return list;
String[] aspects = str.split(",");
for (String aspect : aspects) {
if (aspect.startsWith(" ")) aspect = aspect.replaceFirst(" ", "");
String[] aspct = aspect.split("\\s+");
if (aspct.length == 2) list.add(Aspect.aspects.get(aspct[0]), Integer.parseInt(aspct[1]));
if (aspct.length == 2) output.add(Aspect.aspects.get(aspct[0]), Integer.parseInt(aspct[1]));
}
return list;
return output;
}
public static AspectList removeAspects(AspectList list, String str) {
AspectList output=new AspectList();
if (list != null)
output.add(list);
String[] aspects = str.split(",");
for (String aspect : aspects) {
if (aspect.startsWith(" ")) aspect = aspect.replaceFirst(" ", "");
String[] aspct = aspect.split("\\s+");
if (aspct.length == 2) {
list.remove(Aspect.aspects.get(aspct[0]), Integer.parseInt(aspct[1]));
output.remove(Aspect.aspects.get(aspct[0]), Integer.parseInt(aspct[1]));
}
}
return list;
return output;
}
public static String getResearchTab(String key) {

2
src/main/java/modtweaker/mods/thaumcraft/handlers/Aspects.java
View file

@ -198,7 +198,7 @@ public class Aspects {
if (oldList != null) {
newList = ThaumcraftHelper.removeAspects(oldList, aspects);
ThaumcraftHelper.removeEntityAspects(entityName);
ThaumcraftApi.registerEntityTag(entityName, newList);
ThaumcraftApi.registerEntityTag(entityName, newList);
}
}