lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

this doesn't compile yet, but have something to peek at

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-08-14 20:53:42 -07:00
parent 973f1019a5
commit 5fcdd978d7
329 changed files with 3247 additions and 2953 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java
View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.client.render;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
import net.minecraft.client.entity.AbstractClientPlayer;
@ -31,7 +31,7 @@ public class LayerBloodElytra implements LayerRenderer<AbstractClientPlayer>
if (LivingArmour.hasFullSet(clientPlayer))
{
ItemStack chestStack = clientPlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
if (ItemLivingArmour.hasUpgrade(Constants.Mod.MODID + ".upgrade.elytra", chestStack))
if (ItemLivingArmour.hasUpgrade(BloodMagic.MODID + ".upgrade.elytra", chestStack))
{
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
GlStateManager.enableBlend();

2
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java
View file

@ -50,7 +50,7 @@ public class AttractorAlchemyCircleRenderer extends AlchemyCircleRenderer
{
if (craftTime < secondaryOffset)
{
float modifier = 90 * (craftTime - offset) / (float) (secondaryOffset - offset);
float modifier = 90 * (craftTime - offset) / (secondaryOffset - offset);
return modifier;
} else
{

2
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java
View file

@ -96,7 +96,7 @@ public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer
float offset = 2;
if (circle == -1)
{
return (float) (craftTime * 360 * 2 / 5 / sweepTime);
return craftTime * 360 * 2 / 5 / sweepTime;
}
if (craftTime >= offset)
{

8
src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java
View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.client.render.block;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.ConfigHandler;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.iface.INodeRenderer;
import WayofTime.bloodmagic.client.helper.ShaderHelper;
import WayofTime.bloodmagic.tile.routing.TileRoutingNode;
@ -20,7 +20,7 @@ import java.util.List;
public class RenderItemRoutingNode extends TileEntitySpecialRenderer<TileRoutingNode>
{
private static final ResourceLocation beamTexture = new ResourceLocation(Constants.Mod.MODID, "textures/entities/nodeBeam.png");
private static final ResourceLocation beamTexture = new ResourceLocation(BloodMagic.MODID, "textures/entities/nodeBeam.png");
private static final Minecraft mc = Minecraft.getMinecraft();
// private static final ResourceLocation test = new ResourceLocation("luminescence:textures/models/InputMirror.png");
@ -71,11 +71,11 @@ public class RenderItemRoutingNode extends TileEntitySpecialRenderer<TileRouting
double d23 = width / 2;
double d24 = width / 2;
double d25 = width / 2;
double d26 = (double) (distance * f1);
double d26 = distance * f1;
double d27 = 0.0D;
double d28 = 1.0D;
double d29 = (double) (f3) + test;
double d30 = (double) (distance * f1) + d29;
double d30 = distance * f1 + d29;
GlStateManager.translate(x + 0.5, y + 0.5, z + 0.5);

4
src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java
View file

@ -1,11 +1,11 @@
package WayofTime.bloodmagic.client.render.entity;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.util.ResourceLocation;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.client.render.model.ModelMeteor;
import WayofTime.bloodmagic.entity.projectile.EntityMeteor;
@ -13,7 +13,7 @@ public class RenderEntityMeteor extends Render<EntityMeteor>
{
public ModelBase model = new ModelMeteor();
private float scale = 1;
private static final ResourceLocation resource = new ResourceLocation(Constants.Mod.MODID, "textures/models/Meteor.png");
private static final ResourceLocation resource = new ResourceLocation(BloodMagic.MODID, "textures/models/Meteor.png");
public RenderEntityMeteor(RenderManager renderManagerIn)
{

2
src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java
View file

@ -82,7 +82,7 @@ public class RenderEntityMimic extends RenderLiving<EntityMimic>
if (!StringUtils.isNullOrEmpty(s))
{
gameprofile = TileEntitySkull.updateGameprofile(new GameProfile((UUID) null, s));
gameprofile = TileEntitySkull.updateGameprofile(new GameProfile(null, s));
nbttagcompound.setTag("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), gameprofile));
}
}

4
src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java
View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.client.render.entity;
import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderItem;
@ -30,7 +30,7 @@ public class RenderEntitySoulSnare extends Render<EntitySoulSnare>
GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
this.renderItem.renderItem(new ItemStack(ModItems.SOUL_SNARE), ItemCameraTransforms.TransformType.GROUND);
this.renderItem.renderItem(new ItemStack(RegistrarBloodMagicItems.SOUL_SNARE), ItemCameraTransforms.TransformType.GROUND);
GlStateManager.disableRescaleNormal();
GlStateManager.popMatrix();
super.doRender(entity, x, y, z, entityYaw, partialTicks);

2
src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java
View file

@ -35,7 +35,7 @@ public class LayerAlchemyCircle<T extends EntityCorruptedSheep> implements Layer
VertexBuffer wr = tessellator.getBuffer();
GlStateManager.pushMatrix();
float rot = (float) this.rotationspeed * (partialTicks + demon.ticksExisted);
float rot = this.rotationspeed * (partialTicks + demon.ticksExisted);
float secondaryRot = 0;
float size = 3.0F;