Updated Sanguine Armour textures, added Blood Letter's Pack texture, fixed API imports.
|
@ -32,6 +32,7 @@ import WayofTime.alchemicalWizardry.common.items.EnergySword;
|
||||||
import WayofTime.alchemicalWizardry.common.items.EnhancedTelepositionFocus;
|
import WayofTime.alchemicalWizardry.common.items.EnhancedTelepositionFocus;
|
||||||
import WayofTime.alchemicalWizardry.common.items.FireScribeTool;
|
import WayofTime.alchemicalWizardry.common.items.FireScribeTool;
|
||||||
import WayofTime.alchemicalWizardry.common.items.ItemAlchemyBase;
|
import WayofTime.alchemicalWizardry.common.items.ItemAlchemyBase;
|
||||||
|
import WayofTime.alchemicalWizardry.common.items.ItemBloodLetterPack;
|
||||||
import WayofTime.alchemicalWizardry.common.items.ItemComplexSpellCrystal;
|
import WayofTime.alchemicalWizardry.common.items.ItemComplexSpellCrystal;
|
||||||
import WayofTime.alchemicalWizardry.common.items.ItemComponents;
|
import WayofTime.alchemicalWizardry.common.items.ItemComponents;
|
||||||
import WayofTime.alchemicalWizardry.common.items.ItemDiabloKey;
|
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.SigilOfWind;
|
||||||
import WayofTime.alchemicalWizardry.common.items.sigil.VoidSigil;
|
import WayofTime.alchemicalWizardry.common.items.sigil.VoidSigil;
|
||||||
import WayofTime.alchemicalWizardry.common.items.sigil.WaterSigil;
|
import WayofTime.alchemicalWizardry.common.items.sigil.WaterSigil;
|
||||||
import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemBloodLetterPack;
|
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package WayofTime.alchemicalWizardry.api.renderer;
|
package WayofTime.alchemicalWizardry.api.renderer;
|
||||||
|
|
||||||
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
|
|
||||||
import net.minecraft.client.renderer.texture.TextureManager;
|
import net.minecraft.client.renderer.texture.TextureManager;
|
||||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone;
|
||||||
|
|
||||||
public abstract class MRSRenderer
|
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_)
|
protected void bindTexture(ResourceLocation p_147499_1_)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,4 +33,8 @@ public interface IMasterRitualStone extends ISegmentedReagentHandler
|
||||||
public NBTTagCompound getCustomRitualTag();
|
public NBTTagCompound getCustomRitualTag();
|
||||||
|
|
||||||
public void setCustomRitualTag(NBTTagCompound tag);
|
public void setCustomRitualTag(NBTTagCompound tag);
|
||||||
|
|
||||||
|
public boolean areTanksEmpty();
|
||||||
|
|
||||||
|
public int getRunningTime();
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,6 @@ import java.util.UUID;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.GsonBuilder;
|
import com.google.gson.GsonBuilder;
|
||||||
|
@ -77,7 +76,6 @@ public class ComplexNetworkHandler
|
||||||
|
|
||||||
Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
||||||
String json = gson.toJson(keyMap);
|
String json = gson.toJson(keyMap);
|
||||||
AlchemicalWizardry.logger.info("Here, too!");
|
|
||||||
Writer writer;
|
Writer writer;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package WayofTime.alchemicalWizardry.common.items.thaumcraft;
|
package WayofTime.alchemicalWizardry.common.items;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public void registerIcons(IIconRegister iconRegister)
|
public void registerIcons(IIconRegister iconRegister)
|
||||||
{
|
{
|
||||||
this.plateIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundPlate");
|
this.plateIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodPack");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -64,7 +64,7 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl
|
||||||
@Override
|
@Override
|
||||||
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
|
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
|
@Override
|
|
@ -42,9 +42,9 @@ public class ItemSanguineArmour extends ItemArmor implements ArmourUpgrade, IGog
|
||||||
{
|
{
|
||||||
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem");
|
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem");
|
||||||
this.helmetIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguineHelmet");
|
this.helmetIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguineHelmet");
|
||||||
this.plateIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundPlate");
|
this.plateIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguinePlate");
|
||||||
this.leggingsIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundLeggings");
|
this.leggingsIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguineLeggings");
|
||||||
this.bootsIcon = iconRegister.registerIcon("AlchemicalWizardry:BoundBoots");
|
this.bootsIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguineBoots");
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
package WayofTime.alchemicalWizardry.common.renderer;
|
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.client.renderer.Tessellator;
|
||||||
import net.minecraft.util.MathHelper;
|
import net.minecraft.util.MathHelper;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import WayofTime.alchemicalWizardry.api.renderer.MRSRenderer;
|
||||||
|
import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone;
|
||||||
|
|
||||||
public class AlchemyCircleRenderer extends MRSRenderer
|
public class AlchemyCircleRenderer extends MRSRenderer
|
||||||
{
|
{
|
||||||
private ResourceLocation resourceLocation = new ResourceLocation("alchemicalwizardry:textures/models/TransCircle.png");
|
private ResourceLocation resourceLocation = new ResourceLocation("alchemicalwizardry:textures/models/TransCircle.png");
|
||||||
|
@ -38,7 +39,7 @@ public class AlchemyCircleRenderer extends MRSRenderer
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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)
|
if (tile.areTanksEmpty() && !renderWithoutReagents)
|
||||||
{
|
{
|
||||||
|
@ -63,14 +64,14 @@ public class AlchemyCircleRenderer extends MRSRenderer
|
||||||
tessellator.startDrawingQuads();
|
tessellator.startDrawingQuads();
|
||||||
tessellator.setColorRGBA(colourRed, colourGreen, colourBlue, colourIntensity);
|
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);
|
float rotationAngle = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL);
|
||||||
|
|
||||||
GL11.glRotatef(rotationAngle, 0F, 1F, 0F); //Rotate on planar axis
|
GL11.glRotatef(rotationAngle, 0F, 1F, 0F); //Rotate on planar axis
|
||||||
tessellator.setBrightness(240);
|
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, 0.0d, 0.0d);
|
||||||
tessellator.addVertexWithUV(finalRadius, 0, -finalRadius, 1.0d, 0.0d);
|
tessellator.addVertexWithUV(finalRadius, 0, -finalRadius, 1.0d, 0.0d);
|
||||||
|
|
|
@ -656,4 +656,10 @@ public class TEMasterStone extends TileEntity implements IMasterRitualStone
|
||||||
{
|
{
|
||||||
this.customRitualTag = tag;
|
this.customRitualTag = tag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getRunningTime()
|
||||||
|
{
|
||||||
|
return this.runningTime;
|
||||||
|
}
|
||||||
}
|
}
|
After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 554 B After Width: | Height: | Size: 547 B |
After Width: | Height: | Size: 319 B |
Before Width: | Height: | Size: 709 B After Width: | Height: | Size: 702 B |
After Width: | Height: | Size: 309 B |
Before Width: | Height: | Size: 292 B After Width: | Height: | Size: 305 B |
After Width: | Height: | Size: 269 B |
After Width: | Height: | Size: 316 B |