Better networking and fancy fancy request effects.

This commit is contained in:
Lizbeth Rika committed 2015-02-16 00:37:14 +00:00
1 parent 94799463e9
commit 06e9f844e3
7 files changed
+209 -52

No files matched your search

@@ -20,6 +20,7 @@ import scala.actors.threadpool.Arrays;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
@@ -167,6 +168,7 @@ public final class CorporeaHelper {
int count = itemCount;
for(IInventory inv : inventories) {
ICorporeaSpark invSpark = getSparkForInventory(inv);
for(int i = inv.getSizeInventory() - 1; i >= 0; i--) {
if(!isValidSlot(inv, i))
continue;
@@ -188,6 +190,8 @@ public final class CorporeaHelper {
stackAt.stackSize -= rem;
if(stackAt.stackSize == 0)
inv.setInventorySlotContents(i, null);
if(invSpark != null)
invSpark.onItemExtracted(stackAt);
}
count -= rem;
}
@@ -196,6 +200,17 @@ public final class CorporeaHelper {
return stacks;
}
/**
* Gets the spark attached to the inventory passed case it's a TileEntity.
*/
public static ICorporeaSpark getSparkForInventory(IInventory inv) {
if(!(inv instanceof TileEntity))
return null;
TileEntity tile = (TileEntity) inv;
return getSparkForBlock(tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord);
}
/**
* Gets the spark attached to the block in the coords passed in. Note that the coords passed
@@ -13,6 +13,7 @@ package vazkii.botania.api.corporea;
import java.util.List;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
/**
* An interface for a Corporea Spark. Includes functions for handling
@@ -61,6 +62,17 @@ public interface ICorporeaSpark {
*/
public ICorporeaSpark getMaster();
/**
* Called when an item is extracted from the inventory this spark is attached to through this
* spark.
*/
public void onItemExtracted(ItemStack stack);
/**
* Called when this spark requests items, passes in the result of the request and not the actual requested stack(s).
*/
public void onItemsRequested(List<ItemStack> stacks);
/**
* Gets if this spark is considered a master spark.
*/
@@ -309,14 +309,14 @@ public final class HUDHandler {
String txt2 = EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.nearIndex2");
int l = Math.max(mc.fontRenderer.getStringWidth(txt0), Math.max(mc.fontRenderer.getStringWidth(txt1), mc.fontRenderer.getStringWidth(txt2))) + 20;
int x = res.getScaledWidth() / 2 - l / 2;
int y = res.getScaledHeight() - 95;
int x = res.getScaledWidth() - l - 20;
int y = res.getScaledHeight() - 60;
Gui.drawRect(x - 6, y - 6, x + l + 6, y + 37, 0x44000000);
Gui.drawRect(x - 4, y - 4, x + l + 4, y + 35, 0x44000000);
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, new ItemStack(ModBlocks.corporeaIndex), res.getScaledWidth() / 2 - l / 2, y + 10);
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, new ItemStack(ModBlocks.corporeaIndex), x, y + 10);
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
mc.fontRenderer.drawStringWithShadow(txt0, x + 20, y, 0xFFFFFF);
@@ -10,10 +10,21 @@
*/
package vazkii.botania.client.render.entity;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.util.IIcon;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.common.entity.EntityCorporeaSpark;
import vazkii.botania.common.item.ItemCorporeaSpark;
@@ -35,4 +46,57 @@ public class RenderCorporeaSpark extends RenderSparkBase<EntityCorporeaSpark> {
return ItemCorporeaSpark.iconColorStar;
}
@Override
public void renderCallback(EntityCorporeaSpark entity, float pticks) {
int time = entity.getItemDisplayTicks();
if(time == 0)
return;
float absTime = Math.abs(time) - pticks;
GL11.glPushMatrix();
GL11.glRotated(90F, 1F, 0F, 0F);
float scalef = 1F / 6F;
GL11.glScalef(scalef, scalef, scalef);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glColor4f(1F, 1F, 1F, absTime / 10);
GL11.glTranslatef(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6);
ItemStack stack = entity.getDisplayedItem();
if(stack == null)
return;
Item item = stack.getItem();
boolean block = item instanceof ItemBlock;
Minecraft.getMinecraft().renderEngine.bindTexture(block ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture);
IIcon icon = block ? Block.getBlockFromItem(item).getBlockTextureFromSide(ForgeDirection.UP.ordinal()) : item.getIcon(stack, 0);
float minU = icon.getMinU();
float maxU = icon.getMaxU();
float minV = icon.getMinV();
float maxV = icon.getMaxV();
int pieces = 8;
float stepU = (maxU - minU) / pieces;
float stepV = (maxV - minV) / pieces;
float gap = 1F + (time > 0 ? 10F - absTime : absTime) * 0.2F;
int shift = pieces / 2;
float scale = 1F / pieces * 3F;
GL11.glScalef(scale, scale, 1F);
for(int i = -shift; i < shift; i++) {
GL11.glTranslated(gap * i, 0F, 0F);
for(int j = -shift; j < shift; j++) {
GL11.glTranslated(0F, gap * j, 0F);
ItemRenderer.renderItemIn2D(Tessellator.instance, minU + stepU * (i + shift), minV + stepV * (j + shift + 1), minU + stepU * (i + shift + 1), minV + stepV * (j + shift), icon.getIconWidth() / pieces, icon.getIconHeight() / pieces, 1F / 8F);
GL11.glTranslated(0F, -gap * j, 0F);
}
GL11.glTranslated(-gap * i, 0F, 0F);
}
GL11.glDisable(GL11.GL_BLEND);
GL11.glPopMatrix();
}
}
@@ -49,6 +49,7 @@ public class RenderSparkBase<T extends Entity> extends RenderEntity {
bindEntityTexture(par1Entity);
Tessellator tessellator = Tessellator.instance;
GL11.glPushMatrix();
float r = 180.0F - renderManager.playerViewY;
GL11.glRotatef(r, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(-renderManager.playerViewX, 1F, 0F, 0F);
@@ -61,8 +62,9 @@ public class RenderSparkBase<T extends Entity> extends RenderEntity {
colorSpinningIcon(tEntity);
func_77026_a(tessellator, spinningIcon);
}
GL11.glRotatef(-r, 0.0F, 1.0F, 0.0F);
GL11.glPopMatrix();
GL11.glColor4f(1F, 1F, 1F, 1F);
renderCallback(tEntity, par9);
GL11.glDisable(GL11.GL_BLEND);
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
@@ -81,6 +83,10 @@ public class RenderSparkBase<T extends Entity> extends RenderEntity {
return null;
}
public void renderCallback(T entity, float pticks) {
// NO-OP
}
@Override
protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
return TextureMap.locationItemsTexture;
@@ -218,6 +218,9 @@ public class TileCorporeaIndex extends TileCorporeaBase {
if(!nearbyIndexes.isEmpty()) {
String msg = event.message.toLowerCase().trim();
for(TileCorporeaIndex index : nearbyIndexes) {
if(index.worldObj.isRemote)
continue;
ICorporeaSpark spark = index.getSpark();
if(spark != null) {
String matchedPattern = "";
@@ -240,6 +243,7 @@ public class TileCorporeaIndex extends TileCorporeaBase {
}
List<ItemStack> stacks = CorporeaHelper.requestItem(name, count, spark, true);
spark.onItemsRequested(stacks);
for(ItemStack stack : stacks)
if(stack != null) {
EntityItem item = new EntityItem(index.worldObj, index.xCoord + 0.5, index.yCoord + 1.5, index.zCoord + 0.5, stack);
@@ -33,36 +33,42 @@ import vazkii.botania.common.item.ModItems;
public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
private static final int SCAN_RANGE = 8;
private static final String TAG_MASTER = "master";
private static final String TAG_NETWORK = "network";
ICorporeaSpark master;
List<ICorporeaSpark> connections = new ArrayList();
List<ICorporeaSpark> connectionsClient = new ArrayList();
List<ICorporeaSpark> relatives = new ArrayList();
boolean firstUpdate = true;
boolean firstUpdateClient = true;
boolean firstUpdateServer = true;
boolean didStartupParticles = false;
public EntityCorporeaSpark(World world) {
super(world);
isImmuneToFire = true;
}
@Override
protected void entityInit() {
setSize(0.5F, 0.5F);
dataWatcher.addObject(28, 0);
dataWatcher.addObject(29, 0);
dataWatcher.addObject(30, 0);
dataWatcher.addObject(31, new ItemStack(Blocks.stone, 0, 0));
dataWatcher.setObjectWatched(28);
dataWatcher.setObjectWatched(29);
dataWatcher.setObjectWatched(30);
dataWatcher.setObjectWatched(31);
}
@Override
public boolean canBeCollidedWith() {
return true;
}
@Override
public void onUpdate() {
super.onUpdate();
@@ -72,45 +78,42 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
setDead();
return;
}
if(isMaster())
master = this;
if(firstUpdate) {
if(worldObj.isRemote ? firstUpdateClient : firstUpdateServer) {
if(isMaster())
restartNetwork();
else {
List<ICorporeaSpark> sparks = getNearbySparks();
if(sparks.size() > 0) {
for(ICorporeaSpark spark : sparks) {
ICorporeaSpark master = spark.getMaster();
if(master != null) {
this.master = master;
restartNetwork();
break;
}
}
}
}
firstUpdate = false;
else findNetwork();
if(worldObj.isRemote)
firstUpdateClient = false;
else firstUpdateServer = false;
}
if(!didStartupParticles) {
displayRelatives(new ArrayList(), master);
didStartupParticles = true;
}
if(master != null && master.getNetwork() != getNetwork())
master = null;
int displayTicks = getItemDisplayTicks();
if(displayTicks > 0)
setItemDisplayTicks(displayTicks - 1);
else if(displayTicks < 0)
setItemDisplayTicks(displayTicks + 1);
}
@Override
public void setDead() {
super.setDead();
if(!worldObj.isRemote)
entityDropItem(new ItemStack(ModItems.corporeaSpark, 1, isMaster() ? 1 : 0), 0F);
connections.remove(this);
connectionsClient.remove(this);
restartNetwork();
}
@@ -121,22 +124,26 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
for(ICorporeaSpark spark : sparks) {
if(spark == null || connections.contains(spark) || spark.getNetwork() != getNetwork() || spark.isMaster() || ((Entity) spark).isDead)
continue;
connections.add(spark);
relatives.add(spark);
spark.registerConnections(master, this, connections);
}
this.master = master;
this.connections = connections;
if(worldObj.isRemote)
connectionsClient = connections;
else this.connections = connections;
}
List<ICorporeaSpark> getNearbySparks() {
return worldObj.getEntitiesWithinAABB(ICorporeaSpark.class, AxisAlignedBB.getBoundingBox(posX - SCAN_RANGE, posY - SCAN_RANGE, posZ - SCAN_RANGE, posX + SCAN_RANGE, posY + SCAN_RANGE, posZ + SCAN_RANGE));
}
public void restartNetwork() {
connections = new ArrayList();
void restartNetwork() {
if(worldObj.isRemote)
connectionsClient = new ArrayList();
else connections = new ArrayList();
relatives = new ArrayList();
if(master != null) {
@@ -146,11 +153,27 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
oldMaster.registerConnections(oldMaster, this, new ArrayList());
}
}
void findNetwork() {
List<ICorporeaSpark> sparks = getNearbySparks();
if(sparks.size() > 0) {
for(ICorporeaSpark spark : sparks)
if(spark.getNetwork() == getNetwork()) {
ICorporeaSpark master = spark.getMaster();
if(master != null) {
this.master = master;
restartNetwork();
break;
}
}
}
}
void displayRelatives(ArrayList<ICorporeaSpark> checked, ICorporeaSpark spark) {
if(spark == null)
return;
List<ICorporeaSpark> sparks = spark.getRelatives();
if(sparks.isEmpty())
EntitySpark.particleBeam((Entity) spark, (Entity) spark.getMaster());
@@ -173,14 +196,28 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
@Override
public List<ICorporeaSpark> getConnections() {
return connections;
return worldObj.isRemote ? connectionsClient : connections;
}
@Override
public List<ICorporeaSpark> getRelatives() {
return relatives;
}
@Override
public void onItemExtracted(ItemStack stack) {
setItemDisplayTicks(10);
setDisplayedItem(stack);
}
@Override
public void onItemsRequested(List<ItemStack> stacks) {
if(!stacks.isEmpty()) {
setItemDisplayTicks(-10);
setDisplayedItem(stacks.get(0));
}
}
@Override
public ICorporeaSpark getMaster() {
return master;
@@ -189,12 +226,12 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
public void setMaster(boolean master) {
dataWatcher.updateObject(28, master ? 1 : 0);
}
@Override
public boolean isMaster() {
return dataWatcher.getWatchableObjectInt(28) == 1;
}
public void setNetwork(int network) {
dataWatcher.updateObject(29, network);
}
@@ -203,7 +240,23 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
public int getNetwork() {
return dataWatcher.getWatchableObjectInt(29);
}
public int getItemDisplayTicks() {
return dataWatcher.getWatchableObjectInt(30);
}
public void setItemDisplayTicks(int ticks) {
dataWatcher.updateObject(30, ticks);
}
public ItemStack getDisplayedItem() {
return dataWatcher.getWatchableObjectItemStack(31);
}
public void setDisplayedItem(ItemStack stack) {
dataWatcher.updateObject(31, stack);
}
@Override
public boolean interactFirst(EntityPlayer player) {
ItemStack stack = player.getCurrentEquippedItem();
@@ -222,9 +275,12 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
int color = stack.getItemDamage();
if(color != getNetwork()) {
setNetwork(color);
restartNetwork();
if(master != null)
restartNetwork();
else findNetwork();
stack.stackSize--;
firstUpdate = true;
if(player.worldObj.isRemote)
player.swingItem();
}
@@ -233,7 +289,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
return false;
}
@Override
protected void readEntityFromNBT(NBTTagCompound cmp) {
setMaster(cmp.getBoolean(TAG_MASTER));