Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-11-22 19:58:34 +01:00
Code Issues Projects Releases Wiki Activity

fixed the altar not allowing extraction of outputs that might be inputs for catalysts not present

Browse source
This commit is contained in:
Ellpeck 2019-02-08 20:10:25 +01:00
parent 9ebb334c58
commit de8cffc0ba
1 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityNatureAltar.java
View file

@ -38,7 +38,7 @@ public class TileEntityNatureAltar extends TileEntityImpl implements ITickable {
@Override @Override
protected boolean canInsert(ItemStack stack, int slot) { protected boolean canInsert(ItemStack stack, int slot) {
return getRecipeForInput(stack) != null || stack.hasCapability(NaturesAuraAPI.capAuraContainer, null); return TileEntityNatureAltar.this.getRecipeForInput(stack) != null || stack.hasCapability(NaturesAuraAPI.capAuraContainer, null);
} }
@Override @Override
@ -46,7 +46,7 @@ public class TileEntityNatureAltar extends TileEntityImpl implements ITickable {
if (stack.hasCapability(NaturesAuraAPI.capAuraContainer, null)) if (stack.hasCapability(NaturesAuraAPI.capAuraContainer, null))
return stack.getCapability(NaturesAuraAPI.capAuraContainer, null).storeAura(1, true) <= 0; return stack.getCapability(NaturesAuraAPI.capAuraContainer, null).storeAura(1, true) <= 0;
else else
return getRecipeForInput(stack) == null; return TileEntityNatureAltar.this.getRecipeForInput(stack) == null;
} }
}; };
@ -54,6 +54,7 @@ public class TileEntityNatureAltar extends TileEntityImpl implements ITickable {
public int bobTimer; public int bobTimer;
private final BasicAuraContainer container = new BasicAuraContainer(NaturesAuraAPI.TYPE_OVERWORLD, 500000); private final BasicAuraContainer container = new BasicAuraContainer(NaturesAuraAPI.TYPE_OVERWORLD, 500000);
private final ItemStack[] catalysts = new ItemStack[4];
public boolean structureFine; public boolean structureFine;
private AltarRecipe currentRecipe; private AltarRecipe currentRecipe;
@ -72,6 +73,18 @@ public class TileEntityNatureAltar extends TileEntityImpl implements ITickable {
this.structureFine = fine; this.structureFine = fine;
this.sendToClients(); this.sendToClients();
} }
if (this.structureFine) {
int index = 0;
for (int x = -2; x <= 2; x += 4) {
for (int z = -2; z <= 2; z += 4) {
BlockPos offset = this.pos.add(x, 1, z);
IBlockState state = this.world.getBlockState(offset);
this.catalysts[index] = state.getBlock().getItem(this.world, offset, state);
index++;
}
}
}
} }
if (this.structureFine) { if (this.structureFine) {
@ -113,13 +126,13 @@ public class TileEntityNatureAltar extends TileEntityImpl implements ITickable {
} else { } else {
if (this.currentRecipe == null) { if (this.currentRecipe == null) {
if (!stack.isEmpty()) { if (!stack.isEmpty()) {
this.currentRecipe = getRecipeForInput(stack); this.currentRecipe = this.getRecipeForInput(stack);
} }
} else { } else {
if (stack.isEmpty() || !this.currentRecipe.input.apply(stack)) { if (stack.isEmpty() || !this.currentRecipe.input.apply(stack)) {
this.currentRecipe = null; this.currentRecipe = null;
this.timer = 0; this.timer = 0;
} else if (this.hasCatalyst(this.currentRecipe.catalyst)) { } else {
int req = MathHelper.ceil(this.currentRecipe.aura / (double) this.currentRecipe.time); int req = MathHelper.ceil(this.currentRecipe.aura / (double) this.currentRecipe.time);
if (this.container.getStoredAura() >= req) { if (this.container.getStoredAura() >= req) {
this.container.drainAura(req, false); this.container.drainAura(req, false);
@ -179,31 +192,19 @@ public class TileEntityNatureAltar extends TileEntityImpl implements ITickable {
} }
} }
private static AltarRecipe getRecipeForInput(ItemStack input) { private AltarRecipe getRecipeForInput(ItemStack input) {
for (AltarRecipe recipe : NaturesAuraAPI.ALTAR_RECIPES.values()) { for (AltarRecipe recipe : NaturesAuraAPI.ALTAR_RECIPES.values()) {
if (recipe.input.apply(input)) { if (recipe.input.apply(input)) {
return recipe; if (recipe.catalyst == Ingredient.EMPTY)
return recipe;
for (ItemStack stack : this.catalysts)
if (recipe.catalyst.apply(stack))
return recipe;
} }
} }
return null; return null;
} }
private boolean hasCatalyst(Ingredient catalyst) {
if (catalyst == Ingredient.EMPTY)
return true;
for (int x = -2; x <= 2; x += 4) {
for (int z = -2; z <= 2; z += 4) {
BlockPos offset = this.pos.add(x, 1, z);
IBlockState state = this.world.getBlockState(offset);
ItemStack stack = state.getBlock().getItem(this.world, offset, state);
if (catalyst.apply(stack))
return true;
}
}
return false;
}
@Override @Override
public void writeNBT(NBTTagCompound compound, SaveType type) { public void writeNBT(NBTTagCompound compound, SaveType type) {
super.writeNBT(compound, type); super.writeNBT(compound, type);