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

Readded Spike and Updraft Arrays. Also WIP Day Array

Browse source
This commit is contained in:
WayofTime 2020-12-28 16:28:33 -05:00
parent 64b20227b2
commit f01a743a3e
22 changed files with 928 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/wayoftime/bloodmagic/client/ClientEvents.java
View file

@ -21,6 +21,8 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.api.compat.IMultiWillTool;
import wayoftime.bloodmagic.client.model.MimicColor;
import wayoftime.bloodmagic.client.render.alchemyarray.BeaconAlchemyCircleRenderer;
import wayoftime.bloodmagic.client.render.alchemyarray.LowStaticAlchemyCircleRenderer;
import wayoftime.bloodmagic.client.render.alchemyarray.StaticAlchemyCircleRenderer;
import wayoftime.bloodmagic.client.render.block.RenderAlchemyArray;
import wayoftime.bloodmagic.client.render.block.RenderAltar;
@ -102,6 +104,9 @@ public class ClientEvents
});
AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/movement"), new StaticAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/movementarray.png")));
AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/updraft"), new BeaconAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/updraftarray.png")));
AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/spike"), new LowStaticAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/spikearray.png")));
AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/day"), new LowStaticAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/spikearray.png")));
}
public static void registerItemModelProperties(FMLClientSetupEvent event)

113
src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/BeaconAlchemyCircleRenderer.java Normal file
View file

@ -0,0 +1,113 @@
package wayoftime.bloodmagic.client.render.alchemyarray;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.vector.Quaternion;
import wayoftime.bloodmagic.client.render.BloodMagicRenderer;
import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D;
import wayoftime.bloodmagic.client.render.RenderResizableQuadrilateral;
import wayoftime.bloodmagic.tile.TileAlchemyArray;
public class BeaconAlchemyCircleRenderer extends AlchemyArrayRenderer
{
public BeaconAlchemyCircleRenderer(ResourceLocation arrayResource)
{
super(arrayResource);
}
@Override
public float getRotation(float craftTime)
{
float offset = 2;
if (craftTime >= offset)
{
float modifier = (craftTime - offset) * 5f;
return modifier * 1f;
}
return 0;
}
@Override
public float getSecondaryRotation(float craftTime)
{
float offset = 50;
float secondaryOffset = 150;
if (craftTime >= offset)
{
if (craftTime < secondaryOffset)
{
float modifier = 90 * (craftTime - offset) / (secondaryOffset - offset);
return modifier;
} else
{
return 90;
}
}
return 0;
}
public float getSizeModifier(float craftTime)
{
return 1.0f;
}
// public float getVerticalOffset(float craftTime)
// {
// if (craftTime >= 5)
// {
// if (craftTime <= 40)
// {
// return (float) (-0.4 + (0.4) * Math.pow((craftTime - 5) / 35f, 3));
// } else
// {
// return 0;
// }
// }
// return -0.4f;
// }
public void renderAt(TileAlchemyArray tileArray, double x, double y, double z, float craftTime, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn)
{
matrixStack.push();
matrixStack.translate(0.5, 0.5, 0.5);
float rot = getRotation(craftTime);
float secondaryRot = getSecondaryRotation(craftTime);
float size = 1.0F * getSizeModifier(craftTime);
Direction rotation = tileArray.getRotation();
matrixStack.push();
matrixStack.translate(0, getVerticalOffset(craftTime), 0);
matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true));
matrixStack.push();
matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), rot, true));
matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), -secondaryRot, true));
// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true));
IVertexBuilder twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(arrayResource));
Model2D arrayModel = new BloodMagicRenderer.Model2D();
arrayModel.minX = -0.5;
arrayModel.maxX = +0.5;
arrayModel.minY = -0.5;
arrayModel.maxY = +0.5;
arrayModel.resource = arrayResource;
matrixStack.scale(size, size, size);
// RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0x000000FF, 0xFFFFFFFF, OverlayTexture.NO_OVERLAY);
RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0xFFFFFFFF, 0x00F000F0, combinedOverlayIn);
matrixStack.pop();
matrixStack.pop();
matrixStack.pop();
}
}

23
src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowAlchemyCircleRenderer.java Normal file
View file

@ -0,0 +1,23 @@
package wayoftime.bloodmagic.client.render.alchemyarray;
import net.minecraft.util.ResourceLocation;
import wayoftime.bloodmagic.BloodMagic;
public class LowAlchemyCircleRenderer extends SingleAlchemyCircleRenderer
{
public LowAlchemyCircleRenderer()
{
this(BloodMagic.rl("textures/models/AlchemyArrays/SkeletonTurret1.png"));
}
public LowAlchemyCircleRenderer(ResourceLocation arrayResource)
{
super(arrayResource);
}
@Override
public float getVerticalOffset(float craftTime)
{
return -0.4f;
}
}

