mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 04:09:40 +00:00
Merge branch 'master' of https://github.com/Vazkii/Botania
This commit is contained in:
commit
5e3a98fa1f
3 files changed
+56
-14
No files matched your search
@@ -44,11 +44,7 @@ public class RecipeElvenTrade {
|
||||
List<ItemStack> validStacks = OreDictionary.getOres((String) input);
|
||||
boolean found = false;
|
||||
for(ItemStack ostack : validStacks) {
|
||||
ItemStack cstack = ostack.copy();
|
||||
if(cstack.getItemDamage() == Short.MAX_VALUE)
|
||||
cstack.setItemDamage(stack.getItemDamage());
|
||||
|
||||
if(stack.isItemEqual(cstack)) {
|
||||
if(OreDictionary.itemMatches(ostack, stack, false)) {
|
||||
if(!stacksToRemove.contains(stack))
|
||||
stacksToRemove.add(stack);
|
||||
oredictIndex = j;
|
||||
|
||||
@@ -41,6 +41,7 @@ import vazkii.botania.client.model.ModelTinyPotato;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.TileTinyPotato;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.block.ItemBlockTinyPotato;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
|
||||
|
||||
@@ -173,44 +174,61 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
}
|
||||
|
||||
boolean block = stack.getItem() instanceof ItemBlock;
|
||||
boolean mySon = stack.getItem() instanceof ItemBlockTinyPotato;
|
||||
|
||||
switch(side) {
|
||||
case UP:
|
||||
if(block)
|
||||
if(mySon)
|
||||
GlStateManager.translate(0F, 0.6F, 0.5F);
|
||||
else if(block)
|
||||
GlStateManager.translate(0F, 0.3F, 0.5F);
|
||||
GlStateManager.translate(0F, -0.5F, -0.4F);
|
||||
break;
|
||||
case DOWN:
|
||||
GlStateManager.translate(0, -2.3, -0.88);
|
||||
if(block)
|
||||
if(mySon)
|
||||
GlStateManager.translate(0, .65, 0.6);
|
||||
else if(block)
|
||||
GlStateManager.translate(0, 1, 0.6);
|
||||
break;
|
||||
case NORTH:
|
||||
GlStateManager.translate(0, -1.9, 0.02);
|
||||
if(block)
|
||||
if(mySon)
|
||||
GlStateManager.translate(0, 1, 0.6);
|
||||
else if(block)
|
||||
GlStateManager.translate(0, 1, 0.6);
|
||||
break;
|
||||
case SOUTH:
|
||||
GlStateManager.translate(0, -1.6, -0.89);
|
||||
if(block)
|
||||
GlStateManager.translate(0, 1, 0.6);
|
||||
if(mySon)
|
||||
GlStateManager.translate(0, 1.4, 0.5);
|
||||
else if(block)
|
||||
GlStateManager.translate(0, 1.0, 0.5);
|
||||
break;
|
||||
case EAST:
|
||||
if(block)
|
||||
if(mySon)
|
||||
GlStateManager.translate(-0.4F, 0.65F, 0F);
|
||||
else if(block)
|
||||
GlStateManager.translate(-0.4F, 0.8F, 0F);
|
||||
else GlStateManager.rotate(-90F, 0F, 1F, 0F);
|
||||
GlStateManager.translate(-0.3F, -1.9F, 0.04F);
|
||||
break;
|
||||
case WEST:
|
||||
if(block)
|
||||
if(mySon)
|
||||
GlStateManager.translate(1F, 0.65F, 1F);
|
||||
else if(block)
|
||||
GlStateManager.translate(1F, 0.8F, 1F);
|
||||
else GlStateManager.rotate(-90F, 0F, 1F, 0F);
|
||||
GlStateManager.translate(-0.3F, -1.9F, -0.92F);
|
||||
break;
|
||||
}
|
||||
|
||||
if(block)
|
||||
if (mySon)
|
||||
GlStateManager.scale(1.1, 1.1, 1.1);
|
||||
else if(block)
|
||||
GlStateManager.scale(0.5, 0.5, 0.5);
|
||||
if(block && side != EnumFacing.NORTH)
|
||||
GlStateManager.rotate(180F, 0, 1, 0);
|
||||
renderItem(stack);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -21,6 +22,7 @@ import net.minecraft.util.ITickable;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.lexicon.ILexicon;
|
||||
import vazkii.botania.api.lexicon.multiblock.Multiblock;
|
||||
@@ -74,6 +76,7 @@ public class TileAlfPortal extends TileMod implements ITickable {
|
||||
public int ticksOpen = 0;
|
||||
private int ticksSinceLastItem = 0;
|
||||
private boolean closeNow = false;
|
||||
private boolean explode = false;
|
||||
|
||||
private static final Function<BlockPos, BlockPos> CONVERTER_X_Z = input -> new BlockPos(input.getZ(), input.getY(), input.getX());
|
||||
|
||||
@@ -141,7 +144,8 @@ public class TileAlfPortal extends TileMod implements ITickable {
|
||||
|
||||
if (consume) {
|
||||
item.setDead();
|
||||
addItem(stack);
|
||||
if (validateItemUsage(stack))
|
||||
addItem(stack);
|
||||
ticksSinceLastItem = 0;
|
||||
}
|
||||
}
|
||||
@@ -162,9 +166,33 @@ public class TileAlfPortal extends TileMod implements ITickable {
|
||||
for(int i = 0; i < 36; i++)
|
||||
blockParticle(state);
|
||||
world.setBlockState(getPos(), world.getBlockState(getPos()).withProperty(BotaniaStateProps.ALFPORTAL_STATE, newState), 1 | 2);
|
||||
} else if(explode) {
|
||||
world.createExplosion(null, pos.getX() + .5, pos.getY() + 2.0, pos.getZ() + .5, 3f, true);
|
||||
explode = false;
|
||||
}
|
||||
}
|
||||
|
||||
private boolean validateItemUsage(ItemStack inputStack) {
|
||||
for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) {
|
||||
for(Object o : recipe.getInputs()) {
|
||||
if(o instanceof String) {
|
||||
for(ItemStack target : OreDictionary.getOres((String) o)) {
|
||||
if(OreDictionary.itemMatches(target, inputStack, false))
|
||||
return true;
|
||||
}
|
||||
} else if(o instanceof ItemStack) {
|
||||
ItemStack target = (ItemStack) o;
|
||||
if(inputStack.getItem() == target.getItem() && inputStack.getItemDamage() == target.getItemDamage())
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(inputStack.getItem() == Items.BREAD) //Don't teleport bread. (See also: #2403)
|
||||
explode = true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private void blockParticle(AlfPortalState state) {
|
||||
int i = world.rand.nextInt(AIR_POSITIONS.length);
|
||||
double[] pos = new double[] {
|
||||
|
||||
Reference in new issue
Block a user