generated from tilera/1710mod
fix: vis calculation
This commit is contained in:
parent
59ec91cf7c
commit
80bbd9f283
|
@ -24,7 +24,7 @@ apply from: './gradle/scripts/mixins.gradle'
|
|||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
|
||||
version = "1.7.0"
|
||||
version = "1.7.1"
|
||||
group= "dev.tilera"
|
||||
archivesBaseName = "auracore"
|
||||
|
||||
|
|
|
@ -50,6 +50,7 @@ public abstract class MixinThaumcraftCraftingManager {
|
|||
}
|
||||
ret = invokeGenerateTagsFromCrucibleRecipes(item, meta, history);
|
||||
if (ret != null) {
|
||||
removeVis(ret);
|
||||
return ret;
|
||||
}
|
||||
ret = AspectCalculation.generateTagsFromArcaneRecipes(item, meta, history);
|
||||
|
@ -58,6 +59,7 @@ public abstract class MixinThaumcraftCraftingManager {
|
|||
}
|
||||
ret = invokeGenerateTagsFromArcaneRecipes(item, meta, history);
|
||||
if (ret != null) {
|
||||
removeVis(ret);
|
||||
return ret;
|
||||
}
|
||||
ret = AspectCalculation.generateTagsFromInfusionRecipes(item, meta, history);
|
||||
|
@ -66,20 +68,25 @@ public abstract class MixinThaumcraftCraftingManager {
|
|||
}
|
||||
ret = invokeGenerateTagsFromInfusionRecipes(item, meta, history);
|
||||
if (ret != null) {
|
||||
removeVis(ret);
|
||||
return ret;
|
||||
}
|
||||
ret = invokeGenerateTagsFromCraftingRecipes(item, meta, history);
|
||||
|
||||
if (ret != null) {
|
||||
int vis = ret.getAmount(Aspects.VIS);
|
||||
if (vis > 0) {
|
||||
ret.remove(Aspects.VIS);
|
||||
int magic = Math.round((float)vis / 10.0f);
|
||||
ret.add(Aspect.MAGIC, magic);
|
||||
}
|
||||
removeVis(ret);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
private static void removeVis(AspectList aspects) {
|
||||
int vis = aspects.getAmount(Aspects.VIS);
|
||||
if (vis > 0) {
|
||||
aspects.remove(Aspects.VIS);
|
||||
int magic = Math.round((float)vis / 10.0f);
|
||||
aspects.add(Aspect.MAGIC, magic);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue