Added a new (slightly WIP?) array, the Turret Array
This commit is contained in:
WayofTime
parent
ecb81a7017
commit
bbe026dda9
|
|
@ -5,6 +5,8 @@ Version 2.2.8
|
|||
- It's a bright idea to fix this as soon as I can.
|
||||
- Changed the recipe of the Teleport Array:
|
||||
- Note from Scotty: Captain, I'll remind ya what happened last time you put an apple in her array! Use an Enderpearl and redstone dust next time!
|
||||
- Added a new (slightly WIP?) array, the Turret Array:
|
||||
- Place an array on top of an inventory with arrows and then place a bow and an arrow in the array. The array will target enemies greater than 3 blocks away and less than 32, using any arrows in the inventory.
|
||||
- Increased the max number of items transferable by the Master Routing Node in its system to 64 per second. Will revisit this limit if I figure out a less silly upgrade system.
|
||||
|
||||
------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -0,0 +1,242 @@
|
|||
package WayofTime.bloodmagic.alchemyArray;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import net.minecraft.entity.monster.EntityMob;
|
||||
import net.minecraft.entity.projectile.EntityTippedArrow;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemArrow;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.Vec2f;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.items.IItemHandler;
|
||||
import WayofTime.bloodmagic.util.Utils;
|
||||
|
||||
public class AlchemyArrayEffectArrowTurret extends AlchemyArrayEffect
|
||||
{
|
||||
public EntityLiving target;
|
||||
public int arrowTimer;
|
||||
public static final int ARROW_WINDUP = 50;
|
||||
private int lastChestSlot = -1;
|
||||
|
||||
private double pitch = 0;
|
||||
private double lastPitch = 0;
|
||||
private double yaw = 0;
|
||||
private double lastYaw = 0;
|
||||
|
||||
public AlchemyArrayEffectArrowTurret(String key)
|
||||
{
|
||||
super(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean update(TileEntity tile, int ticksActive)
|
||||
{
|
||||
BlockPos pos = tile.getPos();
|
||||
World world = tile.getWorld();
|
||||
|
||||
BlockPos chestPos = pos.down();
|
||||
TileEntity chestTile = world.getTileEntity(chestPos);
|
||||
if (chestTile == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
IItemHandler itemHandler = Utils.getInventory(chestTile, EnumFacing.UP);
|
||||
if (itemHandler == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
ItemStack arrowStack = new ItemStack(Items.AIR);
|
||||
if (lastChestSlot >= 0 && lastChestSlot < itemHandler.getSlots())
|
||||
{
|
||||
ItemStack testStack = itemHandler.extractItem(lastChestSlot, 1, true);
|
||||
if (testStack.isEmpty() || !(testStack.getItem() instanceof ItemArrow))
|
||||
{
|
||||
lastChestSlot = -1;
|
||||
} else
|
||||
{
|
||||
arrowStack = testStack;
|
||||
}
|
||||
}
|
||||
|
||||
if (lastChestSlot < 0)
|
||||
{
|
||||
for (int i = 0; i < itemHandler.getSlots(); i++)
|
||||
{
|
||||
ItemStack testStack = itemHandler.extractItem(i, 1, true);
|
||||
if (!testStack.isEmpty() && testStack.getItem() instanceof ItemArrow)
|
||||
{
|
||||
arrowStack = testStack;
|
||||
lastChestSlot = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (lastChestSlot < 0)
|
||||
{
|
||||
return false; //No arrows in the chest. Welp!
|
||||
}
|
||||
|
||||
if (canFireOnMob(world, pos, target))
|
||||
{
|
||||
Vec2f pitchYaw = getPitchYaw(pos, target);
|
||||
lastPitch = pitch;
|
||||
lastYaw = yaw;
|
||||
pitch = pitchYaw.x;
|
||||
yaw = pitchYaw.y;
|
||||
arrowTimer++;
|
||||
|
||||
if (arrowTimer >= ARROW_WINDUP)
|
||||
{
|
||||
// ItemStack arrowStack = new ItemStack(Items.ARROW);
|
||||
fireOnTarget(world, pos, arrowStack, target);
|
||||
if (!world.isRemote)
|
||||
{
|
||||
itemHandler.extractItem(lastChestSlot, 1, false);
|
||||
}
|
||||
arrowTimer = 0;
|
||||
}
|
||||
return false;
|
||||
} else
|
||||
{
|
||||
target = null;
|
||||
arrowTimer = -1;
|
||||
}
|
||||
|
||||
List<EntityMob> mobsInRange = world.getEntitiesWithinAABB(EntityMob.class, getBounds(pos));
|
||||
|
||||
for (EntityMob entity : mobsInRange)
|
||||
{
|
||||
if (canFireOnMob(world, pos, entity))// && isMobInFilter(ent))
|
||||
{
|
||||
target = entity;
|
||||
arrowTimer = 0;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
arrowTimer = -1;
|
||||
target = null;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public double getPitch()
|
||||
{
|
||||
return pitch;
|
||||
}
|
||||
|
||||
public double getLastPitch()
|
||||
{
|
||||
return lastPitch;
|
||||
}
|
||||
|
||||
public double getYaw()
|
||||
{
|
||||
return yaw;
|
||||
}
|
||||
|
||||
public double getLastYaw()
|
||||
{
|
||||
return lastYaw;
|
||||
}
|
||||
|
||||
public void fireOnTarget(World world, BlockPos pos, ItemStack arrowStack, EntityLiving targetMob)
|
||||
{
|
||||
float vel = 3f;
|
||||
double damage = 2;
|
||||
if (!world.isRemote)
|
||||
{
|
||||
if (arrowStack.getItem() instanceof ItemArrow)
|
||||
{
|
||||
// ItemArrow arrow = (ItemArrow) arrowStack.getItem();
|
||||
// EntityArrow entityarrow = arrow.createArrow(world, arrowStack, targetMob);
|
||||
EntityTippedArrow entityarrow = new EntityTippedArrow(world);
|
||||
entityarrow.setPotionEffect(arrowStack);
|
||||
entityarrow.posX = pos.getX() + 0.5;
|
||||
entityarrow.posY = pos.getY() + 0.5;
|
||||
entityarrow.posZ = pos.getZ() + 0.5;
|
||||
|
||||
double d0 = targetMob.posX - (pos.getX() + 0.5);
|
||||
double d1 = targetMob.posY + targetMob.height - (pos.getY() + 0.5);
|
||||
double d2 = targetMob.posZ - (pos.getZ() + 0.5);
|
||||
double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2);
|
||||
entityarrow.setDamage(damage);
|
||||
entityarrow.shoot(d0, d1 + d3 * 0.05, d2, vel, 0);
|
||||
world.spawnEntity(entityarrow);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static Vec2f getPitchYaw(BlockPos pos, Entity entityIn)
|
||||
{
|
||||
if (entityIn == null)
|
||||
{
|
||||
return new Vec2f(0, 0);
|
||||
}
|
||||
|
||||
double distanceX = entityIn.posX - (pos.getX() + 0.5);
|
||||
double distanceY = entityIn.posY + (double) entityIn.getEyeHeight() - (pos.getY() + 0.5);
|
||||
double distanceZ = entityIn.posZ - (pos.getZ() + 0.5);
|
||||
double radialDistance = Math.sqrt(distanceX * distanceX + distanceZ * distanceZ);
|
||||
double yaw = Math.atan2(-distanceX, distanceZ) * 180 / Math.PI;
|
||||
double pitch = -Math.atan2(distanceY, radialDistance) * 180 / Math.PI;
|
||||
|
||||
return new Vec2f((float) pitch, (float) yaw);
|
||||
}
|
||||
|
||||
public boolean canEntityBeSeen(World world, BlockPos pos, Entity entityIn)
|
||||
{
|
||||
return world.rayTraceBlocks(new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5), new Vec3d(entityIn.posX, entityIn.posY + (double) entityIn.getEyeHeight(), entityIn.posZ), false, true, false) == null;
|
||||
}
|
||||
|
||||
public boolean canFireOnMob(World world, BlockPos pos, Entity entityIn)
|
||||
{
|
||||
return entityIn != null && !entityIn.isDead && entityIn.getDistanceSqToCenter(pos) <= getRange() * getRange() && entityIn.getDistanceSqToCenter(pos) >= getMinRange() * getMinRange() && canEntityBeSeen(world, pos, entityIn);
|
||||
}
|
||||
|
||||
public AxisAlignedBB getBounds(BlockPos pos)
|
||||
{
|
||||
return new AxisAlignedBB(pos).grow(getRange(), getRange(), getRange());
|
||||
}
|
||||
|
||||
public float getRange()
|
||||
{
|
||||
return 32;
|
||||
}
|
||||
|
||||
public float getMinRange()
|
||||
{
|
||||
return 3;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound tag)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public AlchemyArrayEffect getNewCopy()
|
||||
{
|
||||
return new AlchemyArrayEffectArrowTurret(key);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,285 @@
|
|||
package WayofTime.bloodmagic.client.render.alchemyArray;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Vec2f;
|
||||
import net.minecraft.world.World;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectArrowTurret;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyCircleRenderer;
|
||||
import WayofTime.bloodmagic.tile.TileAlchemyArray;
|
||||
|
||||
public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer
|
||||
{
|
||||
private ResourceLocation bottomArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png");
|
||||
private ResourceLocation middleArrayResource = new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png");
|
||||
|
||||
public TurretAlchemyCircleRenderer(ResourceLocation location)
|
||||
{
|
||||
super(location);
|
||||
}
|
||||
|
||||
public TurretAlchemyCircleRenderer()
|
||||
{
|
||||
this(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getSizeModifier(float craftTime)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getRotation(float craftTime)
|
||||
{
|
||||
float offset = 50;
|
||||
if (craftTime >= offset)
|
||||
{
|
||||
float modifier = (craftTime - offset) * 5f;
|
||||
return modifier * 1f;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getSecondaryRotation(float craftTime)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderAt(TileEntity tile, double x, double y, double z, float craftTime)
|
||||
{
|
||||
if (!(tile instanceof TileAlchemyArray))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
float f = 0; //Not working
|
||||
|
||||
TileAlchemyArray tileArray = (TileAlchemyArray) tile;
|
||||
AlchemyArrayEffect effect = tileArray.arrayEffect;
|
||||
double pitch = 0;
|
||||
double yaw = 0;
|
||||
int arrowTimer = -1;
|
||||
if (effect instanceof AlchemyArrayEffectArrowTurret)
|
||||
{
|
||||
AlchemyArrayEffectArrowTurret turretEffect = (AlchemyArrayEffectArrowTurret) effect;
|
||||
pitch = (turretEffect.getPitch() - turretEffect.getLastPitch()) * f + turretEffect.getLastPitch();
|
||||
yaw = (turretEffect.getYaw() - turretEffect.getLastYaw()) * f + turretEffect.getLastYaw();
|
||||
arrowTimer = turretEffect.arrowTimer;
|
||||
}
|
||||
|
||||
double arrowAnimation = arrowTimer + f;
|
||||
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
BufferBuilder wr = tessellator.getBuffer();
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
|
||||
float rot = getRotation(craftTime);
|
||||
|
||||
float size = 1.0F * getSizeModifier(craftTime);
|
||||
|
||||
// Bind the texture to the circle
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource);
|
||||
|
||||
GlStateManager.disableCull();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(770, 1);
|
||||
|
||||
GlStateManager.translate(x, y, z);
|
||||
|
||||
// Specify which face this "circle" is located on
|
||||
EnumFacing sideHit = EnumFacing.UP;
|
||||
EnumFacing rotation = tileArray.getRotation();
|
||||
|
||||
GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace);
|
||||
|
||||
switch (sideHit)
|
||||
{
|
||||
case DOWN:
|
||||
GlStateManager.translate(0, 0, 1);
|
||||
GlStateManager.rotate(-90.0f, 1, 0, 0);
|
||||
break;
|
||||
case EAST:
|
||||
GlStateManager.rotate(-90.0f, 0, 1, 0);
|
||||
GlStateManager.translate(0, 0, -1);
|
||||
break;
|
||||
case NORTH:
|
||||
break;
|
||||
case SOUTH:
|
||||
GlStateManager.rotate(180.0f, 0, 1, 0);
|
||||
GlStateManager.translate(-1, 0, -1);
|
||||
break;
|
||||
case UP:
|
||||
GlStateManager.translate(0, 1, 0);
|
||||
GlStateManager.rotate(90.0f, 1, 0, 0);
|
||||
break;
|
||||
case WEST:
|
||||
GlStateManager.translate(0, 0, 1);
|
||||
GlStateManager.rotate(90.0f, 0, 1, 0);
|
||||
break;
|
||||
}
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime));
|
||||
// GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1);
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
|
||||
double topHeightOffset = getTopHeightOffset(craftTime, arrowAnimation);
|
||||
double middleHeightOffset = getMiddleHeightOffset(craftTime, arrowAnimation);
|
||||
double bottomHeightOffset = getBottomHeightOffset(craftTime, arrowAnimation);
|
||||
|
||||
BlockPos pos = tileArray.getPos();
|
||||
World world = tileArray.getWorld();
|
||||
|
||||
GlStateManager.rotate((float) (yaw + 360 * getStartupPitchYawRatio(craftTime)), 0, 0, 1);
|
||||
GlStateManager.rotate((float) ((pitch + 90) * getStartupPitchYawRatio(craftTime)), 1, 0, 0);
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(bottomArrayResource);
|
||||
GlStateManager.rotate(-rot, 0, 0, 1);
|
||||
GlStateManager.translate(0, 0, -bottomHeightOffset);
|
||||
renderStandardCircle(tessellator, wr, size / 2);
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(middleArrayResource);
|
||||
GlStateManager.rotate(0, 0, 0, 1);
|
||||
GlStateManager.translate(0, 0, -middleHeightOffset);
|
||||
renderStandardCircle(tessellator, wr, size);
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource);
|
||||
GlStateManager.rotate(rot, 0, 0, 1);
|
||||
GlStateManager.translate(0, 0, -topHeightOffset);
|
||||
renderStandardCircle(tessellator, wr, size);
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
// GlStateManager.depthMask(true);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.enableCull();
|
||||
// GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
public float getStartupPitchYawRatio(float craftTime)
|
||||
{
|
||||
if (craftTime <= 80)
|
||||
{
|
||||
return 0;
|
||||
} else if (craftTime > 80 && craftTime < 140)
|
||||
{
|
||||
return (craftTime - 80) / 60f;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
public double getBottomHeightOffset(double craftTime, double arrowAnimation)
|
||||
{
|
||||
if (craftTime <= 40)
|
||||
{
|
||||
return 0;
|
||||
} else if (craftTime > 40 && craftTime < 100)
|
||||
{
|
||||
return -0.4 * (craftTime - 40) / 60d;
|
||||
} else if (craftTime >= 100 && craftTime < 140)
|
||||
{
|
||||
return -0.4 * (140 - craftTime) / 40d;
|
||||
}
|
||||
|
||||
if (arrowAnimation > 0 && arrowAnimation < 45)
|
||||
{
|
||||
return -0.4 * (arrowAnimation) / 45;
|
||||
} else if (arrowAnimation >= 45 && arrowAnimation < 50)
|
||||
{
|
||||
return -0.4 * (50 - arrowAnimation) / 5;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
public double getMiddleHeightOffset(double craftTime, double arrowAnimation)
|
||||
{
|
||||
if (craftTime <= 40)
|
||||
{
|
||||
return 0;
|
||||
} else if (craftTime > 40 && craftTime < 100)
|
||||
{
|
||||
return 0.1 * (craftTime - 40) / 60d;
|
||||
} else if (craftTime >= 100 && craftTime < 140)
|
||||
{
|
||||
return 0.1 * (140 - craftTime) / 40d;
|
||||
}
|
||||
|
||||
if (arrowAnimation > 0 && arrowAnimation < 45)
|
||||
{
|
||||
return 0.1 * (arrowAnimation) / 45;
|
||||
} else if (arrowAnimation >= 45 && arrowAnimation < 50)
|
||||
{
|
||||
return 0.1 * (50 - arrowAnimation) / 5;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
public double getTopHeightOffset(double craftTime, double arrowAnimation)
|
||||
{
|
||||
if (craftTime <= 40)
|
||||
{
|
||||
return 0;
|
||||
} else if (craftTime > 40 && craftTime < 100)
|
||||
{
|
||||
return 0.4 * (craftTime - 40) / 60d;
|
||||
} else if (craftTime >= 100 && craftTime < 140)
|
||||
{
|
||||
return 0.4 * (140 - craftTime) / 40d;
|
||||
}
|
||||
|
||||
if (arrowAnimation > 0 && arrowAnimation < 45)
|
||||
{
|
||||
return 0.4 * (arrowAnimation) / 45;
|
||||
} else if (arrowAnimation >= 45 && arrowAnimation < 50)
|
||||
{
|
||||
return 0.4 * (50 - arrowAnimation) / 5;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
private void renderStandardCircle(Tessellator tessellator, BufferBuilder builder, double size)
|
||||
{
|
||||
double var31 = 0.0D;
|
||||
double var33 = 1.0D;
|
||||
double var35 = 0;
|
||||
double var37 = 1;
|
||||
GlStateManager.color(1f, 1f, 1f, 1f);
|
||||
builder.begin(7, DefaultVertexFormats.POSITION_TEX);
|
||||
// wr.setBrightness(200);
|
||||
builder.pos(size / 2f, size / 2f, 0).tex(var33, var37).endVertex();
|
||||
builder.pos(size / 2f, -size / 2f, 0).tex(var33, var35).endVertex();
|
||||
builder.pos(-size / 2f, -size / 2f, 0).tex(var31, var35).endVertex();
|
||||
builder.pos(-size / 2f, size / 2f, 0).tex(var31, var37).endVertex();
|
||||
tessellator.draw();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,26 +1,11 @@
|
|||
package WayofTime.bloodmagic.registry;
|
||||
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import WayofTime.bloodmagic.alchemyArray.*;
|
||||
import WayofTime.bloodmagic.compress.CompressionRegistry;
|
||||
import WayofTime.bloodmagic.iface.ISigil;
|
||||
import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade;
|
||||
import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry;
|
||||
import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry;
|
||||
import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry;
|
||||
import WayofTime.bloodmagic.client.render.alchemyArray.*;
|
||||
import WayofTime.bloodmagic.compress.AdvancedCompressionHandler;
|
||||
import WayofTime.bloodmagic.compress.BaseCompressionHandler;
|
||||
import WayofTime.bloodmagic.compress.StorageBlockCraftingManager;
|
||||
import WayofTime.bloodmagic.core.RegistrarBloodMagic;
|
||||
import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
|
||||
import WayofTime.bloodmagic.item.types.ComponentTypes;
|
||||
import WayofTime.bloodmagic.livingArmour.downgrade.*;
|
||||
import WayofTime.bloodmagic.potion.BMPotionUtils;
|
||||
import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableDyeableRecipe;
|
||||
import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionRecipe;
|
||||
import WayofTime.bloodmagic.util.Utils;
|
||||
import com.google.common.base.Stopwatch;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.init.MobEffects;
|
||||
|
|
@ -31,13 +16,54 @@ import net.minecraft.util.ResourceLocation;
|
|||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.util.text.TextComponentTranslation;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import WayofTime.bloodmagic.BloodMagic;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectArrowTurret;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectAttractor;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBounce;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectFurnaceFuel;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectMovement;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSigil;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSkeletonTurret;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectTeleport;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectUpdraft;
|
||||
import WayofTime.bloodmagic.client.render.alchemyArray.AttractorAlchemyCircleRenderer;
|
||||
import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer;
|
||||
import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer;
|
||||
import WayofTime.bloodmagic.client.render.alchemyArray.LowAlchemyCircleRenderer;
|
||||
import WayofTime.bloodmagic.client.render.alchemyArray.SingleAlchemyCircleRenderer;
|
||||
import WayofTime.bloodmagic.client.render.alchemyArray.StaticAlchemyCircleRenderer;
|
||||
import WayofTime.bloodmagic.client.render.alchemyArray.TurretAlchemyCircleRenderer;
|
||||
import WayofTime.bloodmagic.compress.AdvancedCompressionHandler;
|
||||
import WayofTime.bloodmagic.compress.BaseCompressionHandler;
|
||||
import WayofTime.bloodmagic.compress.CompressionRegistry;
|
||||
import WayofTime.bloodmagic.compress.StorageBlockCraftingManager;
|
||||
import WayofTime.bloodmagic.core.RegistrarBloodMagic;
|
||||
import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;
|
||||
import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry;
|
||||
import WayofTime.bloodmagic.core.registry.AlchemyTableRecipeRegistry;
|
||||
import WayofTime.bloodmagic.core.registry.LivingArmourDowngradeRecipeRegistry;
|
||||
import WayofTime.bloodmagic.iface.ISigil;
|
||||
import WayofTime.bloodmagic.item.types.ComponentTypes;
|
||||
import WayofTime.bloodmagic.livingArmour.LivingArmourUpgrade;
|
||||
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeBattleHungry;
|
||||
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeCrippledArm;
|
||||
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeDigSlowdown;
|
||||
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeDisoriented;
|
||||
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeMeleeDecrease;
|
||||
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeQuenched;
|
||||
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeSlowHeal;
|
||||
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeSlowness;
|
||||
import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeStormTrooper;
|
||||
import WayofTime.bloodmagic.potion.BMPotionUtils;
|
||||
import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTableDyeableRecipe;
|
||||
import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionRecipe;
|
||||
import WayofTime.bloodmagic.util.Utils;
|
||||
|
||||
import com.google.common.base.Stopwatch;
|
||||
|
||||
public class ModRecipes
|
||||
{
|
||||
|
|
@ -96,6 +122,7 @@ public class ModRecipes
|
|||
AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png")));
|
||||
|
||||
AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectTeleport("teleport"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/teleportation.png")));
|
||||
AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.BOW), new ItemStack(Items.ARROW), new AlchemyArrayEffectArrowTurret("turretTest"), new TurretAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png")));
|
||||
// AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.APPLE), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectLaputa("laputa"), new AttractorAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/shardoflaputa.png")));
|
||||
|
||||
AlchemyArrayRecipeRegistry.registerRecipe(ComponentTypes.REAGENT_FAST_MINER.getStack(), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")));
|
||||
|
|
|
|||
|
|
@ -1,10 +1,16 @@
|
|||
package WayofTime.bloodmagic.tile;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ITickable;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect;
|
||||
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCraftingNew;
|
||||
import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
|
||||
|
|
@ -20,7 +26,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche
|
|||
public EnumFacing rotation = EnumFacing.HORIZONTALS[0];
|
||||
|
||||
private String key = "empty";
|
||||
private AlchemyArrayEffect arrayEffect;
|
||||
public AlchemyArrayEffect arrayEffect;
|
||||
private boolean doDropIngredients = true;
|
||||
|
||||
public TileAlchemyArray()
|
||||
|
|
@ -192,4 +198,11 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche
|
|||
{
|
||||
this.rotation = rotation;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public AxisAlignedBB getRenderBoundingBox()
|
||||
{
|
||||
return Block.FULL_BLOCK_AABB.offset(getPos());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue