tilera
/
auracore
generated from tilera/1710mod
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

fix: vis calculation
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details

This commit is contained in:
Timo Ley 2023-01-14 17:27:38 +01:00
parent 59ec91cf7c
commit 80bbd9f283
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -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"

29
src/main/java/dev/tilera/auracore/mixins/MixinThaumcraftCraftingManager.java
View File

@ -46,40 +46,47 @@ public abstract class MixinThaumcraftCraftingManager {
AspectList ret = null;
ret = AspectCalculation.generateTagsFromCrucibleRecipes(item, meta, history);
if (ret != null) {
return ret;
return ret;
}
ret = invokeGenerateTagsFromCrucibleRecipes(item, meta, history);
if (ret != null) {
return ret;
removeVis(ret);
return ret;
}
ret = AspectCalculation.generateTagsFromArcaneRecipes(item, meta, history);
if (ret != null) {
return ret;
return ret;
}
ret = invokeGenerateTagsFromArcaneRecipes(item, meta, history);
if (ret != null) {
return ret;
removeVis(ret);
return ret;
}
ret = AspectCalculation.generateTagsFromInfusionRecipes(item, meta, history);
if (ret != null) {
return ret;
return ret;
}
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);
}
}
}