lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initial work on the Attractor alchemy array. Very WIP and is not quite where I like it.

Browse source
This commit is contained in:
WayofTime 2016-06-27 20:01:34 -04:00
parent a35e4385ed
commit ad546380a3
11 changed files with 895 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java
View file

@ -133,7 +133,7 @@ public class AlchemyCircleRenderer
double var35 = 0;
double var37 = 1;
GlStateManager.color(0.5f, 1f, 1f, 1f);
GlStateManager.color(1f, 1f, 1f, 1f);
wr.begin(7, DefaultVertexFormats.POSITION_TEX);
// wr.setBrightness(200);
wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex();

22
src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java
View file

@ -174,11 +174,29 @@ public class AlchemyArrayRecipeRegistry
if (input.size() == 1 && arrayRecipe.getInput().size() == 1)
{
if (ItemStackWrapper.getHolder(arrayRecipe.getInput().get(0)).equals(ItemStackWrapper.getHolder(input.get(0))))
return arrayRecipe.getAlchemyArrayEffectForCatalyst(catalystStack); // TODO: Decide if a copy should be returned.
{
AlchemyArrayEffect effect = arrayRecipe.getAlchemyArrayEffectForCatalyst(catalystStack);
if (effect != null)
{
return effect.getNewCopy();
} else
{
return null;
}
}
} else
{
if (input.equals(arrayRecipe.getInput()))
return arrayRecipe.getAlchemyArrayEffectForCatalyst(catalystStack);
{
AlchemyArrayEffect effect = arrayRecipe.getAlchemyArrayEffectForCatalyst(catalystStack);
if (effect != null)
{
return effect.getNewCopy();
} else
{
return null;
}
}
}
}