36
src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowStaticAlchemyCircleRenderer.java Normal file
View file

@ -0,0 +1,36 @@
package wayoftime.bloodmagic.client.render.alchemyarray;
import net.minecraft.util.ResourceLocation;
import wayoftime.bloodmagic.BloodMagic;
public class LowStaticAlchemyCircleRenderer extends LowAlchemyCircleRenderer
{
public LowStaticAlchemyCircleRenderer()
{
this(BloodMagic.rl("textures/models/AlchemyArrays/SkeletonTurret1.png"));
}
public LowStaticAlchemyCircleRenderer(ResourceLocation arrayResource)
{
super(arrayResource);
}
@Override
public float getRotation(float craftTime)
{
return 0;
}
public float getSecondaryRotation(float craftTime)
{
float offset = 2;
float duration = 180;
if (craftTime >= offset && craftTime < offset + duration)
{
float modifier = (craftTime - offset) * 2f;
return modifier * 1f;
}
return 0;
}
}

84
src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/SingleAlchemyCircleRenderer.java Normal file
View file

@ -0,0 +1,84 @@
package wayoftime.bloodmagic.client.render.alchemyarray;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.vector.Quaternion;
import wayoftime.bloodmagic.client.render.BloodMagicRenderer;
import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D;
import wayoftime.bloodmagic.client.render.RenderResizableQuadrilateral;
import wayoftime.bloodmagic.tile.TileAlchemyArray;
public class SingleAlchemyCircleRenderer extends AlchemyArrayRenderer
{
public SingleAlchemyCircleRenderer(ResourceLocation arrayResource)
{
super(arrayResource);
}
@Override
public float getRotation(float craftTime)
{
float offset = 2;
if (craftTime >= offset)
{
float modifier = (craftTime - offset) * 2f;
return modifier * 1f;
}
return 0;
}
public float getSecondaryRotation(float craftTime)
{
return 0;
}
public float getSizeModifier(float craftTime)
{
return 1.0f;
}
public void renderAt(TileAlchemyArray tileArray, double x, double y, double z, float craftTime, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn)
{
matrixStack.push();
matrixStack.translate(0.5, 0.5, 0.5);
float rot = getRotation(craftTime);
float secondaryRot = getSecondaryRotation(craftTime);
float size = 1.0F * getSizeModifier(craftTime);
Direction rotation = tileArray.getRotation();
matrixStack.push();
matrixStack.translate(0, getVerticalOffset(craftTime), 0);
matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true));
matrixStack.push();
matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), rot, true));
matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), secondaryRot, true));
// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true));
IVertexBuilder twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(arrayResource));
Model2D arrayModel = new BloodMagicRenderer.Model2D();
arrayModel.minX = -0.5;
arrayModel.maxX = +0.5;
arrayModel.minY = -0.5;
arrayModel.maxY = +0.5;
arrayModel.resource = arrayResource;
matrixStack.scale(size, size, size);
RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0xFFFFFFFF, 0x00F000F0, OverlayTexture.NO_OVERLAY);
matrixStack.pop();
matrixStack.pop();
matrixStack.pop();
}
}

53
src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectDay.java Normal file
View file

@ -0,0 +1,53 @@
package wayoftime.bloodmagic.common.alchemyarray;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.world.server.ServerWorld;
import wayoftime.bloodmagic.tile.TileAlchemyArray;
public class AlchemyArrayEffectDay extends AlchemyArrayEffect
{
public AlchemyArrayEffectDay()
{
}
@Override
public boolean update(TileAlchemyArray tile, int ticksActive)
{
// TODO: Add recipe rechecking to verify nothing screwy is going on.
if (tile.getWorld().isRemote)
{
return false;
}
if (tile.getWorld() instanceof ServerWorld)
{
long time = (tile.getWorld().getGameTime() / 24000) * 24000;
for (ServerWorld serverworld : tile.getWorld().getServer().getWorlds())
{
serverworld.func_241114_a_((long) time);
}
return true;
}
return false;
}
@Override
public void writeToNBT(CompoundNBT tag)
{
}
@Override
public void readFromNBT(CompoundNBT tag)
{
}
@Override
public AlchemyArrayEffect getNewCopy()
{
return new AlchemyArrayEffectDay();
}
}

53
src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectSpike.java Normal file
View file

