From f0364a0bc6744627b8481b1d46d35516ff8011b5 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 15 Feb 2015 22:05:24 +0000 Subject: [PATCH] Corporea networks. --- .../render/entity/RenderCorporeaSpark.java | 14 ++++++++++ .../client/render/entity/RenderSparkBase.java | 5 ++++ .../common/entity/EntityCorporeaSpark.java | 26 ++++++++++++++++-- .../common/item/ItemCorporeaSpark.java | 3 +- .../textures/items/corporeaSparkStar.png | Bin 0 -> 17835 bytes 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/corporeaSparkStar.png diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index a9e9f1b8e..b0e8a46cc 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -10,6 +10,9 @@ */ package vazkii.botania.client.render.entity; +import org.lwjgl.opengl.GL11; + +import net.minecraft.entity.passive.EntitySheep; import net.minecraft.util.IIcon; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.item.ItemCorporeaSpark; @@ -20,5 +23,16 @@ public class RenderCorporeaSpark extends RenderSparkBase { public IIcon getBaseIcon(EntityCorporeaSpark entity) { return entity.isMaster() ? ItemCorporeaSpark.worldIconMaster : ItemCorporeaSpark.worldIcon; } + + @Override + public void colorSpinningIcon(EntityCorporeaSpark entity) { + int network = Math.min(15, entity.getNetwork()); + GL11.glColor3f(EntitySheep.fleeceColorTable[network][0], EntitySheep.fleeceColorTable[network][1], EntitySheep.fleeceColorTable[network][2]); + } + + @Override + public IIcon getSpinningIcon(EntityCorporeaSpark entity) { + return ItemCorporeaSpark.iconColorStar; + } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 0030e215b..31ee7361d 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -58,6 +58,7 @@ public class RenderSparkBase extends RenderEntity { if(spinningIcon != null) { GL11.glTranslatef(-0.02F + (float) Math.sin(time / 20) * 0.2F, 0.24F + (float) Math.cos(time / 20) * 0.2F, 0.005F); GL11.glScalef(0.2F, 0.2F, 0.2F); + colorSpinningIcon(tEntity); func_77026_a(tessellator, spinningIcon); } @@ -72,6 +73,10 @@ public class RenderSparkBase extends RenderEntity { return ItemSpark.worldIcon; } + public void colorSpinningIcon(T entity) { + // NO-OP + } + public IIcon getSpinningIcon(T entity) { return null; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 3c99d06fd..3844d1acf 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -100,6 +100,9 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { displayRelatives(new ArrayList(), master); didStartupParticles = true; } + + if(master != null && master.getNetwork() != getNetwork()) + master = null; } @Override @@ -133,8 +136,15 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } public void restartNetwork() { - if(master != null) - master.registerConnections(master, this, new ArrayList()); + connections = new ArrayList(); + relatives = new ArrayList(); + + if(master != null) { + ICorporeaSpark oldMaster = master; + master = null; + + oldMaster.registerConnections(oldMaster, this, new ArrayList()); + } } void displayRelatives(ArrayList checked, ICorporeaSpark spark) { @@ -208,7 +218,17 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { didStartupParticles = false; return true; } - } // TODO Dyeing + } else if(stack.getItem() == ModItems.dye) { + int color = stack.getItemDamage(); + if(color != getNetwork()) { + setNetwork(color); + restartNetwork(); + stack.stackSize--; + firstUpdate = true; + if(player.worldObj.isRemote) + player.swingItem(); + } + } } return false; diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index b40b09054..2efd3a7e7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -28,7 +28,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemCorporeaSpark extends ItemMod { - public static IIcon invIcon, worldIcon, invIconMaster, worldIconMaster; + public static IIcon invIcon, worldIcon, invIconMaster, worldIconMaster, iconColorStar; public ItemCorporeaSpark() { setUnlocalizedName(LibItemNames.CORPOREA_SPARK); @@ -65,6 +65,7 @@ public class ItemCorporeaSpark extends ItemMod { worldIcon = IconHelper.forItem(par1IconRegister, this, 1); invIconMaster = IconHelper.forItem(par1IconRegister, this, 2); worldIconMaster = IconHelper.forItem(par1IconRegister, this, 3); + iconColorStar = IconHelper.forItem(par1IconRegister, this, "Star"); } @Override diff --git a/src/main/resources/assets/botania/textures/items/corporeaSparkStar.png b/src/main/resources/assets/botania/textures/items/corporeaSparkStar.png new file mode 100644 index 0000000000000000000000000000000000000000..8afce6a03a3f7bd4dfb723e0a38b5abae6321a0c GIT binary patch literal 17835 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 khy9EGqO_CALs7NBn