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

Changed texture for Ritual Range

Browse source 
Changed the placeholder texture to use the chiseled sandstone from vanilla, tinted red.
This commit is contained in:
WayofTime 2020-11-10 14:56:55 -05:00
parent 0e6c57076d
commit 4ada12dd5e
2 changed files with 16 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/wayoftime/bloodmagic/util/Utils.java
View file

@ -181,8 +181,8 @@ public class Utils
if (playSound) if (playSound)
{ {
initialWorld.playSound(initialPos.getX(), initialPos.getY(), initialPos.getZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); initialWorld.playSound(null, initialPos.getX(), initialPos.getY(), initialPos.getZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F);
finalWorld.playSound(finalPos.getX(), finalPos.getY(), finalPos.getZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); finalWorld.playSound(null, finalPos.getX(), finalPos.getY(), finalPos.getZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F);
} }
// Finally, we get to do something! (CLEARING TILES) // Finally, we get to do something! (CLEARING TILES)

84
src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java
View file

@ -70,6 +70,7 @@ public class ClientHandler
public static ResourceLocation ritualStoneAir = BloodMagic.rl("block/airritualstone");; public static ResourceLocation ritualStoneAir = BloodMagic.rl("block/airritualstone");;
public static ResourceLocation ritualStoneDawn = BloodMagic.rl("block/dawnritualstone");; public static ResourceLocation ritualStoneDawn = BloodMagic.rl("block/dawnritualstone");;
public static ResourceLocation ritualStoneDusk = BloodMagic.rl("block/duskritualstone");; public static ResourceLocation ritualStoneDusk = BloodMagic.rl("block/duskritualstone");;
public static ResourceLocation boarder = new ResourceLocation("block/chiseled_sandstone");
public static TextureAtlasSprite blankBloodRune; public static TextureAtlasSprite blankBloodRune;
public static TextureAtlasSprite stoneBrick; public static TextureAtlasSprite stoneBrick;
public static TextureAtlasSprite glowstone; public static TextureAtlasSprite glowstone;
@ -329,14 +330,10 @@ public class ClientHandler
Model3D model = getBlockModel(rl); Model3D model = getBlockModel(rl);
RenderResizableCuboid.INSTANCE.renderCube(model, stack, buffer, 0xDDFFFFFF, 0x00F000F0, OverlayTexture.NO_OVERLAY); RenderResizableCuboid.INSTANCE.renderCube(model, stack, buffer, 0xDDFFFFFF, 0x00F000F0, OverlayTexture.NO_OVERLAY);
// RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ);
} }
stack.pop(); stack.pop();
} }
// GlStateManager.popMatrix();
} }
public static void renderRangeHologram(MatrixStack stack, IRenderTypeBuffer renderer, TileMasterRitualStone masterRitualStone, float partialTicks) public static void renderRangeHologram(MatrixStack stack, IRenderTypeBuffer renderer, TileMasterRitualStone masterRitualStone, float partialTicks)
@ -354,7 +351,6 @@ public class ClientHandler
EnumRitualReaderState state = ((ItemRitualReader) itemStack.getItem()).getState(itemStack); EnumRitualReaderState state = ((ItemRitualReader) itemStack.getItem()).getState(itemStack);
if (state == EnumRitualReaderState.SET_AREA) if (state == EnumRitualReaderState.SET_AREA)
{ {
Ritual ritual = masterRitualStone.getCurrentRitual();
String range = ((ItemRitualReader) itemStack.getItem()).getCurrentBlockRange(itemStack); String range = ((ItemRitualReader) itemStack.getItem()).getCurrentBlockRange(itemStack);
AreaDescriptor descriptor = masterRitualStone.getBlockRange(range); AreaDescriptor descriptor = masterRitualStone.getBlockRange(range);
if (descriptor == null) if (descriptor == null)
@ -363,80 +359,28 @@ public class ClientHandler
} }
stack.push(); stack.push();
BlockPos vec3, vX; BlockPos vec3;
vec3 = masterRitualStone.getPos(); vec3 = masterRitualStone.getPos();
AxisAlignedBB aabb = descriptor.getAABB(vec3); AxisAlignedBB aabb = descriptor.getAABB(vec3);
double sizeOffset = -1d / 16d;
if (aabb.contains(eyePos))
{
sizeOffset *= -1;
}
double minX = aabb.minX - eyePos.x; double minX = aabb.minX - eyePos.x + sizeOffset;
double minY = aabb.minY - eyePos.y; double minY = aabb.minY - eyePos.y + sizeOffset;
double minZ = aabb.minZ - eyePos.z; double minZ = aabb.minZ - eyePos.z + sizeOffset;
stack.translate(minX, minY, minZ); stack.translate(minX, minY, minZ);
ResourceLocation rl = ritualStoneFire; ResourceLocation rl = boarder;
Model3D model = getBlockModelWithSize(rl, aabb.getXSize(), aabb.getYSize(), aabb.getZSize()); Model3D model = getBlockModelWithSize(rl, aabb.getXSize() - 2 * sizeOffset, aabb.getYSize() - 2
RenderResizableCuboid.INSTANCE.renderCube(model, stack, buffer, 0xDDFFFFFF, 0x00F000F0, OverlayTexture.NO_OVERLAY); * sizeOffset, aabb.getZSize() - 2 * sizeOffset);
RenderResizableCuboid.INSTANCE.renderCube(model, stack, buffer, 0x99FF4444, 0x00F000F0, OverlayTexture.NO_OVERLAY);
stack.pop(); stack.pop();
} }
} }
// if (ritual == null)
// {
// return;
// }
//
// BlockPos vec3, vX;
// vec3 = masterRitualStone.getPos();
//
// List<RitualComponent> components = Lists.newArrayList();
// ritual.gatherComponents(components::add);
// for (RitualComponent ritualComponent : components)
// {
// stack.push();
// vX = vec3.add(ritualComponent.getOffset(direction));
//
// double minX = vX.getX() - eyePos.x;
// double minY = vX.getY() - eyePos.y;
// double minZ = vX.getZ() - eyePos.z;
//
// stack.translate(minX, minY, minZ);
//
// if (!world.getBlockState(vX).isOpaqueCube(world, vX))
// {
// ResourceLocation rl = null;
//
// switch (ritualComponent.getRuneType())
// {
// case BLANK:
// rl = ritualStoneBlank;
// break;
// case WATER:
// rl = ritualStoneWater;
// break;
// case FIRE:
// rl = ritualStoneFire;
// break;
// case EARTH:
// rl = ritualStoneEarth;
// break;
// case AIR:
// rl = ritualStoneAir;
// break;
// case DAWN:
// rl = ritualStoneDawn;
// break;
// case DUSK:
// rl = ritualStoneDusk;
// break;
// }
//
//// RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ);
// }
//
// stack.pop();
// }
// GlStateManager.popMatrix();
} }
private static Model3D getBlockModel(ResourceLocation rl) private static Model3D getBlockModel(ResourceLocation rl)