diff --git a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java index 7a536bdb..68b7f44c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java @@ -32,6 +32,7 @@ import WayofTime.alchemicalWizardry.common.items.EnergySword; import WayofTime.alchemicalWizardry.common.items.EnhancedTelepositionFocus; import WayofTime.alchemicalWizardry.common.items.FireScribeTool; import WayofTime.alchemicalWizardry.common.items.ItemAlchemyBase; +import WayofTime.alchemicalWizardry.common.items.ItemBloodLetterPack; import WayofTime.alchemicalWizardry.common.items.ItemComplexSpellCrystal; import WayofTime.alchemicalWizardry.common.items.ItemComponents; import WayofTime.alchemicalWizardry.common.items.ItemDiabloKey; @@ -79,7 +80,6 @@ import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfTheFastMiner; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfWind; import WayofTime.alchemicalWizardry.common.items.sigil.VoidSigil; import WayofTime.alchemicalWizardry.common.items.sigil.WaterSigil; -import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemBloodLetterPack; import cpw.mods.fml.common.registry.GameRegistry; /** diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/renderer/MRSRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/api/renderer/MRSRenderer.java index d8177f26..7eea34c1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/renderer/MRSRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/renderer/MRSRenderer.java @@ -1,13 +1,13 @@ package WayofTime.alchemicalWizardry.api.renderer; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.ResourceLocation; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; public abstract class MRSRenderer { - public abstract void renderAt(TEMasterStone tile, double x, double y, double z); + public abstract void renderAt(IMasterRitualStone tile, double x, double y, double z); protected void bindTexture(ResourceLocation p_147499_1_) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IMasterRitualStone.java b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IMasterRitualStone.java index e00ed793..6704d974 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IMasterRitualStone.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IMasterRitualStone.java @@ -33,4 +33,8 @@ public interface IMasterRitualStone extends ISegmentedReagentHandler public NBTTagCompound getCustomRitualTag(); public void setCustomRitualTag(NBTTagCompound tag); + + public boolean areTanksEmpty(); + + public int getRunningTime(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/ComplexNetworkHandler.java b/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/ComplexNetworkHandler.java index 0a7bb37d..c9b69311 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/ComplexNetworkHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/ComplexNetworkHandler.java @@ -13,7 +13,6 @@ import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -77,7 +76,6 @@ public class ComplexNetworkHandler Gson gson = new GsonBuilder().setPrettyPrinting().create(); String json = gson.toJson(keyMap); - AlchemicalWizardry.logger.info("Here, too!"); Writer writer; try { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemBloodLetterPack.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java similarity index 96% rename from src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemBloodLetterPack.java rename to src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java index a9ae6df3..b94982ce 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemBloodLetterPack.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java @@ -1,4 +1,4 @@ -package WayofTime.alchemicalWizardry.common.items.thaumcraft; +package WayofTime.alchemicalWizardry.common.items; import java.util.List; @@ -39,7 +39,7 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - this.plateIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundPlate"); + this.plateIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodPack"); } @Override @@ -64,7 +64,7 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return "alchemicalwizardry:models/armor/sanguineArmour_layer_1.png"; + return "alchemicalwizardry:models/armor/bloodPack_layer_1.png"; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java index 7db973ca..2e88f951 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java @@ -42,9 +42,9 @@ public class ItemSanguineArmour extends ItemArmor implements ArmourUpgrade, IGog { this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem"); this.helmetIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguineHelmet"); - this.plateIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundPlate"); - this.leggingsIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundLeggings"); - this.bootsIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundBoots"); + this.plateIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguinePlate"); + this.leggingsIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguineLeggings"); + this.bootsIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguineBoots"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/AlchemyCircleRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/AlchemyCircleRenderer.java index 53aa4f5d..555f6bef 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/AlchemyCircleRenderer.java @@ -1,13 +1,14 @@ package WayofTime.alchemicalWizardry.common.renderer; -import WayofTime.alchemicalWizardry.api.renderer.MRSRenderer; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import WayofTime.alchemicalWizardry.api.renderer.MRSRenderer; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; + public class AlchemyCircleRenderer extends MRSRenderer { private ResourceLocation resourceLocation = new ResourceLocation("alchemicalwizardry:textures/models/TransCircle.png"); @@ -38,7 +39,7 @@ public class AlchemyCircleRenderer extends MRSRenderer } @Override - public void renderAt(TEMasterStone tile, double x, double y, double z) + public void renderAt(IMasterRitualStone tile, double x, double y, double z) { if (tile.areTanksEmpty() && !renderWithoutReagents) { @@ -63,14 +64,14 @@ public class AlchemyCircleRenderer extends MRSRenderer tessellator.startDrawingQuads(); tessellator.setColorRGBA(colourRed, colourGreen, colourBlue, colourIntensity); - GL11.glTranslated(x + 0.5 + xOffset, y + 0.5 + (yOffset - initialY) * (tile.runningTime / 100d) + initialY, z + 0.5 + zOffset); + GL11.glTranslated(x + 0.5 + xOffset, y + 0.5 + (yOffset - initialY) * (tile.getRunningTime() / 100d) + initialY, z + 0.5 + zOffset); float rotationAngle = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL); GL11.glRotatef(rotationAngle, 0F, 1F, 0F); //Rotate on planar axis tessellator.setBrightness(240); - double finalRadius = (radius) * (tile.runningTime / 100d); + double finalRadius = (radius) * (tile.getRunningTime() / 100d); tessellator.addVertexWithUV(-finalRadius, 0, -finalRadius, 0.0d, 0.0d); tessellator.addVertexWithUV(finalRadius, 0, -finalRadius, 1.0d, 0.0d); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEMasterStone.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEMasterStone.java index 478af034..60a08da3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEMasterStone.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEMasterStone.java @@ -656,4 +656,10 @@ public class TEMasterStone extends TileEntity implements IMasterRitualStone { this.customRitualTag = tag; } + + @Override + public int getRunningTime() + { + return this.runningTime; + } } \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/armor/bloodPack_layer_1.png b/src/main/resources/assets/alchemicalwizardry/models/armor/bloodPack_layer_1.png new file mode 100644 index 00000000..246902a9 Binary files /dev/null and b/src/main/resources/assets/alchemicalwizardry/models/armor/bloodPack_layer_1.png differ diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/BlankSlate.png b/src/main/resources/assets/alchemicalwizardry/textures/items/BlankSlate.png index f7ce2e2e..f9761287 100644 Binary files a/src/main/resources/assets/alchemicalwizardry/textures/items/BlankSlate.png and b/src/main/resources/assets/alchemicalwizardry/textures/items/BlankSlate.png differ diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/BloodPack.png b/src/main/resources/assets/alchemicalwizardry/textures/items/BloodPack.png new file mode 100644 index 00000000..a6d99cc8 Binary files /dev/null and b/src/main/resources/assets/alchemicalwizardry/textures/items/BloodPack.png differ diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/ReinforcedSlate.png b/src/main/resources/assets/alchemicalwizardry/textures/items/ReinforcedSlate.png index 9485f48a..0084030f 100644 Binary files a/src/main/resources/assets/alchemicalwizardry/textures/items/ReinforcedSlate.png and b/src/main/resources/assets/alchemicalwizardry/textures/items/ReinforcedSlate.png differ diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/SanguineBoots.png b/src/main/resources/assets/alchemicalwizardry/textures/items/SanguineBoots.png new file mode 100644 index 00000000..2294a81b Binary files /dev/null and b/src/main/resources/assets/alchemicalwizardry/textures/items/SanguineBoots.png differ diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/SanguineHelmet.png b/src/main/resources/assets/alchemicalwizardry/textures/items/SanguineHelmet.png index 6149aff0..e64e7a75 100644 Binary files a/src/main/resources/assets/alchemicalwizardry/textures/items/SanguineHelmet.png and b/src/main/resources/assets/alchemicalwizardry/textures/items/SanguineHelmet.png differ diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/SanguineLeggings.png b/src/main/resources/assets/alchemicalwizardry/textures/items/SanguineLeggings.png new file mode 100644 index 00000000..5c4c4727 Binary files /dev/null and b/src/main/resources/assets/alchemicalwizardry/textures/items/SanguineLeggings.png differ diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/SanguinePlate.png b/src/main/resources/assets/alchemicalwizardry/textures/items/SanguinePlate.png new file mode 100644 index 00000000..8114d71c Binary files /dev/null and b/src/main/resources/assets/alchemicalwizardry/textures/items/SanguinePlate.png differ