@ -0,0 +1,53 @@
package wayoftime.bloodmagic.common.alchemyarray;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.DamageSource;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import wayoftime.bloodmagic.tile.TileAlchemyArray;
public class AlchemyArrayEffectSpike extends AlchemyArrayEffect
{
public AlchemyArrayEffectSpike()
{
super();
}
@Override
public boolean update(TileAlchemyArray tile, int ticksActive)
{
return false;
}
@Override
public void onEntityCollidedWithBlock(TileAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity)
{
if (entity instanceof LivingEntity)
{
entity.attackEntityFrom(DamageSource.CACTUS, 2);
}
}
@Override
public AlchemyArrayEffect getNewCopy()
{
return new AlchemyArrayEffectSpike();
}
@Override
public void readFromNBT(CompoundNBT compound)
{
// TODO Auto-generated method stub
}
@Override
public void writeToNBT(CompoundNBT compound)
{
// TODO Auto-generated method stub
}
}

63
src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectUpdraft.java Normal file
View file

@ -0,0 +1,63 @@
package wayoftime.bloodmagic.common.alchemyarray;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.World;
import wayoftime.bloodmagic.tile.TileAlchemyArray;
public class AlchemyArrayEffectUpdraft extends AlchemyArrayEffect
{
public AlchemyArrayEffectUpdraft()
{
super();
}
@Override
public boolean update(TileAlchemyArray tile, int ticksActive)
{
return false;
}
@Override
public void onEntityCollidedWithBlock(TileAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity)
{
double motionY = 1;
double motionYGlowstoneMod = 0.1;
double motionYFeatherMod = 0.05;
TileAlchemyArray tileArray = (TileAlchemyArray) array;
motionY += motionYGlowstoneMod * (tileArray.getStackInSlot(0).getCount() - 1); // Glowstone Dust
motionY += motionYFeatherMod * (tileArray.getStackInSlot(1).getCount() - 1); // Feathers
// entity.getMotion().y = motionY;
entity.fallDistance = 0;
entity.setMotion(new Vector3d(0, motionY, 0));
}
@Override
public AlchemyArrayEffect getNewCopy()
{
return new AlchemyArrayEffectUpdraft();
}
@Override
public void readFromNBT(CompoundNBT compound)
{
// TODO Auto-generated method stub
}
@Override
public void writeToNBT(CompoundNBT compound)
{
// TODO Auto-generated method stub
}
}

3
src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyArrayRecipeProvider.java
View file

@ -37,6 +37,9 @@ public class AlchemyArrayRecipeProvider implements ISubRecipeProvider
AlchemyArrayRecipeBuilder.array(AlchemyArrayRegistry.BINDING_ARRAY, Ingredient.fromItems(BloodMagicItems.REAGENT_BINDING.get()), Ingredient.fromItems(Items.IRON_BOOTS), new ItemStack(BloodMagicItems.LIVING_BOOTS.get())).build(consumer, BloodMagic.rl(basePath + "living_boots"));
AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/movementarray.png"), Ingredient.fromItems(Items.FEATHER), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "movement"));
AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/updraftarray.png"), Ingredient.fromItems(Items.FEATHER), Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "updraft"));
AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/spikearray.png"), Ingredient.fromItems(Items.COBBLESTONE), Ingredient.fromTag(Tags.Items.INGOTS_IRON), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "spike"));
AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/spikearray.png"), Ingredient.fromItems(Items.COAL), Ingredient.fromItems(Items.COAL), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "day"));
// AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/fastminersigil.png"),
// Ingredient.fromItems(BloodMagicItems.REAGENT_FAST_MINER.get()),
// Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new

6
src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java
View file

@ -12,7 +12,10 @@ import wayoftime.bloodmagic.BloodMagic;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffect;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectBinding;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectCrafting;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectDay;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectMovement;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectSpike;
import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectUpdraft;
import wayoftime.bloodmagic.impl.BloodMagicAPI;
import wayoftime.bloodmagic.recipe.RecipeAlchemyArray;
@ -33,6 +36,9 @@ public class AlchemyArrayRegistry
public static void registerBaseArrays()
{
registerEffect(BloodMagic.rl("array/movement"), new AlchemyArrayEffectMovement());
registerEffect(BloodMagic.rl("array/updraft"), new AlchemyArrayEffectUpdraft());
registerEffect(BloodMagic.rl("array/spike"), new AlchemyArrayEffectSpike());
registerEffect(BloodMagic.rl("array/day"), new AlchemyArrayEffectDay());
}
public static AlchemyArrayEffect getEffect(World world, ResourceLocation rl, RecipeAlchemyArray recipe)

2
src/main/java/wayoftime/bloodmagic/tile/TileAlchemyArray.java
View file

@ -118,7 +118,7 @@ public class TileAlchemyArray extends TileInventory implements ITickableTileEnti
} else
{
AlchemyArrayEffect effect = AlchemyArrayRegistry.getEffect(world, this.getStackInSlot(0), this.getStackInSlot(1));
System.out.println("Effect: " + effect);
// System.out.println("Effect: " + effect);
if (effect == null)
{
// key = effect.i